张延森 пре 5 година
родитељ
комит
fd65d37e0a

+ 7
- 4
src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java Прегледај датотеку

19
 import com.huiju.estateagents.common.StringUtils;
19
 import com.huiju.estateagents.common.StringUtils;
20
 import com.huiju.estateagents.entity.*;
20
 import com.huiju.estateagents.entity.*;
21
 import com.huiju.estateagents.mapper.*;
21
 import com.huiju.estateagents.mapper.*;
22
-import com.huiju.estateagents.service.ITaBuildingReportService;
23
-import com.huiju.estateagents.service.ITaPersonService;
24
-import com.huiju.estateagents.service.ITaRecommendCustomerService;
25
-import com.huiju.estateagents.service.ITdReportService;
22
+import com.huiju.estateagents.service.*;
26
 import org.apache.commons.collections.CollectionUtils;
23
 import org.apache.commons.collections.CollectionUtils;
27
 import org.springframework.beans.factory.annotation.Autowired;
24
 import org.springframework.beans.factory.annotation.Autowired;
28
 import org.springframework.stereotype.Service;
25
 import org.springframework.stereotype.Service;
88
 
85
 
89
 	@Autowired
86
 	@Autowired
90
     private ITaRecommendCustomerService iTaRecommendCustomerService;
87
     private ITaRecommendCustomerService iTaRecommendCustomerService;
88
+
89
+	@Autowired
90
+	private ISysOrgParamsService iSysOrgParamsService;
91
 	
91
 	
92
 	@Override
92
 	@Override
93
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
93
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
172
 			throw new Exception("生成用户信息失败");
172
 			throw new Exception("生成用户信息失败");
173
 		}
173
 		}
174
 
174
 
175
+		// 导入系统参数
176
+		iSysOrgParamsService.importParamsFromTemplate(taOrg.getOrgId());
177
+
175
 		return taUser;
178
 		return taUser;
176
 	}
179
 	}
177
 
180
 

+ 2
- 0
src/main/java/com/huiju/estateagents/service/ISysOrgParamsService.java Прегледај датотеку

13
  * @since 2019-08-01
13
  * @since 2019-08-01
14
  */
14
  */
15
 public interface ISysOrgParamsService extends IService<SysOrgParams> {
15
 public interface ISysOrgParamsService extends IService<SysOrgParams> {
16
+    SysOrgParams getParamByCode(String paramCode, Integer orgId);
16
 
17
 
18
+    boolean importParamsFromTemplate(Integer orgId);
17
 }
19
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/MiniAppServiceImpl.java Прегледај датотеку

92
         };
92
         };
93
 
93
 
94
         if (((Boolean) true).equals(tpl.getIsSubscribe())) {
94
         if (((Boolean) true).equals(tpl.getIsSubscribe())) {
95
-            String[] data = new String[] { name, content, DateUtils.cutSecond(dt) };
95
+            String[] data = new String[] { name, phone, content, DateUtils.cutSecond(dt) };
96
             ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
96
             ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
97
             if (res.getCode() != ResponseBean.CODE_SUCCESS) {
97
             if (res.getCode() != ResponseBean.CODE_SUCCESS) {
98
                 // 使用短信发送
98
                 // 使用短信发送

+ 54
- 0
src/main/java/com/huiju/estateagents/service/impl/SysOrgParamsServiceImpl.java Прегледај датотеку

1
 package com.huiju.estateagents.service.impl;
1
 package com.huiju.estateagents.service.impl;
2
 
2
 
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
3
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4
 import com.huiju.estateagents.entity.SysOrgParams;
5
 import com.huiju.estateagents.entity.SysOrgParams;
5
 import com.huiju.estateagents.mapper.SysOrgParamsMapper;
6
 import com.huiju.estateagents.mapper.SysOrgParamsMapper;
6
 import com.huiju.estateagents.service.ISysOrgParamsService;
7
 import com.huiju.estateagents.service.ISysOrgParamsService;
8
+import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.stereotype.Service;
9
 import org.springframework.stereotype.Service;
8
 
10
 
11
+import java.util.ArrayList;
12
+import java.util.List;
13
+
9
 /**
14
 /**
10
  * <p>
15
  * <p>
11
  * 组织参数配置表  服务实现类
16
  * 组织参数配置表  服务实现类
16
  */
21
  */
17
 @Service
22
 @Service
18
 public class SysOrgParamsServiceImpl extends ServiceImpl<SysOrgParamsMapper, SysOrgParams> implements ISysOrgParamsService {
23
 public class SysOrgParamsServiceImpl extends ServiceImpl<SysOrgParamsMapper, SysOrgParams> implements ISysOrgParamsService {
24
+    @Autowired
25
+    SysOrgParamsMapper sysOrgParamsMapper;
26
+
27
+    @Override
28
+    public SysOrgParams getParamByCode(String paramCode, Integer orgId) {
29
+        QueryWrapper<SysOrgParams> queryWrapper = new QueryWrapper<>();
30
+        queryWrapper.eq("org_id", orgId);
31
+        queryWrapper.eq("param_code", paramCode);
32
+        queryWrapper.last("limit 1");
33
+
34
+        return sysOrgParamsMapper.selectOne(queryWrapper);
35
+    }
36
+
37
+    /**
38
+     * 从模板中导入系统参数, 支持多次导入
39
+     * 已经导入的不会再次导入
40
+     * @param orgId
41
+     * @return
42
+     */
43
+    @Override
44
+    public boolean importParamsFromTemplate(Integer orgId) {
45
+        // 查询模板列表, org 为 0 代表为模板数据
46
+        QueryWrapper<SysOrgParams> queryWrapper = new QueryWrapper<>();
47
+        queryWrapper.eq("org_id", 0);
48
+
49
+        List<SysOrgParams> tpls = sysOrgParamsMapper.selectList(queryWrapper);
50
+        List<SysOrgParams> willSave = new ArrayList<>();
51
+
52
+        for(SysOrgParams param: tpls) {
53
+            QueryWrapper<SysOrgParams> query = new QueryWrapper<>();
54
+            query.eq("org_id", orgId);
55
+            query.eq("param_code", param.getParamCode());
56
+
57
+            // 使用 count 查询是否该参数已经存在
58
+            // 如果存在, 则不处理
59
+            int count = this.count(query);
60
+
61
+            if (count == 0) {
62
+                param.setParamId(null);
63
+                param.setOrgId(orgId);
64
+                willSave.add(param);
65
+            }
66
+        }
67
+
68
+        if (willSave.size() > 0) {
69
+            return this.saveBatch(willSave);
70
+        }
19
 
71
 
72
+        return true;
73
+    }
20
 }
74
 }