diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index 91f1ea9..ffaea82 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -14,6 +14,7 @@ import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; @@ -33,6 +34,7 @@ @RequestMapping("/meter/standard") public class MeterStandardEquipmentController extends ExportController { + @Autowired private IMeterStandardEquipmentService meterStandardEquipmentService; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index 91f1ea9..ffaea82 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -14,6 +14,7 @@ import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; @@ -33,6 +34,7 @@ @RequestMapping("/meter/standard") public class MeterStandardEquipmentController extends ExportController { + @Autowired private IMeterStandardEquipmentService meterStandardEquipmentService; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java new file mode 100644 index 0000000..668a2bd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterStandardEquipmentFile; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cuicheng + * @since 2022-12-16 + */ +public interface MeterStandardEquipmentFileMapper extends BaseMapper { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index 91f1ea9..ffaea82 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -14,6 +14,7 @@ import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; @@ -33,6 +34,7 @@ @RequestMapping("/meter/standard") public class MeterStandardEquipmentController extends ExportController { + @Autowired private IMeterStandardEquipmentService meterStandardEquipmentService; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java new file mode 100644 index 0000000..668a2bd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterStandardEquipmentFile; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cuicheng + * @since 2022-12-16 + */ +public interface MeterStandardEquipmentFileMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentFileMapper.xml new file mode 100644 index 0000000..0a9f7a9 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentFileMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + id, standard_id, file_name, minio_file_name, file_type, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index 91f1ea9..ffaea82 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -14,6 +14,7 @@ import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; @@ -33,6 +34,7 @@ @RequestMapping("/meter/standard") public class MeterStandardEquipmentController extends ExportController { + @Autowired private IMeterStandardEquipmentService meterStandardEquipmentService; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java new file mode 100644 index 0000000..668a2bd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterStandardEquipmentFile; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cuicheng + * @since 2022-12-16 + */ +public interface MeterStandardEquipmentFileMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentFileMapper.xml new file mode 100644 index 0000000..0a9f7a9 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentFileMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + id, standard_id, file_name, minio_file_name, file_type, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml index 9f6b047..02f56f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml @@ -4,7 +4,7 @@ - mse.id, standard_no, standard_name, project_no, construction_standard_project, organize_no, construction_standard_unit_name, standard_owner, contact_info, category, standard_level, transmit_range, total_investment, preparation_date, standard_laboratory, laboratory_owner, laboratory_owner_contact, manager_state, measure_major, assessment_unit, assess_date, uncertainty, mesure_range, standard_temperature, standard_humidity, version, remark, is_del, create_user, create_time, update_time + mse.* @@ -15,9 +15,9 @@ SELECT , su.name as standardOwnerName, mo.organize_name as standardLaboratoryName, mo.director as laboratoryOwnerName FROM meter_standard_equipment mse - LEFT JOIN sys_user su ON su.id = mse.use_person - LEFT JOIN meter_organize mo on mo.dept_id = mse.use_dept - WHERE 1=1 and is_del != 1 + LEFT JOIN sys_user su ON su.id = mse.standard_owner + LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory + WHERE 1=1 and mse.is_del != 1 and mse.id = #{request.id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java index 5ceac3f..dd92764 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java @@ -33,13 +33,13 @@ * 类别-字典code */ @ApiModelProperty(value = "类别", dataType = "String") - @DictCodeField(message = "类别", cacheName = MeterDictCode.STANDARD_CATEGORY) + @DictCodeField(message = "类别不合法", cacheName = MeterDictCode.STANDARD_CATEGORY) private Integer category; /** * 管理状态-字典code */ - @DictCodeField(message = "管理状态", cacheName = MeterDictCode.STANDARD_MANAGER_STATE) + @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE) @ApiModelProperty(value = "管理状态", dataType = "Integer") private Integer managerState; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index 91f1ea9..ffaea82 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -14,6 +14,7 @@ import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; @@ -33,6 +34,7 @@ @RequestMapping("/meter/standard") public class MeterStandardEquipmentController extends ExportController { + @Autowired private IMeterStandardEquipmentService meterStandardEquipmentService; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java new file mode 100644 index 0000000..668a2bd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterStandardEquipmentFile; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cuicheng + * @since 2022-12-16 + */ +public interface MeterStandardEquipmentFileMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentFileMapper.xml new file mode 100644 index 0000000..0a9f7a9 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentFileMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + id, standard_id, file_name, minio_file_name, file_type, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml index 9f6b047..02f56f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml @@ -4,7 +4,7 @@ - mse.id, standard_no, standard_name, project_no, construction_standard_project, organize_no, construction_standard_unit_name, standard_owner, contact_info, category, standard_level, transmit_range, total_investment, preparation_date, standard_laboratory, laboratory_owner, laboratory_owner_contact, manager_state, measure_major, assessment_unit, assess_date, uncertainty, mesure_range, standard_temperature, standard_humidity, version, remark, is_del, create_user, create_time, update_time + mse.* @@ -15,9 +15,9 @@ SELECT , su.name as standardOwnerName, mo.organize_name as standardLaboratoryName, mo.director as laboratoryOwnerName FROM meter_standard_equipment mse - LEFT JOIN sys_user su ON su.id = mse.use_person - LEFT JOIN meter_organize mo on mo.dept_id = mse.use_dept - WHERE 1=1 and is_del != 1 + LEFT JOIN sys_user su ON su.id = mse.standard_owner + LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory + WHERE 1=1 and mse.is_del != 1 and mse.id = #{request.id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java index 5ceac3f..dd92764 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java @@ -33,13 +33,13 @@ * 类别-字典code */ @ApiModelProperty(value = "类别", dataType = "String") - @DictCodeField(message = "类别", cacheName = MeterDictCode.STANDARD_CATEGORY) + @DictCodeField(message = "类别不合法", cacheName = MeterDictCode.STANDARD_CATEGORY) private Integer category; /** * 管理状态-字典code */ - @DictCodeField(message = "管理状态", cacheName = MeterDictCode.STANDARD_MANAGER_STATE) + @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE) @ApiModelProperty(value = "管理状态", dataType = "Integer") private Integer managerState; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java index 38860a4..a9e3bca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java @@ -10,8 +10,10 @@ import lombok.Setter; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigDecimal; +import java.util.List; /** *

@@ -38,7 +40,6 @@ /** * 标准代码 */ - @NotBlank(message = "标准代码不能为空") @TableField("standard_no") @ApiModelProperty(value = "标准代码", dataType = "String") private String standardNo; @@ -86,7 +87,7 @@ /** * 标准负责人 */ - @NotBlank(message = "标准负责人不能为空") + @NotNull(message = "标准负责人不能为空") @TableField("standard_owner") @ApiModelProperty(value = "标准负责人", dataType = "Long") private Long standardOwner; @@ -110,10 +111,10 @@ /** * 类别-字典code */ - @NotBlank(message = "类别不能为空") + @NotNull(message = "类别不能为空") @TableField("category") @ApiModelProperty(value = "类别", dataType = "String") - @DictCodeField(message = "类别", cacheName = MeterDictCode.STANDARD_CATEGORY) + @DictCodeField(message = "类别不合法", cacheName = MeterDictCode.STANDARD_CATEGORY) private Integer category; /** @@ -126,10 +127,10 @@ /** * 标准等级-字典code */ - @NotBlank(message = "标准等级不能为空") + @NotNull(message = "标准等级不能为空") @TableField("standard_level") @ApiModelProperty(value = "标准等级", dataType = "Integer") - @DictCodeField(message = "标准等级", cacheName = MeterDictCode.STANDARD_LEVEL) + @DictCodeField(message = "标准等级不合法", cacheName = MeterDictCode.STANDARD_LEVEL) private Integer standardLevel; /** @@ -142,10 +143,10 @@ /** * 传递范围-字典code */ - @NotBlank(message = "传递范围不能为空") + @NotNull(message = "传递范围不能为空") @TableField(exist = false) @ApiModelProperty(value = "传递范围", dataType = "Integer") - @DictCodeField(message = "传递范围", cacheName = MeterDictCode.STANDARD_TRANSMIT_RANGE) + @DictCodeField(message = "传递范围不合法", cacheName = MeterDictCode.STANDARD_TRANSMIT_RANGE) private Integer transmitRange; /** @@ -209,9 +210,9 @@ /** * 管理状态-字典code */ - @NotBlank(message = "管理状态不能为空") + @NotNull(message = "管理状态不能为空") @TableField("manager_state") - @DictCodeField(message = "管理状态", cacheName = MeterDictCode.STANDARD_MANAGER_STATE) + @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE) @ApiModelProperty(value = "管理状态", dataType = "Integer") private Integer managerState; @@ -225,10 +226,10 @@ /** * 计量专业-字典code */ - @NotBlank(message = "计量专业不能为空") + @NotNull(message = "计量专业不能为空") @TableField("measure_major") @ApiModelProperty(value = "计量专业", dataType = "Integer") - @DictCodeField(message = "计量专业", cacheName = MeterDictCode.MEASURE_MAJOR) + @DictCodeField(message = "计量专业不合法", cacheName = MeterDictCode.MEASURE_MAJOR) private Integer measureMajor; /** * 计量专业名称 @@ -272,7 +273,7 @@ /** * 标准温度 */ - @NotBlank(message = "标准温度不能为空") + @NotNull(message = "标准温度不能为空") @TableField("standard_temperature") @ApiModelProperty(value = "标准温度", dataType = "BigDecimal") private BigDecimal standardTemperature; @@ -280,7 +281,7 @@ /** * 标准湿度 */ - @NotBlank(message = "标准湿度不能为空") + @NotNull(message = "标准湿度不能为空") @TableField("standard_humidity") @ApiModelProperty(value = "标准湿度", dataType = "BigDecimal") private BigDecimal standardHumidity; @@ -327,4 +328,11 @@ @ApiModelProperty(value = "更新时间", dataType = "String") private String updateTime; + + /** + * 文件列表 + */ + @TableField(exist = false) + @ApiModelProperty(value = "文件列表", dataType = "List") + private List fileList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentFile.java new file mode 100644 index 0000000..17d0aac --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentFile.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author cuicheng + * @since 2022-12-16 + */ +@Getter +@Setter +@TableName("meter_standard_equipment_file") +public class MeterStandardEquipmentFile implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long", required = true) + private Long id; + + /** + * 标准装置id + */ + @TableField("standard_id") + @ApiModelProperty(value = "标准装置id", dataType = "Long", required = true) + private Long standardId; + + /** + * 文件名 + */ + @ApiModelProperty(value = "文件名", dataType = "String", required = true) + @TableField("file_name") + private String fileName; + + /** + * minio存储文件名 + */ + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String", required = true) + private String minioFileName; + + /** + * 文件类型-字典code + */ + @TableField("file_type") + @ApiModelProperty(value = "文件类型", dataType = "String", required = true) + private Integer fileType; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index 91f1ea9..ffaea82 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -14,6 +14,7 @@ import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; @@ -33,6 +34,7 @@ @RequestMapping("/meter/standard") public class MeterStandardEquipmentController extends ExportController { + @Autowired private IMeterStandardEquipmentService meterStandardEquipmentService; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java new file mode 100644 index 0000000..668a2bd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterStandardEquipmentFile; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cuicheng + * @since 2022-12-16 + */ +public interface MeterStandardEquipmentFileMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentFileMapper.xml new file mode 100644 index 0000000..0a9f7a9 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentFileMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + id, standard_id, file_name, minio_file_name, file_type, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml index 9f6b047..02f56f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml @@ -4,7 +4,7 @@ - mse.id, standard_no, standard_name, project_no, construction_standard_project, organize_no, construction_standard_unit_name, standard_owner, contact_info, category, standard_level, transmit_range, total_investment, preparation_date, standard_laboratory, laboratory_owner, laboratory_owner_contact, manager_state, measure_major, assessment_unit, assess_date, uncertainty, mesure_range, standard_temperature, standard_humidity, version, remark, is_del, create_user, create_time, update_time + mse.* @@ -15,9 +15,9 @@ SELECT , su.name as standardOwnerName, mo.organize_name as standardLaboratoryName, mo.director as laboratoryOwnerName FROM meter_standard_equipment mse - LEFT JOIN sys_user su ON su.id = mse.use_person - LEFT JOIN meter_organize mo on mo.dept_id = mse.use_dept - WHERE 1=1 and is_del != 1 + LEFT JOIN sys_user su ON su.id = mse.standard_owner + LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory + WHERE 1=1 and mse.is_del != 1 and mse.id = #{request.id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java index 5ceac3f..dd92764 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java @@ -33,13 +33,13 @@ * 类别-字典code */ @ApiModelProperty(value = "类别", dataType = "String") - @DictCodeField(message = "类别", cacheName = MeterDictCode.STANDARD_CATEGORY) + @DictCodeField(message = "类别不合法", cacheName = MeterDictCode.STANDARD_CATEGORY) private Integer category; /** * 管理状态-字典code */ - @DictCodeField(message = "管理状态", cacheName = MeterDictCode.STANDARD_MANAGER_STATE) + @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE) @ApiModelProperty(value = "管理状态", dataType = "Integer") private Integer managerState; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java index 38860a4..a9e3bca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipment.java @@ -10,8 +10,10 @@ import lombok.Setter; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigDecimal; +import java.util.List; /** *

@@ -38,7 +40,6 @@ /** * 标准代码 */ - @NotBlank(message = "标准代码不能为空") @TableField("standard_no") @ApiModelProperty(value = "标准代码", dataType = "String") private String standardNo; @@ -86,7 +87,7 @@ /** * 标准负责人 */ - @NotBlank(message = "标准负责人不能为空") + @NotNull(message = "标准负责人不能为空") @TableField("standard_owner") @ApiModelProperty(value = "标准负责人", dataType = "Long") private Long standardOwner; @@ -110,10 +111,10 @@ /** * 类别-字典code */ - @NotBlank(message = "类别不能为空") + @NotNull(message = "类别不能为空") @TableField("category") @ApiModelProperty(value = "类别", dataType = "String") - @DictCodeField(message = "类别", cacheName = MeterDictCode.STANDARD_CATEGORY) + @DictCodeField(message = "类别不合法", cacheName = MeterDictCode.STANDARD_CATEGORY) private Integer category; /** @@ -126,10 +127,10 @@ /** * 标准等级-字典code */ - @NotBlank(message = "标准等级不能为空") + @NotNull(message = "标准等级不能为空") @TableField("standard_level") @ApiModelProperty(value = "标准等级", dataType = "Integer") - @DictCodeField(message = "标准等级", cacheName = MeterDictCode.STANDARD_LEVEL) + @DictCodeField(message = "标准等级不合法", cacheName = MeterDictCode.STANDARD_LEVEL) private Integer standardLevel; /** @@ -142,10 +143,10 @@ /** * 传递范围-字典code */ - @NotBlank(message = "传递范围不能为空") + @NotNull(message = "传递范围不能为空") @TableField(exist = false) @ApiModelProperty(value = "传递范围", dataType = "Integer") - @DictCodeField(message = "传递范围", cacheName = MeterDictCode.STANDARD_TRANSMIT_RANGE) + @DictCodeField(message = "传递范围不合法", cacheName = MeterDictCode.STANDARD_TRANSMIT_RANGE) private Integer transmitRange; /** @@ -209,9 +210,9 @@ /** * 管理状态-字典code */ - @NotBlank(message = "管理状态不能为空") + @NotNull(message = "管理状态不能为空") @TableField("manager_state") - @DictCodeField(message = "管理状态", cacheName = MeterDictCode.STANDARD_MANAGER_STATE) + @DictCodeField(message = "管理状态不合法", cacheName = MeterDictCode.STANDARD_MANAGER_STATE) @ApiModelProperty(value = "管理状态", dataType = "Integer") private Integer managerState; @@ -225,10 +226,10 @@ /** * 计量专业-字典code */ - @NotBlank(message = "计量专业不能为空") + @NotNull(message = "计量专业不能为空") @TableField("measure_major") @ApiModelProperty(value = "计量专业", dataType = "Integer") - @DictCodeField(message = "计量专业", cacheName = MeterDictCode.MEASURE_MAJOR) + @DictCodeField(message = "计量专业不合法", cacheName = MeterDictCode.MEASURE_MAJOR) private Integer measureMajor; /** * 计量专业名称 @@ -272,7 +273,7 @@ /** * 标准温度 */ - @NotBlank(message = "标准温度不能为空") + @NotNull(message = "标准温度不能为空") @TableField("standard_temperature") @ApiModelProperty(value = "标准温度", dataType = "BigDecimal") private BigDecimal standardTemperature; @@ -280,7 +281,7 @@ /** * 标准湿度 */ - @NotBlank(message = "标准湿度不能为空") + @NotNull(message = "标准湿度不能为空") @TableField("standard_humidity") @ApiModelProperty(value = "标准湿度", dataType = "BigDecimal") private BigDecimal standardHumidity; @@ -327,4 +328,11 @@ @ApiModelProperty(value = "更新时间", dataType = "String") private String updateTime; + + /** + * 文件列表 + */ + @TableField(exist = false) + @ApiModelProperty(value = "文件列表", dataType = "List") + private List fileList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentFile.java new file mode 100644 index 0000000..17d0aac --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStandardEquipmentFile.java @@ -0,0 +1,94 @@ +package com.casic.missiles.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author cuicheng + * @since 2022-12-16 + */ +@Getter +@Setter +@TableName("meter_standard_equipment_file") +public class MeterStandardEquipmentFile implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId("id") + @ApiModelProperty(value = "主键", dataType = "Long", required = true) + private Long id; + + /** + * 标准装置id + */ + @TableField("standard_id") + @ApiModelProperty(value = "标准装置id", dataType = "Long", required = true) + private Long standardId; + + /** + * 文件名 + */ + @ApiModelProperty(value = "文件名", dataType = "String", required = true) + @TableField("file_name") + private String fileName; + + /** + * minio存储文件名 + */ + @TableField("minio_file_name") + @ApiModelProperty(value = "minio存储文件名", dataType = "String", required = true) + private String minioFileName; + + /** + * 文件类型-字典code + */ + @TableField("file_type") + @ApiModelProperty(value = "文件类型", dataType = "String", required = true) + private Integer fileType; + + /** + * 备注 + */ + @TableField("remark") + @ApiModelProperty(value = "备注", dataType = "String", required = false) + private String remark; + + /** + * 删除标记 + */ + @TableField("is_del") + private Integer isDel; + + /** + * 创建人 + */ + @TableField("create_user") + private Long createUser; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentFileServiceImpl.java new file mode 100644 index 0000000..ecc22e1 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentFileServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.service.Impl.meter; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.meter.MeterStandardEquipmentFileMapper; +import com.casic.missiles.model.MeterStandardEquipmentFile; +import com.casic.missiles.service.meter.IMeterStandardEquipmentFileService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author cuicheng + * @since 2022-12-16 + */ +@Service +public class MeterStandardEquipmentFileServiceImpl extends ServiceImpl implements IMeterStandardEquipmentFileService { + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentServiceImpl.java index cc19c25..0e8b336 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardEquipmentServiceImpl.java @@ -7,10 +7,12 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.StandardEquipmentRequest; +import com.casic.missiles.mapper.meter.MeterStandardEquipmentFileMapper; import com.casic.missiles.mapper.meter.MeterStandardEquipmentMapper; -import com.casic.missiles.model.MeterFixedAssetFile; import com.casic.missiles.model.MeterStandardEquipment; +import com.casic.missiles.model.MeterStandardEquipmentFile; import com.casic.missiles.model.page.PageQuery; +import com.casic.missiles.service.meter.IMeterStandardEquipmentFileService; import com.casic.missiles.service.meter.IMeterStandardEquipmentService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; @@ -37,6 +39,12 @@ @Autowired(required = false) private MeterStandardEquipmentMapper meterStandardEquipmentMapper; + @Autowired(required = false) + private MeterStandardEquipmentFileMapper meterStandardEquipmentFileMapper; + + @Autowired + private IMeterStandardEquipmentFileService meterStandardEquipmentFileService; + @Override public Page listPage(Page page, StandardEquipmentRequest request) throws Exception { Page resultPage = meterStandardEquipmentMapper.listPage(page, request); @@ -126,9 +134,29 @@ if(!CollectionUtils.isEmpty(resultPage.getRecords())) { meterStandardEquipment = resultPage.getRecords().get(0); DictCodeUtils.convertDictCodeToName(meterStandardEquipment); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("asset_id", id); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("standard_id", id); + // 获取文件 + meterStandardEquipment.setFileList(meterStandardEquipmentFileMapper.selectList(wrapper)); } return meterStandardEquipment; } + + + /** + * + * @param meterStandardEquipment + */ + public void batchSaveFile(MeterStandardEquipment meterStandardEquipment) { + if (!CollectionUtils.isEmpty(meterStandardEquipment.getFileList())) { + // 删除老的文件，更新新的文件 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("standard_id", meterStandardEquipment.getId()); + meterStandardEquipmentFileMapper.delete(wrapper); + meterStandardEquipment.getFileList().stream().forEach(item -> { + item.setStandardId(meterStandardEquipment.getId()); + }); + meterStandardEquipmentFileService.saveBatch(meterStandardEquipment.getFileList()); + } + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java index 91f1ea9..ffaea82 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardEquipmentController.java @@ -14,6 +14,7 @@ import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; @@ -33,6 +34,7 @@ @RequestMapping("/meter/standard") public class MeterStandardEquipmentController extends ExportController { + @Autowired private IMeterStandardEquipmentService meterStandardEquipmentService; /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java new file mode 100644 index 0000000..668a2bd --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStandardEquipmentFileMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.meter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.MeterStandardEquipmentFile; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cuicheng + * @since 2022-12-16 + */ +public interface MeterStandardEquipmentFileMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentFileMapper.xml new file mode 100644 index 0000000..0a9f7a9 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentFileMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + id, standard_id, file_name, minio_file_name, file_type, remark, is_del, create_user, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml index 9f6b047..02f56f4 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml @@ -4,7 +4,7 @@ - mse.id, standard_no, standard_name, project_no, construction_standard_project, organize_no, construction_standard_unit_name, standard_owner, contact_info, category, standard_level, transmit_range, total_investment, preparation_date, standard_laboratory, laboratory_owner, laboratory_owner_contact, manager_state, measure_major, assessment_unit, assess_date, uncertainty, mesure_range, standard_temperature, standard_humidity, version, remark, is_del, create_user, create_time, update_time + mse.*