Merge pull request 'master' (#54) from master into V3

Reviewed-on: http://git.lrdaiot.cn:9000/thing/thing_api/pulls/54

modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java

@@ -89,8 +89,8 @@ public class PeakValleyServiceImpl implements PeakValleyService {
             param.setDateType("dd");
         }
         List<String> attrList = new ArrayList<>();
-        attrList.add(param.getKey()+"_peak"+param.getDateType());
         attrList.add(param.getKey()+"_rush"+param.getDateType());
+        attrList.add(param.getKey()+"_peak"+param.getDateType());
         attrList.add(param.getKey()+"_valley"+param.getDateType());
         attrList.add(param.getKey()+"_normal"+param.getDateType());
         List<PeakValleyDosageReq> tempList = queryList(param.getKey(),param.getThingCode(),attrList,startTs,endTs);
@@ -587,11 +587,11 @@ public class PeakValleyServiceImpl implements PeakValleyService {
             if(temp.getAttrCode().contains("peak")){
                 temp.setAttrName(priceInfo.getPeakPriceBean()==null?"峰用"+priceInfo.getBaseName():priceInfo.getPeakPriceBean().getAttrName());
                 temp.setUintPrice(priceInfo.getPeakPriceBean()==null?BigDecimal.ZERO:priceInfo.getPeakPriceBean().getPrice());
-                temp.setSort(1);
+                temp.setSort(2);
             }else if(temp.getAttrCode().contains("rush")){
                 temp.setAttrName(priceInfo.getRushPriceBean()==null?"尖用"+priceInfo.getBaseName():priceInfo.getRushPriceBean().getAttrName());
                 temp.setUintPrice(priceInfo.getRushPriceBean()==null?BigDecimal.ZERO:priceInfo.getRushPriceBean().getPrice());
-                temp.setSort(2);
+                temp.setSort(1);
             }else if(temp.getAttrCode().contains("valley")){
                 temp.setAttrName(priceInfo.getValleyPriceBean()==null?"谷用"+priceInfo.getBaseName():priceInfo.getValleyPriceBean().getAttrName());
                 temp.setUintPrice(priceInfo.getValleyPriceBean()==null?BigDecimal.ZERO:priceInfo.getValleyPriceBean().getPrice());