提交

CODE/smart-community/app-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/app-api/src/main/java/com/community/huiju/common/perproties/DaSuProperties.java

@@ -0,0 +1,26 @@
+package com.community.huiju.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 提供给 大苏 的 appid 和 appsecret
+ * @author weiximei
+ */
+@Component
+@ConfigurationProperties(prefix = "da-su")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DaSuProperties {
+
+    private String appid;
+
+    private String appSecret;
+
+    private String communityId;
+
+}

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

@@ -0,0 +1,44 @@
+package com.community.huiju.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 富士配置类
+ * @author weiximei
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Component
+@ConfigurationProperties(prefix = "fu-shi")
+public class FuShiProperties {
+
+    /**
+     * 富士云 请求地址
+     */
+    private String url;
+
+    /**
+     * 富士云 appid
+     */
+    private String appid;
+
+    /**
+     * 富士云 appSecret
+     */
+    private String appSecret;
+
+    /**
+     * 富士云 私钥 privateKey
+     */
+    private String privateKey;
+
+    /**
+     * 停车场编码
+     */
+    private String parkingCode;
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/sign/DaSuSign.java

@@ -0,0 +1,83 @@
+package com.community.huiju.common.sign;
+
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+/**
+ * 大苏签名校验
+ */
+@Slf4j
+public class DaSuSign {
+
+    /**
+     * 校验签名是否相等
+     * @param val_1
+     * @param val_2
+     * @return true 相等  false 不相等
+     */
+    public static boolean isMD5Sign(String val_1, String val_2) {
+        return StringUtils.equals(val_1, val_2);
+    }
+
+    /**
+     *
+     * 创建签名
+     *
+     * @param appid
+     * @param appSecret
+     * @param datetime 时间戳
+     * @param encrypt 加密方式(目前就 MD5)
+     * @param communityId 小区id
+     * @return
+     */
+    public static String createSign(String appid, String appSecret, String datetime, String encrypt, String communityId, String phone){
+        TreeMap<String ,Object> treeMap = Maps.newTreeMap();
+        treeMap.put("appid", appid);
+        treeMap.put("datetime", datetime);
+        treeMap.put("encrypt", encrypt);
+        treeMap.put("communityid", communityId);
+        treeMap.put("phone", phone);
+
+        String sign = "";
+
+        StringBuilder sb = new StringBuilder();
+        Set<Map.Entry<String, Object>> entries = treeMap.entrySet();
+        entries.forEach(e-> {
+            sb.append(e.getKey());
+            sb.append("=");
+            sb.append(e.getValue());
+            sb.append("&");
+        });
+
+        sign = sb.toString();
+        sign = sign.substring(0, sign.lastIndexOf("&"));
+
+        log.info("签名之前参数: {}" , sign);
+
+        try {
+            String str = new String(sign.getBytes("UTF-8"), "UTF-8");
+            sign = DigestUtils.md5Hex( str + appSecret);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        log.info("签名: {}" , sign);
+
+        return sign;
+    }
+
+    public static void main(String[] args) {
+
+        Long timeMillis = System.currentTimeMillis();
+        System.out.println(timeMillis);
+        String sign = createSign("dssdw2576sd997", "fgexhd855sf4", timeMillis + "", "md5", "101", "15850791953");
+    }
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/config/FuShiConfig.java

@@ -0,0 +1,40 @@
+package com.community.huiju.config;
+
+import com.community.commom.fushi.FuShiHttpClient;
+import com.community.commom.fushi.FuShiRequestAPI;
+import com.community.huiju.common.perproties.FuShiProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 富士配置类
+ * @author weiximei
+ */
+@Configuration
+public class FuShiConfig {
+
+    @Autowired
+    private FuShiProperties fuShiProperties;
+
+
+    /**
+     * 初始化富士HTTP客户端
+     * @return FuShiHttpClient
+     */
+    @Bean
+    public FuShiHttpClient fuShiHttpClient() {
+        return new FuShiHttpClient(fuShiProperties.getUrl(), fuShiProperties.getAppid(), fuShiProperties.getAppSecret(), fuShiProperties.getPrivateKey());
+    }
+
+    /**
+     * 初始化富士请求 API
+     * @param fuShiHttpClient
+     * @return
+     */
+    @Bean
+    public FuShiRequestAPI fuShiRequestAPI(FuShiHttpClient fuShiHttpClient) {
+        return new FuShiRequestAPI(fuShiHttpClient);
+    }
+
+}

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

@@ -0,0 +1,95 @@
+package com.community.huiju.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.service.IFuShiService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "车辆操作API", description = "车辆操作API")
+public class FSController extends BaseController {
+
+    @Autowired
+    private IFuShiService iFuShiService;
+
+    @RequestMapping(value = "/car/getParkInfoByCarNo/{carNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取停车信息（通过车牌号）", notes = "获取停车信息（通过车牌号）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号")
+    })
+    public ResponseBean getParkInfoByCarNo(@PathVariable("carNo") String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iFuShiService.getParkInfoByCarNo(carNo);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/apiThirdPartyMonthCardPay", method = RequestMethod.POST)
+    @ApiOperation(value = "月卡续费", notes = "月卡续费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "Phone手机号;RenewDayType续费日期类型( 3:年 2:月 1:日, 选入对应的数字);" +
+                    "RenewDay续费日期数目;" +
+                    "PayStyle交易方式(中文描述)，例如：微信、 支付宝、 银联;" +
+                    "CarNo车牌号;" +
+                    "CardNo停车卡号;" +
+                    "RechargeAmt充值续费金额;")
+    })
+    public ResponseBean apiThirdPartyMonthCardPay(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        responseBean = iFuShiService.apiThirdPartyMonthCardPay(jsonObject.getString("Phone"),
+                jsonObject.getString("RenewDayType"),
+                jsonObject.getString("RenewDay"),
+                jsonObject.getString("PayStyle"),
+                jsonObject.getString("CarNo"),
+                jsonObject.getString("CardNo"),
+                jsonObject.getString("RechargeAmt"));
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/apiThirdPartyTemporaryCardPay", method = RequestMethod.POST)
+    @ApiOperation(value = "第三方临时卡上发缴费", notes = "第三方临时卡上发缴费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "Amount应缴金额（单位元）;" +
+                    "ActualAmount实缴金额（单位元）;" +
+                    "DeductionAmount抵扣金额（单位元）;" +
+                    "Reason抵扣原因;" +
+                    "PayStyle交易方式(汉字描述)，例如：微信、支付宝、银联;" +
+                    "CarNo车牌号;" +
+                    "CardNo停车卡号;" +
+                    "CouponList使用的优惠券列表")
+    })
+    public ResponseBean apiThirdPartyTemporaryCardPay(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        responseBean = iFuShiService.apiThirdPartyTemporaryCardPay(jsonObject.getString("Amount"),
+                jsonObject.getString("ActualAmount"),
+                jsonObject.getString("DeductionAmount"),
+                jsonObject.getString("Reason"),
+                jsonObject.getString("PayStyle"),
+                jsonObject.getString("CarNo"),
+                jsonObject.getString("CardNo"),
+                jsonObject.getString("CouponList"));
+        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/app-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -296,4 +296,33 @@ public class UserController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "获取令牌", notes = "获取令牌")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "提供的appid"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "encrypt加密方式(目前值为md5)"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "phone", value = "手机号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "communityId", value = "提供的小区编号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "生成的签名"),
+    })
+    @RequestMapping(value = "/user/token", method = RequestMethod.GET)
+    public ResponseBean daSuToken(@RequestParam("appid") String appid,
+                                  @RequestParam("datetime") String datetime,
+                                  @RequestParam("encrypt") String encrypt,
+                                  @RequestParam("phone") String phone,
+                                  @RequestParam("communityId") String communityId,
+                                  @RequestParam("sign") String sign,
+                                  HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaUserService.daSuToken(appid, datetime, encrypt, communityId, phone, sign, session);
+        Object object = responseBean.getData();
+        if (null != object) {
+            TaUserVO userVO = (TaUserVO) responseBean.getData();
+            if (userVO != null) {
+                setUserElement(userVO, session);
+            }
+        }
+        return responseBean;
+    }
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserVerifyController.java

