新需求

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

@@ -123,6 +123,49 @@ public class TaCompanyController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 条件查询企业列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param companyName
+     * @return
+     */
+    @RequestMapping(value = "/channel/taCompanyList", method = RequestMethod.GET)
+    public ResponseBean channelCompanyList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                           @RequestParam(value = "companyName") String companyName,
+                                           @RequestParam(value = "companyCode")String companyCode,
+                                           @RequestParam(value = "certifiedStatus")String certifiedStatus,
+                                           @RequestParam(value = "authorizeStatus")String authorizeStatus) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaCompany> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCompany> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(StringUtils.isNotBlank(companyName), "company_name", companyName);
+            queryWrapper.like(StringUtils.isNotBlank(companyCode), "company_code", companyCode);
+            queryWrapper.eq(StringUtils.isNotBlank(certifiedStatus), "certified_status", certifiedStatus);
+            queryWrapper.eq(StringUtils.isNotBlank(authorizeStatus), "authorize_status", authorizeStatus);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
+            List<TaCompany> taCompanyList = result.getRecords();
+            for (TaCompany taCompany : taCompanyList){
+                QueryWrapper<TaCompanySeal> sealQueryWrapper = new QueryWrapper<>();
+                sealQueryWrapper.eq("company_id", taCompany.getCompanyId());
+                taCompany.setSealNum(iTaCompanySealService.count(sealQueryWrapper));
+            }
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 保存对象
      *

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

@@ -1,18 +1,25 @@
 package com.huiju.estateagents.eContract.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.eContract.entity.TaCompany;
 import com.huiju.estateagents.eContract.entity.TaCompanySeal;
 import com.huiju.estateagents.eContract.service.ITaCompanySealService;
+import com.huiju.estateagents.eContract.service.ITaCompanyService;
+import com.huiju.estateagents.eContract.service.impl.TaCompanySealUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
     * 公司印章  前端控制器
@@ -30,6 +37,11 @@ public class TaCompanySealController extends BaseController {
     @Autowired
     public ITaCompanySealService iTaCompanySealService;
 
+    @Autowired
+    private ITaCompanyService iTaCompanyService;
+
+    @Autowired
+    private TaCompanySealUtil taCompanySealUtil;
 
     /**
      * 分页查询列表
@@ -59,15 +71,57 @@ public class TaCompanySealController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channel/taCompanySeal",method= RequestMethod.GET)
+    public ResponseBean channelCompanySealList(
+                                          @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @RequestParam(value ="companyId", required = false) String companyId,
+                                          @RequestParam(value ="sealName", required = false) String sealName){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaCompanySeal> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCompanySeal> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("company_id", companyId);
+            queryWrapper.like(!StringUtils.isEmpty(sealName), "seal_name", sealName);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCompanySeal> result = iTaCompanySealService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCompanySealList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 保存对象
      * @param taCompanySeal 实体对象
      * @return
      */
-    @RequestMapping(value="/taCompanySeal",method= RequestMethod.POST)
+    @RequestMapping(value="/channel/taCompanySeal",method= RequestMethod.POST)
     public ResponseBean taCompanySealAdd(@RequestBody TaCompanySeal taCompanySeal){
         ResponseBean responseBean = new ResponseBean();
         try {
+            TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
+            String result = taCompanySealUtil.addSignaTrue(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());
+                return responseBean;
+            }
+
+            String data = params.getString("data");
+            taCompanySeal.setCreateDate(LocalDateTime.now());
+            taCompanySeal.setStatus(CommConstant.STATUS_NORMAL);
             if (iTaCompanySealService.save(taCompanySeal)){
                 responseBean.addSuccess(taCompanySeal);
             }else {

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

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -61,6 +62,7 @@ public class TaContractBusinessController extends BaseController {
             queryWrapper.like(!StringUtils.isEmpty(targetName), "target_name", targetName);
             queryWrapper.like(!StringUtils.isEmpty(companyName), "company_name", companyName);
             queryWrapper.eq(status != null, "status", status);
+            queryWrapper.ne("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("create_date");
             IPage<TaContractBusiness> result = iTaContractBusinessService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -113,7 +115,7 @@ public class TaContractBusinessController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taContractBusiness/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/taContractBusiness/{id}", method= RequestMethod.PUT)
     public ResponseBean taContractBusinessDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -130,6 +132,27 @@ public class TaContractBusinessController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 根据id批量删除对象
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/batchDelBusinessConfig", method= RequestMethod.PUT)
+    public ResponseBean batchDelBusinessConfig(@RequestBody TaContractBusiness contractBusinesses, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        for (TaContractBusiness taContractBusiness : contractBusinesses.getContractBusinessList()){
+            taContractBusiness.setStatus(CommConstant.STATUS_DELETE);
+        }
+        try{
+            iTaContractBusinessService.updateBatchById(contractBusinesses.getContractBusinessList());
+            responseBean.addSuccess("success");
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError("fail");
+        }
+
+        return responseBean;
+    }
+
     /**
      * 修改对象
      * @param id  实体ID

src/main/java/com/huiju/estateagents/eContract/entity/TaContractBusiness.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -110,4 +112,6 @@ public class TaContractBusiness implements Serializable {
      */
     private Integer status;
 
+    @TableField(exist = false)
+    private List<TaContractBusiness> contractBusinessList;
 }

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

@@ -0,0 +1,21 @@
+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.huiju.estateagents.config.FadadaProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class TaCompanySealUtil {
+
+    @Autowired
+    private FadadaProperties fadadaProperties;
+
+    public String addSignaTrue(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);
+    }
+}