胡翰林 / ash · Commits

Commit 219d0bd1d51d050728dbd432ac2574fbaff9ba83

Authored by 胡翰林
1 parent 00a39c16

0815需求修改

Inline Side-by-side
Showing 8 changed files with 40 additions and 27 deletions
... ... @@ -719,7 +719,7 @@ public class StatisticsController extends BaseController {
719 719 for (WarningInstance cd : majorWiData) {
720 720 WiLossVo clv = new WiLossVo();
721 721 clv.setCode(cd.getCode());
722   - clv.setArea(cd.getAnalysis().getArea());
  722 + clv.setArea(cd.getArea());
723 723 clv.setCounty(cd.getCounty());
724 724 clv.setAlarmSubType(cd.getAlarmSubType());
725 725 clv.setAmount(String.valueOf(cd.getAnalysis().getAmount()));
... ... @@ -728,7 +728,7 @@ public class StatisticsController extends BaseController {
728 728 clv.setSex(cd.getAnalysis().getSex());
729 729 clv.setCareer(cd.getAnalysis().getCareer());
730 730 mwiDataList.add(clv);
731   - caseLossAreaMap.put(cd.getAnalysis().getArea(), "");
  731 + caseLossAreaMap.put(cd.getArea(), "");
732 732 if (cd.getAnalysis().getAmount() < 1000000) {
733 733 wi50wValue++;
734 734 } else {
... ...
... ... @@ -104,7 +104,7 @@ public class WarningInstanceController extends BaseController {
104 104 @PostMapping("/getNextUnReviewId")
105 105 public JsonResult getNextUnReviewId(@RequestBody WarningInstance warningInstance) {
106 106 try {
107   - List<String> dataList = warningInstanceService.listUnReview(warningInstance.getExceptIds());
  107 + List<String> dataList = warningInstanceService.listUnReview(warningInstance.getExceptIds(), warningInstance.getArea());
108 108 if (CollectionUtils.isEmpty(dataList)) {
109 109 return new JsonResult(true, AshErrorCode.NEXT_DATA_EMPTY.getText(), null);
110 110 }
... ... @@ -210,7 +210,6 @@ public class WarningInstanceController extends BaseController {
210 210 BeanUtils.copyProperties(e, ed);
211 211 WarningInstanceAnalysis analysis = e.getAnalysis();
212 212 if (analysis != null) {
213   - ed.setArea(analysis.getArea());
214 213 ed.setAmount(analysis.getAmount());
215 214 ed.setSex(analysis.getSex());
216 215 ed.setCareer(analysis.getCareer());
... ...
... ... @@ -148,6 +148,12 @@ public class WarningInstance extends BaseModel {
148 148 @TableField(value = "alarm_sub_type")
149 149 private String alarmSubType;
150 150
  151 + /**
  152 + * 地区
  153 + */
  154 + @TableField(value = "area")
  155 + private String area;
  156 +
151 157 @Transient
152 158 private transient String startTime;
153 159
... ...
... ... @@ -58,7 +58,7 @@ public class WarningInstanceThread implements Runnable {
58 58 dataList.add(dbData);
59 59 }
60 60 List<String> ids = dataList.stream().map(WarningInstance::getId).collect(Collectors.toList());
61   - warningInstanceMapper.insertBatchSomeColumn(dataList);
  61 + warningInstanceService.saveAll(dataList);
62 62 warningInstanceService.analysisByIds(ids);
63 63 } catch (Exception ex) {
64 64 ex.printStackTrace();
... ...
... ... @@ -730,6 +730,10 @@ public class CaseService {
730 730 wa.setRainageMethod(analysisResult.getString("diversionMethod"));
731 731 wa.setRainageMethodDetail(analysisResult.getString("detailMethod"));
732 732 wa.setPayMethod(analysisResult.getString("paymentMethod"));
  733 + wa.setRainagePhone(analysisResult.getString("phoneNumber"));
  734 + wa.setTrackingNumber(analysisResult.getString("trackingNumber"));
  735 + wa.setExpressCompany(analysisResult.getString("expressCompany"));
  736 + wa.setDeliverWealth(analysisResult.getString("isCash"));
733 737 wa.setConformStatus(ConformStatusEnum.UNCONFIRMED);
734 738 caseAnalysisService.save(wa);
735 739 cd.setAnalysisStatus(AnalysisStatusEnum.success);
... ...
... ... @@ -79,8 +79,11 @@ public class WarningInstanceService {
79 79 log.info("from " + fromIndex + " to " + toIndex + "....");
80 80 sub = dataList.subList(fromIndex, toIndex);
81 81 sub.forEach(t -> {
82   - String uuid = UUIDGenerator.uuid();
83   - t.setId(uuid);
  82 + if (StringUtils.isBlank(t.getId())) {
  83 + String uuid = UUIDGenerator.uuid();
  84 + t.setId(uuid);
  85 + }
  86 + t.setArea(t.getMunicipalPolice().replaceAll(AshConstant.WI_AREA_RS, ""));
84 87 });
85 88 try {
86 89 Integer result = warningInstanceMapper.insertBatchSomeColumn(sub);
... ... @@ -128,7 +131,7 @@ public class WarningInstanceService {
128 131 return warningInstanceMapper.selectList(queryWrapper);
129 132 }
130 133
131   - public List<String> listUnReview(List<String> exceptIds) {
  134 + public List<String> listUnReview(List<String> exceptIds, String area) {
132 135 QueryWrapper<WarningInstance> queryWrapper = new QueryWrapper<>();
133 136 LambdaQueryWrapper<WarningInstance> lambda = queryWrapper.lambda();
134 137 lambda.select(WarningInstance::getId);
... ... @@ -136,6 +139,11 @@ public class WarningInstanceService {
136 139 if (!CollectionUtils.isEmpty(exceptIds)) {
137 140 lambda.notIn(WarningInstance::getId, exceptIds);
138 141 }
  142 +
  143 + if (StringUtils.isNotBlank(area)) {
  144 + lambda.like(WarningInstance::getArea, area);
  145 + }
  146 +
139 147 lambda.last("limit 1");
140 148 lambda.orderByDesc(BaseModel::getCreateTime).orderByDesc(WarningInstance::getId);
141 149 List<WarningInstance> warningInstances = warningInstanceMapper.selectList(queryWrapper);
... ... @@ -168,7 +176,7 @@ public class WarningInstanceService {
168 176
169 177 public List<BarChartVo> statisticsByArea(StatisticsParams params) {
170 178 MPJQueryWrapper<WarningInstance> mpjQueryWrapper = new MPJQueryWrapper<>();
171   - mpjQueryWrapper.select("wia.area,count(t.id) as field_count")
  179 + mpjQueryWrapper.select("t.area,count(t.id) as field_count")
172 180 .leftJoin("t_ash_warning_instance_analysis wia on t.id=wia.wi_id");
173 181
174 182 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
... ... @@ -181,7 +189,7 @@ public class WarningInstanceService {
181 189 mpjQueryWrapper.le("t.alarm_date", sdf.format(DateUtils.weeHours(params.getEndTime(), 1)));
182 190 }
183 191
184   - mpjQueryWrapper.groupBy("wia.area");
  192 + mpjQueryWrapper.groupBy("t.area");
185 193 mpjQueryWrapper.orderByDesc("field_count");
186 194
187 195 List<Map<String, Object>> dataList = warningInstanceMapper.selectJoinMaps(mpjQueryWrapper);
... ... @@ -210,7 +218,7 @@ public class WarningInstanceService {
210 218
211 219 public List<PieChartVo> statisticsCountByArea(StatisticsParams params) {
212 220 MPJQueryWrapper<WarningInstance> mpjQueryWrapper = new MPJQueryWrapper<>();
213   - mpjQueryWrapper.select("wia.area,count(t.id) as field_count")
  221 + mpjQueryWrapper.select("t.area,count(t.id) as field_count")
214 222 .leftJoin("t_ash_warning_instance_analysis wia on t.id=wia.wi_id");
215 223
216 224 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
... ... @@ -223,7 +231,7 @@ public class WarningInstanceService {
223 231 mpjQueryWrapper.le("t.alarm_date", sdf.format(DateUtils.weeHours(params.getEndTime(), 1)));
224 232 }
225 233
226   - mpjQueryWrapper.groupBy("wia.area");
  234 + mpjQueryWrapper.groupBy("t.area");
227 235 mpjQueryWrapper.orderByDesc("field_count");
228 236
229 237 List<Map<String, Object>> dataList = warningInstanceMapper.selectJoinMaps(mpjQueryWrapper);
... ... @@ -319,7 +327,7 @@ public class WarningInstanceService {
319 327
320 328 public List<BarChartVo> statisticsSequentialByArea(StatisticsParams params) {
321 329 MPJQueryWrapper<WarningInstance> mpjQueryWrapper = new MPJQueryWrapper<>();
322   - mpjQueryWrapper.select("wia.area,count(t.id) as field_count")
  330 + mpjQueryWrapper.select("t.area,count(t.id) as field_count")
323 331 .leftJoin("t_ash_warning_instance_analysis wia on t.id=wia.wi_id");
324 332
325 333 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
... ... @@ -332,7 +340,7 @@ public class WarningInstanceService {
332 340 mpjQueryWrapper.le("t.alarm_date", sdf.format(DateUtils.weeHours(params.getEndTime(), 1)));
333 341 }
334 342
335   - mpjQueryWrapper.groupBy("wia.area");
  343 + mpjQueryWrapper.groupBy("t.area");
336 344 mpjQueryWrapper.orderByDesc("field_count");
337 345
338 346 List<Map<String, Object>> dataList = warningInstanceMapper.selectJoinMaps(mpjQueryWrapper);
... ... @@ -364,6 +372,10 @@ public class WarningInstanceService {
364 372 lambda.eq(WarningInstance::getReviewStatus, params.getReviewStatus());
365 373 }
366 374
  375 + if (StringUtils.isNotBlank(params.getArea())) {
  376 + lambda.like(WarningInstance::getArea, params.getArea());
  377 + }
  378 +
367 379 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
368 380 if (StringUtils.isNotBlank(params.getStartTime())) {
369 381 try {
... ... @@ -432,7 +444,7 @@ public class WarningInstanceService {
432 444 // JSONObject analysisData = analysisResult.getJSONObject("data");
433 445 WarningInstanceAnalysis wa = new WarningInstanceAnalysis();
434 446 wa.setWiId(cd.getId());
435   - wa.setArea(cd.getMunicipalPolice().replaceAll("市公安局", ""));
  447 + wa.setArea(cd.getMunicipalPolice().replaceAll(AshConstant.WI_AREA_RS, ""));
436 448 wa.setCounty(analysisResult.getString("area"));
437 449 wa.setAmount(analysisResult.getDouble("value"));
438 450 wa.setSex(analysisResult.getString("gender"));
... ...
... ... @@ -6,7 +6,7 @@ public interface AshConstant {
6 6
7 7 String REDIS_DIVISION = "_";
8 8
9   - Integer sessionExprie=1440;
  9 + Integer sessionExprie = 1440;
10 10
11 11 String UC_ALREADY_LOGIN = "ASH" + REDIS_DIVISION
12 12 + "ALREADY" + REDIS_DIVISION + "LOGIN";
... ... @@ -15,5 +15,7 @@ public interface AshConstant {
15 15 String UC_LOGIN_SESSION = "ASH" + REDIS_DIVISION
16 16 + "LOGIN" + REDIS_DIVISION + "SESSION";
17 17
  18 + String WI_AREA_RS = "市公安局";
  19 +
18 20
19 21 }
... ...
... ... @@ -63,17 +63,7 @@ create table `t_ash_case`
63 63 analysis_status varchar(50) DEFAULT 'unanalysis',
64 64 review_status varchar(50) DEFAULT 'UNAUDITED',
65 65 area varchar(50),
66   - county varchar(50),
67 66 total_amount double,
68   - amount double,
69   - sex varchar(50),
70   - age int,
71   - career varchar(50),
72   - id_card varchar(50),
73   - fraud_type varchar(50),
74   - rainage_method varchar(50),
75   - rainage_detail varchar(500),
76   - pay_method varchar(50),
77 67 create_time timestamp null,
78 68 create_by varchar(32),
79 69 last_modify_time timestamp null,
... ... @@ -145,6 +135,6 @@ ALTER TABLE t_ash_case_analysis ADD COLUMN rainage_phone VARCHAR(50) NULL;
145 135 ALTER TABLE t_ash_case_analysis ADD COLUMN tracking_number VARCHAR(50) NULL;
146 136 ALTER TABLE t_ash_case_analysis ADD COLUMN express_company VARCHAR(50) NULL;
147 137 ALTER TABLE t_ash_case_analysis ADD COLUMN deliver_wealth VARCHAR(50) NULL;
148   -
149 138 ALTER TABLE t_ash_case ADD COLUMN area VARCHAR(50) NULL;
150 139 ALTER TABLE t_ash_case ADD COLUMN total_amount VARCHAR(50) NULL;
  140 +ALTER TABLE t_ash_warning_instance ADD COLUMN area VARCHAR(50) NULL;
... ...