|
|
@@ -1,8 +1,10 @@
|
|
1
|
1
|
package api.controller.patient;
|
|
2
|
2
|
|
|
|
3
|
+import api.entity.database.call.Blacklist;
|
|
3
|
4
|
import api.entity.database.patient.Patient;
|
|
4
|
5
|
import api.entity.database.patient.PatientLog;
|
|
5
|
6
|
import api.entity.input.patient.AddBlackListInput;
|
|
|
7
|
+import api.service.call.IBlacklistService;
|
|
6
|
8
|
import api.service.patient.IPatientLogService;
|
|
7
|
9
|
import api.service.patient.IPatientService;
|
|
8
|
10
|
import api.util.enums.PhoneStatus;
|
|
|
@@ -39,7 +41,8 @@ public class BlackListController extends BaseController {
|
|
39
|
41
|
|
|
40
|
42
|
@Autowired
|
|
41
|
43
|
private IPatientService patientService;
|
|
42
|
|
-
|
|
|
44
|
+ @Autowired
|
|
|
45
|
+ private IBlacklistService callblacklistService;
|
|
43
|
46
|
@ApiOperation("列表")
|
|
44
|
47
|
@Log(title = "查询p_blacklist列表",businessType = BusinessType.QUERY)
|
|
45
|
48
|
@GetMapping
|
|
|
@@ -117,6 +120,56 @@ public class BlackListController extends BaseController {
|
|
117
|
120
|
wrapper.set(Patient::getPhoneStatus, PhoneStatus.BLACK.getValue());
|
|
118
|
121
|
boolean paresult= patientService.updateBatch(wrapper);
|
|
119
|
122
|
|
|
|
123
|
+ //同步到通话记录的黑名单表
|
|
|
124
|
+ LambdaQueryWrapper<Blacklist> ex=new LambdaQueryWrapper<>();
|
|
|
125
|
+ String callnum=SecretHelper.AesDecrypt(patient.getPhoneNumber());
|
|
|
126
|
+ ex.eq(Blacklist::getCallNumber,SecretHelper.AesDecrypt(patient.getPhoneNumber()));
|
|
|
127
|
+ if(!callblacklistService.exists(ex)){
|
|
|
128
|
+ Blacklist blacklist=new Blacklist();
|
|
|
129
|
+ blacklist.setCreateBy(CurrentUser().getUserName());
|
|
|
130
|
+ blacklist.setCreateTime(new Date());
|
|
|
131
|
+ blacklist.setDelFlag("0");
|
|
|
132
|
+ if(input.getStarttime()==null && input.getEndtime()==null){
|
|
|
133
|
+ blacklist.setBlackType(2L);
|
|
|
134
|
+ }
|
|
|
135
|
+ else {
|
|
|
136
|
+ blacklist.setBlackType(1L);
|
|
|
137
|
+ blacklist.setStartTime(input.getStarttime());
|
|
|
138
|
+ blacklist.setEndTime(input.getEndtime());
|
|
|
139
|
+ }
|
|
|
140
|
+
|
|
|
141
|
+ blacklist.setCallNumber(SecretHelper.AesDecrypt(patient.getPhoneNumber()));
|
|
|
142
|
+
|
|
|
143
|
+ blacklist.setRemark(input.getReason());
|
|
|
144
|
+ callblacklistService.insert(blacklist);
|
|
|
145
|
+
|
|
|
146
|
+ }
|
|
|
147
|
+ else{
|
|
|
148
|
+
|
|
|
149
|
+ LambdaUpdateWrapper<Blacklist> updateWrapper=new LambdaUpdateWrapper<>();
|
|
|
150
|
+ updateWrapper.eq(Blacklist::getCallNumber,callnum);
|
|
|
151
|
+ updateWrapper.set(Blacklist::getStartTime,input.getStarttime());
|
|
|
152
|
+ updateWrapper.set(Blacklist::getEndTime,input.getEndtime());
|
|
|
153
|
+ updateWrapper.set(Blacklist::getRemark,input.getReason());
|
|
|
154
|
+ updateWrapper.set(Blacklist::getUpdateBy,CurrentUser().getUserName());
|
|
|
155
|
+ updateWrapper.set(Blacklist::getUpdateTime,new Date());
|
|
|
156
|
+ updateWrapper.set(Blacklist::getDelFlag,0);
|
|
|
157
|
+
|
|
|
158
|
+
|
|
|
159
|
+ if(input.getStarttime()==null && input.getEndtime()==null){
|
|
|
160
|
+ updateWrapper.set(Blacklist::getBlackType,2L);
|
|
|
161
|
+ }
|
|
|
162
|
+ else {
|
|
|
163
|
+ updateWrapper.set(Blacklist::getBlackType,1L);
|
|
|
164
|
+ }
|
|
|
165
|
+ callblacklistService.updateBatch(updateWrapper);
|
|
|
166
|
+
|
|
|
167
|
+ }
|
|
|
168
|
+
|
|
|
169
|
+
|
|
|
170
|
+
|
|
|
171
|
+
|
|
|
172
|
+
|
|
120
|
173
|
return Success("成功");
|
|
121
|
174
|
} else {
|
|
122
|
175
|
return Error("新增失败");
|
|
|
@@ -139,6 +192,23 @@ public class BlackListController extends BaseController {
|
|
139
|
192
|
|
|
140
|
193
|
boolean result = blacklistService.updateBatch(qw);
|
|
141
|
194
|
if (result) {
|
|
|
195
|
+ BlackList bl=blacklistService.getEntity(input.getBlackId());
|
|
|
196
|
+ String callnum= SecretHelper.AesDecrypt( bl.getPhoneNumber());
|
|
|
197
|
+ LambdaUpdateWrapper<Blacklist> updateWrapper=new LambdaUpdateWrapper<>();
|
|
|
198
|
+ updateWrapper.eq(Blacklist::getCallNumber,callnum);
|
|
|
199
|
+ updateWrapper.set(Blacklist::getStartTime,input.getStarttime());
|
|
|
200
|
+ updateWrapper.set(Blacklist::getEndTime,input.getEndtime());
|
|
|
201
|
+ updateWrapper.set(Blacklist::getRemark,input.getReason());
|
|
|
202
|
+ updateWrapper.set(Blacklist::getUpdateBy,CurrentUser().getUserName());
|
|
|
203
|
+ updateWrapper.set(Blacklist::getUpdateTime,new Date());
|
|
|
204
|
+
|
|
|
205
|
+ if(input.getStarttime()==null && input.getEndtime()==null){
|
|
|
206
|
+ updateWrapper.set(Blacklist::getBlackType,2L);
|
|
|
207
|
+ }
|
|
|
208
|
+ else {
|
|
|
209
|
+ updateWrapper.set(Blacklist::getBlackType,1L);
|
|
|
210
|
+ }
|
|
|
211
|
+ callblacklistService.updateBatch(updateWrapper);
|
|
142
|
212
|
return Success("成功");
|
|
143
|
213
|
} else {
|
|
144
|
214
|
return Error("修改失败");
|
|
|
@@ -155,6 +225,19 @@ public class BlackListController extends BaseController {
|
|
155
|
225
|
lp.set(BlackList::getIsDelete, 1);
|
|
156
|
226
|
boolean result = blacklistService.updateBatch(lp);
|
|
157
|
227
|
if (result) {
|
|
|
228
|
+ for (Long id :ids){
|
|
|
229
|
+ BlackList bl=blacklistService.getEntity(id);
|
|
|
230
|
+ String callnum= SecretHelper.AesDecrypt( bl.getPhoneNumber());
|
|
|
231
|
+
|
|
|
232
|
+ LambdaUpdateWrapper<Blacklist> lplp = new LambdaUpdateWrapper<>();
|
|
|
233
|
+ lplp.eq(Blacklist::getCallNumber,callnum);
|
|
|
234
|
+ lplp.set(Blacklist::getDelFlag,2L);
|
|
|
235
|
+ lplp.set(Blacklist::getDelTime,new Date());
|
|
|
236
|
+ lplp.set(Blacklist::getDelBy,CurrentUser().getUserName());
|
|
|
237
|
+ callblacklistService.updateBatch(lplp);
|
|
|
238
|
+ }
|
|
|
239
|
+
|
|
|
240
|
+
|
|
158
|
241
|
//删除标签 存log记录
|
|
159
|
242
|
LambdaQueryWrapper<BlackList> qw1 = new LambdaQueryWrapper<>();
|
|
160
|
243
|
qw1.in(BlackList::getBlackId, ids).select(BlackList::getPatientId, BlackList::getPatientName);
|