chen_yx 2 ani în urmă
părinte
comite
c04a43f5ca
21 a modificat fișierele cu 787 adăugiri și 969 ștergeri
  1. 105 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/plotmanage/AdFlatController.java
  2. 0 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/plotmanage/AdManagementController.java
  3. 5 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/plotmanage/AdPlotController.java
  4. 110 0
      ruoyi-admin/src/main/java/com/ruoyi/web/domain/plotmanage/AdFlat.java
  5. 166 0
      ruoyi-admin/src/main/java/com/ruoyi/web/domain/plotmanage/AdManagement.java
  6. 6 7
      ruoyi-admin/src/main/java/com/ruoyi/web/domain/plotmanage/AdPlot.java
  7. 63 0
      ruoyi-admin/src/main/java/com/ruoyi/web/mapper/plotmanage/AdFlatMapper.java
  8. 0 0
      ruoyi-admin/src/main/java/com/ruoyi/web/mapper/plotmanage/AdManagementMapper.java
  9. 63 0
      ruoyi-admin/src/main/java/com/ruoyi/web/service/plotmanage/IAdFlatService.java
  10. 95 0
      ruoyi-admin/src/main/java/com/ruoyi/web/service/plotmanage/impl/AdFlatServiceImpl.java
  11. 78 0
      ruoyi-admin/src/main/resources/mapper/plotmanage/AdFlatMapper.xml
  12. 96 0
      ruoyi-admin/src/main/resources/mapper/plotmanage/AdManagementMapper.xml
  13. 0 104
      ruoyi-system/src/main/java/com/ruoyi/system/controller/AdCommunityManagementController.java
  14. 0 219
      ruoyi-system/src/main/java/com/ruoyi/system/domain/AdCommunityManagement.java
  15. 0 153
      ruoyi-system/src/main/java/com/ruoyi/system/domain/AdManagement.java
  16. 0 61
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/AdCommunityManagementMapper.java
  17. 0 61
      ruoyi-system/src/main/java/com/ruoyi/system/service/AdManagementMapper.java
  18. 0 61
      ruoyi-system/src/main/java/com/ruoyi/system/service/IAdCommunityManagementService.java
  19. 0 94
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AdCommunityManagementServiceImpl.java
  20. 0 116
      ruoyi-system/src/main/resources/mapper/system/AdCommunityManagementMapper.xml
  21. 0 93
      ruoyi-system/src/main/resources/mapper/system/AdManagementMapper.xml

