修改定时任务未启动，场站列表统计修改为redis数据

xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java

@@ -108,4 +108,11 @@ public interface XhpcTerminalMapper {
      */
     List<Map<String, Object>> getXhpcPileNameAndStationNameAndTerminalNumList(@Param("terminalSerialNumber") String terminalSerialNumber, @Param("pileName") String pileName, @Param("stationName") String stationName);
 
+
+    /**
+     * 根据电站获取终端的编号
+     * @param chargingStationId
+     * @return
+     */
+    List<String> getTerminal(@Param("chargingStationId") Long chargingStationId);
 }

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

@@ -15,7 +15,7 @@ public interface IXhpcTerminalService {
 
 
     /**
-     * PC端页面统计
+     * PC端页面统计(已作废)
      * @param chargingStationId 电站id
      * @return
      */
@@ -65,4 +65,11 @@ public interface IXhpcTerminalService {
      */
     List<Map<String, Object>> getXhpcPileNameAndStationNameAndTerminalNumList(String terminalSerialNumber, String pileName, String stationName);
 
+    /**
+     * 根据电站获取终端的编号
+     * @param chargingStationId
+     * @return
+     */
+    List<String> getTerminal(Long chargingStationId);
+
 }

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

@@ -83,11 +83,36 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi
             if (xhpcRateTime != null) {
                 map.putAll(xhpcRateTime);
             }
-            //获取桩的统计
+            //获取桩的统计.redis 数据
-            Map<String, Object> chargingId = xhpcTerminalService.countXhpcTerminalWorkStatus(chargingStationId);
+            List<String> terminal = xhpcTerminalService.getTerminal(chargingStationId);
-            if (chargingId != null) {
+            int offLine =0;//离线
-                map.putAll(chargingId);
+            int fault =0;//故障
+            int freeTime =0;//空闲
+            int charge =0;//充电
+            int unknown =0;//未知
+            if(terminal !=null && terminal.size()>0){
+                for (String st:terminal) {
+                    Map<String, Object> cacheMap = redisService.getCacheMap("gun:" + st);
+                    if(!cacheMap.isEmpty()){
+                        if ("离线".equals(cacheMap.get("status").toString())){
+                            offLine++;
+                        }else if("故障".equals(cacheMap.get("status").toString())){
+                            fault++;
+                        }else if("空闲".equals(cacheMap.get("status").toString())){
+                            freeTime++;
+                        }else{
+                            charge++;
                         }
+                    }else{
+                        unknown++;
+                    }
+                }
+            }
+            map.put("offLine",offLine);
+            map.put("fault",fault);
+            map.put("freeTime",freeTime);
+            map.put("charge",charge);
+            map.put("unknown",unknown);
         }
         return list;
     }
@@ -248,6 +273,12 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi
         if (xhpcChargingStationDto.getImgId() == null) {
             return AjaxResult.error(1001, "图片不能为空");
         }
+        if (xhpcChargingStationDto.getServiceTel() == null) {
+            return AjaxResult.error(1001, "站点电话不能为空");
+        }
+        if (xhpcChargingStationDto.getParkNums() == null) {
+            return AjaxResult.error(1001, "侧位数量不能为空");
+        }
 
         //判断费率和费率时间段 是否有值
         if (xhpcChargingStationDto.getXhpcRateList() == null && xhpcChargingStationDto.getXhpcRateList().size() == 0) {
@@ -1029,15 +1060,11 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi
 //        System.out.println(num);
 
 
-        for (int i = 0; i <10 ; i++) {
+        int i =0;
-
+        i++;
-            if(i==5){
+        System.out.println("111????????????????"+i);
-                continue;
+        i=i++;
-            }
+        System.out.println("222????????????????"+i);
-            System.out.println("i:"+i);
-        }
-
-
     }
 
 

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

@@ -123,4 +123,10 @@ public class XhpcTerminalServiceImpl implements IXhpcTerminalService {
 
         return xhpcTerminalMapper.getXhpcPileNameAndStationNameAndTerminalNumList(terminalSerialNumber, pileName, stationName);
     }
+
+    @Override
+    public List<String> getTerminal(Long chargingStationId) {
+        return xhpcTerminalMapper.getTerminal(chargingStationId);
+    }
+
 }

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

@@ -173,7 +173,9 @@
             <if test="reminderInstructions != null">reminder_instructions = #{reminderInstructions},</if>
             <if test="imgId != null">img_id = #{imgId},</if>
             <if test="stationType != null">station_type = #{stationType},</if>
-            <if test="operatorIdEvcs != null">operator_id_evcs = #{operatorIdEvcs}</if>
+            <if test="operatorIdEvcs != null">operator_id_evcs = #{operatorIdEvcs},</if>
+            <if test="serviceTel != null">service_tel = #{serviceTel},</if>
+            <if test="parkNums != null">park_nums = #{parkNums}</if>
         </trim>
         where charging_station_id = #{chargingStationId}
     </update>
@@ -516,7 +518,13 @@
                 station_type,
             </if>
             <if test="null != operatorIdEvcs and '' != operatorIdEvcs">
