feat: 房源

ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/ContrastController.java

@@ -9,6 +9,7 @@ import com.ruoyi.system.mapper.grid.GridRegionMapper;
 import com.ruoyi.system.mapper.house.ContrastMapper;
 import com.ruoyi.system.mapper.house.HouseResourceMapper;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -33,10 +34,9 @@ public class ContrastController extends BaseController {
     }
 
     @PutMapping("/start")
-    @Transactional(rollbackFor =  Exception.class)
     public AjaxResult start() {
         List<Contrast> contrasts = contrastMapper.selectAll();
-        for (Contrast contrast : contrasts) {
+        contrasts.parallelStream().forEach(contrast -> {
             if (Objects.isNull(contrast.getWgName())) {
                 setFlag(contrast, "未设置网格名称");
             } else {
@@ -44,6 +44,10 @@ public class ContrastController extends BaseController {
                 if (Objects.isNull(contrast.getName())) {
                     setFlag(contrast, "未设置经营主体名称");
                 } else {
+                    System.out.println("当前id = " + contrast.getId());
+                    if (!StringUtils.hasText(contrast.getName())) {
+                        setFlag(contrast, "未设置经营主体名称");
+                    }
                     List<HouseResourcePage> list = houseResourceMapper.selectForContrast(gridRegion.getWgCode(), contrast.getName());
                     if (list.isEmpty()) {
                         setFlag(contrast, "该网格下没有该经营主体");
@@ -61,7 +65,8 @@ public class ContrastController extends BaseController {
                     }
                 }
             }
-        }
+        });
+        System.out.println("处理结束");
         return AjaxResult.success();
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HouseResourceController.java

@@ -95,7 +95,7 @@ public class HouseResourceController {
     }
 
     @PostMapping("/export")
-    public void export(HttpServletResponse response, HouseResourcePageQuery query) {
+    public void export(HttpServletResponse response, @RequestBody HouseResourcePageQuery query) {
         List<HouseResourceExport> exportList = new ArrayList<>();
         List<HouseResourcePage> pageList = houseResourceService.exportListHouseResources(query);
         pageList.forEach(x -> {