Merge remote-tracking branch 'origin/main'

pom.xml

@@ -8,8 +8,8 @@
     <artifactId>ruoyi</artifactId>
     <version>3.8.7</version>
 
-    <name>wst-be</name>
-    <description>万事通后台管理框架</description>
+    <name>yichengstreet-be</name>
+    <description>宜城街道后台管理框架</description>
 
     <properties>
         <ruoyi.version>3.8.7</ruoyi.version>

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

+package com.ruoyi.web.controller.house;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.house.HouseResource;
+import com.ruoyi.system.domain.house.vo.HouseResourcePageQuery;
+import com.ruoyi.system.service.house.HouseResourceService;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/house")
+public class HouseResourceController {
+
+    private final HouseResourceService houseResourceService;
+
+    public HouseResourceController(HouseResourceService houseResourceService) {
+        this.houseResourceService = houseResourceService;
+    }
+
+    @PostMapping
+    public void saveHouseResource(@RequestBody HouseResource houseResource) {
+        houseResourceService.saveHouseResource(houseResource);
+    }
+
+    @GetMapping
+    public AjaxResult queryHouseResourceById(@RequestParam String id) {
+        return AjaxResult.success(houseResourceService.queryHouseResourceById(id));
+    }
+
+    @PutMapping
+    public AjaxResult updateHouseResource(@RequestBody HouseResource houseResource) {
+        houseResourceService.updateHouseResource(houseResource);
+        return AjaxResult.success();
+    }
+
+    @DeleteMapping
+    public AjaxResult deleteHouseResourceById(@RequestParam String id) {
+        houseResourceService.deleteHouseResourceById(id);
+        return AjaxResult.success();
+    }
+
+    @PostMapping("/batch")
+    public AjaxResult batchSaveHouseResources(@RequestBody List<HouseResource> houseResources) {
+        houseResourceService.batchSaveHouseResources(houseResources);
+        return AjaxResult.success();
+    }
+
+    @GetMapping("/page")
+    public AjaxResult pageHouseResources(HouseResourcePageQuery query) {
+        return AjaxResult.success(houseResourceService.pageHouseResources(query));
+    }
+
+}

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

+package com.ruoyi.system.domain.house;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class HouseResource implements Serializable {
+
+    private String id;
+
+    private String relationId;
+
+    private String two;
+
+    private String three;
+
+    private String four;
+
+    private int type;
+
+    private String projectId;
+
+    private String houseResourceUrl;
+
+    private String houseNumber;
+
+    private Integer houseArea;
+
+    private String houseResourceAttribute;
+
+    private String houseResourceType;
+
+    private String houseResourceUse;
+
+    private String houseResourceEquity;
+
+    private String houseResourceEquityTel;
+
+    private String decorationCondition;
+
+    private String orientation;
+
+    private Boolean landingHeadFlag;
+
+    private Integer commonAreaNumber;
+
+    private Integer officeNumber;
+
+    private Integer meetingNumber;
+
+    private Integer stationNumber;
+
+    private String setUp;
+
+    private String labelId;
+
+    private BigDecimal unitPrice;
+
+    private String planeGraphUrl;
+}

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

+package com.ruoyi.system.domain.house.vo;
+
+import com.ruoyi.common.core.page.PageDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class HouseResourcePageQuery extends PageDomain {
+
+    private String two;
+
+    private String three;
+
+    private String four;
+
+    private String houseResourceAttribute;
+
+    private String sortWay;
+}

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

