feat(吉林演示): 松原

1.基础信息配置模块创建基础风机电站表及基础风机电站关联测风塔表,同时生成对应代码;
2.开发基础信息配置模块基础风机电站新增接口,完成接口冒烟测试并生成接口文档同时生成接口测试用例;
3.开发基础信息配置模块基础风机电站详情接口,完成接口冒烟测试并生成接口文档同时生成接口测试用例;
4.开发基础信息配置模块基础风机电站修改接口,完成接口冒烟测试并生成接口文档同时生成接口测试用例;
5.开发基础信息配置模块基础风机电站删除接口,完成接口冒烟测试并生成接口文档同时生成接口测试用例;
6.开发基础信息配置模块基础风机电站分页查询接口,完成接口冒烟测试并生成接口文档同时生成接口测试用例;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C00-common/pps-common/src/main/java/pps/core/common/utils/BaseUtils.java

@@ -68,6 +68,7 @@ public class BaseUtils {
             model.setCreateById(userId);
             model.setCreateByName(userName);
             model.setCreateTime(now);
+            model.setIsDeleted(BusinessConstant.ONE);
         }
         model.setModifyById(userId);
         model.setModifyByName(userName);

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BaseWindTowerEnt.java

+package pps.core.base.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import pps.core.common.entity.BaseModel;
+import xstartup.annotation.XText;
+
+import java.io.Serializable;
+
+/**
+ * 风电站关联测风塔
+ *
+ * @author ZWT
+ * @date 2024/08/28
+ */
+@Data
+@TableName("base_wind_tower")
+public class BaseWindTowerEnt extends BaseModel implements Serializable {
+
+    @XText("风机电站ID")
+    @TableField
+    private String stationId;
+
+    @XText("测风塔ID")
+    @TableField
+    private String towerId;
+
+    @XText("测风塔名称")
+    @TableField
+    private String towerName;
+}
\ No newline at end of file

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BaseWindTowerView.java

+package pps.core.base.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import pps.core.common.entity.BaseModel;
+import xstartup.annotation.XText;
+
+import java.io.Serializable;
+
+/**
+ * 风电站关联测风塔
+ *
+ * @author ZWT
+ * @date 2024/08/28
+ */
+@Data
+public class BaseWindTowerView extends BaseModel implements Serializable {
+
+    @XText("风机电站ID")
+    @TableField
+    private String stationId;
+
+    @XText("测风塔ID")
+    @TableField
+    private String towerId;
+
+    @XText("测风塔名称")
+    @TableField
+    private String towerName;
+}

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BaseWindTurbineEnt.java

+package pps.core.base.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import pps.core.common.entity.BaseModel;
+import xstartup.annotation.XText;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 风机电站表
+ *
+ * @author ZWT
+ * @date 2024/08/28
+ */
+@Data
+@TableName("base_wind_turbine")
+public class BaseWindTurbineEnt extends BaseModel implements Serializable {
+
+    @XText("组织机构ID")
+    @TableField
+    private String ouId;
+
+    @XText("组织机构名称")
+    @TableField
+    private String ouName;
+
+    @XText("风机电站名称")
+    @TableField
+    private String stationName;
+
+    @XText("装机总量(KWP)")
+    @TableField
+    private BigDecimal totalPower;
+
+    @XText("风轮直径(m)")
+    @TableField
+    private BigDecimal diameter;
+
+    @XText("叶片长度(m)")
+    @TableField
+    private BigDecimal vaneLength;
+
+    @XText("轮毂高度(m)")
+    @TableField
+    private BigDecimal hubHeight;
+
+    @XText("经度(°)")
+    @TableField
+    private BigDecimal longitude;
+
+    @XText("纬度(°)")
+    @TableField
+    private BigDecimal latitude;
+
+    @XText("高程(m)")
+    @TableField
+    private BigDecimal elevation;
+
+    @XText("地区编码")
+    @TableField
+    private Integer areaCode;
+}

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BaseWindTurbineView.java

