|
@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
5
|
5
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
6
|
6
|
import com.huiju.estateagents.base.BaseController;
|
7
|
7
|
import com.huiju.estateagents.base.ResponseBean;
|
|
8
|
+import com.huiju.estateagents.common.CommConstant;
|
8
|
9
|
import com.huiju.estateagents.common.StringUtils;
|
9
|
10
|
import com.huiju.estateagents.drainage.entity.TaDrainage;
|
10
|
11
|
import com.huiju.estateagents.drainage.service.ITaDrainageService;
|
|
12
|
+import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
|
|
13
|
+import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
|
11
|
14
|
import org.slf4j.Logger;
|
12
|
15
|
import org.slf4j.LoggerFactory;
|
13
|
16
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -21,6 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
|
21
|
24
|
|
22
|
25
|
import javax.servlet.http.HttpServletRequest;
|
23
|
26
|
import java.time.LocalDateTime;
|
|
27
|
+import java.util.List;
|
|
28
|
+import java.util.UUID;
|
|
29
|
+
|
24
|
30
|
|
25
|
31
|
/**
|
26
|
32
|
* <p>
|
|
@@ -38,7 +44,9 @@ public class TaDrainageController extends BaseController {
|
38
|
44
|
|
39
|
45
|
@Autowired
|
40
|
46
|
public ITaDrainageService iTaDrainageService;
|
41
|
|
-
|
|
47
|
+
|
|
48
|
+ @Autowired
|
|
49
|
+ public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
|
42
|
50
|
|
43
|
51
|
/**
|
44
|
52
|
* 分页查询列表
|
|
@@ -63,6 +71,19 @@ public class TaDrainageController extends BaseController {
|
63
|
71
|
queryWrapper.orderByDesc("create_date");
|
64
|
72
|
|
65
|
73
|
IPage<TaDrainage> result = iTaDrainageService.page(pg, queryWrapper);
|
|
74
|
+ List<TaDrainage> records = result.getRecords();
|
|
75
|
+ records.forEach(e -> {
|
|
76
|
+ QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
|
|
77
|
+ taThirdPartyMiniappConfigQueryWrapper.eq("target_type",CommConstant.TARGET_TYPE_H5);
|
|
78
|
+ taThirdPartyMiniappConfigQueryWrapper.eq("target_id",e.getDrainageId());
|
|
79
|
+ taThirdPartyMiniappConfigQueryWrapper.eq("org_id",getOrgId(request));
|
|
80
|
+ TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
|
|
81
|
+ if (null != taThirdPartyMiniappConfig){
|
|
82
|
+ e.setAppid(taThirdPartyMiniappConfig.getAppid());
|
|
83
|
+ e.setAppSecret(taThirdPartyMiniappConfig.getAppSecret());
|
|
84
|
+ }
|
|
85
|
+ });
|
|
86
|
+ result.setRecords(records);
|
66
|
87
|
responseBean.addSuccess(result);
|
67
|
88
|
}catch (Exception e){
|
68
|
89
|
e.printStackTrace();
|
|
@@ -84,6 +105,15 @@ public class TaDrainageController extends BaseController {
|
84
|
105
|
taDrainage.setOrgId(getOrgId(request));
|
85
|
106
|
taDrainage.setCreateDate(LocalDateTime.now());
|
86
|
107
|
if (iTaDrainageService.save(taDrainage)){
|
|
108
|
+ //添加第三方appid和secret
|
|
109
|
+ TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = new TaThirdPartyMiniappConfig();
|
|
110
|
+ taThirdPartyMiniappConfig.setOrgId(getOrgId(request));
|
|
111
|
+ taThirdPartyMiniappConfig.setAppid(getUUIDS());
|
|
112
|
+ taThirdPartyMiniappConfig.setAppSecret(getUUIDS());
|
|
113
|
+ taThirdPartyMiniappConfig.setExpirationDate(LocalDateTime.now().plusDays(7));
|
|
114
|
+ taThirdPartyMiniappConfig.setTargetType(CommConstant.TARGET_TYPE_H5);
|
|
115
|
+ taThirdPartyMiniappConfig.setTargetId(taDrainage.getDrainageId().toString());
|
|
116
|
+ iTaThirdPartyMiniappConfigService.save(taThirdPartyMiniappConfig);
|
87
|
117
|
responseBean.addSuccess(taDrainage);
|
88
|
118
|
}else {
|
89
|
119
|
responseBean.addError("fail");
|
|
@@ -95,7 +125,16 @@ public class TaDrainageController extends BaseController {
|
95
|
125
|
}
|
96
|
126
|
return responseBean;
|
97
|
127
|
}
|
98
|
|
-
|
|
128
|
+
|
|
129
|
+ /**
|
|
130
|
+ * 获取uuid
|
|
131
|
+ * @return
|
|
132
|
+ */
|
|
133
|
+ private String getUUIDS() {
|
|
134
|
+ String uuid= UUID.randomUUID().toString().replace("-", "");
|
|
135
|
+ return uuid;
|
|
136
|
+ }
|
|
137
|
+
|
99
|
138
|
/**
|
100
|
139
|
* 根据id删除对象
|
101
|
140
|
* @param id 实体ID
|