-                operator_id_evcs
+                operator_id_evcs,
+            </if>
+            <if test="null != serviceTel and '' != serviceTel">
+                service_tel,
+            </if>
+            <if test="null != parkNums and '' != parkNums">
+                park_nums
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -599,7 +607,13 @@
                 #{stationType},
             </if>
             <if test="null != operatorIdEvcs and '' != operatorIdEvcs">
-                #{operatorIdEvcs}
+                #{operatorIdEvcs},
+            </if>
+            <if test="null != serviceTel and '' != serviceTel">
+                #{serviceTel},
+            </if>
+            <if test="null != parkNums and '' != parkNums">
+                #{parkNums}
             </if>
         </trim>
     </insert>

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

@@ -372,4 +372,9 @@
                 And terminal.serial_number like CONCAT('%',#{stationName},'%')
             </if>
     </select>
+
+
+    <select id="getTerminal" resultType="String">
+        select serial_number as serialNumber from xhpc_terminal where charging_station_id=#{chargingStationId}
+    </select>
 </mapper>

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

@@ -114,7 +114,7 @@ public class XhpcChargingStation extends BaseEntity {
     /**
      *侧位数量
      */
-    private String parkNums;
+    private Integer parkNums;
 
 
     public String getOperatorIdEvcs() {
@@ -342,12 +342,12 @@ public class XhpcChargingStation extends BaseEntity {
         this.serviceTel = serviceTel;
     }
 
-    public String getParkNums() {
+    public Integer getParkNums() {
 
         return parkNums;
     }
 
-    public void setParkNums(String parkNums) {
+    public void setParkNums(Integer parkNums) {
 
         this.parkNums = parkNums;
     }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java

@@ -16,6 +16,7 @@ import com.xhpc.order.service.IXhpcHistoryOrderService;
 import com.xhpc.order.service.IXhpcStatisticsService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,6 +32,7 @@ import java.util.*;
  * @author yuyang
  * @date 2021/8/3 21:19
  */
+@EnableScheduling
 @RestController
 @RequestMapping("/histotyOrder")
 @Api(value = "历史订单接口", tags = "历史订单接口")
@@ -196,6 +198,9 @@ public class XhpcHistoryOrderController extends BaseController {
                 }
                 //每分钟多少度电
                 BigDecimal v = new BigDecimal((endTime.getTime() - startTime.getTime())).divide(new BigDecimal(60000),2,RoundingMode.HALF_UP);
+                if(v.compareTo(new BigDecimal(0)) !=1){
+                    break;
+                }
                 BigDecimal multiply = xhpc.getChargingDegree().divide(v,2,RoundingMode.HALF_UP);
 
                 //1时间没有跨天

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java

@@ -170,11 +170,13 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService {
         int number =0;
         if(!"".equals(userMessage.get("soc")) && userMessage.get("soc") !=null && !"".equals(userMessage.get("soc"))){
             number =Integer.parseInt(userMessage.get("soc").toString());
+            logger.info("<<<<<<<<<<<<<<<<<<<<<<<<用户>>>>>>>>>>>>>>>>>:"+number);
         }
         //平台
         String soc = redisService.getCacheObject("global:SOC");
         if(!"".equals(soc) && soc!=null){
             if(number!=0){
+                logger.info("<<<<<<<<<<<<<<<<<<<<<<<<平台>>>>>>>>>>>>>>>>>:"+soc);
                 if(Integer.parseInt(soc)-number<0){
                     number=Integer.parseInt(soc);
                 }
@@ -185,6 +187,7 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService {
         Map<String, Object> operatorMessage = xhpcChargeOrderMapper.getOperatorMessage(xhpcTerminal.getChargingStationId());
         if(operatorMessage !=null && operatorMessage.get("soc") !=null && !"".equals(operatorMessage.get("soc"))){
             if(number!=0){
+                logger.info("<<<<<<<<<<<<<<<<<<<<<<<<营运商>>>>>>>>>>>>>>>>>:"+operatorMessage.get("soc").toString());
                 if(Integer.parseInt(operatorMessage.get("soc").toString())-number<0){
                     number=Integer.parseInt(operatorMessage.get("soc").toString());
                 }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java

@@ -115,6 +115,7 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService {
         logger.info("订单异常回调接口>>>>>orderNo：" + orderNo);
         //获取实时订单
         CacheRealtimeData cacheRealtimeData = redisService.getCacheObject("order:" + orderNo + ".lord");
+        if(cacheRealtimeData !=null){
             XhpcChargeOrder xhpcChargeOrder = xhpcChargeOrderService.getSerialNumberMessage(orderNo);
             Long userId = xhpcChargeOrder.getUserId();
             try {
@@ -409,6 +410,8 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService {
                 logger.info("异常订单回调失败");
                 e.printStackTrace();
             }
+        }
+
 
     }
 

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java

@@ -256,6 +256,16 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService {
         return map;
     }
 
+    /**
+     * 平台管理员权限问题
+     */
+
+    private void jurisdiction(String userId){
+
+
+
+
+    }
 
 
 }

xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml

@@ -95,6 +95,11 @@
         <if test="type==3">
             and internet_user_id=#{internetUserId}
         </if>
+        <if test="type==1 and userId !=1">
+            and operator_id in (
+            SELECT operator_id from xhpc_charging_station where charging_station_id in (SELECT charging_station_id FROM xhpc_user_privilege where user_id=#{userId})
+            )
+        </if>
         group by status
         order by status
     </select>
@@ -133,6 +138,11 @@
         <if test="type==3">
             and internet_user_id=#{internetUserId}
         </if>
+        <if test="type==1 and userId !=1">
+            and operator_id in (
+            SELECT operator_id from xhpc_charging_station where charging_station_id in (SELECT charging_station_id FROM xhpc_user_privilege where user_id=#{userId})
+            )
+        </if>
         group by DATE_FORMAT(create_time,'%Y-%m-%d')
         order by DATE_FORMAT(create_time,'%Y-%m-%d') desc
     </select>
@@ -181,6 +191,11 @@
                 #{operatorId}
             </foreach>
         </if>
+        <if test="type==1 and userId !=1">
+            and operator_id in (
+            SELECT operator_id from xhpc_charging_station where charging_station_id in (SELECT charging_station_id FROM xhpc_user_privilege where user_id=#{userId})
+            )
+        </if>
         group by ss.charging_station_id
     </select>
 
@@ -222,6 +237,11 @@
         <if test="type==3">
             and ss.internet_user_id=#{internetUserId}
         </if>
+        <if test="type==1 and userId !=1">
+            and operator_id in (
+            SELECT operator_id from xhpc_charging_station where charging_station_id in (SELECT charging_station_id FROM xhpc_user_privilege where user_id=#{userId})
+            )
+        </if>
         group by ss.operator_id
     </select>
 
@@ -296,6 +316,11 @@
         <if test="terminalId !=null">
             and te.terminal_id=#{terminalId}
         </if>
+        <if test="type==1 and userId !=1">
+            and operator_id in (
+            SELECT operator_id from xhpc_charging_station where charging_station_id in (SELECT charging_station_id FROM xhpc_user_privilege where user_id=#{userId})
+            )
+        </if>
         group by ss.terminal_id
     </select>
 
@@ -308,6 +333,9 @@
         <if test="type==2">
             and operator_id =#{operatorId}
         </if>
+        <if test="type==1 and userId !=1">
+            and charging_station_id in (SELECT charging_station_id FROM xhpc_user_privilege where user_id=#{userId})
+        </if>
     </select>
 
 
@@ -320,6 +348,11 @@
         <if test="type==2">
             and operator_id =#{operatorId}
         </if>
+        <if test="type==1 and userId !=1">
+            and operator_id in (
+            SELECT operator_id from xhpc_charging_station where charging_station_id in (SELECT charging_station_id FROM xhpc_user_privilege where user_id=#{userId})
+            )
+        </if>
     </select>
 
     <select id="getInternetUserIList" resultType="map">

xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRechargeOrderController.java

@@ -10,6 +10,7 @@ import com.xhpc.payment.service.IXhpcRechargeOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,6 +24,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+@EnableScheduling
 @RestController
 @RequestMapping("/recharge/order")
 @Api(value = "充值订单接口", tags = "充值订单接口")

xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java

@@ -1,17 +1,14 @@
 package com.xhpc.payment.controller;
 
-import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;
 import com.alipay.api.CertAlipayRequest;
 import com.alipay.api.DefaultAlipayClient;
 import com.alipay.api.domain.AlipayFundTransUniTransferModel;
 import com.alipay.api.domain.Participant;
-import com.alipay.api.internal.util.AlipaySignature;
 import com.alipay.api.request.AlipayFundTransUniTransferRequest;
 import com.alipay.api.response.AlipayFundTransUniTransferResponse;
 import com.xhpc.common.core.constant.HttpStatus;
 import com.xhpc.common.core.constant.StatusConstants;
-import com.xhpc.common.core.listener.ConfigListener;
 import com.xhpc.common.core.utils.DateUtils;
 import com.xhpc.common.core.utils.StringUtils;
 import com.xhpc.common.core.utils.WXPayUtil;
@@ -40,13 +37,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import javax.net.ssl.SSLContext;
-import javax.xml.soap.SAAJResult;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -55,6 +52,7 @@ import java.security.KeyStore;
 import java.util.List;
 import java.util.Map;
 
+@EnableScheduling
 @RestController
 @RequestMapping("/refund/audit")
 @Api(value = "退款审核接口", tags = "退款审核接口")
@@ -517,6 +515,7 @@ public class XhpcRefundAuditController extends BaseController {
     @Scheduled(cron = "0 */5 * * * ?")
     @GetMapping("/moneyPage")
     public void moneyPage(){
+        logger.info("++++++++++++111自动审核异常111++++++++++++++++");
         try {
             List<Long> list = iXhpcRefundOrderService.moneyPage();
             if(list !=null && list.size()>0){