Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBillingTemplateService.java

jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBillingTemplateService.java

@@ -166,4 +166,10 @@ public interface IPileBillingTemplateService {
 
     // 批量查询站点计费模板
 	List<BillingTemplateVO> selectBillingTemplateByStationIdList(List<String> stationIdList);
+	/**
+	 * 修改站点计费模板状态并下发最新模板
+	 * @param pileBillingTemplate
+	 * @return
+	 */
+	int changeStationTemplate(PileBillingTemplate pileBillingTemplate);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java

@@ -379,6 +379,22 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi
         return pileBillingDetails;
     }
 
+    /**
+     * 修改站点计费模板状态并下发最新模板
+     * @param pileBillingTemplate
+     * @return
+     */
+    @Override
+    public int changeStationTemplate(PileBillingTemplate pileBillingTemplate) {
+        // 先将以前正在使用的模板查出来，状态改为0
+
+        // 将当前这条模板状态改为1
+
+        // 下发站点下所有桩
+
+        return 0;
+    }
+
     @Override
     public List<BillingTemplateVO> selectBillingTemplateByStationIdList(List<String> stationIdList) {
         if (CollectionUtils.isEmpty(stationIdList)) {

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BillingTemplateVO.java

@@ -31,6 +31,9 @@ public class BillingTemplateVO {
 	// 计费模板名称
 	private String templateName;
 
+	// 计费模板状态
+	private String status;
+
 	// 计费模板备注
 	private String remark;