完成充电桩的equipment字段的增、查、改

xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java

@@ -101,7 +101,7 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService {
 //        HashSet<String> noSet = new HashSet<>();
 //        noSet.add(serialNumber);
 //        powerPileService.addPileWhitelist(chargingStationId, noSet);
-        return AjaxResult.success();
+        return AjaxResult.success(null);
     }
 
     private void addXhpcTerminal(String name, Long chargingStationId, Long rateModelId, String serialNumber, Long chargingPileId, int i, int number) {
@@ -163,7 +163,7 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService {
             powerPileService.addPileWhitelist(chargingStationId, noSet);
         }
         xhpcChargingPileMapper.updaeXhpcChargingPile(xhpcChargingPile);
-        return AjaxResult.success();
+        return AjaxResult.success(null);
     }
 
     @Override

xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml

@@ -67,7 +67,8 @@
                production_date productionDate,
                manufacture_name manufactureName,
                connector_type connectorType,
-               current
+               current,
+               equipment_type equipmentType
         from xhpc_charging_pile
     </sql>
     <select id="selectXhpcChargingPileList" resultType="java.util.Map">
@@ -195,7 +196,10 @@
                 connector_type,
             </if>
             <if test="null != current ">
-                current
+                current,
+            </if>
+            <if test="null != equipmentType ">
+                equipment_type
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -290,7 +294,10 @@
                 #{connectorType},
             </if>
             <if test="null != current ">
-                #{current}
+                #{current},
+            </if>
+            <if test="null != equipmentType ">
+                #{equipmentType}
             </if>
         </trim>
     </insert>
@@ -344,6 +351,7 @@
             <if test="manufactureName != null">manufacture_name = #{manufactureName},</if>
             <if test="connectorType != null">connector_type = #{connectorType},</if>
             <if test="current != null">current = #{current},</if>
+            <if test="equipmentType!=null">equipment_type = #{equipmentType}</if>
         </trim>
         where charging_pile_id = #{chargingPileId}
     </update>

xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java

@@ -77,6 +77,21 @@ public class XhpcChargingPile extends BaseEntity {
      */
     private Integer current;
 
+    /**
+     * 设备类型
+     */
+    private Integer equipmentType;
+
+    public Integer getEquipmentType() {
+
+        return equipmentType;
+    }
+
+    public void setEquipmentType(Integer equipmentType) {
+
+        this.equipmentType = equipmentType;
+    }
+
     public String getManufactureName() {
 
         return manufactureName;