Przeglądaj źródła

代理端新需求

傅行帆 5 lat temu
rodzic
commit
a6e4f55737

+ 81
- 1
src/main/java/com/huiju/estateagents/controller/SysAdvancedConfigController.java Wyświetl plik

@@ -1,17 +1,27 @@
1 1
 package com.huiju.estateagents.controller;
2 2
 
3
+import com.alibaba.fastjson.JSONObject;
3 4
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 5
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 7
 import com.huiju.estateagents.base.BaseController;
7 8
 import com.huiju.estateagents.base.ResponseBean;
8 9
 import com.huiju.estateagents.entity.SysAdvancedConfig;
10
+import com.huiju.estateagents.entity.TaAdvancedController;
11
+import com.huiju.estateagents.entity.TaWxPayConfig;
9 12
 import com.huiju.estateagents.service.ISysAdvancedConfigService;
13
+import com.huiju.estateagents.service.ITaAdvancedControllerService;
14
+import com.huiju.estateagents.service.ITaWxPayConfigService;
10 15
 import org.slf4j.Logger;
11 16
 import org.slf4j.LoggerFactory;
12 17
 import org.springframework.beans.factory.annotation.Autowired;
13 18
 import org.springframework.web.bind.annotation.*;
14 19
 
20
+import java.time.LocalDateTime;
21
+import java.util.HashMap;
22
+import java.util.List;
23
+import java.util.Map;
24
+
15 25
 /**
16 26
  * <p>
17 27
     * 高级配置基础表  前端控制器
@@ -21,7 +31,7 @@ import org.springframework.web.bind.annotation.*;
21 31
  * @since 2020-02-26
22 32
  */
23 33
 @RestController