+package com.ruoyi.system.mapper.house;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.system.domain.house.HouseResource;
+import com.ruoyi.system.domain.house.vo.HouseResourcePageQuery;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface HouseResourceMapper {
+
+    void insertHouseResource(HouseResource houseResource);
+
+    HouseResource selectHouseResourceById(String id);
+
+    void updateHouseResource(HouseResource houseResource);
+
+    void deleteHouseResourceById(String id);
+
+    void batchInsertHouseResources(List<HouseResource> houseResources);
+
+    IPage<HouseResource> selectPage(IPage<HouseResource> page, @Param("query") HouseResourcePageQuery houseResourcePageQuery);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/house/HouseResourceService.java

+package com.ruoyi.system.service.house;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.system.domain.house.HouseResource;
+import com.ruoyi.system.domain.house.vo.HouseResourcePageQuery;
+
+import java.util.List;
+
+public interface HouseResourceService {
+
+    void saveHouseResource(HouseResource houseResource);
+
+    HouseResource queryHouseResourceById(String id);
+
+    void updateHouseResource(HouseResource houseResource);
+
+    void deleteHouseResourceById(String id);
+
+    void batchSaveHouseResources(List<HouseResource> houseResources);
+
+    IPage<HouseResource> pageHouseResources(HouseResourcePageQuery query);
+}

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

+package com.ruoyi.system.service.house.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.system.domain.house.HouseResource;
+import com.ruoyi.system.domain.house.vo.HouseResourcePageQuery;
+import com.ruoyi.system.mapper.house.HouseResourceMapper;
+import com.ruoyi.system.service.house.HouseResourceService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class HouseResourceServiceImpl implements HouseResourceService {
+
+    private final HouseResourceMapper houseResourceMapper;
+
+    public HouseResourceServiceImpl(HouseResourceMapper houseResourceMapper) {
+        this.houseResourceMapper = houseResourceMapper;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveHouseResource(HouseResource houseResource) {
+        houseResource.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+        houseResourceMapper.insertHouseResource(houseResource);
+    }
+
+    @Override
+    public HouseResource queryHouseResourceById(String id) {
+        return houseResourceMapper.selectHouseResourceById(id);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateHouseResource(HouseResource houseResource) {
+        houseResourceMapper.updateHouseResource(houseResource);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteHouseResourceById(String id) {
+        houseResourceMapper.deleteHouseResourceById(id);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void batchSaveHouseResources(List<HouseResource> houseResources) {
+        houseResourceMapper.batchInsertHouseResources(houseResources);
+    }
+
+    @Override
+    public IPage<HouseResource> pageHouseResources(HouseResourcePageQuery query) {
+        return houseResourceMapper.selectPage(new Page<>(query.getPageNum(), query.getPageSize()), query);
+    }
+}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.house.HouseResourceMapper">
+    <resultMap id="BaseResultMap" type="com.ruoyi.system.domain.house.HouseResource">
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="relationId" column="relation_id" jdbcType="VARCHAR"/>
+        <result property="two" column="two" jdbcType="VARCHAR"/>
+        <result property="three" column="three" jdbcType="VARCHAR"/>
+        <result property="four" column="four" jdbcType="VARCHAR"/>
+        <result property="type" column="type" jdbcType="INTEGER"/>
+        <result property="projectId" column="project_id" jdbcType="VARCHAR"/>
+        <result property="houseResourceUrl" column="house_resource_url" jdbcType="VARCHAR"/>
+        <result property="houseNumber" column="house_number" jdbcType="VARCHAR"/>
+        <result property="houseArea" column="house_area" jdbcType="INTEGER"/>
+        <result property="houseResourceAttribute" column="house_resource_attribute" jdbcType="VARCHAR"/>
+        <result property="houseResourceType" column="house_resource_type" jdbcType="VARCHAR"/>
+        <result property="houseResourceUse" column="house_resource_use" jdbcType="VARCHAR"/>
+        <result property="houseResourceEquity" column="house_resource_equity" jdbcType="VARCHAR"/>
+        <result property="houseResourceEquityTel" column="house_resource_equity_tel" jdbcType="VARCHAR"/>
+        <result property="decorationCondition" column="decoration_condition" jdbcType="VARCHAR"/>
+        <result property="orientation" column="orientation" jdbcType="VARCHAR"/>
+        <result property="landingHeadFlag" column="landing_head_flag" jdbcType="BIT"/>
+        <result property="commonAreaNumber" column="common_area_number" jdbcType="INTEGER"/>
+        <result property="officeNumber" column="office_number" jdbcType="INTEGER"/>
+        <result property="meetingNumber" column="meeting_number" jdbcType="INTEGER"/>
+        <result property="stationNumber" column="station_number" jdbcType="INTEGER"/>
+        <result property="setUp" column="set_up" jdbcType="VARCHAR"/>
+        <result property="labelId" column="label_id" jdbcType="VARCHAR"/>
+        <result property="unitPrice" column="unit_price" jdbcType="DECIMAL"/>
+        <result property="planeGraphUrl" column="plane_graph_url" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <insert id="insertHouseResource" parameterType="com.ruoyi.system.domain.house.HouseResource">
+        INSERT INTO house_resource
+        (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,
+         decoration_condition, orientation, landing_head_flag, common_area_number, office_number,
+         meeting_number, station_number, set_up, label_id, unit_price, plane_graph_url)
+        VALUES
+            (#{id}, #{relationId}, #{two}, #{three}, #{four}, #{type}, #{projectId}, #{houseResourceUrl}, #{houseNumber}, #{houseArea},
+             #{houseResourceAttribute}, #{houseResourceType}, #{houseResourceUse}, #{houseResourceEquity}, #{houseResourceEquityTel},
+             #{decorationCondition}, #{orientation}, #{landingHeadFlag}, #{commonAreaNumber}, #{officeNumber},
+             #{meetingNumber}, #{stationNumber}, #{setUp}, #{labelId}, #{unitPrice}, #{planeGraphUrl})
+    </insert>
+
+    <select id="selectHouseResourceById" resultType="com.ruoyi.system.domain.house.HouseResource" parameterType="string">
+        SELECT * FROM house_resource WHERE id = #{id}
+    </select>
+
+    <update id="updateHouseResource" parameterType="com.ruoyi.system.domain.house.HouseResource">
+        UPDATE house_resource
+        SET relation_id = #{relationId},
+            two = #{two},
+            three = #{three},
+            four = #{four},
+            type = #{type},
+            project_id = #{projectId},
+            house_resource_url = #{houseResourceUrl},
+            house_number = #{houseNumber},
+            house_area = #{houseArea},
+            house_resource_attribute = #{houseResourceAttribute},
+            house_resource_type = #{houseResourceType},
+            house_resource_use = #{houseResourceUse},
+            house_resource_equity = #{houseResourceEquity},
+            house_resource_equity_tel = #{houseResourceEquityTel},
+            decoration_condition = #{decorationCondition},
+            orientation = #{orientation},
+            landing_head_flag = #{landingHeadFlag},
+            common_area_number = #{commonAreaNumber},
+            office_number = #{officeNumber},
+            meeting_number = #{meetingNumber},
+            station_number = #{stationNumber},
+            set_up = #{setUp},
+            label_id = #{labelId},
+            unit_price = #{unitPrice},
+            plane_graph_url = #{planeGraphUrl}
+        WHERE id = #{id}
+    </update>
+
+    <delete id="deleteHouseResourceById" parameterType="string">
+        DELETE FROM house_resource WHERE id = #{id}
+    </delete>
+
+    <insert id="batchInsertHouseResources" parameterType="java.util.List">
+        INSERT INTO house_resource
+        (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,
+        decoration_condition, orientation, landing_head_flag, common_area_number, office_number,
+        meeting_number, station_number, set_up, label_id, unit_price, plane_graph_url)
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            (#{item.id}, #{item.relationId},  #{two}, #{three}, #{four}, #{item.type}, #{item.projectId}, #{item.houseResourceUrl},
+            #{item.houseNumber}, #{item.houseArea}, #{item.houseResourceAttribute}, #{item.houseResourceType},
+            #{item.houseResourceUse}, #{item.houseResourceEquity}, #{item.houseResourceEquityTel}, #{item.decorationCondition},
+            #{item.orientation}, #{item.landingHeadFlag}, #{item.commonAreaNumber}, #{item.officeNumber},
+            #{item.meetingNumber}, #{item.stationNumber}, #{item.setUp}, #{item.labelId}, #{item.unitPrice},
+            #{item.planeGraphUrl})
+        </foreach>
+    </insert>
+
+    <select id="selectPage" resultType="com.ruoyi.system.domain.house.HouseResource">
+        select * from house_resource
+        <where>
+            <if test="query.two != null and query.two != ''">
+                and two like concat('%', #{query.two}, '%')
+            </if>
+            <if test="query.three != null and query.three != ''">
+                and three like concat('%', #{query.three}, '%')
+            </if>
+            <if test="query.four != null and query.four != ''">
+                and four like concat('%', #{query.four}, '%')
+            </if>
+            <if test="query.houseResourceAttribute != null and query.houseResourceAttribute != ''">
+                and house_resource_attribute = #{query.houseResourceAttribute}
+            </if>
+            <if test="query.sortWay != null and query.sortWay != ''">
+                order by houseArea ${query.sortWay}
+            </if>
+        </where>
+    </select>
+</mapper>
\ No newline at end of file