+package pps.core.base.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import pps.core.common.entity.BaseModel;
+import xstartup.annotation.XText;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 风机电站表
+ *
+ * @author ZWT
+ * @date 2024/08/28
+ */
+@Data
+public class BaseWindTurbineView extends BaseModel implements Serializable {
+
+    @XText("组织机构ID")
+    @TableField
+    private String ouId;
+
+    @XText("组织机构名称")
+    @TableField
+    private String ouName;
+
+    @XText("风机电站名称")
+    @TableField
+    private String stationName;
+
+    @XText("装机总量(KWP)")
+    @TableField
+    private BigDecimal totalPower;
+
+    @XText("风轮直径(m)")
+    @TableField
+    private BigDecimal diameter;
+
+    @XText("叶片长度(m)")
+    @TableField
+    private BigDecimal vaneLength;
+
+    @XText("轮毂高度(m)")
+    @TableField
+    private BigDecimal hubHeight;
+
+    @XText("经度(°)")
+    @TableField
+    private BigDecimal longitude;
+
+    @XText("纬度(°)")
+    @TableField
+    private BigDecimal latitude;
+
+    @XText("高程(m)")
+    @TableField
+    private BigDecimal elevation;
+
+    @XText("地区编码")
+    @TableField
+    private Integer areaCode;
+
+    /**
+     * 组织ID集合
+     */
+    @XText("组织ID集合")
+    @TableField(exist = false)
+    private List<String> ouList;
+}

C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BaseWindTowerMapper.java

+package pps.core.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+import pps.core.base.entity.BaseWindTowerEnt;
+
+/**
+ * 风电站关联测风塔
+ *
+ * @author ZWT
+ * @date 2024/08/28
+ */
+@Repository(value = "pps.core.base.mapper.BaseWindTowerMapper")
+public interface BaseWindTowerMapper extends BaseMapper<BaseWindTowerEnt> {
+
+}

C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BaseWindTowerViewMapper.java

+package pps.core.base.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import pps.core.base.entity.BaseWindTowerView;
+
+import java.util.List;
+
+/**
+ * 风电站关联测风塔
+ *
+ * @author ZWT
+ * @date 2024/08/28
+ */
+@Repository(value = "pps.core.base.mapper.BaseWindTowerViewMapper")
+public interface BaseWindTowerViewMapper {
+
+    BaseWindTowerView selectOne(BaseWindTowerView record);
+
+    List<BaseWindTowerView> selectList(BaseWindTowerView record);
+
+    /**
+     * 批量插入
+     *
+     * @param list 列表
+     * @return int
+     */
+    int batchInsert(@Param(value = "list") List<BaseWindTowerView> list);
+}

C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BaseWindTurbineMapper.java

+package pps.core.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+import pps.core.base.entity.BaseWindTurbineEnt;
+
+/**
+ * 基础风机电站
+ *
+ * @author ZWT
+ * @date 2024/08/28
+ */
+@Repository(value = "pps.core.base.mapper.BaseWindTurbineMapper")
+public interface BaseWindTurbineMapper extends BaseMapper<BaseWindTurbineEnt> {
+}

C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BaseWindTurbineViewMapper.java

+package pps.core.base.mapper;
+
+import org.springframework.stereotype.Repository;
+import pps.core.base.entity.BaseWindTurbineView;
+
+import java.util.List;
+
+/**
+ * 基础风机电站
+ *
+ * @author ZWT
+ * @date 2024/08/28
+ */
+@Repository(value = "pps.core.base.mapper.BaseWindTurbineViewMapper")
+public interface BaseWindTurbineViewMapper {
+    BaseWindTurbineView selectOne(BaseWindTurbineView record);
+
+    List<BaseWindTurbineView> selectList(BaseWindTurbineView record);
+}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wind_tower/BaseWindTowerInput.java

