tzs-设备相关表创建

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/EquipmentAssociatedDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 配套设备/设施/部件
+ *
+ * @author system_generator
+ * @date 2021-11-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="EquipmentAssociatedDto", description="配套设备/设施/部件")
+public class EquipmentAssociatedDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "设备id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "型号")
+    private String model;
+
+    @ApiModelProperty(value = "规格")
+    private String specifications;
+
+    @ApiModelProperty(value = "编号")
+    private String code;
+
+    @ApiModelProperty(value = "数量")
+    private Integer amount;
+
+    @ApiModelProperty(value = "制造单位")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "制造日期")
+    private Date productionDate;
+
+    @ApiModelProperty(value = "部件/装置号")
+    private String partNumber;
+
+    @ApiModelProperty(value = "型式试验合格证号")
+    private String certificateNumber;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "鉴定机构名称")
+    private String appraisalAgencyName;
+
+    @ApiModelProperty(value = "设计文件鉴定日期")
+    private Date appraisalDate;
+
+    @ApiModelProperty(value = "鉴定报告书编号")
+    private String appraisalReportNumber;
+
+    @ApiModelProperty(value = "监检检验机构")
+    private String supervisoryInspectionAgency;
+
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String socialCreditCode;
+
+    @ApiModelProperty(value = "机构核准证编号")
+    private String approvalCertificateNumber;
+
+    @ApiModelProperty(value = "更新人id")
+    private Long recUserD;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/EquipmentDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 装备信息表
+ *
+ * @author system_generator
+ * @date 2021-11-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "EquipmentDto", description = "装备信息表")
+public class EquipmentDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "设备id")
+    private String equipId;
+
+    @ApiModelProperty(value = "设备编号")
+    private String code;
+
+    @ApiModelProperty(value = "设备名称")
+    private String name;
+
+    @ApiModelProperty(value = "设备类别id")
+    private Long categoryId;
+
+    @ApiModelProperty(value = "设备类别名称")
+    private String categoryName;
+
+    @ApiModelProperty(value = "设备种类id")
+    private Long typeId;
+
+    @ApiModelProperty(value = "设备种类名称")
+    private String typeName;
+
+    @ApiModelProperty(value = "设备品种id")
+    private Long varietyId;
+
+    @ApiModelProperty(value = "设备品种名称")
+    private String varietyName;
+
+    @ApiModelProperty(value = "设备品牌")
+    private String brand;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "单位内部编号")
+    private String innerCode;
+
+    @ApiModelProperty(value = "设计单位名称")
+    private String designUnitName;
+
+    @ApiModelProperty(value = "制造单位名称")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "设计使用年限")
+    private Integer designLife;
+
+    @ApiModelProperty(value = "出厂日期")
+    private Date factoryDate;
+
+    @ApiModelProperty(value = "产品编号（出厂编号）")
+    private String productCode;
+
+    @ApiModelProperty(value = "监督检验机构")
+    private Long supervisionAgency;
+
+    @ApiModelProperty(value = "检验报告编号")
+    private String inspectionReportCode;
+
+    @ApiModelProperty(value = "设备状态（未安装，已安装）")
+    private String status;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "附件")
+    @TableField(exist = false)
+    private Map<String, List<AttachmentDto>> attachments;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/EquipmentIndexDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 设备指标
+ *
+ * @author system_generator
+ * @date 2021-11-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="EquipmentIndexDto", description="设备指标")
+public class EquipmentIndexDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "设备id")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "指标值")
+    private String value;
+
+    @ApiModelProperty(value = "装备定义指标id")
+    private Long defIndexId;
+
+    @ApiModelProperty(value = "装备定义指标名称")
+    private String defIndexName;
+
+    @ApiModelProperty(value = "装备定义指标key")
+    private String defIndexKey;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/Equipment.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 装备信息表
+ *
+ * @author system_generator
+ * @date 2021-11-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tcb_equipment")
+public class Equipment extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备id
+     */
+	@TableField("equip_id")
+    private String equipId;
+
+    /**
+     * 设备编号
+     */
+	@TableField("code")
+    private String code;
+
+    /**
+     * 设备名称
+     */
+	@TableField("name")
+    private String name;
+
+    /**
+     * 设备类别id
+     */
+	@TableField("category_id")
+    private Long categoryId;
+
+    /**
+     * 设备类别名称
+     */
+	@TableField("category_name")
+    private String categoryName;
+
+    /**
+     * 设备种类id
+     */
+	@TableField("type_id")
+    private Long typeId;
+
+    /**
+     * 设备种类名称
+     */
+	@TableField("type_name")
+    private String typeName;
+
+    /**
+     * 设备品种id
+     */
+	@TableField("variety_id")
+    private Long varietyId;
+
+    /**
+     * 设备品种名称
+     */
+	@TableField("variety_name")
+    private String varietyName;
+
+    /**
+     * 设备品牌
+     */
+	@TableField("brand")
+    private String brand;
+
+    /**
+     * 规格型号
+     */
+	@TableField("model")
+    private String model;
+
+    /**
+     * 单位内部编号
+     */
+	@TableField("inner_code")
+    private String innerCode;
+
+    /**
+     * 设计单位名称
+     */
+	@TableField("design_unit_name")
+    private String designUnitName;
+
+    /**
+     * 制造单位名称
+     */
+	@TableField("manufacturer")
+    private String manufacturer;
+
+    /**
+     * 设计使用年限
+     */
+	@TableField("design_life")
+    private Integer designLife;
+
+    /**
+     * 出厂日期
+     */
+	@TableField("factory_date")
+    private Date factoryDate;
+
+    /**
+     * 产品编号（出厂编号）
+     */
+	@TableField("product_code")
+    private String productCode;
+
+    /**
+     * 监督检验机构
+     */
+	@TableField("supervision_agency")
+    private Long supervisionAgency;
+
+    /**
+     * 检验报告编号
+     */
+	@TableField("inspection_report_code")
+    private String inspectionReportCode;
+
+    /**
+     * 设备状态（未安装，已安装）
+     */
+	@TableField("status")
+    private String status;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/EquipmentAssociated.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 配套设备/设施/部件
+ *
+ * @author system_generator
+ * @date 2021-11-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tcb_equipment_associated")
+public class EquipmentAssociated extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备id
+     */
+	@TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 名称
+     */
+	@TableField("name")
+    private String name;
+
+    /**
+     * 型号
+     */
+	@TableField("model")
+    private String model;
+
+    /**
+     * 规格
+     */
+	@TableField("specifications")
+    private String specifications;
+
+    /**
+     * 编号
+     */
+	@TableField("code")
+    private String code;
+
+    /**
+     * 数量
+     */
+	@TableField("amount")
+    private Integer amount;
+
+    /**
+     * 制造单位
+     */
+	@TableField("manufacturer")
+    private String manufacturer;
+
+    /**
+     * 制造日期
+     */
+	@TableField("production_date")
+    private Date productionDate;
+
+    /**
+     * 部件/装置号
+     */
+	@TableField("part_number")
+    private String partNumber;
+
+    /**
+     * 型式试验合格证号
+     */
+	@TableField("certificate_number")
+    private String certificateNumber;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+    /**
+     * 鉴定机构名称
+     */
+	@TableField("appraisal_agency_name")
+    private String appraisalAgencyName;
+
+    /**
+     * 设计文件鉴定日期
+     */
+	@TableField("appraisal_date")
+    private Date appraisalDate;
+
+    /**
+     * 鉴定报告书编号
+     */
+	@TableField("appraisal_report_number")
+    private String appraisalReportNumber;
+
+    /**
+     * 监检检验机构
+     */
+	@TableField("supervisory_inspection_agency")
+    private String supervisoryInspectionAgency;
+
+    /**
+     * 统一社会信用代码
+     */
+	@TableField("social_credit_code")
+    private String socialCreditCode;
+
+    /**
+     * 机构核准证编号
+     */
+	@TableField("approval_certificate_number")
+    private String approvalCertificateNumber;
+
+    /**
+     * 更新人id
+     */
+	@TableField("rec_user_d")
+    private Long recUserD;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/EquipmentIndex.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 设备指标
+ *
+ * @author system_generator
+ * @date 2021-11-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tcb_equipment_index")
+public class EquipmentIndex extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备id
+     */
+	@TableField("equipment_id")
+    private Long equipmentId;
+
+    /**
+     * 设备名称
+     */
+	@TableField("equipment_name")
+    private String equipmentName;
+
+    /**
+     * 指标值
+     */
+	@TableField("value")
+    private String value;
+
+    /**
+     * 装备定义指标id
+     */
+	@TableField("def_index_id")
+    private Long defIndexId;
+
+    /**
+     * 装备定义指标名称
+     */
+	@TableField("def_index_name")
+    private String defIndexName;
+
+    /**
+     * 装备定义指标key
+     */
+	@TableField("def_index_key")
+    private String defIndexKey;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/EquipmentAssociatedMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentAssociated;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 配套设备/设施/部件 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-11-26
+ */
+public interface EquipmentAssociatedMapper extends BaseMapper<EquipmentAssociated> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/EquipmentIndexMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentIndex;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 设备指标 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-11-26
+ */
+public interface EquipmentIndexMapper extends BaseMapper<EquipmentIndex> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/EquipmentMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.Equipment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 装备信息表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-11-25
+ */
+public interface EquipmentMapper extends BaseMapper<Equipment> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/IEquipmentAssociatedService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 配套设备/设施/部件接口类
+ *
+ * @author system_generator
+ * @date 2021-11-26
+ */
+public interface IEquipmentAssociatedService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/IEquipmentIndexService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 设备指标接口类
+ *
+ * @author system_generator
+ * @date 2021-11-26
+ */
+public interface IEquipmentIndexService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/IEquipmentService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentDto;
+
+/**
+ * 装备信息表接口类
+ *
+ * @author system_generator
+ * @date 2021-11-25
+ */
+public interface IEquipmentService {
+
+    /**
+     * 创建新设备
+     *
+     * @param model
+     * @return
+     */
+    EquipmentDto createEquipment(EquipmentDto model);
+
+    /**
+     * 更新设备信息
+     *
+     * @param model
+     * @return
+     */
+    EquipmentDto updateEquipment(EquipmentDto model);
+
+    Boolean deleteById(Long sequenceNbr);
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/EquipmentAssociatedMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.flc.api.mapper.EquipmentAssociatedMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/EquipmentIndexMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.flc.api.mapper.EquipmentIndexMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/EquipmentMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.flc.api.mapper.EquipmentMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/EquipmentAssociatedController.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.EquipmentAssociatedServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentAssociatedDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 配套设备/设施/部件
+ *
+ * @author system_generator
+ * @date 2021-11-26
+ */
+@RestController
+@Api(tags = "配套设备/设施/部件Api")
+@RequestMapping(value = "/equipment-associated")
+public class EquipmentAssociatedController extends BaseController {
+
+    @Autowired
+    EquipmentAssociatedServiceImpl equipmentAssociatedServiceImpl;
+
+    /**
+     * 新增配套设备/设施/部件
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增配套设备/设施/部件", notes = "新增配套设备/设施/部件")
+	public ResponseModel<EquipmentAssociatedDto> save(@RequestBody EquipmentAssociatedDto model) {
+	    model = equipmentAssociatedServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新配套设备/设施/部件", notes = "根据sequenceNbr更新配套设备/设施/部件")
+	public ResponseModel<EquipmentAssociatedDto> updateBySequenceNbrEquipmentAssociated(@RequestBody EquipmentAssociatedDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(equipmentAssociatedServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除配套设备/设施/部件", notes = "根据sequenceNbr删除配套设备/设施/部件")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(equipmentAssociatedServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个配套设备/设施/部件",  notes = "根据sequenceNbr查询单个配套设备/设施/部件")
+	public ResponseModel<EquipmentAssociatedDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(equipmentAssociatedServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "配套设备/设施/部件分页查询",  notes = "配套设备/设施/部件分页查询")
+	public ResponseModel<Page<EquipmentAssociatedDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<EquipmentAssociatedDto> page = new Page<EquipmentAssociatedDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(equipmentAssociatedServiceImpl.queryForEquipmentAssociatedPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "配套设备/设施/部件列表全部数据查询",   notes = "配套设备/设施/部件列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<EquipmentAssociatedDto>> selectForList() {
+	    return ResponseHelper.buildResponse(equipmentAssociatedServiceImpl.queryForEquipmentAssociatedList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/EquipmentController.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentDto;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.EquipmentServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 装备信息表
+ *
+ * @author system_generator
+ * @date 2021-11-25
+ */
+@RestController
+@Api(tags = "装备信息表Api")
+@RequestMapping(value = "/equipment")
+public class EquipmentController extends BaseController {
+
+    @Autowired
+    EquipmentServiceImpl equipmentServiceImpl;
+
+    /**
+     * 新增装备信息表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增装备信息表", notes = "新增装备信息表")
+    public ResponseModel<EquipmentDto> save(@RequestBody EquipmentDto model) {
+        model = equipmentServiceImpl.createEquipment(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新装备信息表", notes = "根据sequenceNbr更新装备信息表")
+    public ResponseModel<EquipmentDto> updateBySequenceNbrEquipment(@RequestBody EquipmentDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+    	model.setSequenceNbr(sequenceNbr);
+        model = equipmentServiceImpl.updateEquipment(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除装备信息表", notes = "根据sequenceNbr删除装备信息表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(equipmentServiceImpl.deleteById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个装备信息表", notes = "根据sequenceNbr查询单个装备信息表")
+    public ResponseModel<EquipmentDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(equipmentServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "装备信息表分页查询", notes = "装备信息表分页查询")
+    public ResponseModel<Page<EquipmentDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size) {
+        Page<EquipmentDto> page = new Page<EquipmentDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(equipmentServiceImpl.queryForEquipmentPage(page));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "装备信息表列表全部数据查询", notes = "装备信息表列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<EquipmentDto>> selectForList() {
+        return ResponseHelper.buildResponse(equipmentServiceImpl.queryForEquipmentList());
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/EquipmentIndexController.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.EquipmentIndexServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentIndexDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 设备指标
+ *
+ * @author system_generator
+ * @date 2021-11-26
+ */
+@RestController
+@Api(tags = "设备指标Api")
+@RequestMapping(value = "/equipment-index")
+public class EquipmentIndexController extends BaseController {
+
+    @Autowired
+    EquipmentIndexServiceImpl equipmentIndexServiceImpl;
+
+    /**
+     * 新增设备指标
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增设备指标", notes = "新增设备指标")
+	public ResponseModel<EquipmentIndexDto> save(@RequestBody EquipmentIndexDto model) {
+	    model = equipmentIndexServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新设备指标", notes = "根据sequenceNbr更新设备指标")
+	public ResponseModel<EquipmentIndexDto> updateBySequenceNbrEquipmentIndex(@RequestBody EquipmentIndexDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(equipmentIndexServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除设备指标", notes = "根据sequenceNbr删除设备指标")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(equipmentIndexServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个设备指标",  notes = "根据sequenceNbr查询单个设备指标")
+	public ResponseModel<EquipmentIndexDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(equipmentIndexServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "设备指标分页查询",  notes = "设备指标分页查询")
+	public ResponseModel<Page<EquipmentIndexDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<EquipmentIndexDto> page = new Page<EquipmentIndexDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(equipmentIndexServiceImpl.queryForEquipmentIndexPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "设备指标列表全部数据查询",   notes = "设备指标列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<EquipmentIndexDto>> selectForList() {
+	    return ResponseHelper.buildResponse(equipmentIndexServiceImpl.queryForEquipmentIndexList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/EquipmentAssociatedServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentAssociated;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.EquipmentAssociatedMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.IEquipmentAssociatedService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentAssociatedDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 配套设备/设施/部件服务实现类
+ *
+ * @author system_generator
+ * @date 2021-11-26
+ */
+@Service
+public class EquipmentAssociatedServiceImpl extends BaseService<EquipmentAssociatedDto,EquipmentAssociated,EquipmentAssociatedMapper> implements IEquipmentAssociatedService {
+    /**
+     * 分页查询
+     */
+    public Page<EquipmentAssociatedDto> queryForEquipmentAssociatedPage(Page<EquipmentAssociatedDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<EquipmentAssociatedDto> queryForEquipmentAssociatedList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/EquipmentIndexServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentIndex;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.EquipmentIndexMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.IEquipmentIndexService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentIndexDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 设备指标服务实现类
+ *
+ * @author system_generator
+ * @date 2021-11-26
+ */
+@Service
+public class EquipmentIndexServiceImpl extends BaseService<EquipmentIndexDto,EquipmentIndex,EquipmentIndexMapper> implements IEquipmentIndexService {
+    /**
+     * 分页查询
+     */
+    public Page<EquipmentIndexDto> queryForEquipmentIndexPage(Page<EquipmentIndexDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<EquipmentIndexDto> queryForEquipmentIndexList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/EquipmentServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.Equipment;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.EquipmentMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.IEquipmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * 装备信息表服务实现类
+ *
+ * @author system_generator
+ * @date 2021-11-25
+ */
+@Service
+public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, EquipmentMapper> implements IEquipmentService {
+
+    @Autowired
+    SourceFileServiceImpl sourceFileService;
+
+    /**
+     * 分页查询
+     */
+    public Page<EquipmentDto> queryForEquipmentPage(Page<EquipmentDto> page) {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<EquipmentDto> queryForEquipmentList() {
+        return this.queryForList("", false);
+    }
+
+    @Override
+    public EquipmentDto createEquipment(EquipmentDto model) {
+        UUID uuid = UUID.randomUUID();
+        model.setEquipId(uuid.toString());
+        model = this.createWithModel(model);
+        saveSourceFile(model);
+        return model;
+    }
+
+    @Override
+    public EquipmentDto updateEquipment(EquipmentDto model) {
+        this.updateWithModel(model);
+        saveSourceFile(model);
+        Bean.copyExistPropertis(this.queryBySeq(model.getSequenceNbr()), model);
+        return model;
+    }
+
+    @Override
+    public Boolean deleteById(Long sequenceNbr) {
+        EquipmentDto equipmentDto = this.queryBySeq(sequenceNbr);
+        if (!ValidationUtil.isEmpty(equipmentDto)) {
+            equipmentDto.setIsDelete(true);
+            this.updateWithModel(equipmentDto);
+            return true;
+        }
+        return false;
+    }
+
+    // 保存附件信息
+    public void saveSourceFile(EquipmentDto model) {
+        if (model.getAttachments() != null) {
+            sourceFileService.saveAttachments(model.getSequenceNbr(), model.getAttachments());
+        }
+    }
+}
\ No newline at end of file

amos-boot-system-supervision/src/main/resources/db/changelog/mt-1.0.0.xml

@@ -294,4 +294,13 @@
             ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
         </sql>
     </changeSet>
+    <changeSet author="tb" id="20211125-1">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="p_check_report" columnName="id"/>
+        </preConditions>
+        <comment>modify p_check_report COLUMN id</comment>
+        <sql>
+            ALTER TABLE `p_check_report` MODIFY COLUMN `id` bigint(30) NOT NULL AUTO_INCREMENT COMMENT '主键';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file