Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2023-11-28 de747065f733ba1edb0345be57412604661cca0d

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

 pipIrr-platform/pipIrr-common/pom.xml

@@ -56,6 +56,12 @@
        <dependency>
            <groupId>com.fasterxml.jackson.dataformat</groupId>
            <artifactId>jackson-dataformat-yaml</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>*</groupId>
                    <artifactId>*</artifactId>
                </exclusion>
            </exclusions>
        </dependency>

        <!-- api在线文档  https://springdoc.org/#modules-->

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/fastjson/FastJsonConfig.java

@@ -6,14 +6,17 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter;
//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;

/**
 * 必须实现WebMvcConfigurer否则不启作用，即Controller转json时不用fastjson
 */
@Configuration
public class FastJsonConfig  {
public class FastJsonConfig implements WebMvcConfigurer {
    /**
     * 配置fastjson输出格式
     **/
@@ -29,12 +32,12 @@
                JSONWriter.Feature.WriteMapNullValue,
                //输出null的boolean 为 false
                JSONWriter.Feature.WriteNullBooleanAsFalse,
                //把Long型输出为String
                //把Long型输出为String，在pojo的属性中个性设置
                //JSONWriter.Feature.WriteLongAsString,
                //输出null的list 为 []
                JSONWriter.Feature.WriteNullListAsEmpty,
                //输出null的number 为 0
                JSONWriter.Feature.WriteNullNumberAsZero,
                //JSONWriter.Feature.WriteNullNumberAsZero,
                //输出null字符串 为 ""
                JSONWriter.Feature.WriteNullStringAsEmpty,
                //对map进行排序

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/envm/Deleted.java

@@ -16,6 +16,14 @@
        this.name = name ;
    }

    /**
     * 实际上转json，见Pojo的对应属性
     * @return json
     */
//    public String toString(){
//        return "{\"code\":" + this.code + "," + "\"name\":" + this.name + "}" ;
//    }

    @Override
    public Byte getCode() {
        return this.code ;

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/envm/Disabled.java

@@ -16,6 +16,14 @@
        this.name = name ;
    }

    /**
     * 实际上转json，见Pojo的对应属性
     * @return json
     */
    //public String toString(){
    //    return "{\"code\":" + this.code + "," + "\"name\":" + this.name + "}" ;
    //}

    @Override
    public Byte getCode() {
        return this.code ;

 pipIrr-platform/pipIrr-mw/pom.xml

@@ -76,9 +76,8 @@
            <artifactId>jackson-dataformat-yaml</artifactId>
            <exclusions>
                <exclusion>
                    <!-- 排除掉依赖 -->
                    <groupId>com.fasterxml.jackson.core</groupId>
                    <artifactId>jackson-databind</artifactId>
                    <groupId>*</groupId>
                    <artifactId>*</artifactId>
                </exclusion>
            </exclusions>
        </dependency>

 pipIrr-platform/pipIrr-web/pipIrr-web.iml

@@ -22,6 +22,7 @@
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:3.1.3" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:3.1.3" level="project" />
    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:2.1.1" level="project" />
    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.33" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:3.1.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:10.1.12" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:10.1.12" level="project" />
@@ -51,6 +52,9 @@
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:3.1.3" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:3.1.3" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:3.1.3" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.15.2" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.15.2" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.15.2" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2" level="project" />
    <orderEntry type="library" name="Maven: io.micrometer:micrometer-observation:1.11.2" level="project" />
    <orderEntry type="library" name="Maven: io.micrometer:micrometer-commons:1.11.2" level="project" />

 pipIrr-platform/pipIrr-web/pom.xml

@@ -80,6 +80,12 @@
        <dependency>
            <groupId>com.fasterxml.jackson.dataformat</groupId>
            <artifactId>jackson-dataformat-yaml</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>*</groupId>
                    <artifactId>*</artifactId>
                </exclusion>
            </exclusions>
        </dependency>

        <!-- 系统监管 -->