diff --git a/hbt-msds/hbt-msds-biz/src/main/java/com/hbt/security/knowledge/base/msds/dao/impl/MsdsDaoImpl.java b/hbt-msds/hbt-msds-biz/src/main/java/com/hbt/security/knowledge/base/msds/dao/impl/MsdsDaoImpl.java index 3e1b3e6..91d3e7f 100644 --- a/hbt-msds/hbt-msds-biz/src/main/java/com/hbt/security/knowledge/base/msds/dao/impl/MsdsDaoImpl.java +++ b/hbt-msds/hbt-msds-biz/src/main/java/com/hbt/security/knowledge/base/msds/dao/impl/MsdsDaoImpl.java @@ -8,6 +8,7 @@ import com.hbt.security.knowledge.base.msds.mapper.MsdsMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.util.List; @@ -37,7 +38,11 @@ public class MsdsDaoImpl implements MsdsDao { */ @Override public Msds selectMsdsByName(String name) { - return msdsMapper.selectMsdsByName(name); + List list = msdsMapper.selectMsdsByName(name); + if(CollectionUtils.isEmpty(list)) { + return new Msds(); + } + return list.get(0); } /** diff --git a/hbt-msds/hbt-msds-biz/src/main/java/com/hbt/security/knowledge/base/msds/mapper/MsdsMapper.java b/hbt-msds/hbt-msds-biz/src/main/java/com/hbt/security/knowledge/base/msds/mapper/MsdsMapper.java index 4a5e0c7..5eaa7b6 100644 --- a/hbt-msds/hbt-msds-biz/src/main/java/com/hbt/security/knowledge/base/msds/mapper/MsdsMapper.java +++ b/hbt-msds/hbt-msds-biz/src/main/java/com/hbt/security/knowledge/base/msds/mapper/MsdsMapper.java @@ -4,19 +4,18 @@ import java.util.List; import com.hbt.msds.api.domain.Msds; import com.hbt.msds.api.domain.MsdsMaterial; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; /** * 化学品安全信息Mapper接口 - * + * * @author hbt */ -public interface MsdsMapper +public interface MsdsMapper { /** * 查询化学品安全信息 - * + * * @param id 化学品安全信息主键 * @return 化学品安全信息 */ @@ -28,7 +27,7 @@ public interface MsdsMapper * @param name 化学品名称 * @return 化学品安全信息 */ - Msds selectMsdsByName(String name); + List selectMsdsByName(String name); /** * 查询化学品安全信息列表 @@ -41,7 +40,7 @@ public interface MsdsMapper /** * 新增化学品安全信息 - * + * * @param msds 化学品安全信息 * @return 结果 */ @@ -51,7 +50,7 @@ public interface MsdsMapper /** * 修改化学品安全信息 - * + * * @param msds 化学品安全信息 * @return 结果 */ @@ -59,7 +58,7 @@ public interface MsdsMapper /** * 删除化学品安全信息 - * + * * @param id 化学品安全信息主键 * @return 结果 */ @@ -67,7 +66,7 @@ public interface MsdsMapper /** * 通过化学品安全信息主键删除${subTable.functionName}信息 - * + * * @param id 化学品安全信息ID */ void deleteMsdsMaterialByMsds(@Param("id") int id); diff --git a/hbt-msds/hbt-msds-biz/src/main/resources/mapper/MsdsMapper.xml b/hbt-msds/hbt-msds-biz/src/main/resources/mapper/MsdsMapper.xml index 7af5085..f90390f 100644 --- a/hbt-msds/hbt-msds-biz/src/main/resources/mapper/MsdsMapper.xml +++ b/hbt-msds/hbt-msds-biz/src/main/resources/mapper/MsdsMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -192,25 +192,25 @@ - + insert into msds ( - chemical_cn, - other_chemical_cn, - chemical_en, - other_chemical_en, - cas, - type, - detonator_profession1, - detonator_profession1_concentration, - detonator_profession1_CAS_No, - detonator_profession2, - detonator_profession2_concentration, - detonator_profession2_CAS_No, - detonator_profession3, - detonator_profession3_concentration, - detonator_profession3_CAS_No, - detonator_profession4, - detonator_profession4_concentration, - detonator_profession4_CAS_No, - detonator_profession5, - detonator_profession5_concentration, - detonator_profession5_CAS_No, - hazard_category, - Invasion_route, - health_hazards, - environmental_hazards, - explosion_hazard, - skin_contact, - eye_contact, - inhalation, - ingestion, - hazard_characteristics, - hazardous_combustion_products, - fire_extinguishing_method, - fire_fighting, - emergency_actions, - operational_considerations, - storage_precautions, - MAC, - PC_TWA, - PC_STEL, - TLV_C, - TLV_TWA, - TLV_STEL, - monitoring_methods, - engineering_control, - respiratory_protection, - eye_protection, - physical_protection, - hand_protection, - other_protection, - appearance_and_shape, - ph_value, - melting_point, - boiling_point, - relative_density, - relative_vapor_density, - saturated_vapor_pressure, - heat_of_combustion, - critical, - critical_pressure, - octanol_water_partition_coefficient, - flash_point, - Ignition_temperature, - lower_explosion_limit, - upper_explosion_limit, - solubility, - main_uses, - stability, - forbidden_mixtures, - avoid_contact_conditions, - aggregation_hazards, - decomposition_products, - nature_of_waste, - disposal_methods, - deprecation_considerations, - dangerous_goods_number, - un_number, - packaging_category, - packaging_logo, - packaging_method, - shipping_precautions, - regulatory_information, - critical_value) + chemical_cn, + other_chemical_cn, + chemical_en, + other_chemical_en, + cas, + type, + detonator_profession1, + detonator_profession1_concentration, + detonator_profession1_CAS_No, + detonator_profession2, + detonator_profession2_concentration, + detonator_profession2_CAS_No, + detonator_profession3, + detonator_profession3_concentration, + detonator_profession3_CAS_No, + detonator_profession4, + detonator_profession4_concentration, + detonator_profession4_CAS_No, + detonator_profession5, + detonator_profession5_concentration, + detonator_profession5_CAS_No, + hazard_category, + Invasion_route, + health_hazards, + environmental_hazards, + explosion_hazard, + skin_contact, + eye_contact, + inhalation, + ingestion, + hazard_characteristics, + hazardous_combustion_products, + fire_extinguishing_method, + fire_fighting, + emergency_actions, + operational_considerations, + storage_precautions, + MAC, + PC_TWA, + PC_STEL, + TLV_C, + TLV_TWA, + TLV_STEL, + monitoring_methods, + engineering_control, + respiratory_protection, + eye_protection, + physical_protection, + hand_protection, + other_protection, + appearance_and_shape, + ph_value, + melting_point, + boiling_point, + relative_density, + relative_vapor_density, + saturated_vapor_pressure, + heat_of_combustion, + critical, + critical_pressure, + octanol_water_partition_coefficient, + flash_point, + Ignition_temperature, + lower_explosion_limit, + upper_explosion_limit, + solubility, + main_uses, + stability, + forbidden_mixtures, + avoid_contact_conditions, + aggregation_hazards, + decomposition_products, + nature_of_waste, + disposal_methods, + deprecation_considerations, + dangerous_goods_number, + un_number, + packaging_category, + packaging_logo, + packaging_method, + shipping_precautions, + regulatory_information, + critical_value) values ( - #{msds.chemicalCn}, - #{msds.otherChemicalCn}, + #{msds.chemicalCn}, + #{msds.otherChemicalCn}, #{msds.chemicalEn}, #{msds.otherChemicalEn}, #{msds.cas}, @@ -402,106 +402,106 @@ #{msds.regulatoryInformation}, #{msds.criticalValue} ) - - select LAST_INSERT_ID() - + + select LAST_INSERT_ID() + insert into msds_material ( - msds, - acute_toxicity, - rats_oral_LD, - rats_percutaneous_LD, - rats_subcutaneous_LD, - rats_venous_LD, - rats_intraperitoneal_LD, - mice_oral_LD, - mice_percutaneous_LD, - mice_venous_LD, - mice_intraperitoneal_LD, - guinea_pigs_oral_LD, - guinea_pigs_percutaneous_LD, - guinea_pigs_subcutaneous_LD, - guinea_pigs_venous_LD, - guinea_pigs_intraperitoneal_LD, - rabbit_oral_LD, - rabbit_percutaneous_LD, - rabbit_subcutaneous_LD, - rabbit_venous_LD, - rabbit_intraperitoneal_LD, - other_animal_LD, - LD, - LDL0, - TDL0, - rats_inhale_LC, - rats_inhale_LCL0, - mice_inhale_LC, - mice_inhale_LCL0, - mice_inhale_TDL0, - people_inhale_LCL0, - people_inhale_TDL0, - IDLH, - other_animal_LC_50, - other_animal_LC_100, - other_animal_LCL0, - other_animal_TCL0, - rabbit_percutaneous, - rabbit_meridians, - rats_percutaneous, - rats_meridians, - guinea_pigs_percutaneous, - guinea_pigs_meridians, - men_percutaneous, - men_meridians, - human_percutaneous, - human_meridians, - subacute_versus_chronic_toxicity, - sensitization, - mutagenicity, - teratogenicity, - carcinogenicity, - other, - absolute_lethal_amount_LD, - half_lethal_dose_LD, - half_lethal_concentration_LC, - half_of_the_effect_concentration_EC, - half_of_the_inhibitory_concentration_IC, - no_action_dose_NOEL, - half_of_the_resistance_to_limited_amount_TLm, - bod5, - soil_half_life_high, - soil_half_life_low, - air_half_life_high, - air_half_life_low, - surface_water_half_life_high, - surface_water_half_life_low, - groundwater_half_life_high, - groundwater_half_life_low, - aqueous_biodegradation_aerobic_high, - aqueous_biodegradation_aerobic_low, - aqueous_biodegradation_anaerobics_high, - aqueous_biodegradation_anaerobics_low, - aqueous_biodegradation_secondary_sedimentation_treatment_high, - aqueous_biodegradation_secondary_sedimentation_treatment_low, - aqueous_photolysis_half_life_high, - aqueous_photolysis_half_life_low, - photolysis_maximal_light_absorption_high, - photolysis_maximal_light_absorption_low, - photooxidation_half_life_in_water_high, - photooxidation_half_life_in_water_low, - photooxidative_half_life_in_air_high, - photooxidative_half_life_in_air_low, - reduction_half_life_high, - reduction_half_life_low, - primary_hydrolysis_half_life, - hydrolysis_in_air_high, - hydrolysis_in_air_low, - cod, - bioconcentration_or_bioaccumulation, - other_harmful_effects - ) + msds, + acute_toxicity, + rats_oral_LD, + rats_percutaneous_LD, + rats_subcutaneous_LD, + rats_venous_LD, + rats_intraperitoneal_LD, + mice_oral_LD, + mice_percutaneous_LD, + mice_venous_LD, + mice_intraperitoneal_LD, + guinea_pigs_oral_LD, + guinea_pigs_percutaneous_LD, + guinea_pigs_subcutaneous_LD, + guinea_pigs_venous_LD, + guinea_pigs_intraperitoneal_LD, + rabbit_oral_LD, + rabbit_percutaneous_LD, + rabbit_subcutaneous_LD, + rabbit_venous_LD, + rabbit_intraperitoneal_LD, + other_animal_LD, + LD, + LDL0, + TDL0, + rats_inhale_LC, + rats_inhale_LCL0, + mice_inhale_LC, + mice_inhale_LCL0, + mice_inhale_TDL0, + people_inhale_LCL0, + people_inhale_TDL0, + IDLH, + other_animal_LC_50, + other_animal_LC_100, + other_animal_LCL0, + other_animal_TCL0, + rabbit_percutaneous, + rabbit_meridians, + rats_percutaneous, + rats_meridians, + guinea_pigs_percutaneous, + guinea_pigs_meridians, + men_percutaneous, + men_meridians, + human_percutaneous, + human_meridians, + subacute_versus_chronic_toxicity, + sensitization, + mutagenicity, + teratogenicity, + carcinogenicity, + other, + absolute_lethal_amount_LD, + half_lethal_dose_LD, + half_lethal_concentration_LC, + half_of_the_effect_concentration_EC, + half_of_the_inhibitory_concentration_IC, + no_action_dose_NOEL, + half_of_the_resistance_to_limited_amount_TLm, + bod5, + soil_half_life_high, + soil_half_life_low, + air_half_life_high, + air_half_life_low, + surface_water_half_life_high, + surface_water_half_life_low, + groundwater_half_life_high, + groundwater_half_life_low, + aqueous_biodegradation_aerobic_high, + aqueous_biodegradation_aerobic_low, + aqueous_biodegradation_anaerobics_high, + aqueous_biodegradation_anaerobics_low, + aqueous_biodegradation_secondary_sedimentation_treatment_high, + aqueous_biodegradation_secondary_sedimentation_treatment_low, + aqueous_photolysis_half_life_high, + aqueous_photolysis_half_life_low, + photolysis_maximal_light_absorption_high, + photolysis_maximal_light_absorption_low, + photooxidation_half_life_in_water_high, + photooxidation_half_life_in_water_low, + photooxidative_half_life_in_air_high, + photooxidative_half_life_in_air_low, + reduction_half_life_high, + reduction_half_life_low, + primary_hydrolysis_half_life, + hydrolysis_in_air_high, + hydrolysis_in_air_low, + cod, + bioconcentration_or_bioaccumulation, + other_harmful_effects + ) values ( #{material.msds}, #{material.acute_toxicity}, @@ -792,7 +792,7 @@ insert into msds_material( id, msds, acute_toxicity, rats_oral_LD, rats_percutaneous_LD, rats_subcutaneous_LD, rats_venous_LD, rats_intraperitoneal_LD, mice_oral_LD, mice_percutaneous_LD, mice_venous_LD, mice_intraperitoneal_LD, guinea_pigs_oral_LD, guinea_pigs_percutaneous_LD, guinea_pigs_subcutaneous_LD, guinea_pigs_venous_LD, guinea_pigs_intraperitoneal_LD, rabbit_oral_LD, rabbit_percutaneous_LD, rabbit_subcutaneous_LD, rabbit_venous_LD, rabbit_intraperitoneal_LD, other_animal_LD, LD, LDL0, TDL0, rats_inhale_LC, rats_inhale_LCL0, mice_inhale_LC, mice_inhale_LCL0, mice_inhale_TDL0, people_inhale_LCL0, people_inhale_TDL0, IDLH, other_animal_LC_50, other_animal_LC_100, other_animal_LCL0, other_animal_TCL0, rabbit_percutaneous, rabbit_meridians, rats_percutaneous, rats_meridians, guinea_pigs_percutaneous, guinea_pigs_meridians, men_percutaneous, men_meridians, human_percutaneous, human_meridians, subacute_versus_chronic_toxicity, sensitization, mutagenicity, teratogenicity, carcinogenicity, other, absolute_lethal_amount_LD, half_lethal_dose_LD, half_lethal_concentration_LC, half_of_the_effect_concentration_EC, half_of_the_inhibitory_concentration_IC, no_action_dose_NOEL, half_of_the_resistance_to_limited_amount_TLm, bod5, soil_half_life_high, soil_half_life_low, air_half_life_high, air_half_life_low, surface_water_half_life_high, surface_water_half_life_low, groundwater_half_life_high, groundwater_half_life_low, aqueous_biodegradation_aerobic_high, aqueous_biodegradation_aerobic_low, aqueous_biodegradation_anaerobics_high, aqueous_biodegradation_anaerobics_low, aqueous_biodegradation_secondary_sedimentation_treatment_high, aqueous_biodegradation_secondary_sedimentation_treatment_low, aqueous_photolysis_half_life_high, aqueous_photolysis_half_life_low, photolysis_maximal_light_absorption_high, photolysis_maximal_light_absorption_low, photooxidation_half_life_in_water_high, photooxidation_half_life_in_water_low, photooxidative_half_life_in_air_high, photooxidative_half_life_in_air_low, reduction_half_life_high, reduction_half_life_low, primary_hydrolysis_half_life, hydrolysis_in_air_high, hydrolysis_in_air_low, cod, bioconcentration_or_bioaccumulation, other_harmful_effects) values - + ( #{item.id}, #{item.msds}, #{item.acuteToxicity}, #{item.ratsOralLd}, #{item.ratsPercutaneousLd}, #{item.ratsSubcutaneousLd}, #{item.ratsVenousLd}, #{item.ratsIntraperitonealLd}, #{item.miceOralLd}, #{item.micePercutaneousLd}, #{item.miceVenousLd}, #{item.miceIntraperitonealLd}, #{item.guineaPigsOralLd}, #{item.guineaPigsPercutaneousLd}, #{item.guineaPigsSubcutaneousLd}, #{item.guineaPigsVenousLd}, #{item.guineaPigsIntraperitonealLd}, #{item.rabbitOralLd}, #{item.rabbitPercutaneousLd}, #{item.rabbitSubcutaneousLd}, #{item.rabbitVenousLd}, #{item.rabbitIntraperitonealLd}, #{item.otherAnimalLd}, #{item.ld}, #{item.ldl0}, #{item.tdl0}, #{item.ratsInhaleLc}, #{item.ratsInhaleLcl0}, #{item.miceInhaleLc}, #{item.miceInhaleLcl0}, #{item.miceInhaleTdl0}, #{item.peopleInhaleLcl0}, #{item.peopleInhaleTdl0}, #{item.idlh}, #{item.otherAnimalLc50}, #{item.otherAnimalLc100}, #{item.otherAnimalLcl0}, #{item.otherAnimalTcl0}, #{item.rabbitPercutaneous}, #{item.rabbitMeridians}, #{item.ratsPercutaneous}, #{item.ratsMeridians}, #{item.guineaPigsPercutaneous}, #{item.guineaPigsMeridians}, #{item.menPercutaneous}, #{item.menMeridians}, #{item.humanPercutaneous}, #{item.humanMeridians}, #{item.subacuteVersusChronicToxicity}, #{item.sensitization}, #{item.mutagenicity}, #{item.teratogenicity}, #{item.carcinogenicity}, #{item.other}, #{item.absoluteLethalAmountLd}, #{item.halfLethalDoseLd}, #{item.halfLethalConcentrationLc}, #{item.halfOfTheEffectConcentrationEc}, #{item.halfOfTheInhibitoryConcentrationIc}, #{item.noActionDoseNoel}, #{item.halfOfTheResistanceToLimitedAmountTlm}, #{item.bod5}, #{item.soilHalfLifeHigh}, #{item.soilHalfLifeLow}, #{item.airHalfLifeHigh}, #{item.airHalfLifeLow}, #{item.surfaceWaterHalfLifeHigh}, #{item.surfaceWaterHalfLifeLow}, #{item.groundwaterHalfLifeHigh}, #{item.groundwaterHalfLifeLow}, #{item.aqueousBiodegradationAerobicHigh}, #{item.aqueousBiodegradationAerobicLow}, #{item.aqueousBiodegradationAnaerobicsHigh}, #{item.aqueousBiodegradationAnaerobicsLow}, #{item.aqueousBiodegradationSecondarySedimentationTreatmentHigh}, #{item.aqueousBiodegradationSecondarySedimentationTreatmentLow}, #{item.aqueousPhotolysisHalfLifeHigh}, #{item.aqueousPhotolysisHalfLifeLow}, #{item.photolysisMaximalLightAbsorptionHigh}, #{item.photolysisMaximalLightAbsorptionLow}, #{item.photooxidationHalfLifeInWaterHigh}, #{item.photooxidationHalfLifeInWaterLow}, #{item.photooxidativeHalfLifeInAirHigh}, #{item.photooxidativeHalfLifeInAirLow}, #{item.reductionHalfLifeHigh}, #{item.reductionHalfLifeLow}, #{item.primaryHydrolysisHalfLife}, #{item.hydrolysisInAirHigh}, #{item.hydrolysisInAirLow}, #{item.cod}, #{item.bioconcentrationOrBioaccumulation}, #{item.otherHarmfulEffects})