@@ -104,4 +104,16 @@ public class UserVerifyController extends BaseController {
         return responseBean;
     }
 
+
+    @RequestMapping(value = "/user_verify/add", method = RequestMethod.POST)
+    @ApiOperation(value = "添加一个审核的房产 大苏", notes = "添加一个审核的房产 大苏")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "userId用户编号;communityId小区编号;roleName角色名称;phaseId期;buildingId楼栋;unitId单元;levelId楼层;roomNoId户号")
+    })
+    public ResponseBean addDaSuUserVerify(@RequestBody String parameter, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = taUserVerifyServicel.addDaSuUserVerify(parameter);
+        return responseBean;
+    }
+
 }

CODE/smart-community/app-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/app-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/app-api/src/main/java/com/community/huiju/log/LogFactory.java

@@ -0,0 +1,101 @@
+package com.community.huiju.log;
+
+import java.io.File;
+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 + "app-log" + File.separator + localDate.getYear() + "-" + localDate.getMonthValue() + "-" + localDate.getDayOfMonth();
+        } else {
+            pathMkdir = "/home/fxf/smart-community" + File.separator + "log" + File.separator + "app-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/app-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/app-api/src/main/java/com/community/huiju/service/IFuShiService.java

@@ -0,0 +1,63 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+
+/**
+ * 富士 业务接口
+ */
+public interface IFuShiService {
+
+    /**
+     * 获取停车信息（通过车牌号）
+     *
+     * @param carNo
+     * @return
+     */
+    ResponseBean getParkInfoByCarNo(String carNo);
+
+    /**
+     * 第三方月卡上发续费
+     * @param Phone 车主手机号
+     * @param RenewDayType 续费日期类型: 3:年; 2:月; 1:日;
+     * @param RenewDay 续费日期数目
+     * @param PayStyle 交易方式(中文描述)，例如：微信、 支付宝、 银联
+     * @param CarNo 车牌号
+     * @param CardNo 停车卡号
+     * @param RechargeAmt 充值续费金额
+     * @return
+     */
+    ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo, String RechargeAmt);
+
+
+    /**
+     * 第三方临时卡上发缴费
+     * @param Amount 应缴金额（单位元）
+     * @param ActualAmount 实缴金额（单位元）
+     * @param DeductionAmount 抵扣金额（单位元）
+     * @param Reason 抵扣原因
+     * @param PayStyle 交易方式(汉字描述)，例如：微信、支付宝、银联
+     * @param CarNo 车牌号
+     * @param CardNo 停车卡号
+     * @param CouponList 使用的优惠券列表(JSON字符串)
+     *               MerchantName: 商户名称
+     *               CouponType: 优惠券优惠类型1全免2减免金额3减免时长4减免百分比
+     *               CouponValue： 对应优惠券类型的值 金额/时间/折扣
+     *               CouponCode： 优惠券编码
+     *               FavorableType： 优惠券类型1 纸质券 2 电子券 3 活动券
+     *               UseStatus：标识优惠券是线上或线下使用的状态 1只在线上使用 2只在线下使用 3线上线下都可以使用
+     *               IsAuto： 是否自动使用优惠券1是2否
+     *               EndTime： 截至时间
+     *               CouponDescribe： 优惠券描述
+     *               CouponName： 优惠券名称
+     *
+     * @return
+     */
+    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/app-api/src/main/java/com/community/huiju/service/ITaUserService.java

@@ -191,4 +191,16 @@ public interface ITaUserService {
      * @return
      */
     ResponseBean deleteTenantAndRelation(UserElement userElement, Integer userVerifyId);
+
+    /**
+     * 大苏 token生成
+     * @param appid
+     * @param datetime 时间戳
+     * @param encrypt 加密方式(默认MD5)
+     * @param communityId 小区
+     * @param phone 手机号
+     * @param sign 传过来的签名
+     * @return
+     */
+    ResponseBean daSuToken(String appid, String datetime, String encrypt, String communityId, String phone,String sign, HttpSession session);
 }

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

@@ -54,4 +54,12 @@ public interface TaUserVerifyServicel {
      */
     ResponseBean verifyUser(UserElement userElement, Integer userVerifyId, String userVerifyStatus, String remark);
 
+    /**
+     * 添加 一个审核房产
+     * @param parameter
+     * @return
+     */
+    ResponseBean addDaSuUserVerify(String parameter);
+
+
 }

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

@@ -0,0 +1,126 @@
+package com.community.huiju.service.impl;
+
+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.common.perproties.FuShiProperties;
+import com.community.huiju.log.LogAnnotation;
+import com.community.huiju.log.LogEnums;
+import com.community.huiju.service.IFuShiService;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Map;
+
+/**
+ * 富士业务实现
+ * @author weiximei
+ */
+@Slf4j
+@Service
+public class FuShiServiceImpl implements IFuShiService {
+
+    @Autowired
+    private FuShiRequestAPI fuShiRequestAPI;
+
+    @Autowired
+    private FuShiProperties fuShiProperties;
+
+    private IdGen idGen = IdGen.get();
+
+    /**
+     * 获取 富士 json 值
+     * @param jsonString
+     * @return
+     */
+    private Map<String,Object> getFuShiInfo(String jsonString) {
+        JSONObject jsonObject = JSONObject.parseObject(jsonString);
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("JsonParam", jsonObject.getJSONObject("JsonParam").getInnerMap());
+        map.put("Redirect", jsonObject.getString("Redirect"));
+        map.put("DataType", jsonObject.getInteger("DataType"));
+        return map;
+    }
+
+    @LogAnnotation(value = LogEnums.DA_SU, alias = "获取停车信息（通过车牌号)")
+    @Override
+    public ResponseBean getParkInfoByCarNo(String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        String parkInfo = fuShiRequestAPI.getParkInfoByCarNo(fuShiProperties.getParkingCode(), carNo);
+        Map<String, Object> fuShiInfo = getFuShiInfo(parkInfo);
+        responseBean.addSuccess(fuShiInfo);
+        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();
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss");
+        // 交易编码
+        String dealNo = idGen.nextId() + "";
+        // 第三方交易日期
+        String dateTime = dateTimeFormatter.format(LocalDateTime.now());
+        // 富士云请求
+        String partyMonthCardPay = fuShiRequestAPI.apiThirdPartyMonthCardPay(RenewDayType, RenewDay, dealNo, PayStyle, CarNo, fuShiProperties.getParkingCode(), CardNo, RechargeAmt, dateTime);
+        String tradeNo = JSONObject.parseObject(partyMonthCardPay).getString("TradeNo");
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("TradeNo", tradeNo);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    /**
+     * 第三方临时卡上发缴费
+     * @param Amount 应缴金额（单位元）
+     * @param ActualAmount 实缴金额（单位元）
+     * @param DeductionAmount 抵扣金额（单位元）
+     * @param Reason 抵扣原因
+     * @param PayStyle 交易方式(汉字描述)，例如：微信、支付宝、银联
+     * @param CarNo 车牌号
+     * @param CardNo 停车卡号
+     * @param CouponList 使用的优惠券列表(JSON字符串)
+     *               MerchantName: 商户名称
+     *               CouponType: 优惠券优惠类型1全免2减免金额3减免时长4减免百分比
+     *               CouponValue： 对应优惠券类型的值 金额/时间/折扣
+     *               CouponCode： 优惠券编码
+     *               FavorableType： 优惠券类型1 纸质券 2 电子券 3 活动券
+     *               UseStatus：标识优惠券是线上或线下使用的状态 1只在线上使用 2只在线下使用 3线上线下都可以使用
+     *               IsAuto： 是否自动使用优惠券1是2否
+     *               EndTime： 截至时间
+     *               CouponDescribe： 优惠券描述
+     *               CouponName： 优惠券名称
+     *
+     * @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();
+        // 交易编号
+        String dealNo = idGen.nextId() + "";
+        String apiThirdPartyTemporaryCardPay = fuShiRequestAPI.apiThirdPartyTemporaryCardPay(Amount, ActualAmount, DeductionAmount, Reason, dealNo, PayStyle, CarNo, fuShiProperties.getParkingCode(), CardNo, "", CouponList);
+        String tradeNo = JSONObject.parseObject(apiThirdPartyTemporaryCardPay).getString("TradeNo");
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("TradeNo", tradeNo);
+        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/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -13,7 +13,9 @@ import com.community.huiju.common.code.ICode;
 import com.community.huiju.common.code.cache.AppkeyCache;
 import com.community.commom.hk.HKConstant;
 import com.community.commom.hk.HKOpenApi;
+import com.community.huiju.common.perproties.DaSuProperties;
 import com.community.huiju.common.perproties.LoginCodePerproties;
+import com.community.huiju.common.sign.DaSuSign;
 import com.community.huiju.common.welcome.OkHttpRequestUtils;
 import com.community.huiju.common.welcome.WelcomeProperties;
 import com.community.huiju.dao.*;
@@ -47,8 +49,7 @@ import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.logging.SimpleFormatter;
@@ -106,6 +107,9 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private IHKService ihkService;
 
+    @Autowired
+    private DaSuProperties daSuProperties;
+
     /**
      * 期
      */
@@ -1118,4 +1122,47 @@ public class TaUserServiceImpl implements ITaUserService {
         responseBean.addSuccess("操作成功！");
         return responseBean;
     }
+
+    @Override
+    public ResponseBean daSuToken(String appid, String datetime, String encrypt, String communityId, String phone, String sign, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+
+        LocalDateTime currrenDate = LocalDateTime.now();
+        LocalDateTime parameDate = Instant.ofEpochMilli(Long.parseLong(datetime)).atZone(ZoneId.systemDefault()).toLocalDateTime();
+
+        long minutes = Duration.between(parameDate, currrenDate).toMinutes();
+        if (minutes > 10) {
+            responseBean.addError("签名已过期!");
+            return responseBean;
+        }
+
+
+        // server 端签名
+        String serverSign = DaSuSign.createSign(daSuProperties.getAppid(), daSuProperties.getAppSecret(), datetime, encrypt, communityId, phone);
+        boolean isMd5Sign = DaSuSign.isMD5Sign(serverSign, sign);
+        if (!isMd5Sign) {
+            responseBean.addError("签名错误!");
+            return responseBean;
+        }
+
+        if (!daSuProperties.getCommunityId().equals(communityId)) {
+            responseBean.addError("小区不正确!");
+            return responseBean;
+        }
+
+        if (!daSuProperties.getAppid().equals(appid)) {
+            responseBean.addError("appid 不正确!");
+            return responseBean;
+        }
+
+        TaUser currentUser = hasUserPhone(phone);
+        if (null == currentUser) {
+            responseBean.addError("未注册，请先注册！请先调用用户添加接口");
+            return responseBean;
+        }
+
+        // 检验登录房产
+        checkLogin(responseBean, currentUser, session);
+        return responseBean;
+    }
 }

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

@@ -385,4 +385,92 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         return tpBuildingOwnerInfo;
     }
 
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean addDaSuUserVerify(String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        TaUserVerify taUserVerify = jsonObject.toJavaObject(TaUserVerify.class);
+
+        // 通过 角色名称 查询出角色的id
+        String roleName = jsonObject.getString("roleName");
+        TaSysRole sysRole = taSysRoleMapper.selectByRoleName(roleName);
+        if (null == sysRole) {
+            responseBean.addError("非法角色!");
+            return responseBean;
+        }
+
+        // 如果申请的是户主
+        if (sysRole.getId().intValue() == 1) {
+            // 校验是否有审核通过的业主
+            TaUserVerify hasUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(taUserVerify.getCommunityId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
+            if (null != hasUserVerify) {
+                responseBean.addError("此房产已存在户主!");
+                return responseBean;
+            }
+        }
+
+
+        // 校验该用户是否已经提交了一个当前房产的审核, 包含 待审核和已审核通过
+        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectCommunityAndAddressAndNotVerifyStatus2(taUserVerify.getUserId(), taUserVerify.getCommunityId(),
+                taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(),
+                taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
+        if (null != userVerifyList && userVerifyList.size() > 0) {
+            responseBean.addError("您已添加了这个房产！");
+            return responseBean;
+        }
+
+
+        // 查询 期/栋/单元/楼层/户号 -> 设置 相应 id 和 name
+        TpPhase phase = tpPhaseMapper.selectByPrimaryKey(taUserVerify.getPhaseId());
+        TpBuilding building = tpBuildingMapper.selectByPrimaryKey(taUserVerify.getBuildingId());
+        TpUnit unit = tpUnitMapper.selectByPrimaryKey(taUserVerify.getUnitId());
+        TpLevel level = tpLevelMapper.selectByPrimaryKey(taUserVerify.getLevelId());
+        TpRoomNo roomNo = tpRoomNoMapper.selectByPrimaryKey(taUserVerify.getRoomNoId());
+
+
+        taUserVerify.setRoleId(sysRole.getId());
+        taUserVerify.setUserId(taUserVerify.getUserId());
+        taUserVerify.setCreateDate(new Date());
+        taUserVerify.setPhaseName(phase.getName());
+        taUserVerify.setBuildingName(building.getName());
+        taUserVerify.setUnitName(unit.getName());
+        taUserVerify.setLevelName(level.getName());
+        taUserVerify.setRoomNoName(roomNo.getName());
+        taUserVerify.setVerifyStatus("1");
+
+        int rows = taUserVerifyMapper.insertSelective(taUserVerify);
+        if (rows <= 0) {
+            responseBean.addError("操作失败！");
+            return responseBean;
+        }
+
+        // 获取这个被审核的用户
+        TaUser user = taUserMapper.selectByPrimaryKey(taUserVerify.getUserId());
+        if (null == user) {
+            throw new WisdomException("用户不存在！");
+        }
+
+        UserElement userElement = new UserElement();
+        userElement.setPhaseId(taUserVerify.getPhaseId());
+        userElement.setBuildingId(taUserVerify.getBuildingId());
+        userElement.setUnitId(taUserVerify.getUnitId());
+        userElement.setLevelId(taUserVerify.getLevelId());
+        userElement.setRoomNoId(taUserVerify.getRoomNoId());
+        userElement.setCommunityId(taUserVerify.getCommunityId());
+
+        // 往楼栋资料库插入数据
+        // 校验楼栋信息表
+        TpBuildingOwnerInfo selectBuild = getBuildingInfo(userElement, user.getLoginName());
+        if (null == selectBuild) {
+            // 插入楼栋信息数据
+            insertTpBuildingOwnerInfo(userElement, user, null, taUserVerify.getId());
+        }
+
+        responseBean.addSuccess(taUserVerify);
+        return responseBean;
+    }
+
 }

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

@@ -52,5 +52,35 @@ weixin:
 
 # 支付回调
 pay-notify:
-  wx-notify: http://ycapi.jcjyhn.com/app-api/wxNotify
-  ali-notify: http://ycapi.jcjyhn.com/app-api/aliPayNotify
+  wx-notify: http://106.14.20.193:8086/app-api/wxNotify
+  ali-notify: http://106.14.20.193:8086/app-api/aliPayNotify
+#  wx-notify: http://ycapi.jcjyhn.com/app-api/wxNotify
+#  ali-notify: http://ycapi.jcjyhn.com/app-api/aliPayNotify
+
+# 大苏
+da-su:
+  appid: dssdw2576sd997
+  app-secret: fgexhd855sf4
+  community-id: 101
+
+# 富士E7+云平台
+fu-shi:
+  url: http://api.mops.fujica.com.cn/v2/Api
+  appid: fujica_a354fedcb214c86b
+  app-secret: 0a0897e0bf154169833f709d6693fe84
+  private-key: MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAL8wJdXId6Pa6l/O
+    d6a+vE0z0RgujUTR2KxRZiRhEWpc4JSi1uyQPS2RS+CleByllAXkgPYCxhxelt6Y
+    wtFb3nuUVrQboesUrxv7DuGoRnbOeakMC2Cb83AanQlEC/erXspsTx9x9lecygAt
+    yOsEPv6nb8VHu8tTEEhFJIyWSTQBAgMBAAECgYA07AH9HGGptKZd4MwUFwYOpMJD
+    XFd0blX41QteFJR6ib0Mx8qQbxjQLUEArS0DWP4RZ4AfGQN3xOMkOMrsou6BcVjR
+    oVXvlKate4tIRQy3ay77dabM8LQFNg8uuigD7EWeGh9s4V1E5Jfuw8Y8zfmBKBbz
+    Id/Mm7bafgbfd4jCtQJBAPn0ik8Iv3pkJ90V60eQG4l6sVGAaskM0GWzyENpecLP
+    6UA7oYmAaqIx9vsY0UyiF4XctgxpMvqG6pM/U0y8LacCQQDDz8h7nhUWF0ZUH1IS
+    H+Qj3sUWR3hHel/WCjGPPKWO5iQUTfwVY9+L54IDIanAjisc40ueO3zK573zzlBE
+    /VYXAkEA61Qmm356+DovpeErILc2ldsj8r3ay+r6kaYQGBfIAXhJ/KWn0pNK0eYE
+    yCd3dpTtXKSN6WVqD6DSXUuzm31X5QJAEDMqlP+ZIwC98su8kH9O8qDFkXhMPS2k
+    rCKfwwfzcoUbywpApsxifEKlAPlR//pDGtq7MNYfFvJhRsB056BF9QJBAKHlCCnt
+    gtzRlhQxwYRg0th4uoJ99BT03+WM94Kepu6zfh3OmKLvPk2gW30TKSeYC5xmursq
+    xGP2TC4KxH2tAn0=
+  parking-code: 19000100250504 # 停车场编码
+

CODE/smart-community/property-api/src/main/java/com/community/huiju/feign/TaUserFeignService.java

@@ -38,4 +38,5 @@ public interface TaUserFeignService {
     ResponseBean downloadAuthorityByDeviceUuids();
 
 
+
 }