修改资源路径

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

@@ -31,7 +31,7 @@ public class HouseholdPvDeviceDto  extends BaseDto {
     private String brand;
 
     @ApiModelProperty(value = "SN编码")
-    private String snCode;
+    private String SNCode;
 
     @ApiModelProperty(value = "型号")
     private String model;

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

@@ -44,7 +44,7 @@ public class HouseholdPvDevice extends BaseEntity {
      * SN编码
      */
 	@TableField("SN_code")
-    private String snCode;
+    private String SNCode;
 
     /**
      * 型号

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

 package com.yeejoin.amos.boot.module.jxiop.api.mapper;
 
-import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPvDevice;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPvDevice;
 
 /**
  * 户用光伏设备表 Mapper 接口
@@ -9,6 +13,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author system_generator
  * @date 2023-03-17
  */
+@Mapper
 public interface HouseholdPvDeviceMapper extends BaseMapper<HouseholdPvDevice> {
 
+	void insertAndUpdate(List<HouseholdPvDevice> list);
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resource/mapper/HouseholdPvDeviceMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.HouseholdPvDeviceMapper">
-
-</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/HouseholdPvDeviceMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.HouseholdPvDeviceMapper">
+	<insert id="insertAndUpdate">
+        INSERT INTO household_pv_device
+        (
+        sequence_nbr, household_pv_id, name, brand,SN_code, model, power, serial_number,type,description) VALUES
+        <foreach item="item" index="index" collection="list" separator=",">
+            (
+            #{item.sequenceNbr}, #{item.householdPvId}, #{item.name}, #{item.brand}, #{item.SNCode}, #{item.model},
+            #{item.power}, #{item.serialNumber}, #{item.type}, #{item.description}
+            )
+        </foreach>
+        ON DUPLICATE KEY UPDATE name = VALUES(name),brand = VALUES(brand),SN_code = VALUES(SNCode)
+    </insert>
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HouseholdPvDeviceServiceImpl.java

@@ -55,6 +55,6 @@ public class HouseholdPvDeviceServiceImpl
 			householdPvDevice.setHouseholdPvId(householdPvId);
 			dataList.add(householdPvDevice);
 		}
-		this.saveBatch(dataList);
+		this.baseMapper.insertAndUpdate(dataList);
 	}
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HouseholdPvServiceImpl.java

@@ -124,7 +124,7 @@ public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto, Househol
 			stringBuilder.append("类型:").append(ObjectUtils.isEmpty(item.getType()) ? "" : item.getType());
 			stringBuilder.append(" 名称:").append(ObjectUtils.isEmpty(item.getName()) ? "" : item.getName());
 			stringBuilder.append(" 品牌:").append(ObjectUtils.isEmpty(item.getBrand()) ? "" : item.getBrand());
-			stringBuilder.append(" SN编码:").append(ObjectUtils.isEmpty(item.getSnCode()) ? "" : item.getSnCode());
+			stringBuilder.append(" SN编码:").append(ObjectUtils.isEmpty(item.getSNCode()) ? "" : item.getSNCode());
 			if (!ObjectUtils.isEmpty(item.getType()) && item.getType().equals("逆变器")) {
 				stringBuilder.append(" 序列号:").append(ObjectUtils.isEmpty(item.getSerialNumber()) ? "" : item.getSerialNumber());
 				stringBuilder.append(" 功率:").append(ObjectUtils.isEmpty(item.getPower()) ? "" : item.getPower());

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/resource/application.properties → amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/resources/application.properties

-spring.application.name=AMOS-JXIOP
+spring.application.name=AMOS-JXIOP-WJ
 server.servlet.context-path=/jxiop
 server.port=33100
 server.uri-encoding=UTF-8