|
@@ -6,11 +6,16 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
|
|
import com.ruoyi.common.core.web.page.PageDomain;
|
|
import com.ruoyi.common.core.web.page.PageDomain;
|
|
import com.ruoyi.common.core.web.page.TableDataInfo;
|
|
import com.ruoyi.common.core.web.page.TableDataInfo;
|
|
import com.ruoyi.common.core.web.page.TableSupport;
|
|
import com.ruoyi.common.core.web.page.TableSupport;
|
|
|
|
+import com.ruoyi.common.security.utils.DictUtils;
|
|
|
|
+import com.sooka.sponest.comprehensive.api.comprehensiveConflictDefuse.domain.ConflictResolution;
|
|
import com.sooka.sponest.comprehensive.api.comprehensiveRoadCase.domain.ComprehensiveRoadProtection;
|
|
import com.sooka.sponest.comprehensive.api.comprehensiveRoadCase.domain.ComprehensiveRoadProtection;
|
|
import com.sooka.sponest.comprehensive.api.comprehensiveRoadCase.service.RemoteRoadProtectionService;
|
|
import com.sooka.sponest.comprehensive.api.comprehensiveRoadCase.service.RemoteRoadProtectionService;
|
|
|
|
+import org.apache.commons.collections4.MapUtils;
|
|
|
|
+import org.apache.ibatis.util.MapUtil;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
|
+import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
@RestController
|
|
@RestController
|
|
@@ -41,7 +46,16 @@ public class AppRoadProtectionController extends BaseController {
|
|
*/
|
|
*/
|
|
@GetMapping("/RoadProtection/edit")
|
|
@GetMapping("/RoadProtection/edit")
|
|
public AjaxResult getInfo(String id) {
|
|
public AjaxResult getInfo(String id) {
|
|
- return remoteRoadProtectionService.selectComprehensiveRoadProtectionById(id);
|
|
|
|
|
|
+ AjaxResult ajaxResult = remoteRoadProtectionService.selectComprehensiveRoadProtectionById(id);
|
|
|
|
+ if("200".equals(String.valueOf(ajaxResult.get("code")))){
|
|
|
|
+ HashMap<String,Object> comprehensiveRoadProtection = (HashMap<String, Object>) ajaxResult.get("data");
|
|
|
|
+ comprehensiveRoadProtection.put("routeTypeLabel",DictUtils.getDictDataByValue("comprehensive_line_type", MapUtils.getString(comprehensiveRoadProtection,"routeType")));
|
|
|
|
+ comprehensiveRoadProtection.put("publicSecurityHazardLevelLabel",DictUtils.getDictDataByValue("comprehensive_policing_level",MapUtils.getString(comprehensiveRoadProtection,"publicSecurityHazardLevel")));
|
|
|
|
+ return AjaxResult.success(comprehensiveRoadProtection);
|
|
|
|
+ }else{
|
|
|
|
+ return AjaxResult.error(ajaxResult.get("code").toString(), ajaxResult.get("msg"));
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|