SZH
2022-08-11 1be9111d14605b208ae2bad2052d5fbeedf0811e
解决应急预案资源文件夹不能打包的问题,resource重命名为resources
已重命名23个文件
已修改3个文件
54 ■■■■■ 文件已修改
emergency/emergency-service/pom.xml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationFileInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationUserInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteUserInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanFileInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanUserInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanAreaInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanDepartmentInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanFileInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanLogInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInspectUserInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesMaintainUserInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyWorkApproveInfoMapper.xml 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/pom.xml
@@ -9,10 +9,13 @@
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>jar</packaging>
    <artifactId>emergency-service</artifactId>
    <properties>
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
    </properties>
    <dependencies>
        <dependency>
            <groupId>com.gkhy.safePlatfrom</groupId>
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationFileInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationUserInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteUserInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanFileInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanUserInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanAreaInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanDepartmentInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanFileInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanLogInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml
文件名从 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml 修改
@@ -23,7 +23,9 @@
        LEFT JOIN emergency_supplies b ON a.supplies_id = b.id
        WHERE
        a.del_flag = 0
        <if test="query.suppliesId != null  and query.suppliesId != ''">and a.supplies_id = #{query.suppliesId}</if>
        <if test="query.suppliesId != null  and query.suppliesId != ''">
          and a.supplies_id = #{query.suppliesId}
        </if>
    </select>
    <insert id="addEmergencySuppliesInspect" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInspectInfo"
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInspectUserInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesMaintainUserInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyWorkApproveInfoMapper.xml
pom.xml
@@ -257,6 +257,11 @@
    <build>
        <plugins>
            <!-- 修改打包插件
                修改打包方式jar为pom后
                默认打包方式为spring-boot-maven-plugin
                    等到后期打包的时候他会一直提示你,你引入的依赖不存在
             -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
@@ -266,6 +271,13 @@
                    <target>1.8</target>
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
                <configuration>
                    <skipTests>true</skipTests>    <!--默认关掉单元测试 -->
                </configuration>
            </plugin>
        </plugins>
    </build>
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
@@ -19,12 +19,14 @@
import org.springframework.stereotype.Repository;
import javax.sql.DataSource;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@Configuration
@MapperScan(basePackages = {"com.gkhy.safePlatform.emergency"},
        sqlSessionTemplateRef = "sqlTemplateEmergency",annotationClass =
        sqlSessionTemplateRef = "sqlSessionTemplateEmergency",annotationClass =
        Repository.class)
public class MyBatisConfigEmergency {
@@ -35,37 +37,26 @@
    @Autowired
    private MybatisPlusInterceptor mybatisPlusInterceptor;
    @Bean(name = "datasourceEmergency")
    @Bean(name = "dataSourceEmergency")
    @ConfigurationProperties(prefix = "spring.datasource.emergency")
    public DruidDataSource druidDataSourceA(){
    public DruidDataSource dataSourceDoublePrevent(){
        return DruidDataSourceBuilder.create().build();
    }
    @Bean(name = "sqlFactoryEmergency")
    public SqlSessionFactory sqlSessionFactory(@Qualifier("datasourceEmergency") DruidDataSource dataSource)
            throws Exception
    {
    @Bean(name = "sqlSessionFactoryEmergency")
    public SqlSessionFactory sqlSessionFactoryEmergency(@Qualifier("dataSourceEmergency") DruidDataSource dataSource) throws Exception {
        MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
        factoryBean.setDataSource(dataSource);
        factoryBean.setDataSource(dsEmergency);
        ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
        //-------------------
        Resource[] rs1 = resolver.getResources("classpath*:config/mapper/emergency/**/**Mapper.xml");
        ArrayList<Resource> resourceArrayList = new ArrayList<>(Arrays.asList(rs1));
        Resource[] resourceArray = new Resource[resourceArrayList.size()];
        resourceArrayList.toArray(resourceArray);
        factoryBean.setMapperLocations(resourceArray);
        //-------------------
        factoryBean.setMapperLocations(resolver.getResources("classpath*:config/mapper/emergency/**Mapper.xml"));
        //设置分页插件
        Interceptor[] plugins = {mybatisPlusInterceptor};
        factoryBean.setPlugins(plugins);
        return factoryBean.getObject();
    }
    @Bean(name = "sqlTemplateEmergency")
    public SqlSessionTemplate sqlSessionTemplate(@Qualifier("sqlFactoryEmergency") SqlSessionFactory sqlSessionFactory)
    {
    @Bean
    public SqlSessionTemplate sqlSessionTemplateEmergency(@Qualifier("sqlSessionFactoryEmergency") SqlSessionFactory sqlSessionFactory){
        return new SqlSessionTemplate(sqlSessionFactory);
    }
}