增加发展定位和园区表

src/main/java/com/lqkj/info/controller/DevelopmentsController.java

@@ -0,0 +1,112 @@
+package com.lqkj.info.controller;
+
+import java.util.List;
+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.lqkj.common.annotation.Log;
+import com.lqkj.common.core.controller.BaseController;
+import com.lqkj.common.core.model.ResultUtil;
+import com.lqkj.common.enums.BusinessType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.lqkj.info.entity.Developments;
+import com.lqkj.info.service.DevelopmentsService;
+import com.lqkj.common.utils.poi.ExcelUtil;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * 发展定位：developmentsController
+ * 
+ * @author lqkj
+ * @date 2024-12-13
+ */
+@Api(tags = {"发展定位：developments"})
+@RestController
+@RequestMapping("/info/development")
+public class DevelopmentsController extends BaseController
+{
+    @Autowired
+    private DevelopmentsService developmentsService;
+
+    /**
+     * 查询发展定位：developments列表
+     */
+    @ApiOperation("查询发展定位：developments列表")
+    @PreAuthorize("@ss.hasPermi('info:development:list')")
+    @GetMapping("/list")
+    public ResultUtil list(Developments developments)
+    {
+        startPage( developments);
+        PageInfo<Developments> pageInfo = new PageInfo<>(developmentsService.selectDevelopmentsList(developments));
+        return ResultUtil.success(pageInfo);
+    }
+
+    /**
+     * 导出发展定位：developments列表
+     */
+    @ApiOperation("导出发展定位：developments列表")
+    @PreAuthorize("@ss.hasPermi('info:development:export')")
+    @Log(title = "发展定位：developments", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public ResultUtil export(Developments developments)
+    {
+        List<Developments> list = developmentsService.selectDevelopmentsList(developments);
+        ExcelUtil<Developments> util = new ExcelUtil<Developments>(Developments.class);
+        return util.exportExcel(list, "发展定位：developments数据");
+    }
+
+    /**
+     * 获取发展定位：developments详细信息
+     */
+    @ApiOperation("获取发展定位：developments详细信息")
+    @PreAuthorize("@ss.hasPermi('info:development:query')")
+    @GetMapping(value = "/{id}")
+    public ResultUtil getInfo(@PathVariable("id") Integer id)
+    {
+        return ResultUtil.success(developmentsService.selectDevelopmentsById(id));
+    }
+
+    /**
+     * 新增发展定位：developments
+     */
+    @ApiOperation("新增发展定位：developments")
+    @PreAuthorize("@ss.hasPermi('info:development:add')")
+    @Log(title = "发展定位：developments", businessType = BusinessType.INSERT)
+    @PostMapping
+    public ResultUtil add(@RequestBody Developments developments)
+    {
+        return resultByRows(developmentsService.insertDevelopments(developments));
+    }
+
+    /**
+     * 修改发展定位：developments
+     */
+    @ApiOperation("修改发展定位：developments")
+    @PreAuthorize("@ss.hasPermi('info:development:edit')")
+    @Log(title = "发展定位：developments", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public ResultUtil edit(@RequestBody Developments developments)
+    {
+        return resultByRows(developmentsService.updateDevelopments(developments));
+    }
+
+    /**
+     * 删除发展定位：developments
+     */
+    @ApiOperation("删除发展定位：developments")
+    @PreAuthorize("@ss.hasPermi('info:development:remove')")
+    @Log(title = "发展定位：developments", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public ResultUtil remove(@PathVariable Integer[] ids)
+    {
+        return resultByRows(developmentsService.deleteDevelopmentsByIds(ids));
+    }
+}

src/main/java/com/lqkj/info/controller/ParkInfoController.java

@@ -0,0 +1,112 @@
+package com.lqkj.info.controller;
+
+import java.util.List;
+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.lqkj.common.annotation.Log;
+import com.lqkj.common.core.controller.BaseController;
+import com.lqkj.common.core.model.ResultUtil;
+import com.lqkj.common.enums.BusinessType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.lqkj.info.entity.ParkInfo;
+import com.lqkj.info.service.ParkInfoService;
+import com.lqkj.common.utils.poi.ExcelUtil;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * 园区对象Controller
+ * 
+ * @author lqkj
+ * @date 2024-12-16
+ */
+@Api(tags = {"园区对象"})
+@RestController
+@RequestMapping("/info/parkInfo")
+public class ParkInfoController extends BaseController
+{
+    @Autowired
+    private ParkInfoService parkInfoService;
+
+    /**
+     * 查询园区对象列表
+     */
+    @ApiOperation("查询园区对象列表")
+    @PreAuthorize("@ss.hasPermi('info:parkInfo:list')")
+    @GetMapping("/list")
+    public ResultUtil list(ParkInfo parkInfo)
+    {
+        startPage( parkInfo);
+        PageInfo<ParkInfo> pageInfo = new PageInfo<>(parkInfoService.selectParkInfoList(parkInfo));
+        return ResultUtil.success(pageInfo);
+    }
+
+    /**
+     * 导出园区对象列表
+     */
+    @ApiOperation("导出园区对象列表")
+    @PreAuthorize("@ss.hasPermi('info:parkInfo:export')")
+    @Log(title = "园区对象", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public ResultUtil export(ParkInfo parkInfo)
+    {
+        List<ParkInfo> list = parkInfoService.selectParkInfoList(parkInfo);
+        ExcelUtil<ParkInfo> util = new ExcelUtil<ParkInfo>(ParkInfo.class);
+        return util.exportExcel(list, "园区对象数据");
+    }
+
+    /**
+     * 获取园区对象详细信息
+     */
+    @ApiOperation("获取园区对象详细信息")
+    @PreAuthorize("@ss.hasPermi('info:parkInfo:query')")
+    @GetMapping(value = "/{parkId}")
+    public ResultUtil getInfo(@PathVariable("parkId") Integer parkId)
+    {
+        return ResultUtil.success(parkInfoService.selectParkInfoByParkId(parkId));
+    }
+
+    /**
+     * 新增园区对象
+     */
+    @ApiOperation("新增园区对象")
+    @PreAuthorize("@ss.hasPermi('info:parkInfo:add')")
+    @Log(title = "园区对象", businessType = BusinessType.INSERT)
+    @PostMapping
+    public ResultUtil add(@RequestBody ParkInfo parkInfo)
+    {
+        return resultByRows(parkInfoService.insertParkInfo(parkInfo));
+    }
+
+    /**
+     * 修改园区对象
+     */
+    @ApiOperation("修改园区对象")
+    @PreAuthorize("@ss.hasPermi('info:parkInfo:edit')")
+    @Log(title = "园区对象", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public ResultUtil edit(@RequestBody ParkInfo parkInfo)
+    {
+        return resultByRows(parkInfoService.updateParkInfo(parkInfo));
+    }
+
+    /**
+     * 删除园区对象
+     */
+    @ApiOperation("删除园区对象")
+    @PreAuthorize("@ss.hasPermi('info:parkInfo:remove')")
+    @Log(title = "园区对象", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{parkIds}")
+    public ResultUtil remove(@PathVariable Integer[] parkIds)
+    {
+        return resultByRows(parkInfoService.deleteParkInfoByParkIds(parkIds));
+    }
+}

src/main/java/com/lqkj/info/entity/Developments.java

@@ -0,0 +1,108 @@
+package com.lqkj.info.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.lqkj.common.annotation.Excel;
+import com.lqkj.common.core.model.BaseEntity;
+import org.springframework.data.annotation.Transient;
+
+/**
+ * 发展定位：developments对象 developments
+ * 
+ * @author lqkj
+ * @date 2024-12-13
+ */
+public class Developments extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Integer id;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String content;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String developmentName;
+
+    /** 文件路径 */
+    @Excel(name = "文件路径")
+    private String url;
+
+    /** 文件名称 */
+    @Excel(name = "文件名称")
+    private String fileName;
+
+    @Transient
+    private String orderBy;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setDevelopmentName(String developmentName) 
+    {
+        this.developmentName = developmentName;
+    }
+
+    public String getDevelopmentName() 
+    {
+        return developmentName;
+    }
+    public void setUrl(String url) 
+    {
+        this.url = url;
+    }
+
+    public String getUrl() 
+    {
+        return url;
+    }
+    public void setFileName(String fileName) 
+    {
+        this.fileName = fileName;
+    }
+
+    public String getFileName() 
+    {
+        return fileName;
+    }
+
+
+    public String getOrderBy() {
+        return orderBy;
+    }
+
+    public void setOrderBy(String orderBy) {
+        this.orderBy = orderBy;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("content", getContent())
+            .append("developmentName", getDevelopmentName())
+            .append("url", getUrl())
+            .append("fileName", getFileName())
+            .append("createTime", getCreateTime())
+            .append("orderBy", getOrderBy())
+            .toString();
+    }
+}

src/main/java/com/lqkj/info/entity/EquipmentInfo.java

@@ -62,6 +62,9 @@ public class EquipmentInfo extends BaseEntity
     /** 品牌 */
     private Integer brand;
 
+    /** 园区id */
+    private Integer parkId;
+
     public void setEquipmentId(Integer equipmentId) 
     {
         this.equipmentId = equipmentId;
@@ -177,6 +180,14 @@ public class EquipmentInfo extends BaseEntity
         this.brand = brand;
     }
 
+    public Integer getParkId() {
+        return parkId;
+    }
+
+    public void setParkId(Integer parkId) {
+        this.parkId = parkId;
+    }
+
     @Override
     public String toString() {
         return "EquipmentInfo{" +
@@ -193,6 +204,7 @@ public class EquipmentInfo extends BaseEntity
                 ", deviceStatus=" + deviceStatus +
                 ", equipCode='" + equipCode + '\'' +
                 ", brand=" + brand +
+                ", parkId=" + parkId +
                 '}';
     }
 }

src/main/java/com/lqkj/info/entity/ForewarningInfo.java

@@ -39,6 +39,9 @@ public class ForewarningInfo extends BaseEntity
     @Excel(name = "是否解决")
     private Boolean isResolve;
 
+    /** 园区id */
+    private Integer parkId;
+
     /** 解决时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
     @Excel(name = "解决时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -108,6 +111,14 @@ public class ForewarningInfo extends BaseEntity
         return resolveTime;
     }
 
+    public Integer getParkId() {
+        return parkId;
+    }
+
+    public void setParkId(Integer parkId) {
+        this.parkId = parkId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -119,6 +130,7 @@ public class ForewarningInfo extends BaseEntity
             .append("createTime", getCreateTime())
             .append("isResolve", getIsResolve())
             .append("resolveTime", getResolveTime())
+            .append("parkId", getParkId())
             .toString();
     }
 }

src/main/java/com/lqkj/info/entity/OrganizationInfo.java

@@ -88,6 +88,9 @@ public class OrganizationInfo extends BaseEntity
     /** 楼层 */
     private Integer floor;
 
+    /** 园区id */
+    private Integer parkId;
+
     public String getAudio() {
         return audio;
     }
@@ -274,6 +277,14 @@ public class OrganizationInfo extends BaseEntity
         this.houseTypeId = houseTypeId;
     }
 
+    public Integer getParkId() {
+        return parkId;
+    }
+
+    public void setParkId(Integer parkId) {
+        this.parkId = parkId;
+    }
+
     @Override
     public String toString() {
         return "OrganizationInfo{" +
@@ -298,6 +309,7 @@ public class OrganizationInfo extends BaseEntity
                 ", employeNum=" + employeNum +
                 ", audio='" + audio + '\'' +
                 ", floor=" + floor +
+                ", parkId=" + parkId +
                 '}';
     }
 }

src/main/java/com/lqkj/info/entity/ParkInfo.java

@@ -0,0 +1,80 @@
+package com.lqkj.info.entity;
+
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.lqkj.common.annotation.Excel;
+import com.lqkj.common.core.model.BaseEntity;
+
+/**
+ * 园区对象对象 park_info
+ * 
+ * @author lqkj
+ * @date 2024-12-16
+ */
+public class ParkInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 园区id */
+    private Integer parkId;
+
+    /** 园区名称 */
+    @Excel(name = "园区名称")
+    private String parkName;
+
+    /** 坐标 */
+    @Excel(name = "坐标")
+    private Object location;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String memo;
+
+    public void setParkId(Integer parkId) 
+    {
+        this.parkId = parkId;
+    }
+
+    public Integer getParkId() 
+    {
+        return parkId;
+    }
+    public void setParkName(String parkName) 
+    {
+        this.parkName = parkName;
+    }
+
+    public String getParkName() 
+    {
+        return parkName;
+    }
+    public void setLocation(Object location)
+    {
+        this.location = location;
+    }
+
+    public Object getLocation()
+    {
+        return location;
+    }
+    public void setMemo(String memo) 
+    {
+        this.memo = memo;
+    }
+
+    public String getMemo() 
+    {
+        return memo;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("parkId", getParkId())
+            .append("parkName", getParkName())
+            .append("location", getLocation())
+            .append("memo", getMemo())
+            .toString();
+    }
+}

src/main/java/com/lqkj/info/mapper/DevelopmentsMapper.java

@@ -0,0 +1,63 @@
+package com.lqkj.info.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import com.lqkj.info.entity.Developments;
+
+/**
+ * 发展定位：developmentsMapper接口
+ * 
+ * @author lqkj
+ * @date 2024-12-13
+ */
+@Mapper
+public interface DevelopmentsMapper 
+{
+    /**
+     * 查询发展定位：developments
+     * 
+     * @param id 发展定位：developments主键
+     * @return 发展定位：developments
+     */
+    public Developments selectDevelopmentsById(Integer id);
+
+    /**
+     * 查询发展定位：developments列表
+     * 
+     * @param developments 发展定位：developments
+     * @return 发展定位：developments集合
+     */
+    public List<Developments> selectDevelopmentsList(Developments developments);
+
+    /**
+     * 新增发展定位：developments
+     * 
+     * @param developments 发展定位：developments
+     * @return 结果
+     */
+    public int insertDevelopments(Developments developments);
+
+    /**
+     * 修改发展定位：developments
+     * 
+     * @param developments 发展定位：developments
+     * @return 结果
+     */
+    public int updateDevelopments(Developments developments);
+
+    /**
+     * 删除发展定位：developments
+     * 
+     * @param id 发展定位：developments主键
+     * @return 结果
+     */
+    public int deleteDevelopmentsById(Integer id);
+
+    /**
+     * 批量删除发展定位：developments
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDevelopmentsByIds(Integer[] ids);
+}

src/main/java/com/lqkj/info/mapper/ParkInfoMapper.java

@@ -0,0 +1,63 @@
+package com.lqkj.info.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import com.lqkj.info.entity.ParkInfo;
+
+/**
+ * 园区对象Mapper接口
+ * 
+ * @author lqkj
+ * @date 2024-12-16
+ */
+@Mapper
+public interface ParkInfoMapper 
+{
+    /**
+     * 查询园区对象
+     * 
+     * @param parkId 园区对象主键
+     * @return 园区对象
+     */
+    public ParkInfo selectParkInfoByParkId(Integer parkId);
+
+    /**
+     * 查询园区对象列表
+     * 
+     * @param parkInfo 园区对象
+     * @return 园区对象集合
+     */
+    public List<ParkInfo> selectParkInfoList(ParkInfo parkInfo);
+
+    /**
+     * 新增园区对象
+     * 
+     * @param parkInfo 园区对象
+     * @return 结果
+     */
+    public int insertParkInfo(ParkInfo parkInfo);
+
+    /**
+     * 修改园区对象
+     * 
+     * @param parkInfo 园区对象
+     * @return 结果
+     */
+    public int updateParkInfo(ParkInfo parkInfo);
+
+    /**
+     * 删除园区对象
+     * 
+     * @param parkId 园区对象主键
+     * @return 结果
+     */
+    public int deleteParkInfoByParkId(Integer parkId);
+
+    /**
+     * 批量删除园区对象
+     * 
+     * @param parkIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteParkInfoByParkIds(Integer[] parkIds);
+}

src/main/java/com/lqkj/info/service/DevelopmentsService.java

@@ -0,0 +1,93 @@
+package com.lqkj.info.service;
+
+import java.util.List;
+import java.time.LocalDateTime;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.lqkj.info.mapper.DevelopmentsMapper;
+import com.lqkj.info.entity.Developments;
+import com.lqkj.common.utils.uuid.IdUtils;
+/**
+ * 发展定位：developmentsService业务层处理
+ * 
+ * @author lqkj
+ * @date 2024-12-13
+ */
+@Service
+public class DevelopmentsService
+{
+    @Autowired
+    private DevelopmentsMapper developmentsMapper;
+
+    /**
+     * 查询发展定位：developments
+     * 
+     * @param id 发展定位：developments主键
+     * @return 发展定位：developments
+     */
+    
+    public Developments selectDevelopmentsById(Integer id)
+    {
+        return developmentsMapper.selectDevelopmentsById(id);
+    }
+
+    /**
+     * 查询发展定位：developments列表
+     * 
+     * @param developments 发展定位：developments
+     * @return 发展定位：developments
+     */
+    public List<Developments> selectDevelopmentsList(Developments developments)
+    {
+        return developmentsMapper.selectDevelopmentsList(developments);
+    }
+
+    /**
+     * 新增发展定位：developments
+     * 
+     * @param developments 发展定位：developments
+     * @return 结果
+     */
+    
+    public int insertDevelopments(Developments developments)
+    {
+        developments.setCreateTime(LocalDateTime.now());
+        return developmentsMapper.insertDevelopments(developments);
+    }
+
+    /**
+     * 修改发展定位：developments
+     * 
+     * @param developments 发展定位：developments
+     * @return 结果
+     */
+    
+    public int updateDevelopments(Developments developments)
+    {
+        return developmentsMapper.updateDevelopments(developments);
+    }
+
+    /**
+     * 批量删除发展定位：developments
+     * 
+     * @param ids 需要删除的发展定位：developments主键
+     * @return 结果
+     */
+    
+    public int deleteDevelopmentsByIds(Integer[] ids)
+    {
+        return developmentsMapper.deleteDevelopmentsByIds(ids);
+    }
+
+    /**
+     * 删除发展定位：developments信息
+     * 
+     * @param id 发展定位：developments主键
+     * @return 结果
+     */
+    
+    public int deleteDevelopmentsById(Integer id)
+    {
+        return developmentsMapper.deleteDevelopmentsById(id);
+    }
+}

src/main/java/com/lqkj/info/service/ParkInfoService.java

@@ -0,0 +1,91 @@
+package com.lqkj.info.service;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.lqkj.info.mapper.ParkInfoMapper;
+import com.lqkj.info.entity.ParkInfo;
+import com.lqkj.common.utils.uuid.IdUtils;
+/**
+ * 园区对象Service业务层处理
+ * 
+ * @author lqkj
+ * @date 2024-12-16
+ */
+@Service
+public class ParkInfoService
+{
+    @Autowired
+    private ParkInfoMapper parkInfoMapper;
+
+    /**
+     * 查询园区对象
+     * 
+     * @param parkId 园区对象主键
+     * @return 园区对象
+     */
+    
+    public ParkInfo selectParkInfoByParkId(Integer parkId)
+    {
+        return parkInfoMapper.selectParkInfoByParkId(parkId);
+    }
+
+    /**
+     * 查询园区对象列表
+     * 
+     * @param parkInfo 园区对象
+     * @return 园区对象
+     */
+    public List<ParkInfo> selectParkInfoList(ParkInfo parkInfo)
+    {
+        return parkInfoMapper.selectParkInfoList(parkInfo);
+    }
+
+    /**
+     * 新增园区对象
+     * 
+     * @param parkInfo 园区对象
+     * @return 结果
+     */
+    
+    public int insertParkInfo(ParkInfo parkInfo)
+    {
+        return parkInfoMapper.insertParkInfo(parkInfo);
+    }
+
+    /**
+     * 修改园区对象
+     * 
+     * @param parkInfo 园区对象
+     * @return 结果
+     */
+    
+    public int updateParkInfo(ParkInfo parkInfo)
+    {
+        return parkInfoMapper.updateParkInfo(parkInfo);
+    }
+
+    /**
+     * 批量删除园区对象
+     * 
+     * @param parkIds 需要删除的园区对象主键
+     * @return 结果
+     */
+    
+    public int deleteParkInfoByParkIds(Integer[] parkIds)
+    {
+        return parkInfoMapper.deleteParkInfoByParkIds(parkIds);
+    }
+
+    /**
+     * 删除园区对象信息
+     * 
+     * @param parkId 园区对象主键
+     * @return 结果
+     */
+    
+    public int deleteParkInfoByParkId(Integer parkId)
+    {
+        return parkInfoMapper.deleteParkInfoByParkId(parkId);
+    }
+}

src/main/java/com/lqkj/system/entity/SysDictData.java

@@ -55,6 +55,9 @@ public class SysDictData extends BaseEntity
     /** 菜单图标 */
     private String icon;
 
+    /** 园区id */
+    private Integer parkId;
+
     public Integer getDictCode()
     {
         return dictCode;
@@ -155,6 +158,14 @@ public class SysDictData extends BaseEntity
         this.icon = icon;
     }
 
+    public Integer getParkId() {
+        return parkId;
+    }
+
+    public void setParkId(Integer parkId) {
+        this.parkId = parkId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -173,6 +184,7 @@ public class SysDictData extends BaseEntity
                 .append("updateTime", getUpdateTime())
                 .append("remark", getRemark())
                 .append("icon", getIcon())
+                .append("parkId", getParkId())
                 .toString();
     }
 }

src/main/resources/db/migration/V1_8__20241216.sql

@@ -0,0 +1,72 @@
+ALTER TABLE developments
+    add COLUMN if not exists development_name VARCHAR(255);
+comment on column developments.development_name is '名称';
+
+ALTER TABLE developments
+    add COLUMN if not exists url VARCHAR(255);
+comment on column developments.url is '文件路径';
+
+ALTER TABLE developments
+    add COLUMN if not exists file_name VARCHAR(255);
+comment on column developments.file_name is '文件名称';
+
+ALTER TABLE developments
+    add COLUMN if not exists create_time TIMESTAMP;
+comment on column developments.create_time is '创建时间';
+
+INSERT INTO "public"."sys_menu" ("menu_id", "menu_name", "parent_id", "order_num", "path", "component", "query", "is_frame", "is_cache", "menu_type", "visible", "status", "perms", "icon", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (2286, '发展定位', 2200, 1, 'development', 'info/development/index', NULL, 'f', 't', 'C', 't', 't', 'info:development:list', 'operation', 'admin', '2024-12-13 08:08:34.901945', '', NULL, '发展定位菜单');
+INSERT INTO "public"."sys_menu" ("menu_id", "menu_name", "parent_id", "order_num", "path", "component", "query", "is_frame", "is_cache", "menu_type", "visible", "status", "perms", "icon", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (2287, '发展定位查询', 2286, 1, '#', '', NULL, 'f', 't', 'F', 't', 't', 'info:development:query', '#', 'admin', '2024-12-13 08:08:34.901945', '', NULL, '');
+INSERT INTO "public"."sys_menu" ("menu_id", "menu_name", "parent_id", "order_num", "path", "component", "query", "is_frame", "is_cache", "menu_type", "visible", "status", "perms", "icon", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (2288, '发展定位新增', 2286, 2, '#', '', NULL, 'f', 't', 'F', 't', 't', 'info:development:add', '#', 'admin', '2024-12-13 08:08:34.901945', '', NULL, '');
+INSERT INTO "public"."sys_menu" ("menu_id", "menu_name", "parent_id", "order_num", "path", "component", "query", "is_frame", "is_cache", "menu_type", "visible", "status", "perms", "icon", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (2289, '发展定位修改', 2286, 3, '#', '', NULL, 'f', 't', 'F', 't', 't', 'info:development:edit', '#', 'admin', '2024-12-13 08:08:34.901945', '', NULL, '');
+INSERT INTO "public"."sys_menu" ("menu_id", "menu_name", "parent_id", "order_num", "path", "component", "query", "is_frame", "is_cache", "menu_type", "visible", "status", "perms", "icon", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (2290, '发展定位删除', 2286, 4, '#', '', NULL, 'f', 't', 'F', 't', 't', 'info:development:remove', '#', 'admin', '2024-12-13 08:08:34.901945', '', NULL, '');
+INSERT INTO "public"."sys_menu" ("menu_id", "menu_name", "parent_id", "order_num", "path", "component", "query", "is_frame", "is_cache", "menu_type", "visible", "status", "perms", "icon", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (2291, '发展定位导出', 2286, 5, '#', '', NULL, 'f', 't', 'F', 't', 't', 'info:development:export', '#', 'admin', '2024-12-13 08:08:34.901945', '', NULL, '');
+
+
+-- 菜单 SQL
+with temp_menu as (
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('园区对象', '2200', '1', 'parkInfo', 'info/parkInfo/index', false, true, 'C', true, true, 'info:parkInfo:list', 'operation', 'admin', now(), '', null, '园区对象菜单') returning menu_id
+    )
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('园区对象查询', (select * from temp_menu), '1',  '#', '', false, true, 'F', true, true, 'info:parkInfo:query',        '#', 'admin', now(), '', null, ''),
+    ('园区对象新增', (select * from temp_menu), '2',  '#', '', false, true, 'F', true, true, 'info:parkInfo:add',          '#', 'admin', now(), '', null, ''),
+    ('园区对象修改', (select * from temp_menu), '3',  '#', '', false, true, 'F', true, true, 'info:parkInfo:edit',         '#', 'admin', now(), '', null, ''),
+    ('园区对象删除', (select * from temp_menu), '4',  '#', '', false, true, 'F', true, true, 'info:parkInfo:remove',       '#', 'admin', now(), '', null, ''),
+    ('园区对象导出', (select * from temp_menu), '5',  '#', '', false, true, 'F', true, true, 'info:parkInfo:export',       '#', 'admin', now(), '', null, '');
+
+SELECT setval('sys_menu_menu_id_seq', (SELECT MAX(menu_id) FROM sys_menu));
+
+CREATE TABLE IF not EXISTS "public"."park_info" (
+                                                    "park_id" SERIAL NOT NULL,
+                                                    "park_name" varchar(255) COLLATE "pg_catalog"."default",
+    "location" json,
+    "memo" varchar(255) COLLATE "pg_catalog"."default",
+    CONSTRAINT "park_info_pkey" PRIMARY KEY ("park_id")
+    )
+;
+
+COMMENT ON COLUMN "public"."park_info"."park_id" IS '园区id';
+
+COMMENT ON COLUMN "public"."park_info"."park_name" IS '园区名称';
+
+COMMENT ON COLUMN "public"."park_info"."location" IS '坐标';
+
+COMMENT ON COLUMN "public"."park_info"."memo" IS '备注';
+
+ALTER TABLE organization_info
+    add COLUMN if not exists park_id int;
+comment on column organization_info.park_id is '园区id';
+
+
+ALTER TABLE forewarning_info
+    add COLUMN if not exists park_id int;
+comment on column forewarning_info.park_id is '园区id';
+
+ALTER TABLE equipment_info
+    add COLUMN if not exists park_id int;
+comment on column equipment_info.park_id is '园区id';
+
+ALTER TABLE sys_dict_data
+    add COLUMN if not exists park_id int;
+comment on column sys_dict_data.park_id is '园区id';

src/main/resources/mapper/info/DevelopmentsMapper.xml

@@ -0,0 +1,81 @@
+<?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.lqkj.info.mapper.DevelopmentsMapper">
+
+	<resultMap type="Developments" id="DevelopmentsResult">
+		<result property="id"    column="id"    />
+		<result property="content"    column="content"    />
+		<result property="developmentName"    column="development_name"    />
+		<result property="url"    column="url"    />
+		<result property="fileName"    column="file_name"    />
+		<result property="createTime"    column="create_time"    />
+	</resultMap>
+
+	<sql id="selectDevelopmentsVo">
+		select id, content, development_name, url, file_name, create_time from developments
+	</sql>
+
+	<select id="selectDevelopmentsList" parameterType="Developments" resultMap="DevelopmentsResult">
+		<include refid="selectDevelopmentsVo"/>
+		<where>
+			<if test="developmentName != null  and developmentName != ''"> and development_name like concat('%', #{developmentName}, '%')</if>
+			<if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
+		</where>
+		<choose>
+			<when test="orderBy != null and orderBy != ''">
+				order by create_time desc
+			</when>
+			<otherwise>
+				order by create_time
+			</otherwise>
+		</choose>
+
+	</select>
+
+	<select id="selectDevelopmentsById" parameterType="Integer" resultMap="DevelopmentsResult">
+		<include refid="selectDevelopmentsVo"/>
+		where id = #{id}
+	</select>
+
+	<insert id="insertDevelopments" parameterType="Developments" useGeneratedKeys="true" keyProperty="id">
+		insert into developments
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="content != null and content != ''">content,</if>
+			<if test="developmentName != null and developmentName != ''">development_name,</if>
+			<if test="url != null and url != ''">url,</if>
+			<if test="fileName != null and fileName != ''">file_name,</if>
+			<if test="createTime != null">create_time,</if>
+		</trim>
+		<trim prefix="values (" suffix=")" suffixOverrides=",">
+			<if test="content != null and content != ''">#{content},</if>
+			<if test="developmentName != null and developmentName != ''">#{developmentName},</if>
+			<if test="url != null and url != ''">#{url},</if>
+			<if test="fileName != null and fileName != ''">#{fileName},</if>
+			now(),
+		</trim>
+	</insert>
+
+	<update id="updateDevelopments" parameterType="Developments">
+		update developments
+		<trim prefix="SET" suffixOverrides=",">
+			content = #{content},
+			development_name = #{developmentName},
+			url = #{url},
+			file_name = #{fileName},
+		</trim>
+		where id = #{id}
+	</update>
+
+	<delete id="deleteDevelopmentsById" parameterType="Integer">
+		delete from developments where id = #{id}
+	</delete>
+
+	<delete id="deleteDevelopmentsByIds" parameterType="String">
+		delete from developments where id in
+		<foreach item="id" collection="array" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</delete>
+</mapper>

src/main/resources/mapper/info/EquipmentInfoMapper.xml

@@ -18,10 +18,11 @@
 		<result property="equipCode"    column="equip_code"    />
 		<result property="deviceStatus"    column="device_status"    />
 		<result property="brand" column="brand"/>
+		<result property="parkId"	column="park_id"/>
 	</resultMap>
 
 	<sql id="selectEquipmentInfoVo">
-		select equipment_id, type_id, room_id, building_id, area_id, equipment_name, lng_lat, raster_lng_lat, type_name, status, equip_code, device_status, brand from equipment_info
+		select equipment_id, type_id, room_id, building_id, area_id, equipment_name, lng_lat, raster_lng_lat, type_name, status, equip_code, device_status, brand, park_id from equipment_info
 	</sql>
 
 	<select id="selectEquipmentInfoList" parameterType="EquipmentInfo" resultMap="EquipmentInfoResult">
@@ -33,6 +34,7 @@
 			<if test="areaId != null"> and area_id = #{areaId}</if>
 			<if test="roomId != null"> and room_id = #{roomId}</if>
 			<if test="status != null"> and status = #{status}</if>
+			<if test="parkId != null"> and park_id = #{parkId}</if>
 		</where>
 		order by equipment_id
 
@@ -58,6 +60,7 @@
 		    <if test="equipCode != null and equipCode != ''">equip_code,</if>
 		    <if test="deviceStatus != null">device_status,</if>
 		    <if test="brand != null">brand,</if>
+		    <if test="parkId != null">park_id,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="typeId != null">#{typeId},</if>
@@ -72,6 +75,7 @@
 		    <if test="equipCode != null and equipCode != ''">#{equipCode},</if>
 		    <if test="deviceStatus != null">#{deviceStatus},</if>
 		    <if test="brand != null">#{brand},</if>
+		    <if test="parkId != null">#{parkId},</if>
 		</trim>
 	</insert>
 
@@ -90,6 +94,7 @@
 		    equip_code = #{equipCode},
 		    device_status = #{deviceStatus},
 		    brand = #{brand},
+		    park_id = #{parkId}
 		</trim>
 		where equipment_id = #{equipmentId}
 	</update>

src/main/resources/mapper/info/ForewarningInfoMapper.xml

@@ -13,10 +13,11 @@
 		<result property="createTime"    column="create_time"    />
 		<result property="isResolve"    column="is_resolve"    />
 		<result property="resolveTime"    column="resolve_time"    />
+		<result property="parkId"	column="park_id"/>
 	</resultMap>
 
 	<sql id="selectForewarningInfoVo">
-		select forewarning_id, forewarning_name, content, equipment_id, equipment_name, create_time, is_resolve, resolve_time from forewarning_info
+		select forewarning_id, forewarning_name, content, equipment_id, equipment_name, create_time, is_resolve, resolve_time, park_id from forewarning_info
 	</sql>
 
 	<select id="selectForewarningInfoList" parameterType="ForewarningInfo" resultMap="ForewarningInfoResult">
@@ -26,6 +27,7 @@
 			<if test="equipmentId != null "> and equipment_id = #{equipmentId}</if>
 			<if test="isResolve != null "> and is_resolve like concat('%', #{isResolve}, '%')</if>
 			<if test="resolveTime != null "> and resolve_time like concat('%', #{resolveTime}, '%')</if>
+			 <if test="parkId != null"> and park_id = #{parkId}</if>
 		</where>
 		order by forewarning_id
 
@@ -46,6 +48,7 @@
 			<if test="createTime != null">create_time,</if>
 			<if test="isResolve != null">is_resolve,</if>
 			<if test="resolveTime != null">resolve_time,</if>
+		    <if test="parkId != null">park_id,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="forewarningName != null and forewarningName != ''">#{forewarningName},</if>
@@ -55,6 +58,7 @@
 			now(),
 			<if test="isResolve != null">#{isResolve},</if>
 			<if test="resolveTime != null">#{resolveTime},</if>
+		    <if test="parkId != null">#{parkId},</if>
 		</trim>
 	</insert>
 
@@ -67,6 +71,7 @@
 			equipment_name = #{equipmentName},
 			is_resolve = #{isResolve},
 			resolve_time = #{resolveTime},
+		    park_id = #{parkId},
 		</trim>
 		where forewarning_id = #{forewarningId}
 	</update>

src/main/resources/mapper/info/OrganizationInfoMapper.xml

@@ -26,10 +26,11 @@
 		<result property="industryType" column="industry_type"/>
 		<result property="floor" column="floor"/>
 		<result property="houseTypeId" column="house_type_id"/>
+		<result property="parkId"	column="park_id"/>
 	</resultMap>
 
 	<sql id="selectOrganizationInfoVo">
-		select organization_id, type_id, room_id, building_id, area_id, organization_name, intro, lng_lat, raster_lng_lat, important, type_name, address, logo, telephone, product, enter_time, employe_num, audio, industry_type, floor, house_type_id from organization_info
+		select organization_id, type_id, room_id, building_id, area_id, organization_name, intro, lng_lat, raster_lng_lat, important, type_name, address, logo, telephone, product, enter_time, employe_num, audio, industry_type, floor, house_type_id, park_id from organization_info
 	</sql>
 
 	<select id="selectOrganizationInfoList" parameterType="OrganizationInfo" resultMap="OrganizationInfoResult">
@@ -44,6 +45,7 @@
 			<if test="industryType != null "> and industry_type = #{industryType}</if>
 			<if test="floor != null "> and floor = #{floor}</if>
 			<if test="houseTypeId != null "> and house_type_id = #{houseTypeId}</if>
+			<if test="parkId != null"> and park_id = #{parkId}</if>
 		</where>
 		order by organization_id
 
@@ -77,6 +79,7 @@
 		    <if test="industryType != null">industry_type,</if>
 		    <if test="floor != null">floor,</if>
 		    <if test="houseTypeId != null">house_type_id,</if>
+		    <if test="parkId != null">park_id,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="typeId != null">#{typeId},</if>
@@ -99,6 +102,7 @@
 		    <if test="industryType != null">#{industryType},</if>
 		    <if test="floor != null">#{floor},</if>
 		    <if test="houseTypeId != null">#{houseTypeId},</if>
+		    <if test="parkId != null">#{parkId},</if>
 		</trim>
 	</insert>
 
@@ -125,6 +129,7 @@
 		    industry_type = #{industryType},
 		    floor = #{floor},
 		    house_type_id = #{houseTypeId}
+		    park_id = #{parkId}
 		</trim>
 		where organization_id = #{organizationId}
 	</update>

src/main/resources/mapper/info/ParkInfoMapper.xml

@@ -0,0 +1,66 @@
+<?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.lqkj.info.mapper.ParkInfoMapper">
+
+	<resultMap type="ParkInfo" id="ParkInfoResult">
+		<result property="parkId"    column="park_id"    />
+		<result property="parkName"    column="park_name"    />
+		<result property="location"    column="location"    />
+		<result property="memo"    column="memo"    />
+	</resultMap>
+
+	<sql id="selectParkInfoVo">
+		select park_id, park_name, location, memo from park_info
+	</sql>
+
+	<select id="selectParkInfoList" parameterType="ParkInfo" resultMap="ParkInfoResult">
+		<include refid="selectParkInfoVo"/>
+		<where>
+			<if test="parkName != null  and parkName != ''"> and park_name like concat('%', #{parkName}, '%')</if>
+		</where>
+		order by park_id
+
+	</select>
+
+	<select id="selectParkInfoByParkId" parameterType="Integer" resultMap="ParkInfoResult">
+		<include refid="selectParkInfoVo"/>
+		where park_id = #{parkId}
+	</select>
+
+	<insert id="insertParkInfo" parameterType="ParkInfo" useGeneratedKeys="true" keyProperty="parkId">
+		insert into park_info
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="parkName != null and parkName != ''">park_name,</if>
+			<if test="location != null and location != ''">location,</if>
+			<if test="memo != null and memo != ''">memo,</if>
+		</trim>
+		<trim prefix="values (" suffix=")" suffixOverrides=",">
+			<if test="parkName != null and parkName != ''">#{parkName},</if>
+			<if test="location != null and location != ''">#{location, jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler},</if>
+			<if test="memo != null and memo != ''">#{memo},</if>
+		</trim>
+	</insert>
+
+	<update id="updateParkInfo" parameterType="ParkInfo">
+		update park_info
+		<trim prefix="SET" suffixOverrides=",">
+			park_name = #{parkName},
+			location = #{location, jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler},
+			memo = #{memo},
+		</trim>
+		where park_id = #{parkId}
+	</update>
+
+	<delete id="deleteParkInfoByParkId" parameterType="Integer">
+		delete from park_info where park_id = #{parkId}
+	</delete>
+
+	<delete id="deleteParkInfoByParkIds" parameterType="String">
+		delete from park_info where park_id in
+		<foreach item="parkId" collection="array" open="(" separator="," close=")">
+			#{parkId}
+		</foreach>
+	</delete>
+</mapper>

src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -19,10 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
 		<result property="icon"		  column="icon"        />
+		<result property="parkId"	column="park_id"/>
 	</resultMap>
 	
 	<sql id="selectDictDataVo">
-        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark, icon
+        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark, icon, park_id
 		from sys_dict_data
     </sql>
 
@@ -38,6 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null">
 				AND status = #{status}
 			</if>
+			<if test="parkId != null">
+				AND park_id = #{parkId}
+			</if>
 		</where>
 		order by dict_sort asc
 	</select>
@@ -86,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  		    <if test="icon != null and icon != ''">icon = #{icon},</if>
+ 		    <if test="parkId != null">park_id = #{parkId},</if>
  			update_time = now()
  		</set>
  		where dict_code = #{dictCode}
@@ -108,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null and remark != ''">remark,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  		    <if test="icon != null and icon != ''">icon,</if>
+ 		    <if test="parkId != null">park_id,</if>
  			create_time
  		)values(
  		    <if test="dictSort != null">#{dictSort},</if>
@@ -121,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  		    <if test="icon != null and icon != ''">#{icon},</if>
+ 		    <if test="parkId != null">#{parkId},</if>
 		now()
  		)
 	</insert>