24
-@RequestMapping("/")
34
+@RequestMapping("/api")
25 35
 public class SysAdvancedConfigController extends BaseController {
26 36
 
27 37
     private final Logger logger = LoggerFactory.getLogger(SysAdvancedConfigController.class);
@@ -29,6 +39,11 @@ public class SysAdvancedConfigController extends BaseController {
29 39
     @Autowired
30 40
     public ISysAdvancedConfigService iSysAdvancedConfigService;
31 41
 
42
+    @Autowired
43
+    public ITaWxPayConfigService taWxPayConfigService;
44
+
45
+    @Autowired
46
+    public ITaAdvancedControllerService taAdvancedControllerService;
32 47
 
33 48
     /**
34 49
      * 分页查询列表
@@ -140,4 +155,69 @@ public class SysAdvancedConfigController extends BaseController {
140 155
         }
141 156
         return responseBean;
142 157
     }
158
+
159
+    /**
160
+     * 根据id查询对象
161
+     * @param orgId  小程序的orgId
162
+     */
163
+    @RequestMapping(value="/center/sysAdvancedConfig/list",method= RequestMethod.GET)
164
+    public ResponseBean sysAdvancedConfigList(@RequestParam Integer orgId){
165
+        ResponseBean responseBean = new ResponseBean();
166
+        try {
167
+            Map<String,Object> map = new HashMap<>();
168
+            List<SysAdvancedConfig> sysAdvancedConfigList = iSysAdvancedConfigService.getSysAdvancedConfigList(orgId);
169
+            TaWxPayConfig taWxPayConfig = taWxPayConfigService.getOne(new QueryWrapper<TaWxPayConfig>().eq("org_id", orgId));
170
+            map.put("list",sysAdvancedConfigList);
171
+            map.put("taWxPayConfig",taWxPayConfig);
172
+            responseBean.addSuccess(map);
173
+        }catch (Exception e){
174
+            e.printStackTrace();
175
+            logger.error("sysAdvancedConfigDelete -=- {}",e.toString());
176
+            responseBean.addError(e.getMessage());
177
+        }
178
+        return responseBean;
179
+    }
180
+
181
+
182
+    /**
183
+     * 修改高级配置
184
+     * @param data
185
+     * @return
186
+     */
187
+    @PostMapping(value = "/center/sysAdvancedConfig/save")
188
+    public ResponseBean saveAdvancedConfig(@RequestBody Map<String, Object> data) {
189
+        Integer orgId = (Integer) data.get("orgId");
190
+        List<Integer> advancedConfigIds = (List<Integer>) data.get("menus");
191
+        Map<String,Object> wxPayData = (Map<String, Object>) data.get("wxPayData");
192
+
193
+        try {
194
+            if (advancedConfigIds.size() > 0){
195
+                //插入高级控制表先删除后添加
196
+                taAdvancedControllerService.remove(new QueryWrapper<TaAdvancedController>().eq("org_id",orgId));
197
+                advancedConfigIds.forEach(e -> {
198
+                    TaAdvancedController taAdvancedController = new TaAdvancedController();
199
+                    taAdvancedController.setAdvancedConfigId(e);
200
+                    taAdvancedController.setCreateDate(LocalDateTime.now());
201
+                    taAdvancedController.setOrgId(orgId);
202
+                    taAdvancedControllerService.save(taAdvancedController);
203
+                });
204
+            }
205
+            if (null != wxPayData){
206
+                //维护支付信息先删除后添加
207
+                taWxPayConfigService.remove(new QueryWrapper<TaWxPayConfig>().eq("org_id",orgId));
208
+                TaWxPayConfig taWxPayConfig = new TaWxPayConfig();
209
+                taWxPayConfig.setApiPath((String) wxPayData.get("apiPath"));
210
+                taWxPayConfig.setAppid((String) wxPayData.get("appid"));
211
+                taWxPayConfig.setMchId((String) wxPayData.get("mchId"));
212
+                taWxPayConfig.setMchKey((String) wxPayData.get("mchKey"));
213
+                taWxPayConfig.setOrgId(orgId);
214
+                taWxPayConfig.setCreateDate(LocalDateTime.now());
215
+                taWxPayConfigService.save(taWxPayConfig);
216
+            }
217
+        } catch (Exception e) {
218
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
219
+        }
220
+
221
+        return ResponseBean.success("ok");
222
+    }
143 223
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaAdvancedControllerController.java Wyświetl plik

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

+ 6
- 1
src/main/java/com/huiju/estateagents/entity/SysAdvancedConfig.java Wyświetl plik

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

+ 8
- 0
src/main/java/com/huiju/estateagents/mapper/SysAdvancedConfigMapper.java Wyświetl plik

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

+ 9
- 0
src/main/java/com/huiju/estateagents/service/ISysAdvancedConfigService.java Wyświetl plik

@@ -3,6 +3,8 @@ package com.huiju.estateagents.service;
3 3
 import com.baomidou.mybatisplus.extension.service.IService;
4 4
 import com.huiju.estateagents.entity.SysAdvancedConfig;
5 5
 
6
+import java.util.List;
7
+
6 8
 /**
7 9
  * <p>
8 10
  * 高级配置基础表  服务类
@@ -13,4 +15,11 @@ import com.huiju.estateagents.entity.SysAdvancedConfig;
13 15
  */
14 16
 public interface ISysAdvancedConfigService extends IService<SysAdvancedConfig> {
15 17
 
18
+    /**
19
+     *
20
+     * 获取高级配置
21
+     * @param orgId
22
+     * @return
23
+     */
24
+    List<SysAdvancedConfig> getSysAdvancedConfigList(Integer orgId);
16 25
 }

+ 16
- 0
src/main/java/com/huiju/estateagents/service/impl/SysAdvancedConfigServiceImpl.java Wyświetl plik

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4 4
 import com.huiju.estateagents.entity.SysAdvancedConfig;
5 5
 import com.huiju.estateagents.mapper.SysAdvancedConfigMapper;
6 6
 import com.huiju.estateagents.service.ISysAdvancedConfigService;
7
+import org.springframework.beans.factory.annotation.Autowired;
7 8
 import org.springframework.stereotype.Service;
8 9
 
10
+import java.util.List;
11
+
9 12
 /**
10 13
  * <p>
11 14
  * 高级配置基础表  服务实现类
@@ -17,4 +20,17 @@ import org.springframework.stereotype.Service;
17 20
 @Service
18 21
 public class SysAdvancedConfigServiceImpl extends ServiceImpl<SysAdvancedConfigMapper, SysAdvancedConfig> implements ISysAdvancedConfigService {
19 22
 
23
+    @Autowired
24
+    private SysAdvancedConfigMapper sysAdvancedConfigMapper;
25
+
26
+    /**
27
+     * 获取高级配置
28
+     *
29
+     * @param orgId
30
+     * @return
31
+     */
32
+    @Override
33
+    public List<SysAdvancedConfig> getSysAdvancedConfigList(Integer orgId) {
34
+        return sysAdvancedConfigMapper.getSysAdvancedConfigList(orgId);
35
+    }
20 36
 }

+ 9
- 0
src/main/resources/mapper/SysAdvancedConfigMapper.xml Wyświetl plik

@@ -2,4 +2,13 @@
2 2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3
 <mapper namespace="com.huiju.estateagents.mapper.SysAdvancedConfigMapper">
4 4
 
5
+    <select id="getSysAdvancedConfigList" resultType="com.huiju.estateagents.entity.SysAdvancedConfig">
6
+        SELECT
7
+            t.*,
8
+            IF(s.checked_id IS NULL, 0, 1) AS has_rights
9
+        FROM
10
+            sys_advanced_config t
11
+        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
12
+        ORDER BY t.create_date
13
+    </select>
5 14
 </mapper>