update

jsowell-admin/src/main/java/com/jsowell/service/PileRemoteService.java

@@ -145,6 +145,7 @@ public class PileRemoteService {
 	 * @return
 	 */
 	public boolean publishBillingTemplate(PublishBillingTemplateDTO dto) {
+
 		// 获取计费模板信息
 		BillingTemplateVO billingTemplateVO = pileBillingTemplateService.selectBillingTemplateByTemplateId(dto.getTemplateId());
 		if (billingTemplateVO == null) {
@@ -181,6 +182,9 @@ public class PileRemoteService {
 		if (CollectionUtils.isNotEmpty(relationList)) {
 			pileBillingTemplateService.insertPileBillingRelation(relationList);
 		}
+
+		// 修改计费模板状态
+		pileBillingTemplateService.changeStationTemplate(dto.getStationId(), dto.getTemplateId());
 		return true;
 	}
 

jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java

@@ -162,4 +162,13 @@ public interface PileBillingTemplateMapper {
 	 * @param pileSnList
 	 */
 	void deleteRelationByPileSn(@Param("pileSnList") List<String> pileSnList);
+
+	/**
+	 * 根据站点id修改状态
+	 * @param stationId
+	 * @param status
+	 */
+    void updateStatusByStationId(@Param("stationId") String stationId, @Param("status") String status);
+
+    void updateStatusByTemplateId(@Param("templateId") String templateId, @Param("status") String status);
 }

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

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

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

@@ -34,6 +34,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
@@ -381,28 +382,17 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi
 
     /**
      * 修改站点计费模板状态并下发最新模板
-     * @param pileBillingTemplate
      * @return
      */
     @Override
-    public int changeStationTemplate(PileBillingTemplate pileBillingTemplate) {
+    @Transactional(readOnly = false, propagation = Propagation.REQUIRED)
-        PileBillingTemplate template = new PileBillingTemplate();
+    public int changeStationTemplate(String stationId, String templateId) {
-        // 先将以前正在使用的模板查出来，状态改为0
+        // 根据stationId把站点下所有的计费模板设置为 未启用
-        BillingTemplateVO billingTemplateVO = queryUsedBillingTemplate(String.valueOf(pileBillingTemplate.getStationId()));
+        pileBillingTemplateMapper.updateStatusByStationId(stationId, Constants.ZERO);
-        if (billingTemplateVO != null) {
+        // 根据templateId 修改状态为启用
-            template.setId(Long.parseLong(billingTemplateVO.getTemplateId()));
+        pileBillingTemplateMapper.updateStatusByTemplateId(templateId, Constants.ONE);
-            template.setStatus("0");
+        // 清缓存
-
+        cleanCache(stationId, Long.parseLong(templateId));
-            updatePileBillingTemplate(template);
-        }
-        // 将当前这条模板状态改为1
-        template.setId(pileBillingTemplate.getId());
-        template.setStatus("1");
-
-        updatePileBillingTemplate(template);
-
-        // 下发站点下所有桩
-        // pileRemoteService.publishBillingTemplate()
         return 0;
     }
 

jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml

@@ -537,4 +537,16 @@
             #{item,jdbcType=VARCHAR}
         </foreach>
     </select>
+
+    <update id="updateStatusByStationId">
+        update pile_billing_template
+        set status = #{status,jdbcType=VARCHAR}
+        where station_id = #{stationId,jdbcType=VARCHAR}
+    </update>
+
+    <update id="updateStatusByTemplateId">
+        update pile_billing_template
+        set status = #{status,jdbcType=VARCHAR}
+        where id = #{templateId,jdbcType=VARCHAR}
+    </update>
 </mapper>