合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/perproties/PayNotifyPerproties.java

@@ -0,0 +1,26 @@
+package com.community.huiju.common.perproties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 支付回调地址配置
+ * @author weiximei
+ */
+@Component
+@ConfigurationProperties(prefix = "pay-notify")
+@Data
+public class PayNotifyPerproties {
+
+    /**
+     * 微信回调
+     */
+    private String wxNotify;
+
+    /**
+     * 支付宝回调
+     */
+    private String aliNotify;
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/AliPayServiceImpl.java

@@ -7,6 +7,7 @@ import com.alipay.api.domain.AlipayTradeAppPayModel;
 import com.alipay.api.request.AlipayTradeAppPayRequest;
 import com.alipay.api.response.AlipayTradeAppPayResponse;
 import com.community.commom.session.UserElement;
+import com.community.huiju.common.perproties.PayNotifyPerproties;
 import com.community.huiju.common.wxpay.HfWxConfig;
 import com.community.huiju.common.wxpay.WXPay;
 import com.community.huiju.common.wxpay.WXPayConstants;
@@ -65,7 +66,10 @@ public class AliPayServiceImpl implements AliPayServiceI {
 	
 	@Value("${alipay.ALIPAY_PUBLIC_KEY}")
 	private String ALIPAY_PUBLIC_KEY;
-	
+
+	@Autowired
+	private PayNotifyPerproties payNotifyPerproties;
+
 	/**
 	 * 支付宝统一下单
 	 *
@@ -101,7 +105,7 @@ public class AliPayServiceImpl implements AliPayServiceI {
 		model.setTotalAmount(BigDecimal.valueOf(Long.valueOf(payPrice)).divide(new BigDecimal(100)).toString());
 		model.setProductCode("QUICK_MSECURITY_PAY");
 		request.setBizModel(model);
-		request.setNotifyUrl("http://106.14.20.193:8086/app-api/aliPayNotify");
+		request.setNotifyUrl(payNotifyPerproties.getAliNotify());
 		try {
 			//这里和普通的接口调用不同，使用的是sdkExecute
 			AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/WxPayServiceImpl.java

@@ -1,6 +1,7 @@
 package com.community.huiju.service.impl;
 
 import com.community.commom.session.UserElement;
+import com.community.huiju.common.perproties.PayNotifyPerproties;
 import com.community.huiju.common.wxpay.HfWxConfig;
 import com.community.huiju.common.wxpay.WXPay;
 import com.community.huiju.common.wxpay.WXPayConstants;
@@ -59,6 +60,9 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	@Autowired
 	private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
 
+	@Autowired
+	private PayNotifyPerproties payNotifyPerproties;
+
 	/**
 	 * 微信支付统一下单
 	 *
@@ -99,7 +103,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		//终端IP
 		data.put("spbill_create_ip", "123.12.12.123");
 		//回调地址
-		data.put("notify_url", "http://106.14.20.193:8086/app-api/wxNotify");
+		data.put("notify_url", payNotifyPerproties.getWxNotify());
 		// 此处指定为APP支付
 		data.put("trade_type", "APP");
 		Map<String, String> resp = wxpay.unifiedOrder(data);

CODE/smart-community/app-api/src/main/resources/application.yml

@@ -50,3 +50,7 @@ weixin:
   appid: wx6070fd3e8ef854e4
   secret: cb07709de2f05b824f1ebda220684d3b
 
+# 支付回调
+pay-notify:
+  wx-notify: http://ycapi.jcjyhn.com/app-api/wxNotify
+  ali-notify: http://ycapi.jcjyhn.com/app-api/aliPayNotify

CODE/smart-community/community-common/src/main/java/com/community/commom/fushi/FuShiRequestAPI.java

@@ -70,10 +70,10 @@ public class FuShiRequestAPI {
      * 获取停车信息（通过车牌号）
      * @return
      */
-    public String getParkInfoByCarNo(String parkingCode, String carNo) {
+    public String getParkInfoByCarNo(String ParkingCode, String CarNo) {
         Map<String, Object> map = Maps.newHashMap();
-        map.put("ParkingCode", parkingCode);
-        map.put("CarNo", carNo);
+        map.put("ParkingCode", ParkingCode);
+        map.put("CarNo", CarNo);
         String json = JSONObject.toJSONString(map);
         log.info("获取停车信息（通过车牌号）请求参数：{}", json);
         SignBuild signBuild = requestSign(json);
@@ -171,8 +171,22 @@ public class FuShiRequestAPI {
     }
 
 
-
-
+    /**
+     * 获取线下算费结果
+     * @return
+     */
+    public String apiGetOfflineFee(String ParkingCode, String CarNoOrCardNo) {
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("ParkingCode", ParkingCode);
+        map.put("CarNoOrCardNo", CarNoOrCardNo);
+        String json = JSONObject.toJSONString(map);
+        log.info("获取线下算费结果 请求参数：{}", json);
+        SignBuild signBuild = requestSign(json);
+        String result = client.doJsonPost(FushiConstant.CALCULATIONCOST_APIGETOFFLINEFEE, json, signBuild.getSign(), signBuild.getTimestamp());
+        showException(result);
+        log.info("获取线下算费结果 返回数据：{}", result);
+        return result;
+    }
 
 
 

CODE/smart-community/community-common/src/main/java/com/community/commom/fushi/FushiConstant.java

@@ -21,4 +21,9 @@ public class FushiConstant {
      */
     public static final String CALCULATIONCOST_APITHIRDPARTYTEMPORARYCARDPAY = "/CalculationCost/ApiThirdPartyTemporaryCardPay";
 
+    /**
+     * 获取线下算费结果
+     */
+    public static final String CALCULATIONCOST_APIGETOFFLINEFEE = "/CalculationCost/ApiGetOfflineFee";
+
 }

CODE/smart-community/property-api/pom.xml

@@ -217,6 +217,13 @@
 			<version>1.10</version>
 		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-aop -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-aop</artifactId>
+			<version>2.0.4.RELEASE</version>
+		</dependency>
+
 
 	</dependencies>
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/aop/LogAOP.java

@@ -0,0 +1,91 @@
+package com.community.huiju.aop;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.fushi.error.FuShiException;
+import com.community.huiju.log.LogAnnotation;
+import com.community.huiju.log.LogEnums;
+import com.community.huiju.log.LogFactory;
+import com.community.huiju.log.LogFileManager;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+
+@Aspect
+@Component
+@Slf4j
+public class LogAOP {
+
+    @Pointcut("@annotation(com.community.huiju.log.LogAnnotation)")
+    public void pointLog() {
+
+    }
+
+    @Around("pointLog()")
+    public Object logAround(ProceedingJoinPoint point) throws Throwable {
+
+        // 获取切面的点的实例
+        Object target = point.getTarget();
+        // 获取反射对象
+        Class<?> zClass = target.getClass();
+        // 获取切面点
+        Signature signature = point.getSignature();
+
+        // 判断日志注解是否用在方法上
+        if (!(signature instanceof MethodSignature)) {
+            throw new RuntimeException("该注解只允许在方法上使用！");
+        }
+
+        // 方法名称
+        String methodName = signature.getName();
+        // 获取方法参数类型
+        Class<?>[] parameterTypes = ((MethodSignature) signature).getMethod().getParameterTypes();
+
+        // 通过方法名称和方法参数类型
+        // 获取当前正在执行切面的方法
+        Method method = zClass.getMethod(methodName, parameterTypes);
+
+        // 所有方法输入参数
+        Object[] args = point.getArgs();
+        // 执行方法的返回值
+        Object result = null;
+        if (null != method && method.isAnnotationPresent(LogAnnotation.class)) {
+
+            // 获取这个注解
+            LogAnnotation logAnnotation = method.getAnnotation(LogAnnotation.class);
+            // 大苏操作
+            if (logAnnotation.record() && logAnnotation.value() == LogEnums.DA_SU) {
+                String alias = "".equals(logAnnotation.alias()) ? "未设置别名" : logAnnotation.alias();
+                    log.info("AOP拦截----大苏操作----执行方法:{}，方法别名:{}, 请求参数:{}", methodName, alias,args);
+                    // 方法返回值
+                    result = point.proceed();
+                    log.info("AOP拦截----大苏操作----执行方法:{}，方法别名:{},请求参数:{}，返回结果:{}", methodName, alias,args, result);
+
+                    String strPararmeter = String.format( "AOP拦截----大苏操作----执行方法:%s，方法别名:%s,请求参数:%s", methodName, alias,JSONObject.toJSONString(args));
+                    String strReturn = String.format("AOP拦截----大苏操作----执行方法:%s，方法别名:%s, 请求参数:%s，返回结果:%s", methodName, alias ,JSONObject.toJSONString(args), JSONObject.toJSONString(result));
+
+                    LogFileManager.getInstance().executeLog(LogFactory.parametersAndReturn(strPararmeter, strReturn));
+
+            }
+
+        }
+
+        return result;
+    }
+
+    @AfterThrowing(value = "pointLog()", throwing = "cause")
+    public void doException(JoinPoint joinPoint, Throwable cause) {
+        if (null != cause) {
+            throw new FuShiException(cause.getMessage());
+        }
+    }
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/FSController.java

@@ -81,4 +81,16 @@ public class FSController extends BaseController {
         return responseBean;
     }
 
+
+    @RequestMapping(value = "/car/apiGetOfflineFee/{carNoOrCardNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取线下算费结果", notes = "获取线下算费结果")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "carNoOrCardNo" , value = "车牌号码或卡号")
+    })
+    public ResponseBean apiGetOfflineFee(@PathVariable("carNoOrCardNo") String carNoOrCardNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iFuShiService.apiGetOfflineFee(carNoOrCardNo);
+        return responseBean;
+    }
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/log/LogAnnotation.java

@@ -0,0 +1,32 @@
+package com.community.huiju.log;
+
+import java.lang.annotation.*;
+
+/**
+ * 日志注解
+ * @author weiximei
+ */
+@Retention(RetentionPolicy.RUNTIME) // 在运行时使用
+@Target({ ElementType.METHOD }) // 在方法上使用
+@Documented
+public @interface LogAnnotation {
+
+    /**
+     * 日志类型
+     * @return
+     */
+    LogEnums value() default LogEnums.NOT;
+
+    /**
+     * 是否记录
+     * @return
+     */
+    boolean record() default true;
+
+    /**
+     * 别名, 作为注释用
+     * @return
+     */
+    String alias() default "";
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/log/LogEnums.java

@@ -0,0 +1,43 @@
+package com.community.huiju.log;
+
+/**
+ * 日志类型
+ *
+ * @author weiximei
+ */
+public enum LogEnums {
+
+    NOT(8000, "无类型"),
+
+    DA_SU(8001, "大苏")
+
+    ;
+
+    private Integer code;
+
+    private String value;
+
+
+    LogEnums(Integer code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/log/LogFactory.java

@@ -0,0 +1,103 @@
+package com.community.huiju.log;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.TimerTask;
+
+/**
+ * 日志工厂
+ * @author weiximei
+ */
+public class LogFactory {
+
+    public static File getFile() {
+        LocalDate localDate = LocalDate.now();
+        String pathMkdir = "";
+
+        String os = System.getProperty("os.name");
+        if(os.toLowerCase().startsWith("win")){
+            pathMkdir = "E:" + File.separator + "log" + File.separator + "property-log" + File.separator + localDate.getYear() + "-" + localDate.getMonthValue() + "-" + localDate.getDayOfMonth();
+        } else {
+            pathMkdir = "/home/fxf/smart-community" + File.separator + "log" + File.separator + "property-log" + File.separator + localDate.getYear() + "-" + localDate.getMonthValue() + "-" + localDate.getDayOfMonth();
+        }
+
+        File file = new File(pathMkdir);
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+        file = new File(pathMkdir + File.separator + "app-log.log");
+
+        return file;
+    }
+
+    /**
+     * 记录请求参数和返回值
+     * @param parameters
+     * @param returnValue
+     * @return
+     */
+    public static TimerTask parametersAndReturn(String parameters, String returnValue){
+        return new TimerTask() {
+            @Override
+            public void run() {
+
+                RandomAccessFile accessFile = null;
+                FileChannel fileChannel = null;
+                FileLock fileLock = null;
+                try {
+                    // 获取这个文件的读和写的权限
+                    accessFile = new RandomAccessFile(getFile(), "rw");
+                    // 文件通道
+                    fileChannel = accessFile.getChannel();
+                    fileLock = null;
+                    while (true) {
+                        try {
+                            // 获取锁，如果失败，继续尝试
+                            fileLock = fileChannel.tryLock();
+                            break;
+                        } catch (Exception e) {
+                            Thread.sleep(100);
+                        }
+                    }
+
+                    // 获取当前这个文件的大小
+                    long length = accessFile.length();
+                    // 设置写入的指针, 设置到这个文件的末尾
+                    accessFile.seek(length);
+                    // 开始写入文件
+                    LocalDateTime localDateTime = LocalDateTime.now();
+                    DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss");
+                    String str = dateTimeFormatter.format(localDateTime) + " === " + Thread.currentThread().getName() + "  : " + parameters + "\n";
+                    fileChannel.write(ByteBuffer.wrap(str.getBytes()));
+                    str = dateTimeFormatter.format(localDateTime) + " === " + Thread.currentThread().getName() + "  : " + returnValue + "\n";
+                    fileChannel.write(ByteBuffer.wrap(str.getBytes()));
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                } finally {
+                    if (fileLock != null && fileChannel != null && accessFile != null) {
+                        // 释放锁
+                        try {
+                            fileLock.release();
+                            fileChannel.close();
+                            accessFile.close();
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+
+
+            }
+        };
+    }
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/log/LogFileManager.java

@@ -0,0 +1,46 @@
+package com.community.huiju.log;
+
+import java.util.TimerTask;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+
+/**
+ * 日志文件记录
+ * @author weiximei
+ */
+public class LogFileManager {
+
+    // 记录日志的线程池
+    private ScheduledThreadPoolExecutor scheduledThreadPoolExecutor = new ScheduledThreadPoolExecutor(10);
+
+    private LogFileManager() {}
+
+    public static LogFileManager getInstance() {
+        return LogSingleton.INSTANCE.getInstance();
+    }
+
+    /**
+     * 记录日志
+     * @param timerTask 任务
+     */
+    public void executeLog(TimerTask timerTask){
+        // 日志记录
+        scheduledThreadPoolExecutor.execute(timerTask);
+    }
+
+    /**
+     * 枚举
+     */
+    private static enum LogSingleton {
+        INSTANCE;
+
+        private LogFileManager logFileManager;
+        private LogSingleton() {
+            logFileManager = new LogFileManager();
+        }
+
+        public LogFileManager getInstance() {
+            return logFileManager;
+        }
+
+    }
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IFuShiService.java

@@ -54,4 +54,10 @@ public interface IFuShiService {
      */
     ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo,  String CouponList);
 
+    /**
+     * 获取线下算费结果
+     * @param CarNoOrCardNo 车牌号码或卡号
+     * @return
+     */
+    ResponseBean apiGetOfflineFee(String CarNoOrCardNo);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/FuShiServiceImpl.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.community.commom.fushi.FuShiRequestAPI;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.uuid.IdGen;
+import com.community.huiju.log.LogAnnotation;
+import com.community.huiju.log.LogEnums;
 import com.community.huiju.common.perproties.FuShiProperties;
 import com.community.huiju.service.IFuShiService;
 import com.google.common.collect.Maps;
@@ -45,6 +47,7 @@ public class FuShiServiceImpl implements IFuShiService {
         return map;
     }
 
+    @LogAnnotation(value = LogEnums.DA_SU, alias = "获取停车信息（通过车牌号)")
     @Override
     public ResponseBean getParkInfoByCarNo(String carNo) {
         ResponseBean responseBean = new ResponseBean();
@@ -54,6 +57,7 @@ public class FuShiServiceImpl implements IFuShiService {
         return responseBean;
     }
 
+    @LogAnnotation(value = LogEnums.DA_SU, alias = "第三方月卡上发续费")
     @Override
     public ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo,String RechargeAmt) {
         ResponseBean responseBean = new ResponseBean();
@@ -94,6 +98,7 @@ public class FuShiServiceImpl implements IFuShiService {
      *
      * @return
      */
+    @LogAnnotation(value = LogEnums.DA_SU, alias = "第三方临时卡上发缴费")
     @Override
     public ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo, String CouponList) {
         ResponseBean responseBean = new ResponseBean();
@@ -106,4 +111,16 @@ public class FuShiServiceImpl implements IFuShiService {
         responseBean.addSuccess(map);
         return responseBean;
     }
+
+    @LogAnnotation(value = LogEnums.DA_SU, alias = "获取线下算费结果")
+    @Override
+    public ResponseBean apiGetOfflineFee(String CarNoOrCardNo) {
+        ResponseBean responseBean = new ResponseBean();
+        String apiGetOfflineFee = fuShiRequestAPI.apiGetOfflineFee(fuShiProperties.getParkingCode(), CarNoOrCardNo);
+        String result = JSONObject.parseObject(apiGetOfflineFee).getString("Result");
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("Result", result);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
 }

CODE/smart-community/property-api/src/main/resources/bootstrap.yml

@@ -18,7 +18,9 @@ spring:
       multipart:
         max-file-size: 10MB
         max-request-size: 100MB
-
+  aop:
+    auto: true
+    proxy-target-class: true
 eureka:
   client:
     service-url: