0815需求联调修改

@@ -149,6 +149,7 @@ public class CaseController extends BaseController {
     public JsonResult page(@RequestParam(value = "pageNo", defaultValue = "1") int pageNo,
                            @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
                            @RequestParam(value = "code", required = false) String code,
+                           @RequestParam(value = "area", required = false) String area,
                            @RequestParam(value = "startTime", required = false) String startTime,
                            @RequestParam(value = "endTime", required = false) String endTime,
                            @RequestParam(value = "analysisStatus", required = false)
@@ -162,6 +163,7 @@ public class CaseController extends BaseController {
         params.setCode(code);
         params.setStartTime(startTime);
         params.setEndTime(endTime);
+        params.setArea(area);
 
         Page<Case> page = new Page<>();
         page.setCurrent(pageNo);
@@ -182,6 +184,7 @@ public class CaseController extends BaseController {
     public void export(@RequestParam(value = "code", required = false) String code,
                        @RequestParam(value = "startTime", required = false) String startTime,
                        @RequestParam(value = "endTime", required = false) String endTime,
+                       @RequestParam(value = "area", required = false) String area,
                        @RequestParam(value = "analysisStatus", required = false)
                                AnalysisStatusEnum analysisStatus,
                        @RequestParam(value = "reviewStatus", required = false)
@@ -194,6 +197,8 @@ public class CaseController extends BaseController {
         params.setCode(code);
         params.setStartTime(startTime);
         params.setEndTime(endTime);
+        params.setArea(area);
+
         List<Case> dataList = caseService.list(params);
 
         List<CaseExportExcelData> dedList = Optional.ofNullable(dataList).map(all ->

@@ -159,6 +159,7 @@ public class WarningInstanceController extends BaseController {
                            @RequestParam(value = "code", required = false) String code,
                            @RequestParam(value = "startTime", required = false) String startTime,
                            @RequestParam(value = "endTime", required = false) String endTime,
+                           @RequestParam(value = "area", required = false) String area,
                            @RequestParam(value = "analysisStatus", required = false)
                                    AnalysisStatusEnum analysisStatus,
                            @RequestParam(value = "reviewStatus", required = false)
@@ -170,6 +171,7 @@ public class WarningInstanceController extends BaseController {
         params.setCode(code);
         params.setStartTime(startTime);
         params.setEndTime(endTime);
+        params.setArea(area);
 
         Page<WarningInstance> page = new Page<>();
         page.setCurrent(pageNo);
@@ -190,6 +192,7 @@ public class WarningInstanceController extends BaseController {
     public void export(@RequestParam(value = "code", required = false) String code,
                        @RequestParam(value = "startTime", required = false) String startTime,
                        @RequestParam(value = "endTime", required = false) String endTime,
+                       @RequestParam(value = "area", required = false) String area,
                        @RequestParam(value = "analysisStatus", required = false)
                                AnalysisStatusEnum analysisStatus,
                        @RequestParam(value = "reviewStatus", required = false)
@@ -202,6 +205,8 @@ public class WarningInstanceController extends BaseController {
         params.setCode(code);
         params.setStartTime(startTime);
         params.setEndTime(endTime);
+        params.setArea(area);
+
         List<WarningInstance> dataList = warningInstanceService.list(params);
 
         List<WarningInstanceExportExcelData> dedList = Optional.ofNullable(dataList).map(all ->

@@ -87,7 +87,12 @@ public class CaseAnalysisService {
         }
 
         Case caseInfo = caseService.load(data.getCaseId());
-        setArea(caseInfo.getCode(), data);
+        if (caseInfo == null) {
+            throw new AshException(AshErrorCode.DATA_NOT_EXIST, "can't find case!,id:" + data.getCaseId());
+        }
+        setArea(null, data);
+        caseInfo.setArea(data.getArea());
+        caseService.update(caseInfo);
 
         caseAnalysisMapper.updateById(data);
     }

@@ -2,11 +2,13 @@ package com.ash.service;
 
 import com.ash.base.AshErrorCode;
 import com.ash.base.AshException;
+import com.ash.entity.Case;
 import com.ash.entity.WarningInstance;
 import com.ash.entity.WarningInstanceAnalysis;
 import com.ash.entity.dao.WarningInstanceAnalysisMapper;
 import com.ash.enums.ConformStatusEnum;
 import com.ash.enums.ReviewStatusEnum;
+import com.ash.util.AshConstant;
 import com.ash.util.UUIDGenerator;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -39,10 +41,30 @@ public class WarningInstanceAnalysisService {
         if (data.getConformStatus() == null) {
             data.setConformStatus(ConformStatusEnum.UNCONFIRMED);
         }
+
+        if (StringUtils.isBlank(data.getWiId())) {
+            throw new AshException(AshErrorCode.ILLEGAL_PARAM, "wiId is empty!");
+        }
+        setArea(data, null);
         int insert = warningInstanceAnalysisMapper.insert(data);
         return insert > 0;
     }
 
+    private void setArea(WarningInstanceAnalysis data, String area) {
+        WarningInstance wi = warningInstanceService.load(data.getWiId());
+        if (wi == null) {
+            throw new AshException(AshErrorCode.DATA_NOT_EXIST, "can't find wi! id:" + data.getWiId());
+        }
+        if (StringUtils.isBlank(area)) {
+            data.setArea(wi.getMunicipalPolice().replaceAll(AshConstant.WI_AREA_RS, ""));
+        } else {
+            data.setArea(area);
+            wi.setArea(area);
+            warningInstanceService.update(wi);
+        }
+
+    }
+
     public WarningInstanceAnalysis load(String id) {
         return warningInstanceAnalysisMapper.selectById(id);
     }
@@ -52,11 +74,7 @@ public class WarningInstanceAnalysisService {
         if (StringUtils.isBlank(id)) {
             throw new AshException(AshErrorCode.ILLEGAL_PARAM, "id is empty!");
         }
-        WarningInstanceAnalysis oldData = warningInstanceAnalysisMapper.selectById(id);
-        if (oldData == null) {
-            throw new AshException(AshErrorCode.DATA_NOT_EXIST);
-        }
-
+        setArea(data, data.getArea());
         warningInstanceAnalysisMapper.updateById(data);
     }