新需求

src/main/java/com/huiju/estateagents/eContract/controller/TaCompanySealController.java

@@ -112,7 +112,7 @@ public class TaCompanySealController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
-            String result = taCompanySealUtil.addSignaTrue(taCompany.getFadadaCode(), taCompanySeal.getSealImg());
+            String result = taCompanySealUtil.addSignaTure(taCompany.getFadadaCode(), taCompanySeal.getSealImg());
             JSONObject params = JSONObject.parseObject(result);
             if (!String.valueOf(CommConstant.STATUS_NORMAL).equals(params.get("code"))){
                 responseBean.addError(params.get("msg").toString());
@@ -122,6 +122,7 @@ public class TaCompanySealController extends BaseController {
             String data = params.getString("data");
             taCompanySeal.setCreateDate(LocalDateTime.now());
             taCompanySeal.setStatus(CommConstant.STATUS_NORMAL);
+            taCompanySeal.setSignatureId(JSONObject.parseObject(data).getString("signature_id"));
             if (iTaCompanySealService.save(taCompanySeal)){
                 responseBean.addSuccess(taCompanySeal);
             }else {
@@ -140,11 +141,24 @@ public class TaCompanySealController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taCompanySeal/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/channel/delCompanySeal/{id}", method= RequestMethod.PUT)
     public ResponseBean taCompanySealDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaCompanySealService.removeById(id)){
+            TaCompanySeal taCompanySeal = iTaCompanySealService.getById(id);
+            TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
+            iTaCompanyService.getById(taCompanySeal.getCompanyId());
+            String res = taCompanySealUtil.delSignature(taCompany.getFadadaCode(), taCompanySeal.getSignatureId());
+            JSONObject params = JSONObject.parseObject(res);
+            if (!String.valueOf(params.get("code")).equals(CommConstant.STATUS_NORMAL)){
+                responseBean.addError(params.getString("msg"));
+                return responseBean;
+            }
+
+            TaCompanySeal delInfo = new TaCompanySeal();
+            taCompanySeal.setSealId(id);
+            taCompanySeal.setStatus(CommConstant.STATUS_DELETE);
+            if(iTaCompanySealService.updateById(delInfo)){
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");
@@ -163,11 +177,20 @@ public class TaCompanySealController extends BaseController {
      * @param taCompanySeal 实体对象
      * @return
      */
-    @RequestMapping(value="/taCompanySeal/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/channel/taCompanySeal/{id}",method= RequestMethod.PUT)
     public ResponseBean taCompanySealUpdate(@PathVariable Integer id,
                                         @RequestBody TaCompanySeal taCompanySeal){
         ResponseBean responseBean = new ResponseBean();
         try {
+            TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
+            String res = taCompanySealUtil.replaceSignature(taCompany.getFadadaCode(), taCompanySeal.getSealImg());
+            JSONObject params = JSONObject.parseObject(res);
+            Integer code = (Integer) params.get("code");
+            if (code != 1){
+                responseBean.addError(params.getString("msg"));
+                return responseBean;
+            }
+            taCompanySeal.setSealId(id);
             if (iTaCompanySealService.updateById(taCompanySeal)){
                 responseBean.addSuccess(taCompanySeal);
             }else {
@@ -185,7 +208,7 @@ public class TaCompanySealController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taCompanySeal/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/channel/taCompanySeal/{id}",method= RequestMethod.GET)
     public ResponseBean taCompanySealGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -197,4 +220,21 @@ public class TaCompanySealController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 根据id查询公司授权对象信息
+     * @param id  实体ID
+     */
+    @RequestMapping(value = "/channel/companySignInfo/id")
+    public ResponseBean companySignInfoByCompanyId(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCompanySealDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/eContract/service/impl/TaCompanySealUtil.java

@@ -2,20 +2,66 @@ package com.huiju.estateagents.eContract.service.impl;
 
 import com.fadada.sdk.client.FddClientBase;
 import com.fadada.sdk.util.crypt.FddEncryptTool;
-import com.huiju.estateagents.base.ResponseBean;
+import com.fadada.sdk.util.http.HttpsUtil;
 import com.huiju.estateagents.config.FadadaProperties;
+import org.apache.http.message.BasicNameValuePair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+
 @Component
 public class TaCompanySealUtil {
 
     @Autowired
     private FadadaProperties fadadaProperties;
 
-    public String addSignaTrue(String customerId, String imgUrl) throws Exception {
+    public String addSignaTure(String customerId, String imgUrl) throws Exception {
         FddClientBase base = new FddClientBase(fadadaProperties.getAppId(), fadadaProperties.getAppSecret(), fadadaProperties.getVersion(), fadadaProperties.getServeHost());
         String base64Url = FddEncryptTool.ImageToBase64ByOnline(imgUrl);
         return base.invokeaddSignature(customerId, base64Url);
     }
+
+    public String replaceSignature(String customerId, String imgUrl){
+        String base64Url = FddEncryptTool.ImageToBase64ByOnline(imgUrl);
+        ArrayList params = new ArrayList();
+
+        try {
+            String timeStamp = HttpsUtil.getTimeStamp();
+            String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId + base64Url));
+            String msgDigest = new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
+            params.add(new BasicNameValuePair("customer_id", customerId));
+            params.add(new BasicNameValuePair("signature_img_base64", base64Url));
+            params.add(new BasicNameValuePair("app_id", fadadaProperties.getAppId()));
+            params.add(new BasicNameValuePair("timestamp", timeStamp));
+            params.add(new BasicNameValuePair("v", fadadaProperties.getVersion()));
+            params.add(new BasicNameValuePair("msg_digest", msgDigest));
+        } catch (Exception var7) {
+            var7.printStackTrace();
+            throw new RuntimeException(var7);
+        }
+
+        return HttpsUtil.doPost(fadadaProperties.getServeHost() + "replace_signature.api", params);
+    }
+
+    public String delSignature(String customerId, String signatureId){
+        ArrayList params = new ArrayList();
+
+        try {
+            String timeStamp = HttpsUtil.getTimeStamp();
+            String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId + signatureId));
+            String msgDigest = new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
+            params.add(new BasicNameValuePair("customer_id", customerId));
+            params.add(new BasicNameValuePair("app_id", fadadaProperties.getAppId()));
+            params.add(new BasicNameValuePair("timestamp", timeStamp));
+            params.add(new BasicNameValuePair("v", fadadaProperties.getVersion()));
+            params.add(new BasicNameValuePair("signature_id", signatureId));
+            params.add(new BasicNameValuePair("msg_digest", msgDigest));
+        } catch (Exception var7) {
+            var7.printStackTrace();
+            throw new RuntimeException(var7);
+        }
+
+        return HttpsUtil.doPost(fadadaProperties.getServeHost() + "remove_signature.api", params);
+    }
 }