+package pps.core.base.service.data.base_wind_tower;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+
+/**
+ * 风电站关联测风塔
+ *
+ * @author ZWT
+ * @date 2024/08/28
+ */
+@Data
+public class BaseWindTowerInput {
+
+    @XText("测风塔ID")
+    private String towerId;
+
+    @XText("测风塔名称")
+    private String towerName;
+}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wind_turbine/CreateBaseWindTurbineInput.java

+package pps.core.base.service.data.base_wind_turbine;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import pps.core.base.service.data.base_wind_tower.BaseWindTowerInput;
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 基础风机电站
+ *
+ * @author ZWT
+ * @date 2024/08/28
+ */
+@Data
+public class CreateBaseWindTurbineInput {
+
+    @XText("组织机构ID")
+    @NotBlank(message = "缺少组织机构ID")
+    private String ouId;
+
+    @XText("组织机构名称")
+    @NotBlank(message = "缺少组织机构名称")
+    private String ouName;
+
+    @XText("风机电站名称")
+    @NotBlank(message = "缺少电站名称")
+    private String stationName;
+
+    @XText("装机总量(KWP)")
+    private BigDecimal totalPower;
+
+    @XText("风轮直径(m)")
+    private BigDecimal diameter;
+
+    @XText("叶片长度(m)")
+    private BigDecimal vaneLength;
+
+    @XText("轮毂高度(m)")
+    private BigDecimal hubHeight;
+
+    @XText("经度(°)")
+    private BigDecimal longitude;
+
+    @XText("纬度(°)")
+    private BigDecimal latitude;
+
+    @XText("高程(m)")
+    private BigDecimal elevation;
+
+    @XText("地区编码")
+    private Integer areaCode;
+
+    @XText("风电站关联测风塔列表")
+    private List<BaseWindTowerInput> windTowerList;
+}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wind_turbine/GetBaseWindTurbineInput.java

+package pps.core.base.service.data.base_wind_turbine;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import xstartup.annotation.XText;
+
+/**
+ * 基础风机电站
+ *
+ * @author ZWT
+ * @date 2024/08/28
+ */
+@Data
+public class GetBaseWindTurbineInput {
+
+    @XText("ID")
+    @NotBlank(message = "缺少风机电站ID")
+    private String id;
+}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wind_turbine/GetBaseWindTurbineOutput.java

+package pps.core.base.service.data.base_wind_turbine;
+
+import lombok.Data;
+import pps.core.base.service.data.base_wind_tower.BaseWindTowerInput;
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 基础风机电站
+ *
+ * @author ZWT
+ * @date 2024/08/28
+ */
+@Data
+public class GetBaseWindTurbineOutput {
+    @XText("风机电站ID")
+    private String id;
+
+    @XText("组织机构ID")
+    private String ouId;
+
+    @XText("组织机构名称")
+    private String ouName;
+
+    @XText("风机电站名称")
+    private String stationName;
+
+    @XText("装机总量(KWP)")
+    private BigDecimal totalPower;
+
+    @XText("风轮直径(m)")
+    private BigDecimal diameter;
+
+    @XText("叶片长度(m)")
+    private BigDecimal vaneLength;
+
+    @XText("轮毂高度(m)")
+    private BigDecimal hubHeight;
+
+    @XText("经度(°)")
+    private BigDecimal longitude;
+
+    @XText("纬度(°)")
+    private BigDecimal latitude;
+
+    @XText("高程(m)")
+    private BigDecimal elevation;
+
+    @XText("地区编码")
+    private Integer areaCode;
+
+    @XText("风电站关联测风塔列表")
+    private List<BaseWindTowerInput> windTowerList;
+}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wind_turbine/QueryBaseWindTurbineViewInput.java

