代理端新需求

src/main/java/com/huiju/estateagents/controller/SysAdvancedConfigController.java

@@ -1,17 +1,27 @@
 package com.huiju.estateagents.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.entity.SysAdvancedConfig;
+import com.huiju.estateagents.entity.TaAdvancedController;
+import com.huiju.estateagents.entity.TaWxPayConfig;
 import com.huiju.estateagents.service.ISysAdvancedConfigService;
+import com.huiju.estateagents.service.ITaAdvancedControllerService;
+import com.huiju.estateagents.service.ITaWxPayConfigService;
 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;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
     * 高级配置基础表  前端控制器
@@ -21,7 +31,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-02-26
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class SysAdvancedConfigController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(SysAdvancedConfigController.class);
@@ -29,6 +39,11 @@ public class SysAdvancedConfigController extends BaseController {
     @Autowired
     public ISysAdvancedConfigService iSysAdvancedConfigService;
 
+    @Autowired
+    public ITaWxPayConfigService taWxPayConfigService;
+
+    @Autowired
+    public ITaAdvancedControllerService taAdvancedControllerService;
 
     /**
      * 分页查询列表
@@ -140,4 +155,69 @@ public class SysAdvancedConfigController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 根据id查询对象
+     * @param orgId  小程序的orgId
+     */
+    @RequestMapping(value="/center/sysAdvancedConfig/list",method= RequestMethod.GET)
+    public ResponseBean sysAdvancedConfigList(@RequestParam Integer orgId){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Map<String,Object> map = new HashMap<>();
+            List<SysAdvancedConfig> sysAdvancedConfigList = iSysAdvancedConfigService.getSysAdvancedConfigList(orgId);
+            TaWxPayConfig taWxPayConfig = taWxPayConfigService.getOne(new QueryWrapper<TaWxPayConfig>().eq("org_id", orgId));
+            map.put("list",sysAdvancedConfigList);
+            map.put("taWxPayConfig",taWxPayConfig);
+            responseBean.addSuccess(map);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysAdvancedConfigDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 修改高级配置
+     * @param data
+     * @return
+     */
+    @PostMapping(value = "/center/sysAdvancedConfig/save")
+    public ResponseBean saveAdvancedConfig(@RequestBody Map<String, Object> data) {
+        Integer orgId = (Integer) data.get("orgId");
+        List<Integer> advancedConfigIds = (List<Integer>) data.get("menus");
+        Map<String,Object> wxPayData = (Map<String, Object>) data.get("wxPayData");
+
+        try {
+            if (advancedConfigIds.size() > 0){
+                //插入高级控制表先删除后添加
+                taAdvancedControllerService.remove(new QueryWrapper<TaAdvancedController>().eq("org_id",orgId));
+                advancedConfigIds.forEach(e -> {
+                    TaAdvancedController taAdvancedController = new TaAdvancedController();
+                    taAdvancedController.setAdvancedConfigId(e);
+                    taAdvancedController.setCreateDate(LocalDateTime.now());
+                    taAdvancedController.setOrgId(orgId);
+                    taAdvancedControllerService.save(taAdvancedController);
+                });
+            }
+            if (null != wxPayData){
+                //维护支付信息先删除后添加
+                taWxPayConfigService.remove(new QueryWrapper<TaWxPayConfig>().eq("org_id",orgId));
+                TaWxPayConfig taWxPayConfig = new TaWxPayConfig();
+                taWxPayConfig.setApiPath((String) wxPayData.get("apiPath"));
+                taWxPayConfig.setAppid((String) wxPayData.get("appid"));
+                taWxPayConfig.setMchId((String) wxPayData.get("mchId"));
+                taWxPayConfig.setMchKey((String) wxPayData.get("mchKey"));
+                taWxPayConfig.setOrgId(orgId);
+                taWxPayConfig.setCreateDate(LocalDateTime.now());
+                taWxPayConfigService.save(taWxPayConfig);
+            }
+        } catch (Exception e) {
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return ResponseBean.success("ok");
+    }
 }

src/main/java/com/huiju/estateagents/controller/TaAdvancedControllerController.java

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-02-26
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaAdvancedControllerController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaAdvancedControllerController.class);

src/main/java/com/huiju/estateagents/entity/SysAdvancedConfig.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -45,5 +46,9 @@ public class SysAdvancedConfig implements Serializable {
      */
     private Integer status;
 
-
+    /**
+     * 是否有权限
+     */
+    @TableField(exist = false)
+    private Boolean hasRights;
 }

src/main/java/com/huiju/estateagents/mapper/SysAdvancedConfigMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.SysAdvancedConfig;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 高级配置基础表  Mapper 接口
@@ -15,4 +17,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SysAdvancedConfigMapper extends BaseMapper<SysAdvancedConfig> {
 
+    /**
+     * 获取高级配置
+     * @param orgId
+     * @return
+     */
+    List<SysAdvancedConfig> getSysAdvancedConfigList(Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/ISysAdvancedConfigService.java

@@ -3,6 +3,8 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.SysAdvancedConfig;
 
+import java.util.List;
+
 /**
  * <p>
  * 高级配置基础表  服务类
@@ -13,4 +15,11 @@ import com.huiju.estateagents.entity.SysAdvancedConfig;
  */
 public interface ISysAdvancedConfigService extends IService<SysAdvancedConfig> {
 
+    /**
+     *
+     * 获取高级配置
+     * @param orgId
+     * @return
+     */
+    List<SysAdvancedConfig> getSysAdvancedConfigList(Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/impl/SysAdvancedConfigServiceImpl.java

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.SysAdvancedConfig;
 import com.huiju.estateagents.mapper.SysAdvancedConfigMapper;
 import com.huiju.estateagents.service.ISysAdvancedConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 高级配置基础表  服务实现类
@@ -17,4 +20,17 @@ import org.springframework.stereotype.Service;
 @Service
 public class SysAdvancedConfigServiceImpl extends ServiceImpl<SysAdvancedConfigMapper, SysAdvancedConfig> implements ISysAdvancedConfigService {
 
+    @Autowired
+    private SysAdvancedConfigMapper sysAdvancedConfigMapper;
+
+    /**
+     * 获取高级配置
+     *
+     * @param orgId
+     * @return
+     */
+    @Override
+    public List<SysAdvancedConfig> getSysAdvancedConfigList(Integer orgId) {
+        return sysAdvancedConfigMapper.getSysAdvancedConfigList(orgId);
+    }
 }

src/main/resources/mapper/SysAdvancedConfigMapper.xml

@@ -2,4 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.SysAdvancedConfigMapper">
 
+    <select id="getSysAdvancedConfigList" resultType="com.huiju.estateagents.entity.SysAdvancedConfig">
+        SELECT
+            t.*,
+            IF(s.checked_id IS NULL, 0, 1) AS has_rights
+        FROM
+            sys_advanced_config t
+        LEFT JOIN ( SELECT org_id,advanced_config_id as checked_id FROM ta_advanced_controller WHERE org_id = #{orgId} ) s ON t.advanced_config_id = s.checked_id
+        ORDER BY t.create_date
+    </select>
 </mapper>