Merge branch 'dev' into 'main'

Dev

See merge request !109

ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java

@@ -69,27 +69,29 @@ public class RegionController extends BaseController {
                        @RequestParam("pageSize") Integer pageSize) {
         try {
             AjaxResult result = new AjaxResult();
-            SysUser user = SecurityUtils.getLoginUser().getUser();
-            //网格
-            GridRegionUserExample example = new GridRegionUserExample();
-            GridRegionUserExample.Criteria criteria = example.createCriteria();
-            criteria.andUserIdEqualTo(user.getUserId());
-//            criteria.andUserIdEqualTo("2");
-            criteria.andIsValidEqualTo("1");
-            List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);
-            String region = relationship.stream().map(GridRegionUser::getWgId).collect(Collectors.joining(","));
-            List<String> regions = Arrays.asList(region.split(","));
-            List<String> regionList = new ArrayList<>();
-            if(!regions.get(0).equals("320282001")){
-                regionList.add("320282001");
-            }
-            regionList.addAll(regions);
+//            SysUser user = SecurityUtils.getLoginUser().getUser();
+//            //网格
+//            GridRegionUserExample example = new GridRegionUserExample();
+//            GridRegionUserExample.Criteria criteria = example.createCriteria();
+//            criteria.andUserIdEqualTo(user.getUserId());
+////            criteria.andUserIdEqualTo("2");
+//            criteria.andIsValidEqualTo("1");
+//            List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);
+//            String region = relationship.stream().map(GridRegionUser::getWgId).collect(Collectors.joining(","));
+//            List<String> regions = Arrays.asList(region.split(","));
+//            List<String> regionList = new ArrayList<>();
+//            if(!regions.get(0).equals("320282001")){
+//                regionList.add("320282001");
+//            }
+//            regionList.addAll(regions);
 
 
             if(wgType.equals("0")){
-                gridRegionFacadeService.getRolesWhereTypeZero(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result);
+//                gridRegionFacadeService.getRolesWhereTypeZero(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result);
+                gridRegionFacadeService.getRoles(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result);
             }else {
-                gridRegionFacadeService.getRoles(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result, regionList);
+                gridRegionFacadeService.getRoles(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result);
+//                gridRegionFacadeService.getRoles(wgName, wgCode, wgType, level, wgPurpose, pageNum, pageSize, result, regionList);
             }
             return JSON.toJSONString(result);
         } catch (Exception e) {
@@ -571,24 +573,25 @@ public class RegionController extends BaseController {
     @RequestMapping(value = "/getWsTreeNode", method = RequestMethod.GET)
     @ResponseBody
     public AjaxResult getWsTreeNode(@RequestParam("wgType") String wgType, String isShow, @RequestParam(value = "isAll", required = false) String isAll) {
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        //网格
-        GridRegionUserExample example = new GridRegionUserExample();
-        GridRegionUserExample.Criteria criteria = example.createCriteria();
-        criteria.andUserIdEqualTo(user.getUserId());
-//        criteria.andUserIdEqualTo("2");
-        criteria.andIsValidEqualTo("1");
-        List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);
-        String region = relationship.stream().map(GridRegionUser::getWgId).collect(Collectors.joining(","));
-        List<String> regions = Arrays.asList(region.split(","));
-        List<String> regionList = new ArrayList<>();
-        if(!regions.get(0).equals("320282001")){
-            regionList.add("320282001");
-        }
-        regionList.addAll(regions);
+//        SysUser user = SecurityUtils.getLoginUser().getUser();
+//        //网格
+//        GridRegionUserExample example = new GridRegionUserExample();
+//        GridRegionUserExample.Criteria criteria = example.createCriteria();
+//        criteria.andUserIdEqualTo(user.getUserId());
+////        criteria.andUserIdEqualTo("1");
+//        criteria.andIsValidEqualTo("1");
+//        List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);
+//        String region = relationship.stream().map(GridRegionUser::getWgId).collect(Collectors.joining(","));
+//        List<String> regions = Arrays.asList(region.split(","));
+//        List<String> regionList = new ArrayList<>();
+//        if(!regions.get(0).equals("320282001")){
+//            regionList.add("320282001");
+//        }
+//        regionList.addAll(regions);
 
         if(wgType.equals("0")){
-            return AjaxResult.success(gridRegionFacadeService.getWsTreeNodeIncludeTwoPointFive(null,null,null,regionList));
+//            return AjaxResult.success(gridRegionFacadeService.getWsTreeNodeIncludeTwoPointFive(null,null,null,regionList));
+            return AjaxResult.success(gridRegionFacadeService.getWsTreeNodeIncludeTwoPointFive(null,null,null));
         }
 
         SysUser sysUser = getLoginUser().getUser();
@@ -601,7 +604,8 @@ public class RegionController extends BaseController {
             }
             wgCodeList  = list.stream().map(GridRegionUser::getWgId).collect(Collectors.toList());
         }
-        return AjaxResult.success(gridRegionFacadeService.getWsTreeNode(wgType, wgCodeList, isShow, regions));
+//        return AjaxResult.success(gridRegionFacadeService.getWsTreeNode(wgType, wgCodeList, isShow, regions));
+        return AjaxResult.success(gridRegionFacadeService.getWsTreeNode(wgType, wgCodeList, isShow));
 
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/HouseResource.java

@@ -68,7 +68,7 @@ public class HouseResource implements Serializable {
 
     private String address;
 
-    private String log;
+    private String lon;
 
     private String lat;
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourceDetail.java

@@ -89,4 +89,6 @@ public class HouseResourceDetail {
     private String log;
 
     private String lat;
+
+    private List<BusinessEntityDto> businessEntityDtoList;
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/house/BusinessEntitySellMapper.java

@@ -24,4 +24,6 @@ public interface BusinessEntitySellMapper {
 
     void deleteBusinessEntitySellByEntityId(@Param("businessEntityId") String businessEntityId);
 
+    List<BusinessEntitySell> selectBusinessEntitySellByEntityId(@Param("entityId") String entityId);
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/grid/GridRegionFacadeService.java

@@ -247,7 +247,8 @@ public class GridRegionFacadeService {
         return gridRegion;
     }
 
-    public void getRoles(String wgName, String wgCode, String wgType, String level, String purpose, Integer pageNum, Integer pageSize, AjaxResult result, List<String> regions) {
+//    public void getRoles(String wgName, String wgCode, String wgType, String level, String purpose, Integer pageNum, Integer pageSize, AjaxResult result, List<String> regions) {
+public void getRoles(String wgName, String wgCode, String wgType, String level, String purpose, Integer pageNum, Integer pageSize, AjaxResult result) {
         if (null == pageNum || pageNum <= 0) {
             pageNum = 1;
         }
@@ -295,26 +296,28 @@ public class GridRegionFacadeService {
             result.buildSuccess("success", appPageModel);
             return;
         }
-        List<GridRegion> res = new ArrayList<>();
-        if(!(regions.size()==1 && regions.get(0).equals("320282001"))){
-            Map<String,Integer> map = new HashMap<>();
-            for(String region: regions){
-                map.put(region, 1);
-            }
-            for(GridRegion region: roles){
-                if(map.containsKey(region.getWgCode())){
-                    res.add(region);
-                }
-            }
-        }else{
-            res = roles;
-        }
+//        List<GridRegion> res = new ArrayList<>();
+//        if(!(regions.size()==1 && regions.get(0).equals("320282001"))){
+//            Map<String,Integer> map = new HashMap<>();
+//            for(String region: regions){
+//                map.put(region, 1);
+//            }
+//            for(GridRegion region: roles){
+//                if(map.containsKey(region.getWgCode())){
+//                    res.add(region);
+//                }
+//            }
+//        }else{
+//            res = roles;
+//        }
 
 
         appPageModel.setCurPage(pageNum);
-        appPageModel.setRecordCount(res.size());
+//        appPageModel.setRecordCount(res.size());
+        appPageModel.setRecordCount(count);
         appPageModel.setPageCount((long) Math.ceil(1.0 * count / pageSize));
-        List<GridRegionWithCompanyItem> itemList = BeanCopyUtil.bathToBean(res, GridRegionWithCompanyItem.class);
+//        List<GridRegionWithCompanyItem> itemList = BeanCopyUtil.bathToBean(res, GridRegionWithCompanyItem.class);
+    List<GridRegionWithCompanyItem> itemList = BeanCopyUtil.bathToBean(roles, GridRegionWithCompanyItem.class);
         itemList.forEach( e -> {
             GridCompanyLandExample gridCompanyLandExample = new GridCompanyLandExample();
             GridCompanyLandExample.Criteria gridCompanyLandExampleCriteria = gridCompanyLandExample.createCriteria();
@@ -785,7 +788,8 @@ public class GridRegionFacadeService {
         return;
     }
 
-    public List<GridTreeNode> getWsTreeNode(String wgType, List<String> wgList, String isShow, List<String> regions) {
+//    public List<GridTreeNode> getWsTreeNode(String wgType, List<String> wgList, String isShow, List<String> regions) {
+public List<GridTreeNode> getWsTreeNode(String wgType, List<String> wgList, String isShow) {
         GridRegionSearchParam param = new GridRegionSearchParam();
         param.setWgType(wgType);
         if(!CollectionUtils.isEmpty(wgList)){
@@ -795,21 +799,22 @@ public class GridRegionFacadeService {
             param.setShow(false);
         }
         List<GridRegion> gridRegionList = gridRegionMapper.getByParams(param);
-        List<GridTreeNode> res = convertFrRegion(gridRegionList, wgList);
-        List<GridTreeNode> degree_second = new ArrayList<>();
-        if(!(regions.size()==1 && regions.get(0).equals("320282001"))){
-            Map<String,Integer> map = new HashMap<>();
-            for(String region: regions){
-                map.put(region, 1);
-            }
-            for(GridTreeNode region: res.get(0).getChild()){
-                if(map.containsKey(region.getCode())){
-                    degree_second.add(region);
-                }
-            }
-            res.get(0).setChild(degree_second);
-        }
-        return res;
+        return convertFrRegion(gridRegionList, wgList);
+//        List<GridTreeNode> res = convertFrRegion(gridRegionList, wgList);
+//        List<GridTreeNode> degree_second = new ArrayList<>();
+//        if(!(regions.size()==1 && regions.get(0).equals("320282001"))){
+//            Map<String,Integer> map = new HashMap<>();
+//            for(String region: regions){
+//                map.put(region, 1);
+//            }
+//            for(GridTreeNode region: res.get(0).getChild()){
+//                if(map.containsKey(region.getCode())){
+//                    degree_second.add(region);
+//                }
+//            }
+//            res.get(0).setChild(degree_second);
+//        }
+//        return res;
     }
 
     private List<GridTreeNode> convertFrRegion(List<GridRegion> gridRegionList, List<String> wgCodes) {
@@ -1169,7 +1174,8 @@ public class GridRegionFacadeService {
         return gridRegionList;
     }
 
-    public List<GridTreeNode> getWsTreeNodeIncludeTwoPointFive(String wgType, List<String> wgList, String isShow, List<String> regions) {
+//    public List<GridTreeNode> getWsTreeNodeIncludeTwoPointFive(String wgType, List<String> wgList, String isShow, List<String> regions) {
+public List<GridTreeNode> getWsTreeNodeIncludeTwoPointFive(String wgType, List<String> wgList, String isShow) {
         //获取一级树
         List<GridRegion> gridRegionList = gridRegionMapper.getRegionByTypeAndCode("1",new ArrayList<>(),"1");
         List<GridTreeNode> res = new ArrayList<>();
@@ -1267,19 +1273,19 @@ public class GridRegionFacadeService {
             gridTreeNode.setChild(secondFiveTree);
         }
 
-        List<GridTreeNode> degree_second = new ArrayList<>();
-        if(!(regions.size()==1 && regions.get(0).equals("320282001"))){
-            Map<String,Integer> map = new HashMap<>();
-            for(String region: regions){
-                map.put(region, 1);
-            }
-            for(GridTreeNode region: res.get(0).getChild()){
-                if(map.containsKey(region.getCode())){
-                    degree_second.add(region);
-                }
-            }
-            res.get(0).setChild(degree_second);
-        }
+//        List<GridTreeNode> degree_second = new ArrayList<>();
+//        if(!(regions.size()==1 && regions.get(0).equals("320282001"))){
+//            Map<String,Integer> map = new HashMap<>();
+//            for(String region: regions){
+//                map.put(region, 1);
+//            }
+//            for(GridTreeNode region: res.get(0).getChild()){
+//                if(map.containsKey(region.getCode())){
+//                    degree_second.add(region);
+//                }
+//            }
+//            res.get(0).setChild(degree_second);
+//        }
 
 
         return res;

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

@@ -12,7 +12,6 @@ import com.ruoyi.system.domain.house.vo.*;
 import com.ruoyi.system.mapper.grid.GridRegionMapper;
 import com.ruoyi.system.mapper.house.BusinessEntityInfoMapper;
 import com.ruoyi.system.mapper.house.BusinessEntitySellMapper;
-import com.ruoyi.system.mapper.house.HouseResourceAssociationObjectMapper;
 import com.ruoyi.system.mapper.house.HouseResourceMapper;
 import com.ruoyi.system.service.house.HouseResourceService;
 import org.springframework.beans.BeanUtils;
@@ -58,6 +57,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
             businessEntityInfoMapper.insertBusinessEntityInfo(businessEntityInfo);
 
             for (BusinessEntitySell businessEntitySell : businessEntityDto.getBusinessEntitySells()) {
+                businessEntitySell.setId(UUID.randomUUID().toString().replaceAll("-", ""));
                 businessEntitySell.setBusinessEntityInfoId(businessEntityInfoId);
                 businessEntitySellMapper.insertBusinessEntitySell(businessEntitySell);
             }
@@ -87,6 +87,17 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         houseResourceDetail.setDecorationConditionText(HouseEnums.DecorationConditionEnum.getDescByCode(houseResourceDetail.getDecorationCondition()));
         houseResourceDetail.setRentalUnitText(HouseEnums.RentalUnitEnum.getDescByCode(houseResourceDetail.getRentalUnit()));
         houseResourceDetail.setHireStatusText(HouseEnums.hireStatusTextEnum.getDescByCode(houseResourceDetail.getHireStatus()));
+
+        List<BusinessEntityInfo> businessEntityInfos = businessEntityInfoMapper.selectAllBusinessEntityInfosByHouseResourceId(houseResourceDetail.getId());
+        List<BusinessEntityDto> businessEntityDtoList = new ArrayList<>();
+        for (BusinessEntityInfo businessEntityInfo : businessEntityInfos) {
+            BusinessEntityDto businessEntityDto = new BusinessEntityDto();
+            BeanUtils.copyProperties(businessEntityInfo, businessEntityDto);
+            List<BusinessEntitySell> businessEntitySells = businessEntitySellMapper.selectBusinessEntitySellByEntityId(businessEntityInfo.getId());
+            businessEntityDto.setBusinessEntitySells(businessEntitySells);
+            businessEntityDtoList.add(businessEntityDto);
+        }
+        houseResourceDetail.setBusinessEntityDtoList(businessEntityDtoList);
         return houseResourceDetail;
     }
 

ruoyi-system/src/main/resources/mapper/house/BusinessEntitySellMapper.xml

@@ -50,4 +50,9 @@
     <delete id="deleteBusinessEntitySellByEntityId">
         DELETE FROM business_entity_sell WHERE business_entity_info_id = #{businessEntityId}
     </delete>
+
+    <select id="selectBusinessEntitySellByEntityId"
+            resultType="com.ruoyi.system.domain.house.BusinessEntitySell">
+        SELECT * FROM business_entity_sell WHERE business_entity_info_id = #{entityId}
+    </select>
 </mapper>
\ No newline at end of file

ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml

@@ -32,7 +32,7 @@
         <result property="planeGraphUrl" column="plane_graph_url" jdbcType="VARCHAR"/>
         <result property="hireStatus" column="hire_status" jdbcType="INTEGER"/>
         <result property="address" column="address" jdbcType="VARCHAR"/>
-        <result property="log" column="log" jdbcType="VARCHAR"/>
+        <result property="lon" column="lon" jdbcType="VARCHAR"/>
         <result property="lat" column="lat" jdbcType="VARCHAR"/>
     </resultMap>
 
@@ -41,12 +41,12 @@
         (id, relation_id, two, three, four, type, project_id, house_resource_url, house_number, house_area,
          house_resource_attribute, house_resource_type, house_resource_use, house_resource_equity, house_resource_equity_tel, ownership,
          decoration_condition, orientation, landing_head_flag, common_area_number, office_number,
-         meeting_number, station_number, set_up, label_id, unit_price, rental_unit, plane_graph_url, hire_status, address, log, lat)
+         meeting_number, station_number, set_up, label_id, unit_price, rental_unit, plane_graph_url, hire_status, address, lon, lat)
         VALUES
             (#{id}, #{relationId}, #{two}, #{three}, #{four}, #{type}, #{projectId}, #{houseResourceUrl}, #{houseNumber}, #{houseArea},
              #{houseResourceAttribute}, #{houseResourceType}, #{houseResourceUse}, #{houseResourceEquity}, #{houseResourceEquityTel}, #{ownership},
              #{decorationCondition}, #{orientation}, #{landingHeadFlag}, #{commonAreaNumber}, #{officeNumber},
-             #{meetingNumber}, #{stationNumber}, #{setUp}, #{labelId}, #{unitPrice}, #{rentalUnit}, #{planeGraphUrl}, #{hireStatus}, #{address}, #{log}, #{lat})
+             #{meetingNumber}, #{stationNumber}, #{setUp}, #{labelId}, #{unitPrice}, #{rentalUnit}, #{planeGraphUrl}, #{hireStatus}, #{address}, #{lon}, #{lat})
     </insert>
 
     <select id="selectHouseResourceById" resultType="com.ruoyi.system.domain.house.HouseResource" parameterType="string">
@@ -84,7 +84,7 @@
             plane_graph_url = #{planeGraphUrl},
             hire_status = #{hireStatus},
             address = #{address},
-            log = #{log},
+            lon = #{lon},
             lat = #{lat}
         WHERE id = #{id}
     </update>
@@ -98,7 +98,7 @@
         (id, relation_id, two, three, four, type, project_id, house_resource_url, house_number, house_area,
         house_resource_attribute, house_resource_type, house_resource_use, house_resource_equity, house_resource_equity_tel, ownership,
         decoration_condition, orientation, landing_head_flag, common_area_number, office_number,
-        meeting_number, station_number, set_up, label_id, unit_price, rental_unit, plane_graph_url, hire_status, address, log, lat)
+        meeting_number, station_number, set_up, label_id, unit_price, rental_unit, plane_graph_url, hire_status, address, lon, lat)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (#{item.id}, #{item.relationId},  #{two}, #{three}, #{four}, #{item.type}, #{item.projectId}, #{item.houseResourceUrl},
@@ -106,7 +106,7 @@
             #{item.houseResourceUse}, #{item.houseResourceEquity}, #{item.houseResourceEquityTel}, #{ownership}, #{item.decorationCondition},
             #{item.orientation}, #{item.landingHeadFlag}, #{item.commonAreaNumber}, #{item.officeNumber},
             #{item.meetingNumber}, #{item.stationNumber}, #{item.setUp}, #{item.labelId}, #{item.unitPrice}, #{item.rentalUnit},
-            #{item.planeGraphUrl}, #{item.hireStatus}, #{item.address}, #{item.log}, #{item.lat})
+            #{item.planeGraphUrl}, #{item.hireStatus}, #{item.address}, #{item.lon}, #{item.lat})
         </foreach>
     </insert>