+package pps.core.base.service.data.base_wind_turbine;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+/**
+ * 基础风机电站
+ *
+ * @author ZWT
+ * @date 2024/08/28
+ */
+@Data
+public class QueryBaseWindTurbineViewInput extends XPageInput {
+
+    @XText("组织机构ID")
+    @NotBlank(message = "缺少组织机构ID")
+    private String ouId;
+
+    @XText("风机电站名称")
+    private String stationName;
+}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wind_turbine/QueryBaseWindTurbineViewOutput.java

+package pps.core.base.service.data.base_wind_turbine;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+
+/**
+ * 基础风机电站
+ *
+ * @author ZWT
+ * @date 2024/08/28
+ */
+@Data
+public class QueryBaseWindTurbineViewOutput {
+
+    @XText("ID")
+    private String id;
+
+    @XText("组织机构名称")
+    private String ouName;
+
+    @XText("风机电站名称")
+    private String stationName;
+
+    @XText("装机总量(KWP)")
+    private BigDecimal totalPower;
+
+    @XText("风轮直径(m)")
+    private BigDecimal diameter;
+
+    @XText("叶片长度(m)")
+    private BigDecimal vaneLength;
+
+    @XText("轮毂高度(m)")
+    private BigDecimal hubHeight;
+
+    @XText("经度(°)")
+    private BigDecimal longitude;
+
+    @XText("纬度(°)")
+    private BigDecimal latitude;
+
+    @XText("高程(m)")
+    private BigDecimal elevation;
+
+    @XText("地区编码")
+    private Integer areaCode;
+}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wind_turbine/UpdateBaseWindTurbineInput.java

