修改实体类

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TdHygfJpCollectorHistoryDto.java

@@ -14,9 +14,8 @@ import java.util.Date;
  * @date 2023-09-19
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="TdHygfJpCollectorHistoryDto", description="户用光伏监盘采集器历史表")
-public class TdHygfJpCollectorHistoryDto  extends BaseDto {
+public class TdHygfJpCollectorHistoryDto   {
 
    private static final long serialVersionUID = 1L;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TdHygfJpInverterHistoryDto.java

@@ -14,9 +14,8 @@ import java.util.Date;
  * @date 2023-09-19
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="TdHygfJpInverterHistoryDto", description="户用光伏监盘逆变器历史表")
-public class TdHygfJpInverterHistoryDto  extends BaseDto {
+public class TdHygfJpInverterHistoryDto  {
 
    private static final long serialVersionUID = 1L;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TdHygfJpInverterWarnDto.java

@@ -14,9 +14,8 @@ import java.util.Date;
  * @date 2023-09-19
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="TdHygfJpInverterWarnDto", description="户用光伏监盘逆变器报警表")
-public class TdHygfJpInverterWarnDto  extends BaseDto {
+public class TdHygfJpInverterWarnDto {
 
    private static final long serialVersionUID = 1L;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TdHygfJpInvertorElecHistoryDto.java

@@ -15,9 +15,8 @@ import java.util.Date;
  * @date 2023-09-19
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="TdHygfJpInvertorElecHistoryDto", description="户用光伏监盘逆变器电能历史表")
-public class TdHygfJpInvertorElecHistoryDto  extends BaseDto {
+public class TdHygfJpInvertorElecHistoryDto  {
 
    private static final long serialVersionUID = 1L;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TdHygfJpStationPowerHistoryDto.java

@@ -14,9 +14,8 @@ import java.util.Date;
  * @date 2023-09-19
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="TdHygfJpStationPowerHistoryDto", description="户用光伏监盘电站功率表")
-public class TdHygfJpStationPowerHistoryDto  extends BaseDto {
+public class TdHygfJpStationPowerHistoryDto  {
 
    private static final long serialVersionUID = 1L;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHygfJpCollectorHistory.java

@@ -15,10 +15,9 @@ import java.util.Date;
  * @date 2023-09-19
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("td_hygf_jp_collector_history")
-public class TdHygfJpCollectorHistory extends BaseEntity {
+public class TdHygfJpCollectorHistory {
 
     private static final long serialVersionUID = 1L;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHygfJpInverterHistory.java

@@ -15,10 +15,9 @@ import java.util.Date;
  * @date 2023-09-19
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("td_hygf_jp_inverter_history")
-public class TdHygfJpInverterHistory extends BaseEntity {
+public class TdHygfJpInverterHistory  {
 
     private static final long serialVersionUID = 1L;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHygfJpInverterWarn.java

@@ -18,7 +18,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("td_hygf_jp_inverter_warn")
-public class TdHygfJpInverterWarn extends BaseEntity {
+public class TdHygfJpInverterWar {
 
     private static final long serialVersionUID = 1L;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHygfJpInvertorElecHistory.java

@@ -15,10 +15,9 @@ import java.util.Date;
  * @date 2023-09-19
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("td_hygf_jp_invertor_elec_history")
-public class TdHygfJpInvertorElecHistory extends BaseEntity {
+public class TdHygfJpInvertorElecHistory  {
 
     private static final long serialVersionUID = 1L;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHygfJpStationPowerHistory.java

@@ -15,10 +15,9 @@ import java.util.Date;
  * @date 2023-09-19
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("td_hygf_jp_station_power_history")
-public class TdHygfJpStationPowerHistory extends BaseEntity {
+public class TdHygfJpStationPowerHistory  {
 
     private static final long serialVersionUID = 1L;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpStationMapper.java

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,5 +15,5 @@ import java.util.List;
  * @date 2023-09-19
  */
 public interface JpStationMapper extends BaseMapper<JpStation> {
-    List<JpStationDto> queryForDealerReviewPage(JpStationDto reviewDto);
+    List<JpStationDto> queryForDealerReviewPage(@Param("dto") JpStationDto reviewDto);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml

@@ -2,4 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.JpStationMapper">
 
+    <select id="queryForDealerReviewPage"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto">
+
+
+         select * from hygf_jp_station
+
+        <if test="dto.name!=null">
+            and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%")
+        </if>
+
+        <if test="dto.address!=null">
+            and hygf_jp_station.address like concat(concat("%",#{dto.address}),"%")
+        </if>
+
+
+
+    </select>
+
+
 </mapper>