...
|
...
|
@@ -116,12 +116,11 @@ public class WarningInstanceService { |
116
|
116
|
public List<WarningInstance> listUnAnalysis() {
|
117
|
117
|
QueryWrapper<WarningInstance> queryWrapper = new QueryWrapper<>();
|
118
|
118
|
LambdaQueryWrapper<WarningInstance> lambda = queryWrapper.lambda();
|
119
|
|
- lambda.ne(WarningInstance::getAnalysisStatus,AnalysisStatusEnum.success);
|
|
119
|
+ lambda.ne(WarningInstance::getAnalysisStatus, AnalysisStatusEnum.success);
|
120
|
120
|
return warningInstanceMapper.selectList(queryWrapper);
|
121
|
121
|
}
|
122
|
122
|
|
123
|
123
|
|
124
|
|
-
|
125
|
124
|
public Page<WarningInstance> pageByCondition(WarningInstance params, Page<WarningInstance> page) {
|
126
|
125
|
QueryWrapper<WarningInstance> queryWrapper = getCondition(params);
|
127
|
126
|
return warningInstanceMapper.selectPage(page, queryWrapper);
|
...
|
...
|
@@ -400,16 +399,17 @@ public class WarningInstanceService { |
400
|
399
|
if (analysisResult == null) {
|
401
|
400
|
cd.setAnalysisStatus(AnalysisStatusEnum.fail);
|
402
|
401
|
update(cd);
|
403
|
|
- } else {
|
|
402
|
+ } else if ("200".equals(analysisResult.getString("code"))) {
|
|
403
|
+ JSONObject analysisData = analysisResult.getJSONObject("data");
|
404
|
404
|
WarningInstanceAnalysis wa = new WarningInstanceAnalysis();
|
405
|
405
|
wa.setWiId(cd.getId());
|
406
|
406
|
wa.setArea(cd.getMunicipalPolice().replaceAll("公安局", ""));
|
407
|
|
- wa.setCounty(analysisResult.getString("area"));
|
408
|
|
- wa.setAmount(analysisResult.getDouble("value"));
|
409
|
|
- wa.setSex(analysisResult.getString("gender"));
|
410
|
|
- wa.setCareer(analysisResult.getString("occupation"));
|
411
|
|
- wa.setRainageMethod(analysisResult.getString("diversionMethod"));
|
412
|
|
- wa.setPayMethod(analysisResult.getString("paymentMethod"));
|
|
407
|
+ wa.setCounty(analysisData.getString("area"));
|
|
408
|
+ wa.setAmount(analysisData.getDouble("value"));
|
|
409
|
+ wa.setSex(analysisData.getString("gender"));
|
|
410
|
+ wa.setCareer(analysisData.getString("occupation"));
|
|
411
|
+ wa.setRainageMethod(analysisData.getString("diversionMethod"));
|
|
412
|
+ wa.setPayMethod(analysisData.getString("paymentMethod"));
|
413
|
413
|
wa.setConformStatus(ConformStatusEnum.UNCONFIRMED);
|
414
|
414
|
warningInstanceAnalysisService.save(wa);
|
415
|
415
|
cd.setAnalysisStatus(AnalysisStatusEnum.success);
|
...
|
...
|
|