初始化

C02-system/pps-core-system/src/main/java/pps/core/system/entity/SysOrganizationEnt.java

@@ -88,6 +88,18 @@ public class SysOrganizationEnt implements Serializable {
     @TableField
     private Integer province;
 
+    @XText("经度")
+    @TableField
+    private BigDecimal longitude;
+
+    @XText("纬度")
+    @TableField
+    private BigDecimal latitude;
+
+    @XText("高程")
+    @TableField
+    private BigDecimal elevation;
+
     public Integer getIsDeleted() {
         return isDeleted;
     }
@@ -240,4 +252,27 @@ public class SysOrganizationEnt implements Serializable {
         this.province = value;
     }
 
+    public BigDecimal getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(BigDecimal longitude) {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(BigDecimal latitude) {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getElevation() {
+        return elevation;
+    }
+
+    public void setElevation(BigDecimal elevation) {
+        this.elevation = elevation;
+    }
 }

C02-system/pps-core-system/src/main/java/pps/core/system/entity/SysOrganizationView.java

@@ -136,6 +136,18 @@ public class SysOrganizationView implements Serializable {
     @Transient
     private Integer isHasChildren;
 
+    @XText("经度")
+    @TableField
+    private BigDecimal longitude;
+
+    @XText("纬度")
+    @TableField
+    private BigDecimal latitude;
+
+    @XText("高程")
+    @TableField
+    private BigDecimal elevation;
+
     public List<String> getOuIds() {
         return ouIds;
     }
@@ -399,4 +411,28 @@ public class SysOrganizationView implements Serializable {
     public void setPartentName(String partentName) {
         this.partentName = partentName;
     }
+
+    public BigDecimal getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(BigDecimal longitude) {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(BigDecimal latitude) {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getElevation() {
+        return elevation;
+    }
+
+    public void setElevation(BigDecimal elevation) {
+        this.elevation = elevation;
+    }
 }

C02-system/pps-core-system/src/main/java/pps/core/system/service/data/sys_organization/GetSysOrganizationViewOutput.java

@@ -63,6 +63,39 @@ public class GetSysOrganizationViewOutput {
     private String parentOuId;
     private String type;
 
+    @XText("经度")
+    private BigDecimal longitude;
+
+    @XText("纬度")
+    private BigDecimal latitude;
+
+    @XText("高程")
+    private BigDecimal elevation;
+
+    public BigDecimal getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(BigDecimal longitude) {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(BigDecimal latitude) {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getElevation() {
+        return elevation;
+    }
+
+    public void setElevation(BigDecimal elevation) {
+        this.elevation = elevation;
+    }
+
     public String getType() {
         return type;
     }

C02-system/pps-core-system/src/main/java/pps/core/system/service/data/sys_organization/QuerySysOrganizationViewOutput.java

 package pps.core.system.service.data.sys_organization;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
@@ -93,6 +94,39 @@ public class QuerySysOrganizationViewOutput extends XPageInput {
     @XText("是否包含子ou：0->否；1->是；")
     private Integer isHasChildren;
 
+    @XText("经度")
+    private BigDecimal longitude;
+
+    @XText("纬度")
+    private BigDecimal latitude;
+
+    @XText("高程")
+    private BigDecimal elevation;
+
+    public BigDecimal getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(BigDecimal longitude) {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(BigDecimal latitude) {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getElevation() {
+        return elevation;
+    }
+
+    public void setElevation(BigDecimal elevation) {
+        this.elevation = elevation;
+    }
+
     public String getMediaType() {
         return mediaType;
     }

C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysMenuViewMapper.xml

@@ -49,8 +49,8 @@
     is_has_appear,
     menu_type,
     media_type,
-    level,
-    describe,
+    `level`,
+    `describe`,
     show_children,
     apply_scene,
     menu_icon
@@ -121,7 +121,7 @@
       sort,
       url,
       apply_scene,
-      describe,
+      `describe`,
       menu_icon
       from sys_menu sm
       where apply_scene=#{applyScene} and sm.id in (
@@ -135,7 +135,7 @@
        join sys_user_group sug on sug.id = sugrr.user_group_id
       where suwugr.user_id  =#{userId}
         and sug.ou_id  = #{ouId}
-      )))
+      ))) a
       where 1=1
       and media_type like concat('%',#{mediaType},'%')
       or media_type ='ALL'
@@ -150,7 +150,7 @@
       a.sort,
       a.url,
       a.apply_scene,
-      a.describe,
+      a.`describe`,
       a.menu_icon
       from temps inner join sys_menu  a on temps.parent_menu_id  = a.id
       )
@@ -196,8 +196,8 @@
                is_has_appear,
                menu_type,
                media_type,
-               level,
-            describe,
+               `level`,
+            `describe`,
             show_children,
             menu_icon
         from sys_menu
@@ -208,11 +208,11 @@
 
         with RECURSIVE temps   as
            (
-               select sm.id ,sm.menu_name ,sm.parent_menu_id ,sm.sort ,sm.url ,sm.media_type ,sm.menu_type ,sm.menu_pattern,sm.describe,sm.menu_icon
+               select sm.id ,sm.menu_name ,sm.parent_menu_id ,sm.sort ,sm.url ,sm.media_type ,sm.menu_type ,sm.menu_pattern,sm.`describe`,sm.menu_icon
                from sys_menu sm
                where   menu_name  like concat('%',#{menuName},'%') and apply_scene=#{applyScene}
                union
-               select sm.id ,sm.menu_name ,sm.parent_menu_id ,sm.sort ,sm.url ,sm.media_type ,sm.menu_type ,sm.menu_pattern,sm.describe,sm.menu_icon
+               select sm.id ,sm.menu_name ,sm.parent_menu_id ,sm.sort ,sm.url ,sm.media_type ,sm.menu_type ,sm.menu_pattern,sm.`describe`,sm.menu_icon
                from temps inner join sys_menu sm on temps.parent_menu_id  = sm.id
            )
         select  temps.* from temps
@@ -259,7 +259,7 @@
                                                      media_type,
                                                      sort,
                                                      url,
-                                                     describe,
+                                                     `describe`,
                                                      menu_icon
                                                  from sys_menu sm
                                                  where sm.id in (
@@ -280,7 +280,7 @@
                                    a.media_type,
                                    a.sort,
                                    a.url,
-                                   a.describe,
+                                   a.`describe`,
                                    a.menu_icon
                                from temps inner join sys_menu  a on temps.parent_menu_id  = a.id
                            )

C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysOrganizationViewMapper.xml

@@ -32,6 +32,9 @@
     <result column="is_has_children" property="isHasChildren" jdbcType="INTEGER" />
     <result column="is_deleted" property="isDeleted" jdbcType="INTEGER" />
     <result column="type" property="type" jdbcType="VARCHAR" />
+    <result column="longitude" property="longitude" jdbcType="DECIMAL" />
+    <result column="latitude" property="latitude" jdbcType="DECIMAL" />
+    <result column="elevation" property="elevation" jdbcType="DECIMAL" />
 
   </resultMap>
   <sql id="Base_Column_List">
@@ -98,19 +101,22 @@
     sor.is_has_children,
     ssop.property_value as media_type,
     so.ou_name as partent_name,
-    sd2.name as province_name
+    sd2.name as province_name,
+    so.longitude,
+    so.latitude,
+    so.elevation
     from sys_organization_rel sor
     left join sys_organization ou on ou.id = sor.ou_id
     left join sys_organization so on sor.parent_ou_id = so.id
     left join sys_area sd2 on sd2.id = ou.province
     left join (
-    select ou_id,string_agg(property_value,',') as property_value from sys_organization_property sop where  sop.end_time &gt;= #{endTime}
+    select ou_id,GROUP_CONCAT(property_value) as property_value from sys_organization_property sop where  sop.end_time &gt;= #{endTime}
     group by ou_id
     ) ssop
     on ssop.ou_id = ou.id
 
     <where>
-      ou.is_deleted = #{isDeleted} and so.is_deleted = #{isDeleted}
+      ou.is_deleted = #{isDeleted}
         and sor.end_time &gt;= #{endTime}
       <if test="id != null and id != ''">
         and sor.parent_ou_id = #{id}

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

+package pps.core.base.entity;
+
+import java.io.Serializable;
+import java.sql.Time;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import xstartup.annotation.XText;
+
+@TableName("base_data")
+public class BaseDataEnt implements Serializable {
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    @XText("组织id")
+    @TableField
+    private String ouId;
+
+    @XText("线路id")
+    @TableField
+    private Integer lineId;
+
+    @XText("日期")
+    @TableField
+    private Date dataDate;
+
+    @XText("时间")
+    @TableField
+    private Time dataTime;
+
+    @XText("风速")
+    @TableField
+    private BigDecimal windSpeed;
+
+    @XText("风向")
+    @TableField
+    private BigDecimal windDirection;
+
+    @XText("温度")
+    @TableField
+    private BigDecimal temperature;
+
+    @XText("压强")
+    @TableField
+    private BigDecimal pressure;
+
+    @XText("湿度")
+    @TableField
+    private BigDecimal humidity;
+
+    @XText("组件平面辐照度")
+    @TableField
+    private BigDecimal planeIrradiance;
+
+    @XText("全水平辐照度")
+    @TableField
+    private BigDecimal horizontalIrradiance;
+
+    @XText("实际功率")
+    @TableField
+    private BigDecimal power;
+
+    @XText("预测功率")
+    @TableField
+    private BigDecimal predictedPower;
+
+    public Integer getId() {
+        return this.id;
+    }
+
+    public void setId(Integer value) {
+        this.id = value;
+    }
+
+    public String getOuId() {
+        return this.ouId;
+    }
+
+    public void setOuId(String value) {
+        this.ouId = value;
+    }
+
+    public Integer getLineId() {
+        return this.lineId;
+    }
+
+    public void setLineId(Integer value) {
+        this.lineId = value;
+    }
+
+    public Date getDataDate() {
+        return this.dataDate;
+    }
+
+    public void setDataDate(Date value) {
+        this.dataDate = value;
+    }
+
+    public Time getDataTime() {
+        return this.dataTime;
+    }
+
+    public void setDataTime(Time value) {
+        this.dataTime = value;
+    }
+
+    public BigDecimal getWindSpeed() {
+        return this.windSpeed;
+    }
+
+    public void setWindSpeed(BigDecimal value) {
+        this.windSpeed = value;
+    }
+
+    public BigDecimal getWindDirection() {
+        return this.windDirection;
+    }
+
+    public void setWindDirection(BigDecimal value) {
+        this.windDirection = value;
+    }
+
+    public BigDecimal getTemperature() {
+        return this.temperature;
+    }
+
+    public void setTemperature(BigDecimal value) {
+        this.temperature = value;
+    }
+
+    public BigDecimal getPressure() {
+        return this.pressure;
+    }
+
+    public void setPressure(BigDecimal value) {
+        this.pressure = value;
+    }
+
+    public BigDecimal getHumidity() {
+        return this.humidity;
+    }
+
+    public void setHumidity(BigDecimal value) {
+        this.humidity = value;
+    }
+
+    public BigDecimal getPlaneIrradiance() {
+        return this.planeIrradiance;
+    }
+
+    public void setPlaneIrradiance(BigDecimal value) {
+        this.planeIrradiance = value;
+    }
+
+    public BigDecimal getHorizontalIrradiance() {
+        return this.horizontalIrradiance;
+    }
+
+    public void setHorizontalIrradiance(BigDecimal value) {
+        this.horizontalIrradiance = value;
+    }
+
+    public BigDecimal getPower() {
+        return this.power;
+    }
+
+    public void setPower(BigDecimal value) {
+        this.power = value;
+    }
+
+    public BigDecimal getPredictedPower() {
+        return this.predictedPower;
+    }
+
+    public void setPredictedPower(BigDecimal value) {
+        this.predictedPower = value;
+    }
+
+}

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

+package pps.core.base.entity;
+
+import java.io.Serializable;
+import java.sql.Time;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableField;
+import xstartup.annotation.XText;
+
+public class BaseDataView implements Serializable {
+    @TableField
+    private Integer id;
+
+    @XText("组织id")
+    @TableField
+    private String ouId;
+
+    @XText("线路id")
+    @TableField
+    private Integer lineId;
+
+    @XText("日期")
+    @TableField
+    private Date dataDate;
+
+    @XText("时间")
+    @TableField
+    private Time dataTime;
+
+    @XText("风速")
+    @TableField
+    private BigDecimal windSpeed;
+
+    @XText("风向")
+    @TableField
+    private BigDecimal windDirection;
+
+    @XText("温度")
+    @TableField
+    private BigDecimal temperature;
+
+    @XText("压强")
+    @TableField
+    private BigDecimal pressure;
+
+    @XText("湿度")
+    @TableField
+    private BigDecimal humidity;
+
+    @XText("组件平面辐照度")
+    @TableField
+    private BigDecimal planeIrradiance;
+
+    @XText("全水平辐照度")
+    @TableField
+    private BigDecimal horizontalIrradiance;
+
+    @XText("实际功率")
+    @TableField
+    private BigDecimal power;
+
+    @XText("预测功率")
+    @TableField
+    private BigDecimal predictedPower;
+
+    public Integer getId() {
+        return this.id;
+    }
+
+    public void setId(Integer value) {
+        this.id = value;
+    }
+
+    public String getOuId() {
+        return this.ouId;
+    }
+
+    public void setOuId(String value) {
+        this.ouId = value;
+    }
+
+    public Integer getLineId() {
+        return this.lineId;
+    }
+
+    public void setLineId(Integer value) {
+        this.lineId = value;
+    }
+
+    public Date getDataDate() {
+        return this.dataDate;
+    }
+
+    public void setDataDate(Date value) {
+        this.dataDate = value;
+    }
+
+    public Time getDataTime() {
+        return this.dataTime;
+    }
+
+    public void setDataTime(Time value) {
+        this.dataTime = value;
+    }
+
+    public BigDecimal getWindSpeed() {
+        return this.windSpeed;
+    }
+
+    public void setWindSpeed(BigDecimal value) {
+        this.windSpeed = value;
+    }
+
+    public BigDecimal getWindDirection() {
+        return this.windDirection;
+    }
+
+    public void setWindDirection(BigDecimal value) {
+        this.windDirection = value;
+    }
+
+    public BigDecimal getTemperature() {
+        return this.temperature;
+    }
+
+    public void setTemperature(BigDecimal value) {
+        this.temperature = value;
+    }
+
+    public BigDecimal getPressure() {
+        return this.pressure;
+    }
+
+    public void setPressure(BigDecimal value) {
+        this.pressure = value;
+    }
+
+    public BigDecimal getHumidity() {
+        return this.humidity;
+    }
+
+    public void setHumidity(BigDecimal value) {
+        this.humidity = value;
+    }
+
+    public BigDecimal getPlaneIrradiance() {
+        return this.planeIrradiance;
+    }
+
+    public void setPlaneIrradiance(BigDecimal value) {
+        this.planeIrradiance = value;
+    }
+
+    public BigDecimal getHorizontalIrradiance() {
+        return this.horizontalIrradiance;
+    }
+
+    public void setHorizontalIrradiance(BigDecimal value) {
+        this.horizontalIrradiance = value;
+    }
+
+    public BigDecimal getPower() {
+        return this.power;
+    }
+
+    public void setPower(BigDecimal value) {
+        this.power = value;
+    }
+
+    public BigDecimal getPredictedPower() {
+        return this.predictedPower;
+    }
+
+    public void setPredictedPower(BigDecimal value) {
+        this.predictedPower = value;
+    }
+
+}

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

+package pps.core.base.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import xstartup.annotation.XText;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class BaseLineAllView implements Serializable {
+    @TableField
+    private Integer id;
+
+    @XText("线路名称")
+    @TableField
+    private String lineName;
+
+    @XText("经度")
+    @TableField
+    private BigDecimal longitude;
+
+    @XText("纬度")
+    @TableField
+    private BigDecimal latitude;
+
+    @XText("高程")
+    @TableField
+    private BigDecimal elevation;
+
+    @XText("组织id")
+    @TableField
+    private String ouId;
+
+
+    @XText("油田ouid")
+    private String oilOuId;
+
+    @XText("油田ouid")
+    private String oilOuName;
+
+    @XText("井场ouid")
+    private String wellOuId;
+
+    @XText("井场ouname")
+    private String wellOuName;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public BigDecimal getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(BigDecimal longitude) {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(BigDecimal latitude) {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getElevation() {
+        return elevation;
+    }
+
+    public void setElevation(BigDecimal elevation) {
+        this.elevation = elevation;
+    }
+
+    public String getOuId() {
+        return ouId;
+    }
+
+    public void setOuId(String ouId) {
+        this.ouId = ouId;
+    }
+
+    public String getOilOuId() {
+        return oilOuId;
+    }
+
+    public void setOilOuId(String oilOuId) {
+        this.oilOuId = oilOuId;
+    }
+
+    public String getOilOuName() {
+        return oilOuName;
+    }
+
+    public void setOilOuName(String oilOuName) {
+        this.oilOuName = oilOuName;
+    }
+
+    public String getWellOuId() {
+        return wellOuId;
+    }
+
+    public void setWellOuId(String wellOuId) {
+        this.wellOuId = wellOuId;
+    }
+
+    public String getWellOuName() {
+        return wellOuName;
+    }
+
+    public void setWellOuName(String wellOuName) {
+        this.wellOuName = wellOuName;
+    }
+}

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

+package pps.core.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import xstartup.annotation.XText;
+
+@TableName("base_line")
+public class BaseLineEnt implements Serializable {
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    @XText("上级线路")
+    @TableField
+    private Integer parentId;
+
+    @XText("线路名称")
+    @TableField
+    private String lineName;
+
+    @XText("线路类型")
+    @TableField
+    private Integer lineType;
+
+    @XText("电网类型")
+    @TableField
+    private Integer gridType;
+
+    @XText("装机容量")
+    @TableField
+    private BigDecimal installCapacity;
+
+    @XText("阵列倾角")
+    @TableField
+    private BigDecimal arrayIncidence;
+
+    @XText("阵列朝向")
+    @TableField
+    private BigDecimal arrayToward;
+
+    @XText("组织id")
+    @TableField
+    private String ouId;
+
+    @TableField
+    private String createById;
+
+    @TableField
+    private String createByName;
+
+    @TableField
+    private Date createTime;
+
+    @TableField
+    private String modifyById;
+
+    @TableField
+    private String modifyByName;
+
+    @TableField
+    private Date modifyTime;
+
+    public Integer getId() {
+        return this.id;
+    }
+
+    public void setId(Integer value) {
+        this.id = value;
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getLineName() {
+        return this.lineName;
+    }
+
+    public void setLineName(String value) {
+        this.lineName = value;
+    }
+
+    public Integer getLineType() {
+        return this.lineType;
+    }
+
+    public void setLineType(Integer value) {
+        this.lineType = value;
+    }
+
+    public Integer getGridType() {
+        return this.gridType;
+    }
+
+    public void setGridType(Integer value) {
+        this.gridType = value;
+    }
+
+    public BigDecimal getInstallCapacity() {
+        return this.installCapacity;
+    }
+
+    public void setInstallCapacity(BigDecimal value) {
+        this.installCapacity = value;
+    }
+
+    public BigDecimal getArrayIncidence() {
+        return this.arrayIncidence;
+    }
+
+    public void setArrayIncidence(BigDecimal value) {
+        this.arrayIncidence = value;
+    }
+
+    public BigDecimal getArrayToward() {
+        return this.arrayToward;
+    }
+
+    public void setArrayToward(BigDecimal value) {
+        this.arrayToward = value;
+    }
+
+    public String getOuId() {
+        return this.ouId;
+    }
+
+    public void setOuId(String value) {
+        this.ouId = value;
+    }
+
+    public String getCreateById() {
+        return this.createById;
+    }
+
+    public void setCreateById(String value) {
+        this.createById = value;
+    }
+
+    public String getCreateByName() {
+        return this.createByName;
+    }
+
+    public void setCreateByName(String value) {
+        this.createByName = value;
+    }
+
+    public Date getCreateTime() {
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date value) {
+        this.createTime = value;
+    }
+
+    public String getModifyById() {
+        return this.modifyById;
+    }
+
+    public void setModifyById(String value) {
+        this.modifyById = value;
+    }
+
+    public String getModifyByName() {
+        return this.modifyByName;
+    }
+
+    public void setModifyByName(String value) {
+        this.modifyByName = value;
+    }
+
+    public Date getModifyTime() {
+        return this.modifyTime;
+    }
+
+    public void setModifyTime(Date value) {
+        this.modifyTime = value;
+    }
+
+}

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

+package pps.core.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableField;
+import xstartup.annotation.XText;
+
+public class BaseLineView implements Serializable {
+    @TableField
+    private Integer id;
+
+    @XText("上级线路")
+    @TableField
+    private Integer parentId;
+
+    @XText("线路名称")
+    @TableField
+    private String lineName;
+
+    @XText("线路类型")
+    @TableField
+    private Integer lineType;
+
+    @XText("电网类型")
+    @TableField
+    private Integer gridType;
+
+    @XText("装机容量")
+    @TableField
+    private BigDecimal installCapacity;
+
+    @XText("阵列倾角")
+    @TableField
+    private BigDecimal arrayIncidence;
+
+    @XText("阵列朝向")
+    @TableField
+    private BigDecimal arrayToward;
+
+    @XText("组织id")
+    @TableField
+    private String ouId;
+
+    @TableField
+    private String createById;
+
+    @TableField
+    private String createByName;
+
+    @TableField
+    private Date createTime;
+
+    @TableField
+    private String modifyById;
+
+    @TableField
+    private String modifyByName;
+
+    @TableField
+    private Date modifyTime;
+
+
+    @XText("油田ouid")
+    private String oilOuId;
+
+    @XText("油田ouid")
+    private String oilOuName;
+
+    @XText("井场ouid")
+    private String wellOuId;
+
+    @XText("井场ouname")
+    private String wellOuName;
+
+    @XText("上级线路名称")
+    private String pLineName;
+
+
+
+    public Integer getId() {
+        return this.id;
+    }
+
+    public void setId(Integer value) {
+        this.id = value;
+    }
+
+
+    public String getLineName() {
+        return this.lineName;
+    }
+
+    public void setLineName(String value) {
+        this.lineName = value;
+    }
+
+    public Integer getLineType() {
+        return this.lineType;
+    }
+
+    public void setLineType(Integer value) {
+        this.lineType = value;
+    }
+
+    public Integer getGridType() {
+        return this.gridType;
+    }
+
+    public void setGridType(Integer value) {
+        this.gridType = value;
+    }
+
+    public BigDecimal getInstallCapacity() {
+        return this.installCapacity;
+    }
+
+    public void setInstallCapacity(BigDecimal value) {
+        this.installCapacity = value;
+    }
+
+    public BigDecimal getArrayIncidence() {
+        return this.arrayIncidence;
+    }
+
+    public void setArrayIncidence(BigDecimal value) {
+        this.arrayIncidence = value;
+    }
+
+    public BigDecimal getArrayToward() {
+        return this.arrayToward;
+    }
+
+    public void setArrayToward(BigDecimal value) {
+        this.arrayToward = value;
+    }
+
+    public String getOuId() {
+        return this.ouId;
+    }
+
+    public void setOuId(String value) {
+        this.ouId = value;
+    }
+
+    public String getCreateById() {
+        return this.createById;
+    }
+
+    public void setCreateById(String value) {
+        this.createById = value;
+    }
+
+    public String getCreateByName() {
+        return this.createByName;
+    }
+
+    public void setCreateByName(String value) {
+        this.createByName = value;
+    }
+
+    public Date getCreateTime() {
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date value) {
+        this.createTime = value;
+    }
+
+    public String getModifyById() {
+        return this.modifyById;
+    }
+
+    public void setModifyById(String value) {
+        this.modifyById = value;
+    }
+
+    public String getModifyByName() {
+        return this.modifyByName;
+    }
+
+    public void setModifyByName(String value) {
+        this.modifyByName = value;
+    }
+
+    public Date getModifyTime() {
+        return this.modifyTime;
+    }
+
+    public void setModifyTime(Date value) {
+        this.modifyTime = value;
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getOilOuId() {
+        return oilOuId;
+    }
+
+    public void setOilOuId(String oilOuId) {
+        this.oilOuId = oilOuId;
+    }
+
+    public String getOilOuName() {
+        return oilOuName;
+    }
+
+    public void setOilOuName(String oilOuName) {
+        this.oilOuName = oilOuName;
+    }
+
+    public String getWellOuId() {
+        return wellOuId;
+    }
+
+    public void setWellOuId(String wellOuId) {
+        this.wellOuId = wellOuId;
+    }
+
+    public String getWellOuName() {
+        return wellOuName;
+    }
+
+    public void setWellOuName(String wellOuName) {
+        this.wellOuName = wellOuName;
+    }
+
+    public String getpLineName() {
+        return pLineName;
+    }
+
+    public void setpLineName(String pLineName) {
+        this.pLineName = pLineName;
+    }
+}

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

+package pps.core.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+import pps.core.base.entity.BaseDataEnt;
+
+@Repository(value="pps.core.base.mapper.BaseDataMapper")
+public interface BaseDataMapper extends BaseMapper<BaseDataEnt> {
+}

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

+package pps.core.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+import pps.core.base.entity.BaseDataView;
+import java.util.List;
+
+@Repository(value="pps.core.base.mapper.BaseDataViewMapper")
+public interface BaseDataViewMapper {
+    BaseDataView selectOne(BaseDataView record);
+    List<BaseDataView> selectList(BaseDataView record);
+}

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

+package pps.core.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+import pps.core.base.entity.BaseLineEnt;
+
+@Repository(value="pps.core.base.mapper.BaseLineMapper")
+public interface BaseLineMapper extends BaseMapper<BaseLineEnt> {
+}

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

+package pps.core.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+import pps.core.base.entity.BaseLineAllView;
+import pps.core.base.entity.BaseLineView;
+import java.util.List;
+
+@Repository(value="pps.core.base.mapper.BaseLineViewMapper")
+public interface BaseLineViewMapper {
+    BaseLineView selectOne(BaseLineView record);
+    List<BaseLineView> selectList(BaseLineView record);
+    List<BaseLineAllView> selectDataList(BaseLineView record);
+}

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseBaseEquipmentCloudServiceImpl.java

-package pps.core.base.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.util.CollectionUtils;
-import pps.cloud.base.service.BaseBaseEquipmentCloudService;
-import pps.cloud.base.service.data.BaseEquipmentPropertyView;
-import pps.cloud.base.service.data.base_equipment.GetBaseEquipmentInput;
-import pps.cloud.base.service.data.base_equipment.GetBaseEquipmentOutput;
-import pps.cloud.system.service.SystemDictionaryService;
-import pps.cloud.system.service.data.QuerySysDictionaryViewInput;
-import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
-import pps.core.base.entity.BaseEquipmentEnt;
-import pps.core.base.entity.BaseEquipmentPropertyEnt;
-import pps.core.base.entity.BaseEquipmentView;
-import pps.core.base.mapper.BaseEquipmentMapper;
-import pps.core.base.mapper.BaseEquipmentPropertyMapper;
-import pps.core.base.mapper.BaseEquipmentViewMapper;
-import xstartup.annotation.XService;
-import xstartup.base.XContext;
-import xstartup.base.util.XCopyUtils;
-import xstartup.base.util.XStringUtils;
-import xstartup.data.XListResult;
-import xstartup.data.XSingleResult;
-import xstartup.error.XError;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-@XService
-public class BaseBaseEquipmentCloudServiceImpl implements BaseBaseEquipmentCloudService {
-
-    @Override
-    public XListResult<GetBaseEquipmentOutput> selectEquimentByOuIdandStationId(XContext context, GetBaseEquipmentInput input) {
-        QuerySysDictionaryViewOutput dict = getDictByAlias(context , "equipment_type_cyg");
-        List<QuerySysDictionaryViewOutput> dictList = queryChildByDicPathIncludeSelf(context , dict);
-        List<String> equipmentTypeList = dictList.stream().map(QuerySysDictionaryViewOutput::getDicKey).collect(Collectors.toList());
-        BaseEquipmentViewMapper mapper = context.getBean(BaseEquipmentViewMapper.class);
-        BaseEquipmentView record = new BaseEquipmentView();
-        XCopyUtils.copyObject(input, record);
-        record.setEquipmentTypeList(equipmentTypeList);
-        List<BaseEquipmentView> list = mapper.selectList(record);
-        List<GetBaseEquipmentOutput> outputs = XCopyUtils.copyNewList(list, GetBaseEquipmentOutput.class);
-        outputs.stream().forEach(item->{
-            item.setEquipmentTypeName(getDictName(item.getEquipmentType() + "" , dictList));
-        });
-        return XListResult.success(outputs);
-    }
-    private QuerySysDictionaryViewOutput getDictByAlias(XContext context , String alias){
-        SystemDictionaryService systemDictionaryService = context.getBean(SystemDictionaryService.class);
-        QuerySysDictionaryViewInput dictionaryViewInput = new QuerySysDictionaryViewInput();
-        dictionaryViewInput.setPage(1);
-        dictionaryViewInput.setLimit(1000);
-        dictionaryViewInput.setAlias(alias);
-        QuerySysDictionaryViewOutput dict = systemDictionaryService.queryByAlias(context , dictionaryViewInput).getResult();
-        return dict;
-    }
-    private List<QuerySysDictionaryViewOutput> queryChildByDicPathIncludeSelf(XContext context , QuerySysDictionaryViewOutput dict){
-        SystemDictionaryService systemDictionaryService = context.getBean(SystemDictionaryService.class);
-        QuerySysDictionaryViewInput dictionaryViewInput = new QuerySysDictionaryViewInput();
-        dictionaryViewInput.setDicPath(dict.getId());
-        dictionaryViewInput.setPage(1);
-        dictionaryViewInput.setLimit(1000);
-        List<QuerySysDictionaryViewOutput> dictList = systemDictionaryService.queryChildByDicPathIncludeSelf(context , dictionaryViewInput).getResult();
-        return dictList;
-    }
-
-    public String getDictName(String dictKey,List<QuerySysDictionaryViewOutput> dictList){
-        if(StringUtils.isBlank(dictKey) || CollectionUtils.isEmpty(dictList)){
-            return " ";
-        }
-        for (QuerySysDictionaryViewOutput dict : dictList) {
-            if(dict.getDicKey().equals(dictKey)){
-                return dict.getDicName();
-            }
-        }
-        return dictKey;
-    }
-
-    @Override
-    public XSingleResult<GetBaseEquipmentOutput> selectEquipmentById(XContext context, GetBaseEquipmentInput input) {
-        BaseEquipmentMapper mapper = context.getBean(BaseEquipmentMapper.class);
-        BaseEquipmentEnt equipmentEnt = mapper.selectById(input.getId());
-        if( equipmentEnt == null){
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetBaseEquipmentOutput output = new GetBaseEquipmentOutput();
-        XCopyUtils.copyObject(equipmentEnt, output);
-        return XSingleResult.success(output);
-    }
-
-    @Override
-    public XListResult<GetBaseEquipmentOutput> selectEquipmentExtendPropertyByStationId(XContext context, GetBaseEquipmentInput input) {
-        BaseEquipmentViewMapper viewMapper = context.getBean(BaseEquipmentViewMapper.class);
-        QuerySysDictionaryViewOutput dict = getDictByAlias(context , "equipment_type_cyg");
-        List<QuerySysDictionaryViewOutput> dictList = queryChildByDicPathIncludeSelf(context , dict);
-        BaseEquipmentView recordView = XCopyUtils.copyNewObject(input, BaseEquipmentView.class);
-        List<BaseEquipmentView> propertyList = viewMapper.selectEquipmentExtendPropertyByStationId(recordView);
-        List<GetBaseEquipmentOutput> propertyOutputs = XCopyUtils.copyNewList(propertyList, GetBaseEquipmentOutput.class);
-        propertyOutputs.stream().forEach(item->{
-            item.setEquipmentTypeName(getDictName(item.getEquipmentType() + "" , dictList));
-        });
-        return XListResult.success(propertyOutputs);
-    }
-
-    @Override
-    public XSingleResult<GetBaseEquipmentOutput> selectEquipmentByStationIdAndEquipmentName(XContext context, GetBaseEquipmentInput input) {
-        BaseEquipmentMapper mapper = context.getBean(BaseEquipmentMapper.class);
-        QueryWrapper<BaseEquipmentEnt> queryWrapper = new QueryWrapper();
-        queryWrapper.lambda().eq(BaseEquipmentEnt::getStationId,input.getStationId()).
-                eq(BaseEquipmentEnt::getEquipmentName,input.getEquipmentName());
-        BaseEquipmentEnt Ent = mapper.selectOne(queryWrapper);
-        GetBaseEquipmentOutput view = XCopyUtils.copyNewObject(Ent, GetBaseEquipmentOutput.class);
-        return XSingleResult.success(view);
-    }
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseBaseEquipmentPropertyServiceImpl.java

-package pps.core.base.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import pps.cloud.base.service.BaseBaseEquipmentPropertyService;
-import pps.cloud.base.service.data.BaseEquipmentPropertyView;
-import pps.core.base.entity.BaseEquipmentPropertyEnt;
-import pps.core.base.mapper.BaseEquipmentPropertyMapper;
-import xstartup.annotation.XService;
-import xstartup.annotation.XText;
-import xstartup.base.XContext;
-import xstartup.base.util.XCopyUtils;
-import xstartup.data.XSingleResult;
-import xstartup.feature.api.annotation.XApiPost;
-
-@XService
-public class BaseBaseEquipmentPropertyServiceImpl implements BaseBaseEquipmentPropertyService {
-
-    @XText("根据设备id和属性英文名称查询设备属性值")
-    @XApiPost
-    @Override
-    public XSingleResult<BaseEquipmentPropertyView> queryBaseEquipmentPropertyView(XContext context, BaseEquipmentPropertyView input){
-        BaseEquipmentPropertyMapper mapper = context.getBean(BaseEquipmentPropertyMapper.class);
-        QueryWrapper<BaseEquipmentPropertyEnt> queryWrapper = new QueryWrapper();
-        queryWrapper.lambda().eq(BaseEquipmentPropertyEnt::getEquipmentId,input.getEquipmentId()).
-                eq(BaseEquipmentPropertyEnt::getPropertyNameEn,input.getPropertyNameEn());
-        queryWrapper.lambda().last("limit 1");
-        BaseEquipmentPropertyEnt Ent = mapper.selectOne(queryWrapper);
-        BaseEquipmentPropertyView view = XCopyUtils.copyNewObject(Ent, BaseEquipmentPropertyView.class);
-        return XSingleResult.success(view);
-    }
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseBaseSegmentServiceImpl.java

-package pps.core.base.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import pps.cloud.base.service.BaseBaseSegmentService;
-import pps.cloud.base.service.data.base_segment.GetBaseSegmentInput;
-import pps.cloud.base.service.data.base_segment.GetBaseSegmentOutput;
-import pps.cloud.base.service.data.base_segment.BaseSegmentBatchInput;
-import pps.core.base.entity.BaseSegmentEnt;
-import pps.core.base.entity.BaseSegmentView;
-import pps.core.base.mapper.BaseSegmentMapper;
-import pps.core.base.mapper.BaseSegmentViewMapper;
-import xstartup.annotation.XService;
-import xstartup.annotation.XText;
-import xstartup.base.XContext;
-import xstartup.base.util.XCopyUtils;
-import xstartup.data.XListResult;
-import xstartup.data.XSingleResult;
-import xstartup.error.XError;
-
-import java.util.List;
-
-/**
- * 王甜创建的查询管段方法
- * @author wang1
- */
-@XText("管段接口")
-@XService
-public class BaseBaseSegmentServiceImpl implements BaseBaseSegmentService {
-    @Override
-    @XText("根据id查询管段")
-    public XSingleResult<GetBaseSegmentOutput> getBaseSegmentById(XContext context, GetBaseSegmentInput input) {
-        BaseSegmentMapper mapper = context.getBean(BaseSegmentMapper.class);
-        QueryWrapper<BaseSegmentEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseSegmentEnt::getId, input.getId());
-        BaseSegmentEnt entity = mapper.selectOne(queryWrapper);
-        if(entity == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetBaseSegmentOutput output = new GetBaseSegmentOutput();
-        XCopyUtils.copyObject(entity, output);
-        return XSingleResult.success(output);
-    }
-
-    public XListResult<GetBaseSegmentOutput> getBaseSeamentId(XContext context, BaseSegmentBatchInput input) {
-        BaseSegmentViewMapper bean = context.getBean(BaseSegmentViewMapper.class);
-        List<BaseSegmentView> list = bean.queryBaseSegmentByPipelineId(input);
-        List<GetBaseSegmentOutput> outputs = XCopyUtils.copyNewList(list, GetBaseSegmentOutput.class);
-        return XListResult.success(outputs);
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseBaseSmallMeteringAppliancesGroupServiceImpl.java

-package pps.core.base.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import pps.cloud.base.service.BaseBaseSmallMeteringAppliancesGroupService;
-import pps.cloud.base.service.data.GetBaseSmallMeteringAppliancesGroupInput;
-import pps.cloud.base.service.data.GetBaseSmallMeteringAppliancesGroupOutput;
-import pps.core.base.entity.BaseSmallMeteringAppliancesGroupEnt;
-import pps.core.base.mapper.BaseSmallMeteringAppliancesGroupMapper;
-import xstartup.annotation.XService;
-import xstartup.base.XContext;
-import xstartup.base.util.XCopyUtils;
-import xstartup.data.XSingleResult;
-import xstartup.error.XError;
-
-@XService
-public class BaseBaseSmallMeteringAppliancesGroupServiceImpl implements BaseBaseSmallMeteringAppliancesGroupService {
-
-    @Override
-    public XSingleResult<GetBaseSmallMeteringAppliancesGroupOutput> getBaseSmallMeteringAppliancesGroup(XContext context, GetBaseSmallMeteringAppliancesGroupInput input) {
-        BaseSmallMeteringAppliancesGroupMapper mapper = context.getBean(BaseSmallMeteringAppliancesGroupMapper.class);
-        QueryWrapper<BaseSmallMeteringAppliancesGroupEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseSmallMeteringAppliancesGroupEnt::getId, input.getId());
-        BaseSmallMeteringAppliancesGroupEnt entity = mapper.selectOne(queryWrapper);
-        if(entity == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetBaseSmallMeteringAppliancesGroupOutput output = new GetBaseSmallMeteringAppliancesGroupOutput();
-        XCopyUtils.copyObject(entity, output);
-        return XSingleResult.success(output);
-    }
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseBaseSmallMeteringFixCoefficientServiceImpl.java

-package pps.core.base.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import pps.cloud.base.service.BaseBaseSmallMeteringFixCoefficientService;
-import pps.cloud.base.service.data.QueryBaseSmallMeteringFixCoefficientInput;
-import pps.cloud.base.service.data.QueryBaseSmallMeteringFixCoefficientOutput;
-import pps.core.base.entity.BaseSmallMeteringFixCoefficientEnt;
-import pps.core.base.mapper.BaseSmallMeteringFixCoefficientMapper;
-import pps.core.common.utils.BigDecimalUtil;
-import xstartup.annotation.XService;
-import xstartup.base.XContext;
-import xstartup.data.XSingleResult;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-@XService
-public class BaseBaseSmallMeteringFixCoefficientServiceImpl implements BaseBaseSmallMeteringFixCoefficientService {
-
-    @Override
-    public XSingleResult<QueryBaseSmallMeteringFixCoefficientOutput> getBaseSmallMeteringFixValue(XContext context, QueryBaseSmallMeteringFixCoefficientInput input) {
-        String meterId = input.getMeterId();
-        BigDecimal val = input.getMeasureValue();
-        BaseSmallMeteringFixCoefficientMapper mapper = context.getBean(BaseSmallMeteringFixCoefficientMapper.class);
-        QueryWrapper<BaseSmallMeteringFixCoefficientEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseSmallMeteringFixCoefficientEnt::getMeterId,meterId)
-                .eq(BaseSmallMeteringFixCoefficientEnt::getMeasureValue,val);
-        List<BaseSmallMeteringFixCoefficientEnt> list = mapper.selectList(queryWrapper);
-        BigDecimal vc = new BigDecimal("0");
-        if(ObjectUtils.isNotEmpty(list)){
-            BigDecimal fixValue = list.get(0).getFixValue();
-            if(fixValue != null){
-                vc = fixValue;
-            }
-        }else{
-            //查询小于输入值
-            QueryWrapper<BaseSmallMeteringFixCoefficientEnt> querylt = new QueryWrapper<>();
-            querylt.lambda().eq(BaseSmallMeteringFixCoefficientEnt::getMeterId,meterId)
-                    .lt(BaseSmallMeteringFixCoefficientEnt::getMeasureValue,val).orderByDesc(BaseSmallMeteringFixCoefficientEnt::getMeasureValue);
-            List<BaseSmallMeteringFixCoefficientEnt> listlt = mapper.selectList(querylt);
-            //查询大于输入值
-            QueryWrapper<BaseSmallMeteringFixCoefficientEnt> querygt = new QueryWrapper<>();
-            querygt.lambda().eq(BaseSmallMeteringFixCoefficientEnt::getMeterId,meterId)
-                    .gt(BaseSmallMeteringFixCoefficientEnt::getMeasureValue,val).orderByAsc(BaseSmallMeteringFixCoefficientEnt::getMeasureValue);
-            List<BaseSmallMeteringFixCoefficientEnt> listgt = mapper.selectList(querygt);
-            //（2）如油高匹配则直接取值对应容积
-            //（3）如油高不匹配，则根据x1、x2查表获得对应的容积y1、y2，并利用内插法计算容积膨胀值，计算公式为：△Vc=y1+(x-x1)*(y2-y1)/(x2-x1)
-            BaseSmallMeteringFixCoefficientEnt leView = null;
-            BaseSmallMeteringFixCoefficientEnt gtView = null;
-            if(ObjectUtils.isNotEmpty(listlt)){
-                leView = listlt.get(0);
-            }
-            if(ObjectUtils.isNotEmpty(listgt)){
-                gtView = listgt.get(0);
-            }
-            if(ObjectUtils.isNotEmpty(leView) && ObjectUtils.isNotEmpty(gtView) && ObjectUtils.isNotEmpty(leView.getFixValue())
-                    && ObjectUtils.isNotEmpty(gtView.getFixValue())&& ObjectUtils.isNotEmpty(leView.getMeasureValue())&& ObjectUtils.isNotEmpty(gtView.getMeasureValue())
-                    && ObjectUtils.isNotEmpty(val)){
-                //(x-x1)
-                BigDecimal height = val.subtract(BigDecimalUtil.parseNull2Zero(leView.getMeasureValue()));
-                //(x2-x1)
-                BigDecimal cheight = BigDecimalUtil.parseNull2Zero(gtView.getMeasureValue()).subtract(BigDecimalUtil.parseNull2Zero(leView.getMeasureValue()));
-                //(y2-y1)
-                BigDecimal cubage = BigDecimalUtil.parseNull2Zero(gtView.getFixValue()).subtract(BigDecimalUtil.parseNull2Zero(leView.getFixValue()));
-                //(x-x1)*(y2-y1)
-                BigDecimal total = height.multiply(cubage);
-                //(x-x1)*(y2-y1)/(x2-x1)
-                BigDecimal divide = total.divide(cheight , 6, BigDecimal.ROUND_HALF_UP);
-                vc = BigDecimalUtil.parseNull2Zero(leView.getFixValue()).add(divide).divide(new BigDecimal(1000));
-            }
-        }
-        QueryBaseSmallMeteringFixCoefficientOutput out = new QueryBaseSmallMeteringFixCoefficientOutput();
-        out.setFixValue(BigDecimalUtil.parseNull2Zero(vc));
-        return XSingleResult.success(out);
-    }
-
-    public XSingleResult<QueryBaseSmallMeteringFixCoefficientOutput> getBaseSmallMeteringFixValueNew(XContext context, QueryBaseSmallMeteringFixCoefficientInput input) {
-        String meterId = input.getMeterId();
-        BigDecimal val = input.getMeasureValue();
-        BaseSmallMeteringFixCoefficientMapper mapper = context.getBean(BaseSmallMeteringFixCoefficientMapper.class);
-        QueryWrapper<BaseSmallMeteringFixCoefficientEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseSmallMeteringFixCoefficientEnt::getMeterId,meterId)
-                .eq(BaseSmallMeteringFixCoefficientEnt::getMeasureValue,val);
-        List<BaseSmallMeteringFixCoefficientEnt> list = mapper.selectList(queryWrapper);
-        BigDecimal vc = new BigDecimal("0");
-        if(ObjectUtils.isNotEmpty(list)){
-            BigDecimal fixValue = list.get(0).getFixValue();
-            if(fixValue != null){
-                //取到后，需要除以1000，用于后面计算
-                vc = fixValue.divide(new BigDecimal(1000));
-            }
-        }else{
-            //查询小于输入值
-            QueryWrapper<BaseSmallMeteringFixCoefficientEnt> querylt = new QueryWrapper<>();
-            querylt.lambda().eq(BaseSmallMeteringFixCoefficientEnt::getMeterId,meterId)
-                    .lt(BaseSmallMeteringFixCoefficientEnt::getMeasureValue,val).orderByDesc(BaseSmallMeteringFixCoefficientEnt::getMeasureValue);
-            List<BaseSmallMeteringFixCoefficientEnt> listlt = mapper.selectList(querylt);
-            //查询大于输入值
-            QueryWrapper<BaseSmallMeteringFixCoefficientEnt> querygt = new QueryWrapper<>();
-            querygt.lambda().eq(BaseSmallMeteringFixCoefficientEnt::getMeterId,meterId)
-                    .gt(BaseSmallMeteringFixCoefficientEnt::getMeasureValue,val).orderByAsc(BaseSmallMeteringFixCoefficientEnt::getMeasureValue);
-            List<BaseSmallMeteringFixCoefficientEnt> listgt = mapper.selectList(querygt);
-            //（2）如油高匹配则直接取值对应容积
-            //（3）如油高不匹配，则根据x1、x2查表获得对应的容积y1、y2，并利用内插法计算容积膨胀值，计算公式为：△Vc=y1+(x-x1)*(y2-y1)/(x2-x1)
-            BaseSmallMeteringFixCoefficientEnt leView = null;
-            BaseSmallMeteringFixCoefficientEnt gtView = null;
-            if(ObjectUtils.isNotEmpty(listlt)){
-                leView = listlt.get(0);
-            }
-            if(ObjectUtils.isNotEmpty(listgt)){
-                gtView = listgt.get(0);
-            }
-            if(ObjectUtils.isNotEmpty(leView) && ObjectUtils.isNotEmpty(gtView) && ObjectUtils.isNotEmpty(leView.getFixValue())
-                    && ObjectUtils.isNotEmpty(gtView.getFixValue())&& ObjectUtils.isNotEmpty(leView.getMeasureValue())&& ObjectUtils.isNotEmpty(gtView.getMeasureValue())
-                    && ObjectUtils.isNotEmpty(val)){
-                //(x-x1)
-                BigDecimal height = val.subtract(BigDecimalUtil.parseNull2Zero(leView.getMeasureValue()));
-                //(x2-x1)
-                BigDecimal cheight = BigDecimalUtil.parseNull2Zero(gtView.getMeasureValue()).subtract(BigDecimalUtil.parseNull2Zero(leView.getMeasureValue()));
-                //(y2-y1)
-                BigDecimal cubage = BigDecimalUtil.parseNull2Zero(gtView.getFixValue()).subtract(BigDecimalUtil.parseNull2Zero(leView.getFixValue()));
-                //(x-x1)*(y2-y1)
-                BigDecimal total = height.multiply(cubage);
-                //(x-x1)*(y2-y1)/(x2-x1)
-                BigDecimal divide = total.divide(cheight , 6, BigDecimal.ROUND_HALF_UP);
-                vc = BigDecimalUtil.parseNull2Zero(leView.getFixValue()).add(divide).divide(new BigDecimal(1000));
-            }
-        }
-        QueryBaseSmallMeteringFixCoefficientOutput out = new QueryBaseSmallMeteringFixCoefficientOutput();
-        out.setFixValue(BigDecimalUtil.parseNull2Zero(vc));
-        return XSingleResult.success(out);
-    }
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseClientCloudServiceImpl.java

-package pps.core.base.service;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import org.apache.commons.lang3.StringUtils;
-import pps.cloud.base.service.BaseBaseClientCloudService;
-import pps.cloud.base.service.data.*;
-import pps.cloud.base.service.data.base_pipeline.SelectClientByConditionInput;
-import pps.core.base.entity.BaseClientEnt;
-import pps.core.base.entity.BaseClientView;
-import pps.core.base.mapper.BaseClientMapper;
-import pps.core.base.mapper.BaseClientViewMapper;
-import pps.core.base.service.data.base_client.UpdateBaseClientInput;
-import pps.core.common.session.PpsUserSession;
-import xstartup.annotation.XService;
-import xstartup.annotation.XText;
-import xstartup.base.XContext;
-import xstartup.base.util.XCopyUtils;
-import xstartup.data.XListResult;
-import xstartup.data.XServiceResult;
-import xstartup.data.XSingleResult;
-import xstartup.error.XError;
-import xstartup.feature.api.annotation.XApiPost;
-import xstartup.helper.XTransactionHelper;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-@XService
-public class BaseClientCloudServiceImpl implements BaseBaseClientCloudService {
-
-    @Override
-    @XText("根据名称获取托运商数据")
-    public XSingleResult<FindBaseClientOutput> selectShipperByName(XContext context, BaseNameInput input) {
-        BaseClientEnt ent = new BaseClientEnt();
-        ent.setClientName(input.getName());
-        ent.setBeConsignor(1);
-        FindBaseClientOutput result = this.selectBaseClient(context, ent);
-        return XSingleResult.success(result);
-    }
-
-    @Override
-    @XText("根据名称获取上游用户数据")
-    public XSingleResult<FindBaseClientOutput> selectUpClientByName(XContext context, BaseNameInput input) {
-        BaseClientEnt ent = new BaseClientEnt();
-        ent.setClientName(input.getName());
-        ent.setBeUpLient(1);
-        FindBaseClientOutput result = this.selectBaseClient(context, ent);
-        return XSingleResult.success(result);
-    }
-
-    @Override
-    @XText("根据名称获取下游数据")
-    public XSingleResult<FindBaseClientOutput> selectDownClientByName(XContext context, BaseNameInput input) {
-        BaseClientEnt ent = new BaseClientEnt();
-        ent.setClientName(input.getName());
-        ent.setBeDownClient(1);
-        FindBaseClientOutput result = this.selectBaseClient(context, ent);
-        return XSingleResult.success(result);
-    }
-
-    @Override
-    @XText("根据条件获取Client数据")
-    public XListResult<FindBaseClientOutput> selectClientByCondition(XContext context, SelectClientByConditionInput input) {
-        BaseClientMapper mapper = context.getBean(BaseClientMapper.class);
-        QueryWrapper<BaseClientEnt> qr = new QueryWrapper<>();
-        qr.lambda().eq(BaseClientEnt::getBeDeleted,0).eq(BaseClientEnt::getOuId,input.getOuId());
-        if(input.getBeConsignor() != null){
-            qr.lambda().eq(BaseClientEnt::getBeConsignor,input.getBeConsignor());
-        }else if(input.getBeDownClient() != null){
-            qr.lambda().eq(BaseClientEnt::getBeDownClient,input.getBeDownClient());
-        }else if(input.getBeUpLient() != null){
-            qr.lambda().eq(BaseClientEnt::getBeUpLient,input.getBeUpLient());
-        }
-        List<BaseClientEnt> list = mapper.selectList(qr);
-        return XListResult.success(XCopyUtils.copyNewList(list,FindBaseClientOutput.class));
-    }
-
-    private FindBaseClientOutput selectBaseClient(XContext context, BaseClientEnt ent){
-        BaseClientMapper mapper = context.getBean(BaseClientMapper.class);
-        QueryWrapper<BaseClientEnt> qr = new QueryWrapper<>();
-        qr.lambda().eq(BaseClientEnt::getClientName,ent.getClientName()).eq(BaseClientEnt::getBeDeleted,0);
-        if(ent.getBeConsignor() != null){
-            qr.lambda().eq(BaseClientEnt::getBeConsignor,ent.getBeConsignor());
-        }else if(ent.getBeDownClient() != null){
-            qr.lambda().eq(BaseClientEnt::getBeDownClient,ent.getBeDownClient());
-        }else if(ent.getBeUpLient() != null){
-            qr.lambda().eq(BaseClientEnt::getBeUpLient,ent.getBeUpLient());
-        }
-        List<BaseClientEnt> dbEnts = mapper.selectList(qr);
-        if(dbEnts.size() == 0 ) return null;
-        return XCopyUtils.copyNewObject(dbEnts.get(0),FindBaseClientOutput.class);
-    }
-
-    @XApiPost
-    @XText("查询上游下游关系列表")
-    @Override
-    public XListResult<QueryBaseClientViewOutput> queryBaseClientStationRelByOuId(XContext context, QueryBaseClientViewInput input){
-        BaseClientViewMapper mapper = context.getBean(BaseClientViewMapper.class);
-        BaseClientView record = new BaseClientView();
-        XCopyUtils.copyObject(input, record);
-        PageHelper.startPage(input.getPage(), input.getLimit());
-        List<BaseClientView> list = mapper.selectListByStationByOuId(record);
-        PageInfo<BaseClientView> pageInfo = new PageInfo<>(list);
-        List<QueryBaseClientViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseClientViewOutput.class);
-        return XListResult.success(outputs);
-    }
-
-    @Override
-    public XSingleResult<QueryBaseClientViewOutput> selectBaseClientById(XContext context, NameIdInput input) {
-        BaseClientMapper mapper = context.getBean(BaseClientMapper.class);
-        BaseClientEnt ent = mapper.selectById(input.getId());
-        if(ent == null){
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        QueryBaseClientViewOutput output = new QueryBaseClientViewOutput();
-        XCopyUtils.copyObject(ent, output);
-        return XSingleResult.success(output);
-    }
-
-    @XText("更新上下游用户与托运商")
-    @Override
-    public XServiceResult updateBaseClient(XContext context, UpdateBaseClientCloudInput input){
-        return XTransactionHelper.begin(context,()-> {
-            BaseClientMapper mapper = context.getBean(BaseClientMapper.class);
-            QueryWrapper<BaseClientEnt> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(BaseClientEnt::getId, input.getId());
-            BaseClientEnt entity = mapper.selectOne(queryWrapper);
-            if (entity == null) {
-                return XServiceResult.error(context, XError.NotFound);
-            }
-            if (StringUtils.isBlank(input.getModifyById())) {
-                PpsUserSession session = context.getSession(PpsUserSession.class);
-                Date date = new Date();
-                input.setModifyTime(date);
-                input.setModifyByName(session.getUserName());
-                input.setModifyById(session.getId() + "");
-            }
-            input.setBeDeleted(0);
-            XCopyUtils.copyObject(input, entity);
-            mapper.updateById(entity);
-            return XServiceResult.OK;
-        });
-    }
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseClientPropertyService.java

-package pps.core.base.service;
-
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import pps.core.base.mapper.*;
-import pps.core.base.entity.*;
-import pps.core.base.service.data.base_client_property.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import xstartup.annotation.XService;
-import xstartup.feature.api.annotation.XApiPost;
-import xstartup.feature.api.annotation.XApiGet;
-import xstartup.feature.api.annotation.XApiAnonymous;
-import xstartup.data.XServiceResult;
-import xstartup.data.XSingleResult;
-import xstartup.data.XListResult;
-import xstartup.data.XPageResult;
-import xstartup.annotation.XText;
-import xstartup.base.XContext;
-import xstartup.base.util.XCopyUtils;
-import xstartup.error.XError;
-import xstartup.base.data.CustomQueryInput;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import xstartup.feature.mybatis.helper.XMapperHelper;
-
-import java.util.List;
-
-@XService
-public class BaseClientPropertyService {
-    @XApiPost
-    public XServiceResult createBaseClientProperty(XContext context, CreateBaseClientPropertyInput input){
-        BaseClientPropertyMapper mapper = context.getBean(BaseClientPropertyMapper.class);
-        BaseClientPropertyEnt entity = new BaseClientPropertyEnt();
-        XCopyUtils.copyObject(input, entity);
-        mapper.insert(entity);
-        return XServiceResult.OK;
-    }
-
-    @XApiPost
-    public XServiceResult updateBaseClientProperty(XContext context, UpdateBaseClientPropertyInput input){
-        BaseClientPropertyMapper mapper = context.getBean(BaseClientPropertyMapper.class);
-        QueryWrapper<BaseClientPropertyEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseClientPropertyEnt::getId, input.getId());
-        BaseClientPropertyEnt entity = mapper.selectOne(queryWrapper);
-        if(entity == null) {
-            return XServiceResult.error(context, XError.NotFound);
-        }
-        XCopyUtils.copyObject(input, entity);
-        mapper.updateById(entity);
-        return XServiceResult.OK;
-    }
-
-    @XApiPost
-    public XServiceResult deleteBaseClientProperty(XContext context, DeleteBaseClientPropertyInput input){
-        BaseClientPropertyMapper mapper = context.getBean(BaseClientPropertyMapper.class);
-        QueryWrapper<BaseClientPropertyEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseClientPropertyEnt::getId, input.getId());
-        BaseClientPropertyEnt entity = mapper.selectOne(queryWrapper);
-        if(entity == null) {
-            return XServiceResult.error(context, XError.NotFound);
-        }
-        mapper.deleteById(entity);
-        return XServiceResult.OK;
-    }
-
-    @XApiGet
-    public XSingleResult<GetBaseClientPropertyOutput> getBaseClientProperty(XContext context, GetBaseClientPropertyInput input){
-        BaseClientPropertyMapper mapper = context.getBean(BaseClientPropertyMapper.class);
-        QueryWrapper<BaseClientPropertyEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseClientPropertyEnt::getId, input.getId());
-        BaseClientPropertyEnt entity = mapper.selectOne(queryWrapper);
-        if(entity == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetBaseClientPropertyOutput output = new GetBaseClientPropertyOutput();
-        XCopyUtils.copyObject(entity, output);
-        return XSingleResult.success(output);
-    }
-
-    @XApiGet
-    public XPageResult<QueryBaseClientPropertyOutput> queryBaseClientProperty(XContext context, QueryBaseClientPropertyInput input){
-        BaseClientPropertyMapper mapper = context.getBean(BaseClientPropertyMapper.class);
-        QueryWrapper<BaseClientPropertyEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().like(BaseClientPropertyEnt::getId, input.getId())
-            .like(BaseClientPropertyEnt::getClientId, input.getClientId())
-            .like(BaseClientPropertyEnt::getPropertyId, input.getPropertyId())
-            .eq(BaseClientPropertyEnt::getPropertyValue, input.getPropertyValue())
-            .eq(BaseClientPropertyEnt::getEffectTime, input.getEffectTime())
-            .eq(BaseClientPropertyEnt::getEndTime, input.getEndTime())
-            .like(BaseClientPropertyEnt::getCreateById, input.getCreateById())
-            .like(BaseClientPropertyEnt::getCreateByName, input.getCreateByName())
-            .eq(BaseClientPropertyEnt::getCreateTime, input.getCreateTime())
-            .like(BaseClientPropertyEnt::getModifyById, input.getModifyById())
-            .like(BaseClientPropertyEnt::getModifyByName, input.getModifyByName())
-            .eq(BaseClientPropertyEnt::getModifyTime, input.getModifyTime());
-        return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseClientPropertyOutput.class);
-    }
-
-    @XApiGet
-    public XPageResult<QueryBaseClientPropertyOutput> dynamicQueryBaseClientProperty(XContext context, CustomQueryInput input){
-        BaseClientPropertyMapper mapper = context.getBean(BaseClientPropertyMapper.class);
-        return XMapperHelper.query(mapper, input, BaseClientPropertyEnt.class, QueryBaseClientPropertyOutput.class);
-    }
-
-    @XApiGet
-    public XSingleResult<GetBaseClientPropertyViewOutput> getBaseClientPropertyView(XContext context, GetBaseClientPropertyViewInput input){
-        BaseClientPropertyViewMapper mapper = context.getBean(BaseClientPropertyViewMapper.class);
-        BaseClientPropertyView record = new BaseClientPropertyView();
-        XCopyUtils.copyObject(input, record);
-        BaseClientPropertyView view = mapper.selectOne(record);
-        if(view == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetBaseClientPropertyViewOutput output = new GetBaseClientPropertyViewOutput();
-        XCopyUtils.copyObject(view, output);
-        return XSingleResult.success(output);
-    }
-
-    @XApiGet
-    public XPageResult<QueryBaseClientPropertyViewOutput> queryBaseClientPropertyView(XContext context, QueryBaseClientPropertyViewInput input){
-        BaseClientPropertyViewMapper mapper = context.getBean(BaseClientPropertyViewMapper.class);
-        BaseClientPropertyView record = new BaseClientPropertyView();
-        XCopyUtils.copyObject(input, record);
-        PageHelper.startPage(input.getPage(), input.getLimit());
-        List<BaseClientPropertyView> list = mapper.selectList(record);
-        PageInfo<BaseClientPropertyView> pageInfo = new PageInfo<>(list);
-        List<QueryBaseClientPropertyViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseClientPropertyViewOutput.class);
-        return XPageResult.success(outputs, input, pageInfo.getTotal());
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseClientStationRelServiceImpl.java

-package pps.core.base.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.util.CollectionUtils;
-import pps.cloud.base.service.BaseBaseClientStationRelService;
-import pps.cloud.base.service.data.*;
-import pps.core.base.entity.BaseClientStationRelEnt;
-import pps.core.base.entity.BaseClientStationRelView;
-import pps.core.base.mapper.BaseClientStationRelMapper;
-import pps.core.base.mapper.BaseClientStationRelViewMapper;
-import pps.core.base.mapper.BaseClientViewMapper;
-import xstartup.annotation.XService;
-import xstartup.annotation.XText;
-import xstartup.base.XContext;
-import xstartup.base.util.XCopyUtils;
-import xstartup.base.util.XStringUtils;
-import xstartup.data.XListResult;
-
-import java.util.List;
-
-@XService
-public class BaseClientStationRelServiceImpl implements BaseBaseClientStationRelService {
-    @XText("根据场站、管线、管道查询客户数据")
-    @Override
-    public XListResult<GetBaseClientStationRelViewOutput> selectListByStationIdAndPipelineIdAndSegmentId(XContext context, GetBaseClientStationRelViewInput input) {
-        BaseClientStationRelViewMapper mapper = context.getBean(BaseClientStationRelViewMapper.class);
-        BaseClientStationRelView record = new BaseClientStationRelView();
-        XCopyUtils.copyObject(input, record);
-        List<BaseClientStationRelView> list = mapper.selectListByStationIdAndPipelineIdAndSegmentId(record);
-        List<GetBaseClientStationRelViewOutput> outputs = XCopyUtils.copyNewList(list , GetBaseClientStationRelViewOutput.class);
-        return XListResult.success(outputs);
-    }
-
-    @XText("根据场站获取托运商数据")
-    @Override
-    public XListResult<FindBaseClientOutput> selectConsignorByStationIds(XContext context, BaseStationIdInput input) {
-        BaseClientStationRelViewMapper mapper = context.getBean(BaseClientStationRelViewMapper.class);
-        BaseClientStationRelView record = new BaseClientStationRelView();
-        XCopyUtils.copyObject(input, record);
-        List<BaseClientStationRelView> list = mapper.selectConsignorListByStationIds(record);
-        List<FindBaseClientOutput> outputs = XCopyUtils.copyNewList(list , FindBaseClientOutput.class);
-        return XListResult.success(outputs);
-    }
-
-    @XText("根据下游用户，查询场站数据")
-    @Override
-    public XListResult<GetBaseClientStationRelViewOutput> selectListByClientIds(XContext context, BaseClientIdInput input) {
-        BaseClientStationRelViewMapper mapper = context.getBean(BaseClientStationRelViewMapper.class);
-        BaseClientStationRelView relView = new BaseClientStationRelView();
-        if(XStringUtils.isNotEmpty(input.getClientId()))
-            relView.setClientId(input.getClientId());
-        if(!CollectionUtils.isEmpty(input.getClientIds()))
-            relView.setClientIds(input.getClientIds());
-        List<BaseClientStationRelView> list = mapper.selectListByClientIds(relView);
-        List<GetBaseClientStationRelViewOutput> outputs = XCopyUtils.copyNewList(list , GetBaseClientStationRelViewOutput.class);
-        return XListResult.success(outputs);
-    }
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/ScadaGatherConfInService.java → C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseDataService.java

 package pps.core.base.service;
 
-import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import pps.core.base.mapper.*;
-import pps.core.base.entity.*;
-import pps.core.base.service.data.scada_gather_conf_in.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import pps.core.base.entity.BaseDataEnt;
+import pps.core.base.entity.BaseDataView;
+import pps.core.base.mapper.BaseDataMapper;
+import pps.core.base.mapper.BaseDataViewMapper;
+import pps.core.base.service.data.base_data.*;
 import xstartup.annotation.XService;
-import xstartup.feature.api.annotation.XApiPost;
-import xstartup.feature.api.annotation.XApiGet;
-import xstartup.feature.api.annotation.XApiAnonymous;
-import xstartup.data.XServiceResult;
-import xstartup.data.XSingleResult;
-import xstartup.data.XListResult;
-import xstartup.data.XPageResult;
-import xstartup.annotation.XText;
 import xstartup.base.XContext;
+import xstartup.base.data.CustomQueryInput;
 import xstartup.base.util.XCopyUtils;
+import xstartup.data.XPageResult;
+import xstartup.data.XServiceResult;
+import xstartup.data.XSingleResult;
 import xstartup.error.XError;
-import xstartup.base.data.CustomQueryInput;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
+import xstartup.feature.api.annotation.XApiAnonymous;
+import xstartup.feature.api.annotation.XApiGet;
+import xstartup.feature.api.annotation.XApiPost;
+import xstartup.feature.mybatis.helper.XMapperHelper;
+
 import java.util.List;
 
 @XService
-public class ScadaGatherConfInService {
+public class BaseDataService {
     @XApiAnonymous
     @XApiPost
-    public XServiceResult createScadaGatherConfIn(XContext context, CreateScadaGatherConfInInput input){
-        ScadaGatherConfInMapper mapper = context.getBean(ScadaGatherConfInMapper.class);
-        ScadaGatherConfInEnt entity = new ScadaGatherConfInEnt();
+    public XServiceResult createBaseData(XContext context, CreateBaseDataInput input){
+        BaseDataMapper mapper = context.getBean(BaseDataMapper.class);
+        BaseDataEnt entity = new BaseDataEnt();
         XCopyUtils.copyObject(input, entity);
         mapper.insert(entity);
         return XServiceResult.OK;
@@ -39,11 +37,11 @@ public class ScadaGatherConfInService {
 
     @XApiAnonymous
     @XApiPost
-    public XServiceResult updateScadaGatherConfIn(XContext context, UpdateScadaGatherConfInInput input){
-        ScadaGatherConfInMapper mapper = context.getBean(ScadaGatherConfInMapper.class);
-        QueryWrapper<ScadaGatherConfInEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(ScadaGatherConfInEnt::getId, input.getId());
-        ScadaGatherConfInEnt entity = mapper.selectOne(queryWrapper);
+    public XServiceResult updateBaseData(XContext context, UpdateBaseDataInput input){
+        BaseDataMapper mapper = context.getBean(BaseDataMapper.class);
+        QueryWrapper<BaseDataEnt> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(BaseDataEnt::getId, input.getId());
+        BaseDataEnt entity = mapper.selectOne(queryWrapper);
         if(entity == null) {
             return XServiceResult.error(context, XError.NotFound);
         }
@@ -54,11 +52,11 @@ public class ScadaGatherConfInService {
 
     @XApiAnonymous
     @XApiPost
-    public XServiceResult deleteScadaGatherConfIn(XContext context, DeleteScadaGatherConfInInput input){
-        ScadaGatherConfInMapper mapper = context.getBean(ScadaGatherConfInMapper.class);
-        QueryWrapper<ScadaGatherConfInEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(ScadaGatherConfInEnt::getId, input.getId());
-        ScadaGatherConfInEnt entity = mapper.selectOne(queryWrapper);
+    public XServiceResult deleteBaseData(XContext context, DeleteBaseDataInput input){
+        BaseDataMapper mapper = context.getBean(BaseDataMapper.class);
+        QueryWrapper<BaseDataEnt> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(BaseDataEnt::getId, input.getId());
+        BaseDataEnt entity = mapper.selectOne(queryWrapper);
         if(entity == null) {
             return XServiceResult.error(context, XError.NotFound);
         }
@@ -68,47 +66,34 @@ public class ScadaGatherConfInService {
 
     @XApiAnonymous
     @XApiGet
-    public XSingleResult<GetScadaGatherConfInOutput> getScadaGatherConfIn(XContext context, GetScadaGatherConfInInput input){
-        ScadaGatherConfInMapper mapper = context.getBean(ScadaGatherConfInMapper.class);
-        QueryWrapper<ScadaGatherConfInEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(ScadaGatherConfInEnt::getId, input.getId());
-        ScadaGatherConfInEnt entity = mapper.selectOne(queryWrapper);
+    public XSingleResult<GetBaseDataOutput> getBaseData(XContext context, GetBaseDataInput input){
+        BaseDataMapper mapper = context.getBean(BaseDataMapper.class);
+        QueryWrapper<BaseDataEnt> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(BaseDataEnt::getId, input.getId());
+        BaseDataEnt entity = mapper.selectOne(queryWrapper);
         if(entity == null) {
             return XSingleResult.error(context, XError.NotFound);
         }
-        GetScadaGatherConfInOutput output = new GetScadaGatherConfInOutput();
+        GetBaseDataOutput output = new GetBaseDataOutput();
         XCopyUtils.copyObject(entity, output);
         return XSingleResult.success(output);
     }
 
-
-
     @XApiAnonymous
     @XApiGet
-    public XSingleResult<GetScadaGatherConfInViewOutput> getScadaGatherConfInView(XContext context, GetScadaGatherConfInViewInput input){
-        ScadaGatherConfInViewMapper mapper = context.getBean(ScadaGatherConfInViewMapper.class);
-        ScadaGatherConfInView record = new ScadaGatherConfInView();
-        XCopyUtils.copyObject(input, record);
-        ScadaGatherConfInView view = mapper.selectOne(record);
-        if(view == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetScadaGatherConfInViewOutput output = new GetScadaGatherConfInViewOutput();
-        XCopyUtils.copyObject(view, output);
-        return XSingleResult.success(output);
+    public XPageResult<QueryBaseDataOutput> queryBaseData(XContext context, QueryBaseDataInput input){
+        BaseDataMapper mapper = context.getBean(BaseDataMapper.class);
+        QueryWrapper<BaseDataEnt> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(BaseDataEnt::getOuId, input.getOuId())
+            .eq(BaseDataEnt::getLineId, input.getLineId())
+            .eq(BaseDataEnt::getDataDate, input.getDataDate());
+        return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseDataOutput.class);
     }
 
     @XApiAnonymous
     @XApiGet
-    public XPageResult<QueryScadaGatherConfInViewOutput> queryScadaGatherConfInView(XContext context, QueryScadaGatherConfInViewInput input){
-        ScadaGatherConfInViewMapper mapper = context.getBean(ScadaGatherConfInViewMapper.class);
-        ScadaGatherConfInView record = new ScadaGatherConfInView();
-        XCopyUtils.copyObject(input, record);
-        PageHelper.startPage(input.getPage(), input.getLimit());
-        List<ScadaGatherConfInView> list = mapper.selectList(record);
-        PageInfo<ScadaGatherConfInView> pageInfo = new PageInfo<>(list);
-        List<QueryScadaGatherConfInViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryScadaGatherConfInViewOutput.class);
-        return XPageResult.success(outputs, input, pageInfo.getTotal());
+    public XPageResult<QueryBaseDataOutput> dynamicQueryBaseData(XContext context, CustomQueryInput input){
+        BaseDataMapper mapper = context.getBean(BaseDataMapper.class);
+        return XMapperHelper.query(mapper, input, BaseDataEnt.class, QueryBaseDataOutput.class);
     }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseEquipmentClientRelService.java

-package pps.core.base.service;
-
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import pps.core.base.mapper.*;
-import pps.core.base.entity.*;
-import pps.core.base.service.data.base_equipment_client_rel.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import xstartup.annotation.XService;
-import xstartup.feature.api.annotation.XApiPost;
-import xstartup.feature.api.annotation.XApiGet;
-import xstartup.feature.api.annotation.XApiAnonymous;
-import xstartup.data.XServiceResult;
-import xstartup.data.XSingleResult;
-import xstartup.data.XListResult;
-import xstartup.data.XPageResult;
-import xstartup.annotation.XText;
-import xstartup.base.XContext;
-import xstartup.base.util.XCopyUtils;
-import xstartup.error.XError;
-import xstartup.base.data.CustomQueryInput;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import xstartup.feature.mybatis.helper.XMapperHelper;
-
-import java.util.List;
-
-@XService
-public class BaseEquipmentClientRelService {
-    
-    @XApiPost
-    public XServiceResult createBaseEquipmentClientRel(XContext context, CreateBaseEquipmentClientRelInput input){
-        BaseEquipmentClientRelMapper mapper = context.getBean(BaseEquipmentClientRelMapper.class);
-        BaseEquipmentClientRelEnt entity = new BaseEquipmentClientRelEnt();
-        XCopyUtils.copyObject(input, entity);
-        mapper.insert(entity);
-        return XServiceResult.OK;
-    }
-
-    
-    @XApiPost
-    public XServiceResult updateBaseEquipmentClientRel(XContext context, UpdateBaseEquipmentClientRelInput input){
-        BaseEquipmentClientRelMapper mapper = context.getBean(BaseEquipmentClientRelMapper.class);
-        QueryWrapper<BaseEquipmentClientRelEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseEquipmentClientRelEnt::getId, input.getId());
-        BaseEquipmentClientRelEnt entity = mapper.selectOne(queryWrapper);
-        if(entity == null) {
-            return XServiceResult.error(context, XError.NotFound);
-        }
-        XCopyUtils.copyObject(input, entity);
-        mapper.updateById(entity);
-        return XServiceResult.OK;
-    }
-
-    
-    @XApiPost
-    public XServiceResult deleteBaseEquipmentClientRel(XContext context, DeleteBaseEquipmentClientRelInput input){
-        BaseEquipmentClientRelMapper mapper = context.getBean(BaseEquipmentClientRelMapper.class);
-        QueryWrapper<BaseEquipmentClientRelEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseEquipmentClientRelEnt::getId, input.getId());
-        BaseEquipmentClientRelEnt entity = mapper.selectOne(queryWrapper);
-        if(entity == null) {
-            return XServiceResult.error(context, XError.NotFound);
-        }
-        mapper.deleteById(entity);
-        return XServiceResult.OK;
-    }
-
-    
-    @XApiGet
-    public XSingleResult<GetBaseEquipmentClientRelOutput> getBaseEquipmentClientRel(XContext context, GetBaseEquipmentClientRelInput input){
-        BaseEquipmentClientRelMapper mapper = context.getBean(BaseEquipmentClientRelMapper.class);
-        QueryWrapper<BaseEquipmentClientRelEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseEquipmentClientRelEnt::getId, input.getId());
-        BaseEquipmentClientRelEnt entity = mapper.selectOne(queryWrapper);
-        if(entity == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetBaseEquipmentClientRelOutput output = new GetBaseEquipmentClientRelOutput();
-        XCopyUtils.copyObject(entity, output);
-        return XSingleResult.success(output);
-    }
-
-    
-    @XApiGet
-    public XPageResult<QueryBaseEquipmentClientRelOutput> queryBaseEquipmentClientRel(XContext context, QueryBaseEquipmentClientRelInput input){
-        BaseEquipmentClientRelMapper mapper = context.getBean(BaseEquipmentClientRelMapper.class);
-        QueryWrapper<BaseEquipmentClientRelEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().like(BaseEquipmentClientRelEnt::getId, input.getId())
-            .like(BaseEquipmentClientRelEnt::getEquipmentId, input.getEquipmentId())
-            .like(BaseEquipmentClientRelEnt::getClientId, input.getClientId())
-            .eq(BaseEquipmentClientRelEnt::getEffectTime, input.getEffectTime())
-            .eq(BaseEquipmentClientRelEnt::getEndTime, input.getEndTime())
-            .like(BaseEquipmentClientRelEnt::getCreateById, input.getCreateById())
-            .like(BaseEquipmentClientRelEnt::getCreateByName, input.getCreateByName())
-            .eq(BaseEquipmentClientRelEnt::getCreateTime, input.getCreateTime())
-            .like(BaseEquipmentClientRelEnt::getModifyById, input.getModifyById())
-            .like(BaseEquipmentClientRelEnt::getModifyByName, input.getModifyByName())
-            .eq(BaseEquipmentClientRelEnt::getModifyTime, input.getModifyTime());
-        return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseEquipmentClientRelOutput.class);
-    }
-
-    
-    @XApiGet
-    public XPageResult<QueryBaseEquipmentClientRelOutput> dynamicQueryBaseEquipmentClientRel(XContext context, CustomQueryInput input){
-        BaseEquipmentClientRelMapper mapper = context.getBean(BaseEquipmentClientRelMapper.class);
-        return XMapperHelper.query(mapper, input, BaseEquipmentClientRelEnt.class, QueryBaseEquipmentClientRelOutput.class);
-    }
-
-    
-    @XApiGet
-    public XSingleResult<GetBaseEquipmentClientRelViewOutput> getBaseEquipmentClientRelView(XContext context, GetBaseEquipmentClientRelViewInput input){
-        BaseEquipmentClientRelViewMapper mapper = context.getBean(BaseEquipmentClientRelViewMapper.class);
-        BaseEquipmentClientRelView record = new BaseEquipmentClientRelView();
-        XCopyUtils.copyObject(input, record);
-        BaseEquipmentClientRelView view = mapper.selectOne(record);
-        if(view == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetBaseEquipmentClientRelViewOutput output = new GetBaseEquipmentClientRelViewOutput();
-        XCopyUtils.copyObject(view, output);
-        return XSingleResult.success(output);
-    }
-
-    
-    @XApiGet
-    public XPageResult<QueryBaseEquipmentClientRelViewOutput> queryBaseEquipmentClientRelView(XContext context, QueryBaseEquipmentClientRelViewInput input){
-        BaseEquipmentClientRelViewMapper mapper = context.getBean(BaseEquipmentClientRelViewMapper.class);
-        BaseEquipmentClientRelView record = new BaseEquipmentClientRelView();
-        XCopyUtils.copyObject(input, record);
-        PageHelper.startPage(input.getPage(), input.getLimit());
-        List<BaseEquipmentClientRelView> list = mapper.selectList(record);
-        PageInfo<BaseEquipmentClientRelView> pageInfo = new PageInfo<>(list);
-        List<QueryBaseEquipmentClientRelViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseEquipmentClientRelViewOutput.class);
-        return XPageResult.success(outputs, input, pageInfo.getTotal());
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseEquipmentPropertyService.java

-package pps.core.base.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import pps.core.base.mapper.*;
-import pps.core.base.entity.*;
-import pps.core.base.service.data.base_equipment_property.*;
-import pps.core.common.session.PpsUserSession;
-import xstartup.annotation.XService;
-import xstartup.annotation.XText;
-import xstartup.data.XListResult;
-import xstartup.feature.api.annotation.XApiPost;
-import xstartup.feature.api.annotation.XApiGet;
-import xstartup.feature.api.annotation.XApiAnonymous;
-import xstartup.data.XServiceResult;
-import xstartup.data.XSingleResult;
-import xstartup.data.XPageResult;
-import xstartup.base.XContext;
-import xstartup.base.util.XCopyUtils;
-import xstartup.error.XError;
-import xstartup.base.data.CustomQueryInput;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import xstartup.feature.mybatis.helper.XMapperHelper;
-
-import java.util.Date;
-import java.util.List;
-
-@XService
-public class BaseEquipmentPropertyService {
-
-    @XApiPost
-    public XServiceResult createBaseEquipmentProperty(XContext context, CreateBaseEquipmentPropertyInput input){
-        BaseEquipmentPropertyMapper mapper = context.getBean(BaseEquipmentPropertyMapper.class);
-        PpsUserSession session = context.getSession(PpsUserSession.class);
-        BaseEquipmentPropertyEnt entity = new BaseEquipmentPropertyEnt();
-        XCopyUtils.copyObject(input, entity);
-        entity.setCreateById(session.getId());
-        entity.setCreateByName(session.getLoginName());
-        entity.setCreateTime(new Date());
-        mapper.insert(entity);
-        return XServiceResult.OK;
-    }
-
-    @XApiPost
-    public XServiceResult updateBaseEquipmentProperty(XContext context, UpdateBaseEquipmentPropertyInput input){
-        BaseEquipmentPropertyMapper mapper = context.getBean(BaseEquipmentPropertyMapper.class);
-        PpsUserSession session = context.getSession(PpsUserSession.class);
-        QueryWrapper<BaseEquipmentPropertyEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseEquipmentPropertyEnt::getId, input.getId());
-        BaseEquipmentPropertyEnt entity = mapper.selectOne(queryWrapper);
-        if(entity == null) {
-            return XServiceResult.error(context, XError.NotFound);
-        }
-        XCopyUtils.copyObject(input, entity);
-        entity.setModifyById(session.getId());
-        entity.setModifyByName(session.getLoginName());
-        entity.setModifyTime(new Date());
-        mapper.updateById(entity);
-        return XServiceResult.OK;
-    }
-
-
-    @XApiPost
-    public XServiceResult deleteBaseEquipmentProperty(XContext context, DeleteBaseEquipmentPropertyInput input){
-        BaseEquipmentPropertyMapper mapper = context.getBean(BaseEquipmentPropertyMapper.class);
-        QueryWrapper<BaseEquipmentPropertyEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseEquipmentPropertyEnt::getId, input.getId());
-        BaseEquipmentPropertyEnt entity = mapper.selectOne(queryWrapper);
-        if(entity == null) {
-            return XServiceResult.error(context, XError.NotFound);
-        }
-        mapper.deleteById(entity);
-        return XServiceResult.OK;
-    }
-
-
-    @XApiGet
-    public XSingleResult<GetBaseEquipmentPropertyOutput> getBaseEquipmentProperty(XContext context, GetBaseEquipmentPropertyInput input){
-        BaseEquipmentPropertyMapper mapper = context.getBean(BaseEquipmentPropertyMapper.class);
-        QueryWrapper<BaseEquipmentPropertyEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseEquipmentPropertyEnt::getId, input.getId());
-        BaseEquipmentPropertyEnt entity = mapper.selectOne(queryWrapper);
-        if(entity == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetBaseEquipmentPropertyOutput output = new GetBaseEquipmentPropertyOutput();
-        XCopyUtils.copyObject(entity, output);
-        return XSingleResult.success(output);
-    }
-
-
-    @XApiGet
-    public XPageResult<QueryBaseEquipmentPropertyOutput> queryBaseEquipmentProperty(XContext context, QueryBaseEquipmentPropertyInput input){
-        BaseEquipmentPropertyMapper mapper = context.getBean(BaseEquipmentPropertyMapper.class);
-        QueryWrapper<BaseEquipmentPropertyEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().like(BaseEquipmentPropertyEnt::getId, input.getId())
-            .like(BaseEquipmentPropertyEnt::getEquipmentId, input.getEquipmentId())
-            .like(BaseEquipmentPropertyEnt::getPropertyId, input.getPropertyId())
-            .like(BaseEquipmentPropertyEnt::getPropertyNameEn, input.getPropertyNameEn())
-            .like(BaseEquipmentPropertyEnt::getPropertyValue, input.getPropertyValue())
-            .like(BaseEquipmentPropertyEnt::getCreateById, input.getCreateById())
-            .like(BaseEquipmentPropertyEnt::getCreateByName, input.getCreateByName())
-            .like(BaseEquipmentPropertyEnt::getModifyById, input.getModifyById())
-            .like(BaseEquipmentPropertyEnt::getModifyByName, input.getModifyByName());
-        return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseEquipmentPropertyOutput.class);
-    }
-
-
-    @XApiGet
-    public XPageResult<QueryBaseEquipmentPropertyOutput> dynamicQueryBaseEquipmentProperty(XContext context, CustomQueryInput input){
-        BaseEquipmentPropertyMapper mapper = context.getBean(BaseEquipmentPropertyMapper.class);
-        return XMapperHelper.query(mapper, input, BaseEquipmentPropertyEnt.class, QueryBaseEquipmentPropertyOutput.class);
-    }
-
-
-    @XApiGet
-    public XSingleResult<GetBaseEquipmentPropertyViewOutput> getBaseEquipmentPropertyView(XContext context, GetBaseEquipmentPropertyViewInput input){
-        BaseEquipmentPropertyViewMapper mapper = context.getBean(BaseEquipmentPropertyViewMapper.class);
-        BaseEquipmentPropertyView record = new BaseEquipmentPropertyView();
-        XCopyUtils.copyObject(input, record);
-        BaseEquipmentPropertyView view = mapper.selectOne(record);
-        if(view == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetBaseEquipmentPropertyViewOutput output = new GetBaseEquipmentPropertyViewOutput();
-        XCopyUtils.copyObject(view, output);
-        return XSingleResult.success(output);
-    }
-
-
-    @XApiGet
-    public XPageResult<QueryBaseEquipmentPropertyViewOutput> queryBaseEquipmentPropertyView(XContext context, QueryBaseEquipmentPropertyViewInput input){
-        BaseEquipmentPropertyViewMapper mapper = context.getBean(BaseEquipmentPropertyViewMapper.class);
-        BaseEquipmentPropertyView record = new BaseEquipmentPropertyView();
-        XCopyUtils.copyObject(input, record);
-        PageHelper.startPage(input.getPage(), input.getLimit());
-        List<BaseEquipmentPropertyView> list = mapper.selectList(record);
-        PageInfo<BaseEquipmentPropertyView> pageInfo = new PageInfo<>(list);
-        List<QueryBaseEquipmentPropertyViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseEquipmentPropertyViewOutput.class);
-        return XPageResult.success(outputs, input, pageInfo.getTotal());
-    }
-
-    @XText("根据设备id和属性英文名称查询设备属性值")
-    @XApiGet
-    public XSingleResult<BaseEquipmentPropertyView> queryBaseEquipmentPropertyView(XContext context, BaseEquipmentPropertyView input){
-        BaseEquipmentPropertyMapper mapper = context.getBean(BaseEquipmentPropertyMapper.class);
-        QueryWrapper<BaseEquipmentPropertyEnt> queryWrapper = new QueryWrapper();
-        queryWrapper.lambda().eq(BaseEquipmentPropertyEnt::getEquipmentId,input.getEquipmentId()).
-                eq(BaseEquipmentPropertyEnt::getPropertyNameEn,input.getPropertyNameEn());
-        BaseEquipmentPropertyEnt Ent = mapper.selectOne(queryWrapper);
-        BaseEquipmentPropertyView view = XCopyUtils.copyNewObject(Ent, BaseEquipmentPropertyView.class);
-        return XSingleResult.success(view);
-    }
-
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseLineService.java

+package pps.core.base.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageInfo;
+import org.apache.commons.lang3.StringUtils;
+import pps.core.base.entity.BaseLineAllView;
+import pps.core.base.entity.BaseLineEnt;
+import pps.core.base.entity.BaseLineView;
+import pps.core.base.mapper.BaseLineMapper;
+import pps.core.base.mapper.BaseLineViewMapper;
+import pps.core.base.service.data.base_line.*;
+import xstartup.annotation.XService;
+import xstartup.base.XContext;
+import xstartup.base.data.CustomQueryInput;
+import xstartup.base.util.XCopyUtils;
+import xstartup.data.XListResult;
+import xstartup.data.XPageResult;
+import xstartup.data.XServiceResult;
+import xstartup.data.XSingleResult;
+import xstartup.error.XError;
+import xstartup.feature.api.annotation.XApiAnonymous;
+import xstartup.feature.api.annotation.XApiPost;
+import xstartup.feature.api.annotation.XApiPost;
+import xstartup.feature.mybatis.helper.XMapperHelper;
+
+import java.util.List;
+
+@XService
+public class BaseLineService {
+    @XApiAnonymous
+    @XApiPost
+    public XServiceResult createBaseLine(XContext context, CreateBaseLineInput input){
+        BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
+        BaseLineEnt entity = new BaseLineEnt();
+        XCopyUtils.copyObject(input, entity);
+        mapper.insert(entity);
+        return XServiceResult.OK;
+    }
+
+    @XApiAnonymous
+    @XApiPost
+    public XServiceResult updateBaseLine(XContext context, UpdateBaseLineInput input){
+        BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
+        QueryWrapper<BaseLineEnt> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(BaseLineEnt::getId, input.getId());
+        BaseLineEnt entity = mapper.selectOne(queryWrapper);
+        if(entity == null) {
+            return XServiceResult.error(context, XError.NotFound);
+        }
+        XCopyUtils.copyObject(input, entity);
+        mapper.updateById(entity);
+        return XServiceResult.OK;
+    }
+
+    @XApiAnonymous
+    @XApiPost
+    public XServiceResult deleteBaseLine(XContext context, DeleteBaseLineInput input){
+        BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
+        QueryWrapper<BaseLineEnt> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(BaseLineEnt::getId, input.getId());
+        BaseLineEnt entity = mapper.selectOne(queryWrapper);
+        if(entity == null) {
+            return XServiceResult.error(context, XError.NotFound);
+        }
+        mapper.deleteById(entity);
+        return XServiceResult.OK;
+    }
+
+    @XApiAnonymous
+    @XApiPost
+    public XSingleResult<GetBaseLineOutput> getBaseLine(XContext context, GetBaseLineInput input){
+        BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
+        QueryWrapper<BaseLineEnt> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(BaseLineEnt::getId, input.getId());
+        BaseLineEnt entity = mapper.selectOne(queryWrapper);
+        if(entity == null) {
+            return XSingleResult.error(context, XError.NotFound);
+        }
+        GetBaseLineOutput output = new GetBaseLineOutput();
+        XCopyUtils.copyObject(entity, output);
+        return XSingleResult.success(output);
+    }
+
+    @XApiAnonymous
+    @XApiPost
+    public XListResult<QueryBaseLineOutput> queryBaseLineList(XContext context, QueryBaseLineListInput input){
+        BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
+        List<BaseLineEnt> list = mapper.selectList(new QueryWrapper<>());
+        List<QueryBaseLineOutput> outputs = XCopyUtils.copyNewList(list, QueryBaseLineOutput.class);
+        return XListResult.success(outputs);
+    }
+
+    @XApiAnonymous
+    @XApiPost
+    public XPageResult<QueryBaseLineOutput> queryBaseLine(XContext context, QueryBaseLineInput input){
+        BaseLineViewMapper mapper = context.getBean(BaseLineViewMapper.class);
+        BaseLineView view = XCopyUtils.copyNewObject(input,BaseLineView.class);
+        List<BaseLineView> list = mapper.selectList(view);
+        PageInfo<BaseLineView> pageInfo = new PageInfo(list);
+        List<QueryBaseLineOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseLineOutput.class);
+        return XPageResult.success(outputs, input, pageInfo.getTotal());
+    }
+
+    @XApiAnonymous
+    @XApiPost
+    public XPageResult<QueryBaseLineAllOutput> queryAllBaseLine(XContext context, QueryBaseLineInput input){
+        BaseLineViewMapper mapper = context.getBean(BaseLineViewMapper.class);
+        BaseLineView view = XCopyUtils.copyNewObject(input,BaseLineView.class);
+        List<BaseLineAllView> list = mapper.selectDataList(view);
+        PageInfo<BaseLineAllView> pageInfo = new PageInfo(list);
+        List<QueryBaseLineAllOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseLineAllOutput.class);
+        return XPageResult.success(outputs, input, pageInfo.getTotal());
+    }
+
+    @XApiAnonymous
+    @XApiPost
+    public XPageResult<QueryBaseLineOutput> dynamicQueryBaseLine(XContext context, CustomQueryInput input){
+        BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
+        return XMapperHelper.query(mapper, input, BaseLineEnt.class, QueryBaseLineOutput.class);
+    }
+
+}

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseOperationalConstraintService.java

-package pps.core.base.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.apache.logging.log4j.util.Strings;
-import pps.cloud.base.service.BaseBaseOperationalConstraintCloudService;
-import pps.cloud.base.service.data.base_operational_constraint.GetBaseOperationalConstraintInput;
-import pps.cloud.base.service.data.base_operational_constraint.GetBaseOperationalConstraintOuput;
-import pps.core.base.constant.OperationalConstraintConstant;
-import pps.core.base.entity.BaseOperationalConstraintEnt;
-import pps.core.base.entity.BaseOperationalConstraintExtendEnt;
-import pps.core.base.mapper.BaseOperationalConstraintExtendMapper;
-import pps.core.base.mapper.BaseOperationalConstraintMapper;
-import pps.core.base.service.data.base_operational_constraint.BaseOperationalConstraintInput;
-import pps.core.base.service.data.base_operational_constraint.BaseOperationalConstraintOuput;
-import pps.core.common.session.PpsUserSession;
-import pps.core.common.utils.UUIDHelper;
-import xstartup.annotation.XService;
-import xstartup.annotation.XText;
-import xstartup.base.XContext;
-import xstartup.base.util.XCopyUtils;
-import xstartup.base.util.XDateUtils;
-import xstartup.data.XServiceResult;
-import xstartup.data.XSingleResult;
-import xstartup.feature.api.annotation.XApiGet;
-import xstartup.feature.api.annotation.XApiPost;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@XText("操作约束相关接口")
-@XService
-public class BaseOperationalConstraintService {
-
-    private final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-
-    private final String BUSINESS_TYPE_SHIPPER_SPLIT = "SHIPPER_GAS_SPLIT";
-    private final String DEFAULT_TIME = "11:00";
-
-    @XText("获取托运商气量拆分约束信息")
-    @XApiGet
-    public XSingleResult<BaseOperationalConstraintOuput> getDataForShipperSplit(XContext context) {
-        BaseOperationalConstraintMapper mapper = context.getBean(BaseOperationalConstraintMapper.class);
-        QueryWrapper<BaseOperationalConstraintEnt> qr = new QueryWrapper<>();
-        qr.lambda().eq(BaseOperationalConstraintEnt::getBusineType,BUSINESS_TYPE_SHIPPER_SPLIT).last(" limit 0,1");
-        BaseOperationalConstraintEnt ent = mapper.selectOne(qr);
-        if(ent == null){
-            PpsUserSession session = context.getSession(PpsUserSession.class);
-            ent = new BaseOperationalConstraintEnt();
-            ent.setId(UUIDHelper.newUUID());
-            ent.setBusineType(BUSINESS_TYPE_SHIPPER_SPLIT);
-            ent.setCreateById(session.getId());
-            ent.setCreateByName(session.getUserName());
-            ent.setCreateTime(new Date());
-            mapper.insert(ent);
-        }
-        BaseOperationalConstraintOuput output = XCopyUtils.copyNewObject(ent, BaseOperationalConstraintOuput.class);
-        return XSingleResult.success(output);
-    }
-
-    @XText("更新操作约束信息")
-    @XApiGet
-    public XServiceResult updateData(XContext context, BaseOperationalConstraintInput input) {
-        BaseOperationalConstraintMapper mapper = context.getBean(BaseOperationalConstraintMapper.class);
-        BaseOperationalConstraintEnt ent = mapper.selectById(input.getId());
-        if(ent == null){
-            return XServiceResult.error(500,"数据不存在");
-        }
-        PpsUserSession session = context.getSession(PpsUserSession.class);
-        XCopyUtils.copyObject(input,ent);
-        ent.setModifyById(session.getId());
-        ent.setModifyByName(session.getUserName());
-        ent.setModifyTime(new Date());
-        mapper.updateById(ent);
-        return XServiceResult.OK;
-    }
-}

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseOperationalConstraintServiceImpl.java

-package pps.core.base.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.apache.logging.log4j.util.Strings;
-import pps.cloud.base.service.BaseBaseOperationalConstraintCloudService;
-import pps.cloud.base.service.data.base_operational_constraint.GetBaseOperationalConstraintInput;
-import pps.cloud.base.service.data.base_operational_constraint.GetBaseOperationalConstraintOuput;
-import pps.core.base.constant.OperationalConstraintConstant;
-import pps.core.base.entity.BaseOperationalConstraintEnt;
-import pps.core.base.entity.BaseOperationalConstraintExtendEnt;
-import pps.core.base.mapper.BaseOperationalConstraintExtendMapper;
-import pps.core.base.mapper.BaseOperationalConstraintMapper;
-import xstartup.annotation.XService;
-import xstartup.annotation.XText;
-import xstartup.base.XContext;
-import xstartup.base.util.XCopyUtils;
-import xstartup.base.util.XDateUtils;
-import xstartup.data.XSingleResult;
-import xstartup.feature.api.annotation.XApiPost;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@XText("操作约束微服务接口")
-@XService
-public class BaseOperationalConstraintServiceImpl implements BaseBaseOperationalConstraintCloudService {
-
-    private final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-
-    @Override
-    @XText("获取操作约束信息")
-    @XApiPost
-    public XSingleResult<GetBaseOperationalConstraintOuput> getBaseOperationalConstraint(XContext context, GetBaseOperationalConstraintInput input) {
-        BaseOperationalConstraintMapper mapper = context.getBean(BaseOperationalConstraintMapper.class);
-        QueryWrapper<BaseOperationalConstraintEnt> qr = new QueryWrapper<>();
-        qr.lambda().eq(BaseOperationalConstraintEnt::getBusineType,input.getBusineType()).last(" limit 0,1");
-        BaseOperationalConstraintEnt ent = mapper.selectOne(qr);
-        //没有配置的话，当前业务不受时效限制
-        if(ent == null){
-            GetBaseOperationalConstraintOuput output = new GetBaseOperationalConstraintOuput();
-            output.setCanSaveOrSubmit(true);
-            output.setCanApplyChange(true);
-            output.setCanAudit(true);
-            return XSingleResult.success(output);
-        }
-        GetBaseOperationalConstraintOuput output = XCopyUtils.copyNewObject(ent, GetBaseOperationalConstraintOuput.class);
-        output.setOperationalDate(input.getOperationalDate());
-        output.setStationId(input.getStationId());
-        this.parseData(context,output);
-        return XSingleResult.success(output);
-    }
-
-    private void parseData(XContext context,GetBaseOperationalConstraintOuput output) {
-        Date operationalDate = output.getOperationalDate();
-        BaseOperationalConstraintExtendMapper extendMapper = context.getBean(BaseOperationalConstraintExtendMapper.class);
-        output.setCanSaveOrSubmit(this.checkCanOperational(extendMapper,OperationalConstraintConstant.OPERATIONAL_TYPE_SAVE,operationalDate,output.getSaveSubmitTime(),output.getStationId()));
-        output.setCanAudit(this.checkCanOperational(extendMapper, OperationalConstraintConstant.OPERATIONAL_TYPE_AUDIT,operationalDate,output.getAuditTime(),output.getStationId()));
-        output.setCanApplyChange(this.checkCanOperational(extendMapper, OperationalConstraintConstant.OPERATIONAL_TYPE_APPLY_CHANGE,operationalDate,output.getApplyChangeTime(),output.getStationId()));
-    }
-
-    /**
-     * 校验是否可以操作
-     * @param operationalDate
-     * @param operationalTime
-     * @return true 可以操作
-     */
-    private boolean checkCanOperational(BaseOperationalConstraintExtendMapper extendMapper,String operationalType,
-                                        Date operationalDate,String operationalTime,String stationId){
-        if(operationalDate == null) return false;
-        if(Strings.isBlank(operationalTime)) return true; //未设置操作时间限制
-        try{
-            //获取约束扩展数据
-            QueryWrapper<BaseOperationalConstraintExtendEnt> qr = new QueryWrapper<>();
-            qr.lambda().eq(BaseOperationalConstraintExtendEnt::getDataDate,operationalDate)
-                    .eq(BaseOperationalConstraintExtendEnt::getStationId,stationId)
-                    .eq(BaseOperationalConstraintExtendEnt::getOperationalType,operationalType).last("limit 0,1");
-            BaseOperationalConstraintExtendEnt extendEnt = extendMapper.selectOne(qr);
-            if(extendEnt != null){
-                operationalDate = extendEnt.getConstraintDate();
-            }else{
-                operationalTime = operationalTime.trim();
-                if(operationalTime.length()>5) operationalTime = operationalTime.substring(0,5);
-                if(operationalTime.length() !=5 || operationalTime.charAt(2) != ':') return false;
-                operationalDate = XDateUtils.getDayBeginTime(operationalDate);
-                String tempTimeStr = XDateUtils.getString(operationalDate,"yyyy-MM-dd")+" "+operationalTime;
-                operationalDate = simpleDateFormat.parse(tempTimeStr);
-            }
-            return operationalDate.getTime() > new Date().getTime();
-        }catch (Exception e){
-            e.printStackTrace();
-            return false;
-        }
-    }
-}