充电桩费率相关

liuhaonan

2022-03-18 794ae298001fb0b06d7ae8d5b72b02350d340289

充电桩费率相关

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java

@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.controller;

import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
@@ -88,8 +89,9 @@


    @GetMapping("/aliConfigList")
    public ResponseVO<Object> aliConfigList(BaseConditionVO baseConditionVO) {
        return ResponseUtil.success(alipayConfigService.configList(baseConditionVO));
    public ResponseVO<Object> aliConfigList(BaseConditionVO baseConditionVO
            , @RequestParam(value = "keyword", required = false) String keyword) {
        return ResponseUtil.success(alipayConfigService.configList(baseConditionVO,keyword));
    }


@@ -156,8 +158,10 @@


    @GetMapping("/WxConfigList")
    public ResponseVO<Object> WxConfigList(BaseConditionVO baseConditionVO) {
        return ResponseUtil.success(wxPayConfigService.configList(baseConditionVO));
    public ResponseVO<Object> WxConfigList(BaseConditionVO baseConditionVO
            , @RequestParam(value = "keyword", required = false) String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        return ResponseUtil.success(wxPayConfigService.configList(baseConditionVO,keyword));
    }



 ximon-admin/src/main/java/com/sandu/ximon/admin/pay/alipay/UsrAlipayConfigService.java

@@ -14,6 +14,7 @@
import com.sandu.ximon.admin.utils.SpringContextUtil;
import com.sandu.ximon.dao.domain.AliConfigEntity;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.WxConfigEntity;
import com.sandu.ximon.dao.mapper.UsrAlipayConfigMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -88,7 +89,7 @@



    public List<AliConfigEntity> configList(BaseConditionVO baseConditionVO){
    public List<AliConfigEntity> configList(BaseConditionVO baseConditionVO,String keyword){
        LambdaQueryWrapper<AliConfigEntity> wrapper =new LambdaQueryWrapper<>();
        System.out.println("----------------------------"+clientService.findClientId());
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
@@ -104,6 +105,26 @@
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
            wrapper= Wrappers.lambdaQuery(AliConfigEntity.class);
        }

        if(!keyword.isEmpty()){
            wrapper= wrapper.like(AliConfigEntity::getConfigId,keyword).or(
                    getAppId->{
                        getAppId.like(AliConfigEntity::getAppId,keyword);
                    }
            ).or(
                    getPid->{
                        getPid.like(AliConfigEntity::getPid,keyword);
                    }
            ).or(
                    getPublicKey->{
                        getPublicKey.like(AliConfigEntity::getPublicKey,keyword);
                    }
            ).or(
                    getPrivateKey->{
                        getPrivateKey.like(AliConfigEntity::getPrivateKey,keyword);
                    }
            );
        }
        return list(wrapper);
    }


 ximon-admin/src/main/java/com/sandu/ximon/admin/pay/alipay/UsrWxPayConfigService.java

@@ -91,7 +91,7 @@
    }


    public List<WxConfigEntity> configList(BaseConditionVO baseConditionVO) {
    public List<WxConfigEntity> configList(BaseConditionVO baseConditionVO,String keyword) {
        LambdaQueryWrapper<WxConfigEntity> wrapper = new LambdaQueryWrapper<>();
        System.out.println("----------------------------" + clientService.findClientId());
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
@@ -107,6 +107,25 @@
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
            wrapper = Wrappers.lambdaQuery(WxConfigEntity.class);
        }
        if(!keyword.isEmpty()){
           wrapper= wrapper.like(WxConfigEntity::getConfigId,keyword).or(
                    appid->{
                        appid.like(WxConfigEntity::getAppid,keyword);
                    }
            ).or(
                    appappid->{
                        appappid.like(WxConfigEntity::getAppappid,keyword);
                    }
            ).or(
                    mchId->{
                        mchId.like(WxConfigEntity::getMchId,keyword);
                    }
            ).or(
                    privateKey->{
                        privateKey.like(WxConfigEntity::getPrivateKey,keyword);
                    }
            );
        }
        return list(wrapper);
    }


 ximon-admin/src/main/java/com/sandu/ximon/admin/schedule/WaterQualityDataSchedule.java

@@ -24,7 +24,7 @@
    private WaterQualityEquipmentService waterQualityEquipmentService;
    private WaterQualityDataService waterQualityDataService;

    @Scheduled(cron = "0 0 0/1 * * ?")
   // @Scheduled(cron = "0 0 0/1 * * ?")
    public void UserSubjectRefund() {
        List<WaterQualityEquipmentBo> waterQualityEquipmentList = waterQualityEquipmentService.listWaterQualityEquipment();
        for (WaterQualityEquipment waterQualityEquipment : waterQualityEquipmentList) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java

@@ -17,6 +17,7 @@
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mChargingCharge;
import com.sandu.ximon.dao.mapper.C3mChargingMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -34,6 +35,8 @@
@AllArgsConstructor
public class C3ChargingService extends BaseServiceImpl<C3mChargingMapper, C3mCharging> {

    private final C3mChargingChargeService c3mChargingChargeService;

    /**
     * 保存上报C3充电设备心跳数据
     *
@@ -41,6 +44,10 @@
     */
    public boolean saveReportData(String deviceName, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {
        C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, deviceName));
        List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, one.getC3Id()));
        if(list.size()==0){//费率表中没有此充电桩数据时  添加默认费率
            c3mChargingChargeService.initCharge((one.getC3Id()).intValue());
        }

        if (one == null) {
            //将设备信息添加到充电桩设备表