+ 105 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/plotmanage/AdFlatController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller.plotmanage;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.web.domain.plotmanage.AdFlat;
+import com.ruoyi.web.service.plotmanage.IAdFlatService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 楼宇管理Controller
+ * 
+ * @author cyx
+ * @date 2022-11-24
+ */
+@RestController
+@RequestMapping("/plotmanage/flat")
+public class AdFlatController extends BaseController
+{
+    @Autowired
+    private IAdFlatService adFlatService;
+
+    /**
+     * 查询楼宇管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('plotmanage:flat:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(AdFlat adFlat)
+    {
+        startPage();
+        List<AdFlat> list = adFlatService.selectAdFlatList(adFlat);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出楼宇管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('plotmanage:flat:export')")
+    @Log(title = "楼宇管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AdFlat adFlat)
+    {
+        List<AdFlat> list = adFlatService.selectAdFlatList(adFlat);
+        ExcelUtil<AdFlat> util = new ExcelUtil<AdFlat>(AdFlat.class);
+        util.exportExcel(response, list, "楼宇管理数据");
+    }
+
+    /**
+     * 获取楼宇管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('plotmanage:flat:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(adFlatService.selectAdFlatById(id));
+    }
+
+    /**
+     * 新增楼宇管理
+     */
+    @PreAuthorize("@ss.hasPermi('plotmanage:flat:add')")
+    @Log(title = "楼宇管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AdFlat adFlat)
+    {
+        return toAjax(adFlatService.insertAdFlat(adFlat));
+    }
+
+    /**
+     * 修改楼宇管理
+     */
+    @PreAuthorize("@ss.hasPermi('plotmanage:flat:edit')")
+    @Log(title = "楼宇管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AdFlat adFlat)
+    {
+        return toAjax(adFlatService.updateAdFlat(adFlat));
+    }
+
+    /**
+     * 删除楼宇管理
+     */
+    @PreAuthorize("@ss.hasPermi('plotmanage:flat:remove')")
+    @Log(title = "楼宇管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(adFlatService.deleteAdFlatByIds(ids));
+    }
+}

+ 0 - 0
ruoyi-system/src/main/java/com/ruoyi/system/controller/AdManagementController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/plotmanage/AdManagementController.java


+ 5 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/plotmanage/AdPlotController.java

@@ -48,6 +48,7 @@ public class AdPlotController extends BaseController
     /**
      * 导出小区管理列表
      */
+    @ApiOperation("导出小区管理列表")
     @PreAuthorize("@ss.hasPermi('plotmanage:plot:export')")
     @Log(title = "小区管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -61,6 +62,7 @@ public class AdPlotController extends BaseController
     /**
      * 获取小区管理详细信息
      */
+    @ApiOperation("获取小区管理详细信息")
     @PreAuthorize("@ss.hasPermi('plotmanage:plot:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
@@ -71,6 +73,7 @@ public class AdPlotController extends BaseController
     /**
      * 新增小区管理
      */
+    @ApiOperation("新增小区管理")
     @PreAuthorize("@ss.hasPermi('plotmanage:plot:add')")
     @Log(title = "小区管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -82,6 +85,7 @@ public class AdPlotController extends BaseController
     /**
      * 修改小区管理
      */
+    @ApiOperation("修改小区管理")
     @PreAuthorize("@ss.hasPermi('plotmanage:plot:edit')")
     @Log(title = "小区管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -93,6 +97,7 @@ public class AdPlotController extends BaseController
     /**
      * 删除小区管理
      */
+    @ApiOperation("删除小区")
     @PreAuthorize("@ss.hasPermi('plotmanage:plot:remove')")
     @Log(title = "小区管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")

+ 110 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/domain/plotmanage/AdFlat.java

@@ -0,0 +1,110 @@
+package com.ruoyi.web.domain.plotmanage;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 楼宇管理对象 ad_flat
+ * 
+ * @author cyx
+ * @date 2022-11-24
+ */
+public class AdFlat extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private String id;
+
+    /** 所属小区 */
+    @Excel(name = "所属小区")
+    private String plotid;
+
+    /** 楼宇名称 */
+    @Excel(name = "楼宇名称")
+    private String name;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remake;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String create;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setPlotid(String plotid) 
+    {
+        this.plotid = plotid;
+    }
+
+    public String getPlotid() 
+    {
+        return plotid;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setRemake(String remake) 
+    {
+        this.remake = remake;
+    }
+
+    public String getRemake() 
+    {
+        return remake;
+    }
+    public void setCreatedate(Date createdate) 
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate() 
+    {
+        return createdate;
+    }
+    public void setCreate(String create) 
+    {
+        this.create = create;
+    }
+
+    public String getCreate() 
+    {
+        return create;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("plotid", getPlotid())
+            .append("name", getName())
+            .append("remake", getRemake())
+            .append("createdate", getCreatedate())
+            .append("create", getCreate())
+            .toString();
+    }
+}

+ 166 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/domain/plotmanage/AdManagement.java

@@ -0,0 +1,166 @@
+package com.ruoyi.web.domain.plotmanage;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 广告位管理对象 ad_management
+ * 
+ * @author cyx
+ * @date 2022-11-24
+ */
+public class AdManagement extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 所属小区 */
+    @Excel(name = "所属小区")
+    private String plotid;
+
+    /** 所属楼宇 */
+    @Excel(name = "所属楼宇")
+    private String flatid;
+
+    /** 所在楼层 */
+    @Excel(name = "所在楼层")
+    private String floor;
+
+    /** 面积 */
+    @Excel(name = "面积")
+    private String area;
+
+    /** 租赁状态 */
+    @Excel(name = "租赁状态")
+    private String status;
+
+    /** 租金 */
+    @Excel(name = "租金")
+    private String rent;
+
+    /** 租金类型 */
+    @Excel(name = "租金类型")
+    private String renttype;
+
+    /** 上架时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "上架时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date addtime;
+
+    /** 是否上架 */
+    @Excel(name = "是否上架")
+    private String isadd;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setPlotid(String plotid) 
+    {
+        this.plotid = plotid;
+    }
+
+    public String getPlotid() 
+    {
+        return plotid;
+    }
+    public void setFlatid(String flatid) 
+    {
+        this.flatid = flatid;
+    }
+
+    public String getFlatid() 
+    {
+        return flatid;
+    }
+    public void setFloor(String floor) 
+    {
+        this.floor = floor;
+    }
+
+    public String getFloor() 
+    {
+        return floor;
+    }
+    public void setArea(String area) 
+    {
+        this.area = area;
+    }
+
+    public String getArea() 
+    {
+        return area;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setRent(String rent) 
+    {
+        this.rent = rent;
+    }
+
+    public String getRent() 
+    {
+        return rent;
+    }
+    public void setRenttype(String renttype) 
+    {
+        this.renttype = renttype;
+    }
+
+    public String getRenttype() 
+    {
+        return renttype;
+    }
+    public void setAddtime(Date addtime) 
+    {
+        this.addtime = addtime;
+    }
+
+    public Date getAddtime() 
+    {
+        return addtime;
+    }
+    public void setIsadd(String isadd) 
+    {
+        this.isadd = isadd;
+    }
+
+    public String getIsadd() 
+    {
+        return isadd;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("plotid", getPlotid())
+            .append("flatid", getFlatid())
+            .append("floor", getFloor())
+            .append("area", getArea())
+            .append("status", getStatus())
+            .append("rent", getRent())
+            .append("renttype", getRenttype())
+            .append("addtime", getAddtime())
+            .append("isadd", getIsadd())
+            .toString();
+    }
+}

+ 6 - 7
ruoyi-admin/src/main/java/com/ruoyi/web/domain/plotmanage/AdPlot.java

@@ -31,7 +31,7 @@ public class AdPlot extends BaseEntity
 
     /** 是否上架 */
     @Excel(name = "是否上架")
-    private Boolean added;
+    private String added;
 
     public void setId(String id)
     {
@@ -60,16 +60,15 @@ public class AdPlot extends BaseEntity
     {
         return updata;
     }
-    public void setAdded(Boolean added)
-    {
-        this.added = added;
-    }
 
-    public Boolean getAdded()
-    {
+    public String getAdded() {
         return added;
     }
 
+    public void setAdded(String added) {
+        this.added = added;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

+ 63 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/mapper/plotmanage/AdFlatMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.web.mapper.plotmanage;
+
+import com.ruoyi.web.domain.plotmanage.AdFlat;
+
+import java.util.List;
+
+
+/**
+ * 楼宇管理Mapper接口
+ * 
+ * @author cyx
+ * @date 2022-11-24
+ */
+public interface AdFlatMapper 
+{
+    /**
+     * 查询楼宇管理
+     * 
+     * @param id 楼宇管理主键
+     * @return 楼宇管理
+     */
+    public AdFlat selectAdFlatById(String id);
+
+    /**
+     * 查询楼宇管理列表
+     * 
+     * @param adFlat 楼宇管理
+     * @return 楼宇管理集合
+     */
+    public List<AdFlat> selectAdFlatList(AdFlat adFlat);
+
+    /**
+     * 新增楼宇管理
+     * 
+     * @param adFlat 楼宇管理
+     * @return 结果
+     */
+    public int insertAdFlat(AdFlat adFlat);
+
+    /**
+     * 修改楼宇管理
+     * 
+     * @param adFlat 楼宇管理
+     * @return 结果
+     */
+    public int updateAdFlat(AdFlat adFlat);
+
+    /**
+     * 删除楼宇管理
+     * 
+     * @param id 楼宇管理主键
+     * @return 结果
+     */
+    public int deleteAdFlatById(String id);
+
+    /**
+     * 批量删除楼宇管理
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAdFlatByIds(String[] ids);
+}

+ 0 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/AdManagementMapper.java → ruoyi-admin/src/main/java/com/ruoyi/web/mapper/plotmanage/AdManagementMapper.java


+ 63 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/service/plotmanage/IAdFlatService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.web.service.plotmanage;
+
+import com.ruoyi.web.domain.plotmanage.AdFlat;
+
+import java.util.List;
+
+
+/**
+ * 楼宇管理Service接口
+ * 
+ * @author cyx
+ * @date 2022-11-24
+ */
+public interface IAdFlatService 
+{
+    /**
+     * 查询楼宇管理
+     * 
+     * @param id 楼宇管理主键
+     * @return 楼宇管理
+     */
+    public AdFlat selectAdFlatById(String id);
+
+    /**
+     * 查询楼宇管理列表
+     * 
+     * @param adFlat 楼宇管理
+     * @return 楼宇管理集合
+     */
+    public List<AdFlat> selectAdFlatList(AdFlat adFlat);
+
+    /**
+     * 新增楼宇管理
+     * 
+     * @param adFlat 楼宇管理
+     * @return 结果
+     */
+    public int insertAdFlat(AdFlat adFlat);
+
+    /**
+     * 修改楼宇管理
+     * 
+     * @param adFlat 楼宇管理
+     * @return 结果
+     */
+    public int updateAdFlat(AdFlat adFlat);
+
+    /**
+     * 批量删除楼宇管理
+     * 
+     * @param ids 需要删除的楼宇管理主键集合
+     * @return 结果
+     */
+    public int deleteAdFlatByIds(String[] ids);
+
+    /**
+     * 删除楼宇管理信息
+     * 
+     * @param id 楼宇管理主键
+     * @return 结果
+     */
+    public int deleteAdFlatById(String id);
+}

+ 95 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/service/plotmanage/impl/AdFlatServiceImpl.java

@@ -0,0 +1,95 @@
+package com.ruoyi.web.service.plotmanage.impl;
+
+import java.util.List;
+
+import com.ruoyi.web.domain.plotmanage.AdFlat;
+import com.ruoyi.web.mapper.plotmanage.AdFlatMapper;
+import com.ruoyi.web.service.plotmanage.IAdFlatService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 楼宇管理Service业务层处理
+ * 
+ * @author cyx
+ * @date 2022-11-24
+ */
+@Service
+public class AdFlatServiceImpl implements IAdFlatService
+{
+    @Autowired
+    private AdFlatMapper adFlatMapper;
+
+    /**
+     * 查询楼宇管理
+     * 
+     * @param id 楼宇管理主键
+     * @return 楼宇管理
+     */
+    @Override
+    public AdFlat selectAdFlatById(String id)
+    {
+        return adFlatMapper.selectAdFlatById(id);
+    }
+
+    /**
+     * 查询楼宇管理列表
+     * 
+     * @param adFlat 楼宇管理
+     * @return 楼宇管理
+     */
+    @Override
+    public List<AdFlat> selectAdFlatList(AdFlat adFlat)
+    {
+        return adFlatMapper.selectAdFlatList(adFlat);
+    }
+
+    /**
+     * 新增楼宇管理
+     * 
+     * @param adFlat 楼宇管理
+     * @return 结果
+     */
+    @Override
+    public int insertAdFlat(AdFlat adFlat)
+    {
+        return adFlatMapper.insertAdFlat(adFlat);
+    }
+
+    /**
+     * 修改楼宇管理
+     * 
+     * @param adFlat 楼宇管理
+     * @return 结果
+     */
+    @Override
+    public int updateAdFlat(AdFlat adFlat)
+    {
+        return adFlatMapper.updateAdFlat(adFlat);
+    }
+
+    /**
+     * 批量删除楼宇管理
+     * 
+     * @param ids 需要删除的楼宇管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAdFlatByIds(String[] ids)
+    {
+        return adFlatMapper.deleteAdFlatByIds(ids);
+    }
+
+    /**
+     * 删除楼宇管理信息
+     * 
+     * @param id 楼宇管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAdFlatById(String id)
+    {
+        return adFlatMapper.deleteAdFlatById(id);
+    }
+}

+ 78 - 0
ruoyi-admin/src/main/resources/mapper/plotmanage/AdFlatMapper.xml

@@ -0,0 +1,78 @@
+<?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.web.mapper.plotmanage.AdFlatMapper">
+    
+    <resultMap type="AdFlat" id="AdFlatResult">
+        <result property="id"    column="id"    />
+        <result property="plotid"    column="plotId"    />
+        <result property="name"    column="name"    />
+        <result property="remake"    column="remake"    />
+        <result property="createdate"    column="createDate"    />
+        <result property="create"    column="create"    />
+    </resultMap>
+
+    <sql id="selectAdFlatVo">
+        select id, plotId, name, remake, createDate, create from ad_flat
+    </sql>
+
+    <select id="selectAdFlatList" parameterType="AdFlat" resultMap="AdFlatResult">
+        <include refid="selectAdFlatVo"/>
+        <where>  
+            <if test="plotid != null  and plotid != ''"> and plotId = #{plotid}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="remake != null  and remake != ''"> and remake = #{remake}</if>
+            <if test="createdate != null "> and createDate = #{createdate}</if>
+            <if test="create != null  and create != ''"> and create = #{create}</if>
+        </where>
+    </select>
+    
+    <select id="selectAdFlatById" parameterType="String" resultMap="AdFlatResult">
+        <include refid="selectAdFlatVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertAdFlat" parameterType="AdFlat">
+        insert into ad_flat
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="plotid != null and plotid != ''">plotId,</if>
+            <if test="name != null">name,</if>
+            <if test="remake != null">remake,</if>
+            <if test="createdate != null">createDate,</if>
+            <if test="create != null">create,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="plotid != null and plotid != ''">#{plotid},</if>
+            <if test="name != null">#{name},</if>
+            <if test="remake != null">#{remake},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="create != null">#{create},</if>
+         </trim>
+    </insert>
+
+    <update id="updateAdFlat" parameterType="AdFlat">
+        update ad_flat
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="plotid != null and plotid != ''">plotId = #{plotid},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="remake != null">remake = #{remake},</if>
+            <if test="createdate != null">createDate = #{createdate},</if>
+            <if test="create != null">create = #{create},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAdFlatById" parameterType="String">
+        delete from ad_flat where id = #{id}
+    </delete>
+
+    <delete id="deleteAdFlatByIds" parameterType="String">
+        delete from ad_flat where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+ 96 - 0
ruoyi-admin/src/main/resources/mapper/plotmanage/AdManagementMapper.xml

@@ -0,0 +1,96 @@
+<?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.web.mapper.plotmanage.AdManagementMapper">
+    
+    <resultMap type="AdManagement" id="AdManagementResult">
+        <result property="id"    column="id"    />
+        <result property="plotid"    column="plotid"    />
+        <result property="flatid"    column="flatid"    />
+        <result property="floor"    column="floor"    />
+        <result property="area"    column="area"    />
+        <result property="status"    column="status"    />
+        <result property="rent"    column="rent"    />
+        <result property="renttype"    column="rentType"    />
+        <result property="addtime"    column="addtime"    />
+        <result property="isadd"    column="iSadd"    />
+    </resultMap>
+
+    <sql id="selectAdManagementVo">
+        select id, plotid, flatid, floor, area, status, rent, rentType, addtime, iSadd from ad_management
+    </sql>
+
+    <select id="selectAdManagementList" parameterType="AdManagement" resultMap="AdManagementResult">
+        <include refid="selectAdManagementVo"/>
+        <where>  
+            <if test="plotid != null  and plotid != ''"> and plotid = #{plotid}</if>
+            <if test="flatid != null  and flatid != ''"> and flatid = #{flatid}</if>
+            <if test="floor != null  and floor != ''"> and floor = #{floor}</if>
+            <if test="area != null  and area != ''"> and area = #{area}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="rent != null  and rent != ''"> and rent = #{rent}</if>
+            <if test="renttype != null  and renttype != ''"> and rentType = #{renttype}</if>
+            <if test="addtime != null "> and addtime = #{addtime}</if>
+            <if test="isadd != null  and isadd != ''"> and iSadd = #{isadd}</if>
+        </where>
+    </select>
+    
+    <select id="selectAdManagementById" parameterType="Long" resultMap="AdManagementResult">
+        <include refid="selectAdManagementVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertAdManagement" parameterType="AdManagement" useGeneratedKeys="true" keyProperty="id">
+        insert into ad_management
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="plotid != null and plotid != ''">plotid,</if>
+            <if test="flatid != null and flatid != ''">flatid,</if>
+            <if test="floor != null">floor,</if>
+            <if test="area != null">area,</if>
+            <if test="status != null">status,</if>
+            <if test="rent != null">rent,</if>
+            <if test="renttype != null">rentType,</if>
+            <if test="addtime != null">addtime,</if>
+            <if test="isadd != null">iSadd,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="plotid != null and plotid != ''">#{plotid},</if>
+            <if test="flatid != null and flatid != ''">#{flatid},</if>
+            <if test="floor != null">#{floor},</if>
+            <if test="area != null">#{area},</if>
+            <if test="status != null">#{status},</if>
+            <if test="rent != null">#{rent},</if>
+            <if test="renttype != null">#{renttype},</if>
+            <if test="addtime != null">#{addtime},</if>
+            <if test="isadd != null">#{isadd},</if>
+         </trim>
+    </insert>
+
+    <update id="updateAdManagement" parameterType="AdManagement">
+        update ad_management
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="plotid != null and plotid != ''">plotid = #{plotid},</if>
+            <if test="flatid != null and flatid != ''">flatid = #{flatid},</if>
+            <if test="floor != null">floor = #{floor},</if>
+            <if test="area != null">area = #{area},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="rent != null">rent = #{rent},</if>
+            <if test="renttype != null">rentType = #{renttype},</if>
+            <if test="addtime != null">addtime = #{addtime},</if>
+            <if test="isadd != null">iSadd = #{isadd},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAdManagementById" parameterType="Long">
+        delete from ad_management where id = #{id}
+    </delete>
+
+    <delete id="deleteAdManagementByIds" parameterType="String">
+        delete from ad_management where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+ 0 - 104
ruoyi-system/src/main/java/com/ruoyi/system/controller/AdCommunityManagementController.java

@@ -1,104 +0,0 @@
-package com.ruoyi.system.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.AdCommunityManagement;
-import com.ruoyi.system.service.IAdCommunityManagementService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 小区管理Controller
- * 
- * @author cyx
- * @date 2022-09-27
- */
-@RestController
-@RequestMapping("/CELLManage/Community")
-public class AdCommunityManagementController extends BaseController
-{
-    @Autowired
-    private IAdCommunityManagementService adCommunityManagementService;
-
-    /**
-     * 查询小区管理列表
-     */
-    @PreAuthorize("@ss.hasPermi('CELLManage:Community:list')")
-    @GetMapping("/List")
-    public TableDataInfo list(AdCommunityManagement adCommunityManagement)
-    {
-        startPage();
-        List<AdCommunityManagement> list = adCommunityManagementService.selectAdCommunityManagementList(adCommunityManagement);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出小区管理列表
-     */
-    @PreAuthorize("@ss.hasPermi('CELLManage:Community:export')")
-    @Log(title = "小区管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, AdCommunityManagement adCommunityManagement)
-    {
-        List<AdCommunityManagement> list = adCommunityManagementService.selectAdCommunityManagementList(adCommunityManagement);
-        ExcelUtil<AdCommunityManagement> util = new ExcelUtil<AdCommunityManagement>(AdCommunityManagement.class);
-        util.exportExcel(response, list, "小区管理数据");
-    }
-
-    /**
-     * 获取小区管理详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('CELLManage:Community:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(adCommunityManagementService.selectAdCommunityManagementById(id));
-    }
-
-    /**
-     * 新增小区管理
-     */
-    @PreAuthorize("@ss.hasPermi('CELLManage:Community:add')")
-    @Log(title = "小区管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody AdCommunityManagement adCommunityManagement)
-    {
-        return toAjax(adCommunityManagementService.insertAdCommunityManagement(adCommunityManagement));
-    }
-
-    /**
-     * 修改小区管理
-     */
-    @PreAuthorize("@ss.hasPermi('CELLManage:Community:edit')")
-    @Log(title = "小区管理", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody AdCommunityManagement adCommunityManagement)
-    {
-        return toAjax(adCommunityManagementService.updateAdCommunityManagement(adCommunityManagement));
-    }
-
-    /**
-     * 删除小区管理
-     */
-    @PreAuthorize("@ss.hasPermi('CELLManage:Community:remove')")
-    @Log(title = "小区管理", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(adCommunityManagementService.deleteAdCommunityManagementByIds(ids));
-    }
-}

+ 0 - 219
ruoyi-system/src/main/java/com/ruoyi/system/domain/AdCommunityManagement.java

@@ -1,219 +0,0 @@
-package com.ruoyi.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 小区管理对象 ad_community_management
- * 
- * @author cyx
- * @date 2022-09-27
- */
-public class AdCommunityManagement extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** Id */
-    private Long id;
-
-    /** 名称 */
-    @Excel(name = "名称")
-    private String name;
-
-    /** 镇区 */
-    @Excel(name = "镇区")
-    private String town;
-
-    /** 片区 */
-    @Excel(name = "片区")
-    private String area;
-
-    /** 商圈 */
-    @Excel(name = "商圈")
-    private String businessDistrict;
-
-    /** 小区类型 */
-    @Excel(name = "小区类型")
-    private String type;
-
-    /** 全市等级 */
-    @Excel(name = "全市等级")
-    private String cityLevel;
-
-    /** 售价 */
-    @Excel(name = "售价")
-    private String price;
-
-    /** 二手价 */
-    @Excel(name = "二手价")
-    private String secondHandPrice;
-
-    /** 户均面积 */
-    @Excel(name = "户均面积")
-    private String householdSize;
-
-    /** 管理费 */
-    @Excel(name = "管理费")
-    private String administrativeFee;
-
-    /** 是否毛坯 */
-    @Excel(name = "是否毛坯")
-    private String whetherTheBlank;
-
-    /** 楼龄 */
-    @Excel(name = "楼龄")
-    private String towerAge;
-
-    /** 平均楼高 */
-    @Excel(name = "平均楼高")
-    private String towerHeight;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setTown(String town) 
-    {
-        this.town = town;
-    }
-
-    public String getTown() 
-    {
-        return town;
-    }
-    public void setArea(String area) 
-    {
-        this.area = area;
-    }
-
-    public String getArea() 
-    {
-        return area;
-    }
-    public void setBusinessDistrict(String businessDistrict) 
-    {
-        this.businessDistrict = businessDistrict;
-    }
-
-    public String getBusinessDistrict() 
-    {
-        return businessDistrict;
-    }
-    public void setType(String type) 
-    {
-        this.type = type;
-    }
-
-    public String getType() 
-    {
-        return type;
-    }
-    public void setCityLevel(String cityLevel) 
-    {
-        this.cityLevel = cityLevel;
-    }
-
-    public String getCityLevel() 
-    {
-        return cityLevel;
-    }
-    public void setPrice(String price) 
-    {
-        this.price = price;
-    }
-
-    public String getPrice() 
-    {
-        return price;
-    }
-    public void setSecondHandPrice(String secondHandPrice) 
-    {
-        this.secondHandPrice = secondHandPrice;
-    }
-
-    public String getSecondHandPrice() 
-    {
-        return secondHandPrice;
-    }
-    public void setHouseholdSize(String householdSize) 
-    {
-        this.householdSize = householdSize;
-    }
-
-    public String getHouseholdSize() 
-    {
-        return householdSize;
-    }
-    public void setAdministrativeFee(String administrativeFee) 
-    {
-        this.administrativeFee = administrativeFee;
-    }
-
-    public String getAdministrativeFee() 
-    {
-        return administrativeFee;
-    }
-    public void setWhetherTheBlank(String whetherTheBlank) 
-    {
-        this.whetherTheBlank = whetherTheBlank;
-    }
-
-    public String getWhetherTheBlank() 
-    {
-        return whetherTheBlank;
-    }
-    public void setTowerAge(String towerAge) 
-    {
-        this.towerAge = towerAge;
-    }
-
-    public String getTowerAge() 
-    {
-        return towerAge;
-    }
-    public void setTowerHeight(String towerHeight) 
-    {
-        this.towerHeight = towerHeight;
-    }
-
-    public String getTowerHeight() 
-    {
-        return towerHeight;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("town", getTown())
-            .append("area", getArea())
-            .append("businessDistrict", getBusinessDistrict())
-            .append("type", getType())
-            .append("cityLevel", getCityLevel())
-            .append("price", getPrice())
-            .append("secondHandPrice", getSecondHandPrice())
-            .append("householdSize", getHouseholdSize())
-            .append("administrativeFee", getAdministrativeFee())
-            .append("whetherTheBlank", getWhetherTheBlank())
-            .append("towerAge", getTowerAge())
-            .append("towerHeight", getTowerHeight())
-            .toString();
-    }
-}

+ 0 - 153
ruoyi-system/src/main/java/com/ruoyi/system/domain/AdManagement.java

@@ -1,153 +0,0 @@
-package com.ruoyi.system.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 广告位管理对象 ad_management
- * 
- * @author cyx
- * @date 2022-09-22
- */
-public class AdManagement extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** id */
-    private Long id;
-
-    /** 广告位 */
-    @Excel(name = "广告位")
-    private String advertising;
-
-    /** 投放地址 */
-    @Excel(name = "投放地址")
-    private String address;
-
-    /** 广告投放人 */
-    @Excel(name = "广告投放人")
-    private String adowner;
-
-    /** 联系方式 */
-    @Excel(name = "联系方式")
-    private String contact;
-
-    /** 投放时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "投放时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date startdate;
-
-    /** 结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date enddate;
-
-    /** 状态 */
-    @Excel(name = "状态")
-    private String status;
-
-    /** 责任人 */
-    @Excel(name = "责任人")
-    private String adperson;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setAdvertising(String advertising) 
-    {
-        this.advertising = advertising;
-    }
-
-    public String getAdvertising() 
-    {
-        return advertising;
-    }
-    public void setAddress(String address) 
-    {
-        this.address = address;
-    }
-
-    public String getAddress() 
-    {
-        return address;
-    }
-    public void setAdowner(String adowner) 
-    {
-        this.adowner = adowner;
-    }
-
-    public String getAdowner() 
-    {
-        return adowner;
-    }
-    public void setContact(String contact) 
-    {
-        this.contact = contact;
-    }
-
-    public String getContact() 
-    {
-        return contact;
-    }
-    public void setStartdate(Date startdate) 
-    {
-        this.startdate = startdate;
-    }
-
-    public Date getStartdate() 
-    {
-        return startdate;
-    }
-    public void setEnddate(Date enddate) 
-    {
-        this.enddate = enddate;
-    }
-
-    public Date getEnddate() 
-    {
-        return enddate;
-    }
-    public void setStatus(String status) 
-    {
-        this.status = status;
-    }
-
-    public String getStatus() 
-    {
-        return status;
-    }
-    public void setAdperson(String adperson) 
-    {
-        this.adperson = adperson;
-    }
-
-    public String getAdperson() 
-    {
-        return adperson;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("advertising", getAdvertising())
-            .append("address", getAddress())
-            .append("adowner", getAdowner())
-            .append("contact", getContact())
-            .append("startdate", getStartdate())
-            .append("enddate", getEnddate())
-            .append("status", getStatus())
-            .append("adperson", getAdperson())
-            .toString();
-    }
-}

+ 0 - 61
ruoyi-system/src/main/java/com/ruoyi/system/mapper/AdCommunityManagementMapper.java

@@ -1,61 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import java.util.List;
-import com.ruoyi.system.domain.AdCommunityManagement;
-
-/**
- * 小区管理Mapper接口
- * 
- * @author cyx
- * @date 2022-09-27
- */
-public interface AdCommunityManagementMapper 
-{
-    /**
-     * 查询小区管理
-     * 
-     * @param id 小区管理主键
-     * @return 小区管理
-     */
-    public AdCommunityManagement selectAdCommunityManagementById(Long id);
-
-    /**
-     * 查询小区管理列表
-     * 
-     * @param adCommunityManagement 小区管理
-     * @return 小区管理集合
-     */
-    public List<AdCommunityManagement> selectAdCommunityManagementList(AdCommunityManagement adCommunityManagement);
-
-    /**
-     * 新增小区管理
-     * 
-     * @param adCommunityManagement 小区管理
-     * @return 结果
-     */
-    public int insertAdCommunityManagement(AdCommunityManagement adCommunityManagement);
-
-    /**
-     * 修改小区管理
-     * 
-     * @param adCommunityManagement 小区管理
-     * @return 结果
-     */
-    public int updateAdCommunityManagement(AdCommunityManagement adCommunityManagement);
-
-    /**
-     * 删除小区管理
-     * 
-     * @param id 小区管理主键
-     * @return 结果
-     */
-    public int deleteAdCommunityManagementById(Long id);
-
-    /**
-     * 批量删除小区管理
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteAdCommunityManagementByIds(Long[] ids);
-}

+ 0 - 61
ruoyi-system/src/main/java/com/ruoyi/system/service/AdManagementMapper.java

@@ -1,61 +0,0 @@
-package com.ruoyi.system.service;
-
-import java.util.List;
-import com.ruoyi.system.domain.AdManagement;
-
-/**
- * 广告位管理Mapper接口
- * 
- * @author cyx
- * @date 2022-09-22
- */
-public interface AdManagementMapper 
-{
-    /**
-     * 查询广告位管理
-     * 
-     * @param id 广告位管理主键
-     * @return 广告位管理
-     */
-    public AdManagement selectAdManagementById(Long id);
-
-    /**
-     * 查询广告位管理列表
-     * 
-     * @param adManagement 广告位管理
-     * @return 广告位管理集合
-     */
-    public List<AdManagement> selectAdManagementList(AdManagement adManagement);
-
-    /**
-     * 新增广告位管理
-     * 
-     * @param adManagement 广告位管理
-     * @return 结果
-     */
-    public int insertAdManagement(AdManagement adManagement);
-
-    /**
-     * 修改广告位管理
-     * 
-     * @param adManagement 广告位管理
-     * @return 结果
-     */
-    public int updateAdManagement(AdManagement adManagement);
-
-    /**
-     * 删除广告位管理
-     * 
-     * @param id 广告位管理主键
-     * @return 结果
-     */
-    public int deleteAdManagementById(Long id);
-
-    /**
-     * 批量删除广告位管理
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteAdManagementByIds(Long[] ids);
-}

+ 0 - 61
ruoyi-system/src/main/java/com/ruoyi/system/service/IAdCommunityManagementService.java

@@ -1,61 +0,0 @@
-package com.ruoyi.system.service;
-
-import java.util.List;
-import com.ruoyi.system.domain.AdCommunityManagement;
-
-/**
- * 小区管理Service接口
- * 
- * @author cyx
- * @date 2022-09-27
- */
-public interface IAdCommunityManagementService 
-{
-    /**
-     * 查询小区管理
-     * 
-     * @param id 小区管理主键
-     * @return 小区管理
-     */
-    public AdCommunityManagement selectAdCommunityManagementById(Long id);
-
-    /**
-     * 查询小区管理列表
-     * 
-     * @param adCommunityManagement 小区管理
-     * @return 小区管理集合
-     */
-    public List<AdCommunityManagement> selectAdCommunityManagementList(AdCommunityManagement adCommunityManagement);
-
-    /**
-     * 新增小区管理
-     * 
-     * @param adCommunityManagement 小区管理
-     * @return 结果
-     */
-    public int insertAdCommunityManagement(AdCommunityManagement adCommunityManagement);
-
-    /**
-     * 修改小区管理
-     * 
-     * @param adCommunityManagement 小区管理
-     * @return 结果
-     */
-    public int updateAdCommunityManagement(AdCommunityManagement adCommunityManagement);
-
-    /**
-     * 批量删除小区管理
-     * 
-     * @param ids 需要删除的小区管理主键集合
-     * @return 结果
-     */
-    public int deleteAdCommunityManagementByIds(Long[] ids);
-
-    /**
-     * 删除小区管理信息
-     * 
-     * @param id 小区管理主键
-     * @return 结果
-     */
-    public int deleteAdCommunityManagementById(Long id);
-}

+ 0 - 94
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AdCommunityManagementServiceImpl.java

@@ -1,94 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.system.mapper.AdCommunityManagementMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.system.domain.AdCommunityManagement;
-import com.ruoyi.system.service.IAdCommunityManagementService;
-
-/**
- * 小区管理Service业务层处理
- * 
- * @author cyx
- * @date 2022-09-27
- */
-@Service
-public class AdCommunityManagementServiceImpl implements IAdCommunityManagementService 
-{
-    @Autowired
-    private AdCommunityManagementMapper adCommunityManagementMapper;
-
-    /**
-     * 查询小区管理
-     * 
-     * @param id 小区管理主键
-     * @return 小区管理
-     */
-    @Override
-    public AdCommunityManagement selectAdCommunityManagementById(Long id)
-    {
-        return adCommunityManagementMapper.selectAdCommunityManagementById(id);
-    }
-
-    /**
-     * 查询小区管理列表
-     * 
-     * @param adCommunityManagement 小区管理
-     * @return 小区管理
-     */
-    @Override
-    public List<AdCommunityManagement> selectAdCommunityManagementList(AdCommunityManagement adCommunityManagement)
-    {
-        return adCommunityManagementMapper.selectAdCommunityManagementList(adCommunityManagement);
-    }
-
-    /**
-     * 新增小区管理
-     * 
-     * @param adCommunityManagement 小区管理
-     * @return 结果
-     */
-    @Override
-    public int insertAdCommunityManagement(AdCommunityManagement adCommunityManagement)
-    {
-        return adCommunityManagementMapper.insertAdCommunityManagement(adCommunityManagement);
-    }
-
-    /**
-     * 修改小区管理
-     * 
-     * @param adCommunityManagement 小区管理
-     * @return 结果
-     */
-    @Override
-    public int updateAdCommunityManagement(AdCommunityManagement adCommunityManagement)
-    {
-        return adCommunityManagementMapper.updateAdCommunityManagement(adCommunityManagement);
-    }
-
-    /**
-     * 批量删除小区管理
-     * 
-     * @param ids 需要删除的小区管理主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdCommunityManagementByIds(Long[] ids)
-    {
-        return adCommunityManagementMapper.deleteAdCommunityManagementByIds(ids);
-    }
-
-    /**
-     * 删除小区管理信息
-     * 
-     * @param id 小区管理主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdCommunityManagementById(Long id)
-    {
-        return adCommunityManagementMapper.deleteAdCommunityManagementById(id);
-    }
-}

+ 0 - 116
ruoyi-system/src/main/resources/mapper/system/AdCommunityManagementMapper.xml

@@ -1,116 +0,0 @@
-<?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.AdCommunityManagementMapper">
-    
-    <resultMap type="AdCommunityManagement" id="AdCommunityManagementResult">
-        <result property="id"    column="Id"    />
-        <result property="name"    column="name"    />
-        <result property="town"    column="town"    />
-        <result property="area"    column="area"    />
-        <result property="businessDistrict"    column="business_district"    />
-        <result property="type"    column="type"    />
-        <result property="cityLevel"    column="city_level"    />
-        <result property="price"    column="price"    />
-        <result property="secondHandPrice"    column="second_hand_price"    />
-        <result property="householdSize"    column="household_size"    />
-        <result property="administrativeFee"    column="administrative_fee"    />
-        <result property="whetherTheBlank"    column="Whether_the_blank"    />
-        <result property="towerAge"    column="tower_age"    />
-        <result property="towerHeight"    column="tower_height"    />
-    </resultMap>
-
-    <sql id="selectAdCommunityManagementVo">
-        select Id, name, town, area, business_district, type, city_level, price, second_hand_price, household_size, administrative_fee, Whether_the_blank, tower_age, tower_height from ad_community_management
-    </sql>
-
-    <select id="selectAdCommunityManagementList" parameterType="AdCommunityManagement" resultMap="AdCommunityManagementResult">
-        <include refid="selectAdCommunityManagementVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="town != null  and town != ''"> and town like concat('%', #{town}, '%')</if>
-            <if test="area != null  and area != ''"> and area like concat('%', #{area}, '%')</if>
-            <if test="businessDistrict != null  and businessDistrict != ''"> and business_district like concat('%', #{businessDistrict}, '%')</if>
-            <if test="type != null  and type != ''"> and type like concat('%', #{type}, '%')</if>
-            <if test="cityLevel != null  and cityLevel != ''"> and city_level like concat('%', #{cityLevel}, '%')</if>
-            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
-            <if test="secondHandPrice != null  and secondHandPrice != ''"> and second_hand_price like concat('%', #{secondHandPrice}, '%')</if>
-            <if test="householdSize != null  and householdSize != ''"> and household_size like concat('%', #{householdSize}, '%')</if>
-            <if test="administrativeFee != null  and administrativeFee != ''"> and administrative_fee = #{administrativeFee}</if>
-            <if test="whetherTheBlank != null  and whetherTheBlank != ''"> and Whether_the_blank like concat('%', #{whetherTheBlank}, '%')</if>
-            <if test="towerAge != null  and towerAge != ''"> and tower_age = #{towerAge}</if>
-            <if test="towerHeight != null  and towerHeight != ''"> and tower_height = #{towerHeight}</if>
-        </where>
-    </select>
-    
-    <select id="selectAdCommunityManagementById" parameterType="Long" resultMap="AdCommunityManagementResult">
-        <include refid="selectAdCommunityManagementVo"/>
-        where Id = #{id}
-    </select>
-        
-    <insert id="insertAdCommunityManagement" parameterType="AdCommunityManagement" useGeneratedKeys="true" keyProperty="id">
-        insert into ad_community_management
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="name != null">name,</if>
-            <if test="town != null">town,</if>
-            <if test="area != null">area,</if>
-            <if test="businessDistrict != null">business_district,</if>
-            <if test="type != null">type,</if>
-            <if test="cityLevel != null">city_level,</if>
-            <if test="price != null">price,</if>
-            <if test="secondHandPrice != null">second_hand_price,</if>
-            <if test="householdSize != null">household_size,</if>
-            <if test="administrativeFee != null">administrative_fee,</if>
-            <if test="whetherTheBlank != null">Whether_the_blank,</if>
-            <if test="towerAge != null">tower_age,</if>
-            <if test="towerHeight != null">tower_height,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="name != null">#{name},</if>
-            <if test="town != null">#{town},</if>
-            <if test="area != null">#{area},</if>
-            <if test="businessDistrict != null">#{businessDistrict},</if>
-            <if test="type != null">#{type},</if>
-            <if test="cityLevel != null">#{cityLevel},</if>
-            <if test="price != null">#{price},</if>
-            <if test="secondHandPrice != null">#{secondHandPrice},</if>
-            <if test="householdSize != null">#{householdSize},</if>
-            <if test="administrativeFee != null">#{administrativeFee},</if>
-            <if test="whetherTheBlank != null">#{whetherTheBlank},</if>
-            <if test="towerAge != null">#{towerAge},</if>
-            <if test="towerHeight != null">#{towerHeight},</if>
-         </trim>
-    </insert>
-
-    <update id="updateAdCommunityManagement" parameterType="AdCommunityManagement">
-        update ad_community_management
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="name != null">name = #{name},</if>
-            <if test="town != null">town = #{town},</if>
-            <if test="area != null">area = #{area},</if>
-            <if test="businessDistrict != null">business_district = #{businessDistrict},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="cityLevel != null">city_level = #{cityLevel},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="secondHandPrice != null">second_hand_price = #{secondHandPrice},</if>
-            <if test="householdSize != null">household_size = #{householdSize},</if>
-            <if test="administrativeFee != null">administrative_fee = #{administrativeFee},</if>
-            <if test="whetherTheBlank != null">Whether_the_blank = #{whetherTheBlank},</if>
-            <if test="towerAge != null">tower_age = #{towerAge},</if>
-            <if test="towerHeight != null">tower_height = #{towerHeight},</if>
-        </trim>
-        where Id = #{id}
-    </update>
-
-    <delete id="deleteAdCommunityManagementById" parameterType="Long">
-        delete from ad_community_management where Id = #{id}
-    </delete>
-
-    <delete id="deleteAdCommunityManagementByIds" parameterType="String">
-        delete from ad_community_management where Id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

+ 0 - 93
ruoyi-system/src/main/resources/mapper/system/AdManagementMapper.xml

@@ -1,93 +0,0 @@
-<?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.AdManagementMapper">
-    
-    <resultMap type="AdManagement" id="AdManagementResult">
-        <result property="id"    column="id"    />
-        <result property="advertising"    column="Advertising"    />
-        <result property="address"    column="address"    />
-        <result property="adowner"    column="adOwner"    />
-        <result property="contact"    column="contact"    />
-        <result property="startdate"    column="startdate"    />
-        <result property="enddate"    column="enddate"    />
-        <result property="status"    column="status"    />
-        <result property="adperson"    column="adperson"    />
-    </resultMap>
-
-    <sql id="selectAdManagementVo">
-        select id, Advertising, address, adOwner, contact, startdate, enddate, status, adperson from ad_management
-    </sql>
-
-    <select id="selectAdManagementList" parameterType="AdManagement" resultMap="AdManagementResult">
-        <include refid="selectAdManagementVo"/>
-        <where>  
-            <if test="advertising != null  and advertising != ''"> and Advertising like concat('%', #{advertising}, '%')</if>
-            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
-            <if test="adowner != null  and adowner != ''"> and adOwner like concat('%', #{adowner}, '%')</if>
-            <if test="contact != null  and contact != ''"> and contact like concat('%', #{contact}, '%')</if>
-            <if test="startdate != null "> and startdate &gt;= #{startdate}</if>
-            <if test="enddate != null "> and enddate &lt;= #{enddate}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="adperson != null  and adperson != ''"> and adperson like concat('%', #{adperson}, '%')</if>
-        </where>
-    </select>
-    
-    <select id="selectAdManagementById" parameterType="Long" resultMap="AdManagementResult">
-        <include refid="selectAdManagementVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertAdManagement" parameterType="AdManagement">
-        insert into ad_management
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="advertising != null">Advertising,</if>
-            <if test="address != null">address,</if>
-            <if test="adowner != null">adOwner,</if>
-            <if test="contact != null">contact,</if>
-            <if test="startdate != null">startdate,</if>
-            <if test="enddate != null">enddate,</if>
-            <if test="status != null">status,</if>
-            <if test="adperson != null">adperson,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="advertising != null">#{advertising},</if>
-            <if test="address != null">#{address},</if>
-            <if test="adowner != null">#{adowner},</if>
-            <if test="contact != null">#{contact},</if>
-            <if test="startdate != null">#{startdate},</if>
-            <if test="enddate != null">#{enddate},</if>
-            <if test="status != null">#{status},</if>
-            <if test="adperson != null">#{adperson},</if>
-         </trim>
-    </insert>
-
-    <update id="updateAdManagement" parameterType="AdManagement">
-        update ad_management
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="advertising != null">Advertising = #{advertising},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="adowner != null">adOwner = #{adowner},</if>
-            <if test="contact != null">contact = #{contact},</if>
-            <if test="startdate != null">startdate = #{startdate},</if>
-            <if test="enddate != null">enddate = #{enddate},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="adperson != null">adperson = #{adperson},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteAdManagementById" parameterType="Long">
-        delete from ad_management where id = #{id}
-    </delete>
-
-    <delete id="deleteAdManagementByIds" parameterType="String">
-        delete from ad_management where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>