加入按楼栋授权功能

java110-utils/src/main/java/com/java110/utils/util/TeldUtil.java

@@ -237,6 +237,32 @@ public class TeldUtil {
         return paramObj.toString();
     }
 
+    /**
+     * 生成加密报文
+     *
+     * @param jsonParam
+     * @param aesKey
+     * @param aesIV
+     * @param signKey
+     * @param OPERATOR_ID
+     * @return
+     * @throws Exception
+     */
+    public static String generateReturnParam(String jsonParam, String aesKey, String aesIV, String signKey, String OPERATOR_ID)
+            throws Exception {
+        System.out.println("generateSecurityParam=" + jsonParam);
+        JSONObject paramObj = new JSONObject();
+        paramObj.put("Ret", 0);
+        paramObj.put("Data", TeldUtil.Encrypt(jsonParam, aesKey, aesIV));
+        paramObj.put("Msg", "成功");
+
+        String signMsg = paramObj.getString("Ret") +paramObj.getString("Msg") + paramObj.getString("Data");
+
+        paramObj.put("Sig", TeldUtil.getHmacMd5Str(signKey, signMsg));
+
+        return paramObj.toString();
+    }
+
     public static String getSeq(String timeStamp) {
 
         if (map.containsKey(timeStamp)) {

service-acct/src/main/java/com/java110/acct/cmd/parkingCoupon/TeldSendParkingCouponCarCmd.java

@@ -95,7 +95,7 @@ public class TeldSendParkingCouponCarCmd extends Cmd {
         paramOut.put("PlateAutFailReason", PlateAutFailReason);
         String paramStr = "";
         try {
-            paramStr = TeldUtil.generateSecurityParam(paramOut.toJSONString(), aesKey, aesIv, signKey, reqJson.getString("OperatorID"));
+            paramStr = TeldUtil.generateReturnParam(paramOut.toJSONString(), aesKey, aesIv, signKey, reqJson.getString("OperatorID"));
         } catch (Exception e) {
             e.printStackTrace();
         }

service-user/src/main/java/com/java110/user/cmd/login/QueryTokenForTeldCmd.java

@@ -127,7 +127,7 @@ public class QueryTokenForTeldCmd extends Cmd {
             param.put("AccessToken", token);
             param.put("TokenAvailableTime", 7200);
             param.put("FailReason", 0);
-            paramOut = TeldUtil.generateSecurityParam(param.toJSONString(), aesKey, aesIv, signKey, dataObj.getString("OperatorID"));
+            paramOut = TeldUtil.generateReturnParam(param.toJSONString(), aesKey, aesIv, signKey, dataObj.getString("OperatorID"));
             context.setResponseEntity(new ResponseEntity(paramOut, HttpStatus.OK));
         } catch (Exception e) {
             throw new RuntimeException(e);