+package pps.core.base.service.data.base_wind_turbine;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import pps.core.base.service.data.base_wind_tower.BaseWindTowerInput;
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 基础风机电站
+ *
+ * @author ZWT
+ * @date 2024/08/28
+ */
+@Data
+public class UpdateBaseWindTurbineInput {
+
+    @XText("ID")
+    @NotBlank(message = "缺少风机电站ID")
+    private String id;
+
+    @XText("组织机构ID")
+    @NotBlank(message = "缺少组织机构ID")
+    private String ouId;
+
+    @XText("组织机构名称")
+    @NotBlank(message = "缺少组织机构名称")
+    private String ouName;
+
+    @XText("风机电站名称")
+    @NotBlank(message = "缺少电站名称")
+    private String stationName;
+
+    @XText("装机总量(KWP)")
+    private BigDecimal totalPower;
+
+    @XText("风轮直径(m)")
+    private BigDecimal diameter;
+
+    @XText("叶片长度(m)")
+    private BigDecimal vaneLength;
+
+    @XText("轮毂高度(m)")
+    private BigDecimal hubHeight;
+
+    @XText("经度(°)")
+    private BigDecimal longitude;
+
+    @XText("纬度(°)")
+    private BigDecimal latitude;
+
+    @XText("高程(m)")
+    private BigDecimal elevation;
+
+    @XText("地区编码")
+    private Integer areaCode;
+
+    @XText("风电站关联测风塔列表")
+    private List<BaseWindTowerInput> windTowerList;
+}

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BaseWindTowerViewMapper.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="pps.core.base.mapper.BaseWindTowerViewMapper">
+    <resultMap id="BaseResultMap" type="pps.core.base.entity.BaseWindTowerView">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="is_deleted" property="isDeleted" jdbcType="INTEGER"/>
+        <result column="create_by_id" property="createById" jdbcType="VARCHAR"/>
+        <result column="create_by_name" property="createByName" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="DATE"/>
+        <result column="modify_by_id" property="modifyById" jdbcType="VARCHAR"/>
+        <result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR"/>
+        <result column="modify_time" property="modifyTime" jdbcType="DATE"/>
+        <result column="station_id" property="stationId" jdbcType="VARCHAR"/>
+        <result column="tower_id" property="towerId" jdbcType="VARCHAR"/>
+        <result column="tower_name" property="towerName" jdbcType="VARCHAR"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        id
+        ,
+    is_deleted,
+    create_by_id,
+    create_by_name,
+    create_time,
+    modify_by_id,
+    modify_by_name,
+    modify_time,
+    station_id,
+    tower_id,
+    tower_name
+    </sql>
+    <select id="selectOne" parameterType="pps.core.base.entity.BaseWindTowerView" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from base_wind_tower
+        where
+        id=#{id}
+    </select>
+    <select id="selectList" parameterType="pps.core.base.entity.BaseWindTowerView" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from base_wind_tower
+        where
+        id=#{id}
+    </select>
+
+    <insert id="batchInsert" parameterType="list">
+        INSERT INTO base_wind_tower (id, is_deleted, create_by_id, create_by_name, create_time, modify_by_id,
+        modify_by_name, modify_time, station_id, tower_id, tower_name) VALUES
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.id},
+            #{item.isDeleted},
+            #{item.createById},
+            #{item.createByName},
+            #{item.createTime},
+            #{item.modifyById},
+            #{item.modifyByName},
+            #{item.modifyTime},
+            #{item.stationId},
+            #{item.towerId},
+            #{item.towerName}
+            )
+        </foreach>
+    </insert>
+</mapper>
\ No newline at end of file

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BaseWindTurbineViewMapper.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="pps.core.base.mapper.BaseWindTurbineViewMapper">
+  <resultMap id="BaseResultMap" type="pps.core.base.entity.BaseWindTurbineView">
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="is_deleted" property="isDeleted" jdbcType="INTEGER" />
+    <result column="create_by_id" property="createById" jdbcType="VARCHAR" />
+    <result column="create_by_name" property="createByName" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="DATE" />
+    <result column="modify_by_id" property="modifyById" jdbcType="VARCHAR" />
+    <result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR" />
+    <result column="modify_time" property="modifyTime" jdbcType="DATE" />
+    <result column="ou_id" property="ouId" jdbcType="VARCHAR" />
+    <result column="ou_name" property="ouName" jdbcType="VARCHAR" />
+    <result column="station_name" property="stationName" jdbcType="VARCHAR" />
+    <result column="total_power" property="totalPower" jdbcType="DECIMAL" />
+    <result column="diameter" property="diameter" jdbcType="DECIMAL" />
+    <result column="vane_length" property="vaneLength" jdbcType="DECIMAL" />
+    <result column="hub_height" property="hubHeight" jdbcType="DECIMAL" />
+    <result column="longitude" property="longitude" jdbcType="DECIMAL" />
+    <result column="latitude" property="latitude" jdbcType="DECIMAL" />
+    <result column="elevation" property="elevation" jdbcType="DECIMAL" />
+    <result column="area_code" property="areaCode" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id,
+    is_deleted,
+    create_by_id,
+    create_by_name,
+    create_time,
+    modify_by_id,
+    modify_by_name,
+    modify_time,
+    ou_id,
+    ou_name,
+    station_name,
+    total_power,
+    diameter,
+    vane_length,
+    hub_height,
+    longitude,
+    latitude,
+    elevation,
+    area_code
+  </sql>
+  <select id="selectOne" parameterType="pps.core.base.entity.BaseWindTurbineView" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from base_wind_turbine
+    where 
+    id=#{id}
+  </select>
+  <select id="selectList" parameterType="pps.core.base.entity.BaseWindTurbineView" resultMap="BaseResultMap">
+      select
+      <include refid="Base_Column_List"/>
+      from base_wind_turbine
+      where
+      is_deleted = 1
+      AND ou_id in
+      <foreach collection="ouList" open="(" close=")" separator="," item="item">
+          #{item}
+      </foreach>
+      <if test="stationName != null and stationName != ''">
+          AND station_name LIKE CONCAT( '%', #{stationName}, '%' )
+      </if>
+      ORDER BY
+      station_name ASC
+  </select>
+</mapper>
\ No newline at end of file