From 061445db0ff6829c6a07d3c706cf8bf73eeccf32 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Wed, 19 Mar 2025 09:34:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=AF=BC=E5=87=BAexcel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicInformationController.java | 174 +++++++++++++++++- .../ruoyi/gysl/entity/BasicInformation.java | 16 +- .../entity/response/ProjectBuildingExcel.java | 36 ++++ .../entity/response/ProjectExcelInfo.java | 54 ++++++ .../gysl/mapper/BasicInformationMapper.java | 10 + .../gysl/service/BasicInformationService.java | 28 +++ .../impl/BasicInformationServiceImpl.java | 138 +++++++++++++- .../mapper/BasicInformationMapper.xml | 59 ++++++ ruoyi-common/pom.xml | 6 +- .../com/ruoyi/common/annotation/Excel.java | 5 + .../common/utils/poi/ChangeExcelUtil.java | 124 +++++++++++++ 11 files changed, 640 insertions(+), 10 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectBuildingExcel.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectExcelInfo.java create mode 100644 ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ChangeExcelUtil.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java index 02c6084..47c2370 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java @@ -3,17 +3,27 @@ package com.ruoyi.gysl.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ChangeExcelUtil; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.response.ProjectBuildingExcel; +import com.ruoyi.gysl.entity.response.ProjectExcelInfo; import com.ruoyi.gysl.service.BasicInformationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.poi.xssf.usermodel.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.io.Serializable; -import java.util.List; +import java.lang.reflect.Field; +import java.net.URLEncoder; +import java.util.*; /** * 基本信息(BasicInformation)表控制层 @@ -92,5 +102,167 @@ public class BasicInformationController extends BaseController { public AjaxResult delete(@RequestParam("idList") List idList) { return success(this.basicInformationService.removeByIds(idList)); } + + /** + * 动态导出基本信息 + */ + @ApiOperation("动态导出基本信息") + @PostMapping("/exportInfo") + public void exportInfo(HttpServletResponse response, @RequestParam List idList) throws NoSuchFieldException, IOException, IllegalAccessException { + //获取对应的基本信息的列表 + List info = basicInformationService.selectList(idList); + System.out.println(info); + //excel 第一层单元格 + List yc = new ArrayList<>(); + //excel 第二层单元格 + List ec = new ArrayList<>(); + //excel 第三层单元格 + List sc = new ArrayList<>(); + //项目建筑信息数据所有字段数量 + int sczdData = 0; + //一共有几组厂房,不包括重复 + int cfsl = 0; + //动态存储每个分组对应的字段数量 + Map zdsl = new LinkedHashMap<>(); + Class clazz = ProjectExcelInfo.class; + Class classBuilding = ProjectBuildingExcel.class; + // 遍历除了建筑获取其他字段注解 + for (int i = 0; i < info.size(); i++) { + if (i == 0) { + for (Field field : clazz.getDeclaredFields()) { + Excel excelColumn = field.getAnnotation(Excel.class); + if (excelColumn != null) { + if (yc.contains(excelColumn.group())) { + yc.add(""); + } else { + yc.add(excelColumn.group()); + } + if ("id".equals(excelColumn.name())) { + sc.add(""); + } else { + sc.add(excelColumn.name()); + } + if (!Objects.equals(excelColumn.group(), "序号")) { + zdsl.merge(excelColumn.group(), 1, Integer::sum); + } + ec.add(""); + } + } + } + for (ProjectBuildingExcel xmjzxx : info.get(i).getXmjzxx()) { + switch (xmjzxx.getFloor()) { + case 1: + if(!ec.contains("一层厂房")){ + ec.add("一层厂房"); + cfsl+=1; + } + break; + case 2: + if(!ec.contains("双层厂房")){ + ec.add("双层厂房"); + cfsl+=1; + } + break; + case 3: + if(!ec.contains("三层厂房")){ + ec.add("三层厂房"); + cfsl+=1; + } + break; + case 4: + if(!ec.contains("四层厂房")){ + ec.add("四层厂房"); + cfsl+=1; + } + break; + case 5: + if(!ec.contains("五层厂房")){ + ec.add("五层厂房"); + cfsl+=1; + } + break; + default: + if(!ec.contains("六层及以上厂房")){ + ec.add("六层及以上厂房"); + cfsl+=1; + } + } + for (Field field : classBuilding.getDeclaredFields()) { + Excel excelColumn = field.getAnnotation(Excel.class); + if (excelColumn != null) { + if (!yc.contains("项目建筑信息")) { + yc.add("项目建筑信息"); + } else { + yc.add(""); + } + ec.add(""); + sc.add(excelColumn.name()); + sczdData+=1; + } + } + ec.remove(ec.size()-1); + } + } + //=======================sheet处理 + // 第一步，创建一个Workbook，对应一个Excel文件 + XSSFWorkbook wb = new XSSFWorkbook(); + // 第二步，在Workbook中添加一个sheet,对应Excel文件中的sheet + XSSFSheet sheet = wb.createSheet("sheet"); + // 第三步，设置样式以及字体样式 + XSSFCellStyle titleStyle = ChangeExcelUtil.createTitleCellStyle(wb); + XSSFCellStyle headerStyle = ChangeExcelUtil.createHeadCellStyle(wb); + XSSFCellStyle contentStyle = ChangeExcelUtil.createContentCellStyle(wb); + // 行号 + int rowNum = 0; + // 创建第一页的第一行，索引从0开始 + XSSFRow row0 = sheet.createRow(rowNum++); + row0.setHeight((short) 600);// 设置行高 + sheet.setColumnWidth(1, 6000); + sheet.setColumnWidth(2, 6000); + //第二行 + XSSFRow row1 = sheet.createRow(rowNum++); + row1.setHeight((short) 500); + //第三行 + XSSFRow row2 = sheet.createRow(rowNum++); + row2.setHeight((short) 1000); + //合并单元格:excel,除了项目建筑信息的其余字段数量,项目建筑信息数据所有字段数量,一共有几组厂房,不包括重复 + ChangeExcelUtil.extracted(sheet, zdsl,sczdData,cfsl); + + // 创建第一行单元格 + for (int i = 0; i < yc.size(); i++) { + XSSFCell c00 = row0.createCell(i); + c00.setCellValue(yc.get(i)); + c00.setCellStyle(headerStyle); + } + // 创建第二行单元格 + for (int i = 0; i < ec.size(); i++) { + XSSFCell tempCell = row1.createCell(i); + tempCell.setCellValue(ec.get(i)); + tempCell.setCellStyle(headerStyle); + } + // 创建第三行单元格 + for (int i = 0; i < sc.size(); i++) { + XSSFCell tempCell = row2.createCell(i); + tempCell.setCellValue(sc.get(i)); + tempCell.setCellStyle(headerStyle); + } + //填充数据 + basicInformationService.approvalMethodfillInData(sheet, contentStyle, rowNum, info,sc,ec,sczdData/cfsl); + + // 1. 设置响应头（必须） + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("UTF-8"); + // 设置文件名（解决中文乱码） + String fileName = URLEncoder.encode("项目信息.xlsx", "UTF-8"); + response.setHeader("Content-Disposition", "attachment; filename=" + fileName); + try (ServletOutputStream out = response.getOutputStream()) { + // 3. 将 Workbook 写入响应流 + wb.write(out); + out.flush(); + } finally { + wb.close(); + } + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java index 6773952..b403892 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java @@ -116,16 +116,20 @@ public class BasicInformation extends Model { //施工许可证发放时间 @ApiModelProperty("施工许可证发放时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date issuingTime; +// @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String issuingTime; //竣工验收时间 @ApiModelProperty("竣工验收时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime acceptanceTime; +// @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String acceptanceTime; + + //建设进度 + @ApiModelProperty("建设进度") + private String jsjd; //项目法人单位简介 @NotBlank diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectBuildingExcel.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectBuildingExcel.java new file mode 100644 index 0000000..e1551d4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectBuildingExcel.java @@ -0,0 +1,36 @@ +package com.ruoyi.gysl.entity.response; + +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 项目基本信息对应的项目建筑信息 + * @author du + * @since 2025/3/17 9:38 + */ +@Data +public class ProjectBuildingExcel { + + @Excel(name = "层数",group = "项目建筑信息") + @ApiModelProperty(value = "层数") + private Integer floor; + + @Excel(name = "总建筑高度",group = "项目建筑信息") + @ApiModelProperty(value = "总建筑高度") + private BigDecimal totalBuildingHeight; + + @Excel(name = "首层高度",group = "项目建筑信息") + @ApiModelProperty(value = "首层高度") + private BigDecimal scgd; + + @Excel(name = "2至4层高",group = "项目建筑信息") + @ApiModelProperty(value = "2至4层高") + private BigDecimal twoAndFourCg; + + @Excel(name = "4层以上层高",group = "项目建筑信息") + @ApiModelProperty(value = "4层以上层高") + private BigDecimal fourYscg; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectExcelInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectExcelInfo.java new file mode 100644 index 0000000..df4e1fa --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectExcelInfo.java @@ -0,0 +1,54 @@ +package com.ruoyi.gysl.entity.response; + +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 项目导出信息 + * @author du + * @since 2025/3/14 14:01 + */ +@Data +public class ProjectExcelInfo { + + //--基本信息 + @Excel(name="id",group = "序号") + @ApiModelProperty("序号") + private String id; + + @Excel(name = "项目名称",group = "项目基础信息") + @ApiModelProperty("项目名称") + private String name; + + @Excel(name = "项目法人单位",group = "项目基础信息") + @ApiModelProperty("项目法人单位") + private String xmfrdwxz; + + @Excel(name = "项目法人单位性质",group = "项目基础信息") + @ApiModelProperty("项目法人单位性质") + private Integer nature; + + //--规划信息 + @Excel(name = "总用地面积",group = "项目规划信息") + @ApiModelProperty(value = "总用地面积") + private BigDecimal zydmj; + + @Excel(name = "容积率",group = "项目规划信息") + @ApiModelProperty(value = "容积率") + private BigDecimal rjl; + + @Excel(name = "总建筑面积",group = "项目规划信息") + @ApiModelProperty(value = "总建筑面积") + private BigDecimal zjzmj; + + @Excel(name = "标准层建筑面积",group = "项目规划信息") + @ApiModelProperty(value = "标准层建筑面积") + private BigDecimal bzcjzmj; + + //--建筑信息 + private List xmjzxx; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java index 07b1f7f..14f4bf0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java @@ -2,6 +2,12 @@ package com.ruoyi.gysl.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.BuildingInformation; +import com.ruoyi.gysl.entity.response.ProjectBuildingExcel; +import com.ruoyi.gysl.entity.response.ProjectExcelInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 基本信息(BasicInformation)表数据库访问层 @@ -11,5 +17,9 @@ import com.ruoyi.gysl.entity.BasicInformation; */ public interface BasicInformationMapper extends BaseMapper { + /** + * 根据基本信息的id列表来查找 + */ + List selectList(@Param("idList") List idList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java index ea32ce3..40610eb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java @@ -2,6 +2,13 @@ package com.ruoyi.gysl.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.response.ProjectBuildingExcel; +import com.ruoyi.gysl.entity.response.ProjectExcelInfo; +import org.apache.poi.xssf.usermodel.XSSFCellStyle; +import org.apache.poi.xssf.usermodel.XSSFSheet; + +import java.util.List; +import java.util.Map; /** * 基本信息(BasicInformation)表服务接口 @@ -11,5 +18,26 @@ import com.ruoyi.gysl.entity.BasicInformation; */ public interface BasicInformationService extends IService { + /** + * 根据基本信息的id列表来查找 + */ + List selectList(List idList); + + + + /** + * 填充数据 + */ + void approvalMethodfillInData(XSSFSheet sheet, XSSFCellStyle contentStyle, int rowNum, List info,List sc,List ec,int a) ; + + /** + * 项目基础信息获取 + */ + String getExcelData(ProjectExcelInfo item,String str); + + /** + * 项目建筑信息获取 + */ + String getBuildingData(ProjectBuildingExcel item,String str); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java index 56f02a3..a89765f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java @@ -1,11 +1,22 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.gysl.mapper.BasicInformationMapper; +import com.ruoyi.common.annotation.Excel; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.response.ProjectBuildingExcel; +import com.ruoyi.gysl.entity.response.ProjectExcelInfo; +import com.ruoyi.gysl.mapper.BasicInformationMapper; import com.ruoyi.gysl.service.BasicInformationService; +import org.apache.poi.xssf.usermodel.XSSFCell; +import org.apache.poi.xssf.usermodel.XSSFCellStyle; +import org.apache.poi.xssf.usermodel.XSSFRow; +import org.apache.poi.xssf.usermodel.XSSFSheet; import org.springframework.stereotype.Service; +import java.lang.reflect.Field; +import java.util.List; +import java.util.Objects; + /** * 基本信息(BasicInformation)表服务实现类 * @@ -15,5 +26,128 @@ import org.springframework.stereotype.Service; @Service("basicInformationService") public class BasicInformationServiceImpl extends ServiceImpl implements BasicInformationService { -} + /** + * 根据基本信息的id列表来查找 + */ + @Override + public List selectList(List idList) { + return baseMapper.selectList(idList); + } + + /** + * 填充数据 + */ + @Override + public void approvalMethodfillInData(XSSFSheet sheet, XSSFCellStyle contentStyle, int rowNum, List info, List sc, List ec, int num) { + Class classBuilding = ProjectBuildingExcel.class; + for (ProjectExcelInfo projectExcelInfo : info) { + XSSFRow tempRow = sheet.createRow(rowNum++); + tempRow.setHeight((short) 1400); + int i1; + for (i1 = 0; i1 < sc.size(); i1++) { + XSSFCell tempCell = tempRow.createCell(i1); + tempCell.setCellStyle(contentStyle); + if (!ec.get(i1).endsWith("厂房")) { + if (Objects.equals(sc.get(i1), "")) { + tempCell.setCellValue(projectExcelInfo.getId()); + } else { + tempCell.setCellValue(getExcelData(projectExcelInfo, sc.get(i1))); + } + } + } +// XSSFCell tempCell = tempRow.createCell(8); +// tempCell.setCellStyle(contentStyle); +// tempCell.setCellValue("12312321"); + + for (int i2 = 0; i2 < projectExcelInfo.getXmjzxx().size(); i2++) { + switch (projectExcelInfo.getXmjzxx().get(i2).getFloor()) { + case 1: + i1 = ec.indexOf("一层厂房"); + break; + case 2: + i1 = ec.indexOf("双层厂房"); + break; + case 3: + i1 = ec.indexOf("三层厂房"); + break; + case 4: + i1 = ec.indexOf("四层厂房"); + break; + case 5: + i1 = ec.indexOf("五层厂房"); + break; + default: + i1 = ec.indexOf("六层及以上厂房"); + } + for (Field field : classBuilding.getDeclaredFields()) { + XSSFCell tempCell = tempRow.createCell(i1); + tempCell.setCellStyle(contentStyle); + Excel excelColumn = field.getAnnotation(Excel.class); + if (excelColumn != null) { + tempCell.setCellValue(getBuildingData(projectExcelInfo.getXmjzxx().get(i2), sc.get(i1))); + i1++; + } + } + } + } + } + + @Override + public String getExcelData(ProjectExcelInfo item, String str) { + String a = null; + switch (str) { + case "": + a = item.getId() == null ? "-" : item.getId(); + break; + case "项目名称": + a = item.getName() == null ? "-" : item.getName(); + break; + case "项目法人单位": + a = item.getXmfrdwxz() == null ? "-" : item.getXmfrdwxz(); + break; + case "项目法人单位性质": + a = String.valueOf(item.getNature() == null ? "-" : item.getNature()); + break; + case "总用地面积": + a = String.valueOf(item.getZydmj() == null ? "-" : item.getZydmj()); + break; + case "容积率": + a = String.valueOf(item.getRjl() == null ? "-" : item.getRjl()); + break; + case "总建筑面积": + a = String.valueOf(item.getZjzmj() == null ? "-" : item.getZjzmj()); + break; + case "标准层建筑面积": + a = String.valueOf(item.getBzcjzmj() == null ? "-" : item.getBzcjzmj()); + break; + } + return a; + } + + /** + * 项目建筑信息获取 + */ + @Override + public String getBuildingData(ProjectBuildingExcel item, String str) { + String a = null; + switch (str) { + case "层数": + a = item.getFloor() == null ? "-" : String.valueOf(item.getFloor()); + break; + case "总建筑高度": + a = item.getTotalBuildingHeight() == null ? "-" : String.valueOf(item.getTotalBuildingHeight()); + break; + case "首层高度": + a = String.valueOf(item.getScgd() == null ? "-" : item.getScgd()); + break; + case "2至4层高": + a = String.valueOf(item.getTwoAndFourCg() == null ? "-" : item.getTwoAndFourCg()); + break; + case "4层以上层高": + a = String.valueOf(item.getFourYscg() == null ? "-" : item.getFourYscg()); + break; + } + return a; + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml new file mode 100644 index 0000000..7c35ab9 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index f141c57..700c025 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -17,7 +17,11 @@ - + + org.apache.poi + poi-ooxml + 5.2.3 + com.baomidou mybatis-plus-boot-starter diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java index 765d8e3..f13271c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java @@ -28,6 +28,11 @@ public @interface Excel */ public String name() default ""; + /** + * 导出到Excel中的分组. + */ + public String group() default ""; + /** * 日期格式, 如: yyyy-MM-dd */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ChangeExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ChangeExcelUtil.java new file mode 100644 index 0000000..99aabd6 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ChangeExcelUtil.java @@ -0,0 +1,124 @@ +package com.ruoyi.common.utils.poi; + +import com.ruoyi.common.annotation.Excel; +import org.apache.poi.ss.usermodel.BorderStyle; +import org.apache.poi.ss.usermodel.FillPatternType; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.XSSFCellStyle; +import org.apache.poi.xssf.usermodel.XSSFFont; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; + +import java.lang.reflect.Field; +import java.util.Map; + +/** + * Excel相关处理 + * + * @author dhy + */ +public class ChangeExcelUtil { + + + + + + public static void extracted(XSSFSheet sheet, Map s, int i,int jzxx) { + // todo: 合并参数分别为： 起始行，结束行，起始列，结束列 + sheet.addMergedRegion(new CellRangeAddress(0, 2, 0, 0)); + int startCol = 1; // 合并起始列 + int endCol = 0; + for (String key : s.keySet()) { + endCol = startCol + s.get(key) - 1; + sheet.addMergedRegion(new CellRangeAddress(0, 1, startCol, endCol)); + // 更新下一个开始列（当前结束列 + 1） + startCol = endCol + 1; + } + endCol+=1; + sheet.addMergedRegion(new CellRangeAddress(0, 0, endCol, endCol+i-1)); + int ehEndCol = 0; + for (int x = 0; x < jzxx; x++) { + ehEndCol = endCol + (i/jzxx) - 1; + sheet.addMergedRegion(new CellRangeAddress(1, 1, endCol, ehEndCol)); + endCol = ehEndCol+1; + } + } + + + /** + * 创建标题样式 + * + * @param wb + * @return + */ + public static XSSFCellStyle createTitleCellStyle(XSSFWorkbook wb) { + XSSFCellStyle cellStyle = wb.createCellStyle(); + cellStyle.setAlignment(HorizontalAlignment.CENTER);//水平居中 + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//垂直对齐 + cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); +// cellStyle.setFillForegroundColor(IndexedColors.GREY_40_PERCENT.getIndex());//背景颜色 + + XSSFFont headerFont1 = (XSSFFont) wb.createFont(); // 创建字体样式 + headerFont1.setBold(true); //字体加粗 + headerFont1.setFontName("黑体"); // 设置字体类型 + headerFont1.setFontHeightInPoints((short) 15); // 设置字体大小 + cellStyle.setFont(headerFont1); // 为标题样式设置字体样式 + return cellStyle; + } + + /** + * 创建表头样式 + * + * @param wb + * @return + */ + public static XSSFCellStyle createHeadCellStyle(XSSFWorkbook wb) { + XSSFCellStyle cellStyle = wb.createCellStyle(); + cellStyle.setWrapText(true);// 设置自动换行 +// cellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());//背景颜色 + cellStyle.setAlignment(HorizontalAlignment.CENTER); //水平居中 + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); //垂直对齐 + cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); +// cellStyle.setBottomBorderColor(IndexedColors.BLACK.index); + cellStyle.setBorderBottom(BorderStyle.THIN); //下边框 + cellStyle.setBorderLeft(BorderStyle.THIN); //左边框 + cellStyle.setBorderRight(BorderStyle.THIN); //右边框 + cellStyle.setBorderTop(BorderStyle.THIN); //上边框 + + XSSFFont headerFont = (XSSFFont) wb.createFont(); // 创建字体样式 + headerFont.setBold(true); //字体加粗 + headerFont.setFontName("黑体"); // 设置字体类型 + headerFont.setFontHeightInPoints((short) 12); // 设置字体大小 + cellStyle.setFont(headerFont); // 为标题样式设置字体样式 + + return cellStyle; + } + + /** + * 创建内容样式 + * + * @param wb + * @return + */ + public static XSSFCellStyle createContentCellStyle(XSSFWorkbook wb) { + XSSFCellStyle cellStyle = wb.createCellStyle(); + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);// 垂直居中 + cellStyle.setAlignment(HorizontalAlignment.CENTER);// 水平居中 + cellStyle.setWrapText(true);// 设置自动换行 + cellStyle.setBorderBottom(BorderStyle.THIN); //下边框 + cellStyle.setBorderLeft(BorderStyle.THIN); //左边框 + cellStyle.setBorderRight(BorderStyle.THIN); //右边框 + cellStyle.setBorderTop(BorderStyle.THIN); //上边框 + + // 生成12号字体 + XSSFFont font = wb.createFont(); + font.setColor((short) 8); + font.setFontHeightInPoints((short) 12); + cellStyle.setFont(font); + + return cellStyle; + } + +} From 1e3f5a682e9bf6270123242491b62dc56b0b6621 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Thu, 20 Mar 2025 09:11:53 +0800 Subject: [PATCH 2/5] bugfix --- .../BasicInformationController.java | 38 ++++-- .../BuildingInformationController.java | 44 +++++-- .../ruoyi/gysl/controller/MxController.java | 14 +-- .../controller/PlanInformationController.java | 41 ++----- .../controller/ProjectLegendController.java | 95 +++++++++++++++ .../ProjectMonthInfoController.java | 108 ++++++++++++++++++ .../ProjectOtherInfoController.java | 81 +++++++++++++ .../controller/ProjectRemarkController.java | 95 +++++++++++++++ .../controller/QyrzInformationController.java | 81 +++++++++++++ .../ruoyi/gysl/controller/XmxlController.java | 95 +++++++++++++++ .../ruoyi/gysl/entity/BasicInformation.java | 65 ++++++----- .../gysl/entity/BuildingInformation.java | 32 +++++- .../main/java/com/ruoyi/gysl/entity/Mx.java | 2 +- .../ruoyi/gysl/entity/PlanInformation.java | 7 ++ .../com/ruoyi/gysl/entity/ProjectLegend.java | 41 +++++++ .../ruoyi/gysl/entity/ProjectMonthInfo.java | 50 ++++++++ .../ruoyi/gysl/entity/ProjectOtherInfo.java | 33 ++++++ .../com/ruoyi/gysl/entity/ProjectRemark.java | 32 ++++++ .../ruoyi/gysl/entity/QyrzInformation.java | 53 +++++++++ .../main/java/com/ruoyi/gysl/entity/Xmxl.java | 42 +++++++ .../request/BasicInformationPageReq.java | 38 ++++++ .../gysl/entity/request/RemarkPageReq.java | 30 +++++ .../gysl/entity/request/ZwIdPageReq.java | 15 +++ .../gysl/mapper/BasicInformationMapper.java | 13 ++- .../gysl/mapper/BuildingInformationDao.java | 15 --- .../mapper/BuildingInformationMapper.java | 25 ++++ ...terpriseDao.java => EnterpriseMapper.java} | 2 +- .../gysl/mapper/{MxDao.java => MxMapper.java} | 2 +- .../mapper/{PjpzDao.java => PjpzMapper.java} | 2 +- .../ruoyi/gysl/mapper/PlanInformationDao.java | 15 --- .../gysl/mapper/PlanInformationMapper.java | 24 ++++ .../gysl/mapper/ProjectLegendMapper.java | 27 +++++ .../gysl/mapper/ProjectMonthInfoMapper.java | 30 +++++ .../gysl/mapper/ProjectOtherInfoMapper.java | 24 ++++ .../gysl/mapper/ProjectRemarkMapper.java | 24 ++++ .../gysl/mapper/QyrzInformationMapper.java | 23 ++++ ...onDao.java => WysmxInformationMapper.java} | 2 +- .../com/ruoyi/gysl/mapper/XmxlMapper.java | 27 +++++ .../gysl/service/BasicInformationService.java | 18 ++- .../service/BuildingInformationService.java | 10 ++ .../gysl/service/PlanInformationService.java | 8 ++ .../gysl/service/ProjectLegendService.java | 25 ++++ .../gysl/service/ProjectMonthInfoService.java | 29 +++++ .../gysl/service/ProjectOtherInfoService.java | 23 ++++ .../gysl/service/ProjectRemarkService.java | 22 ++++ .../gysl/service/QyrzInformationService.java | 23 ++++ .../com/ruoyi/gysl/service/XmxlService.java | 25 ++++ .../impl/BasicInformationServiceImpl.java | 20 +++- .../impl/BuildingInformationServiceImpl.java | 17 ++- .../service/impl/EnterpriseServiceImpl.java | 4 +- .../gysl/service/impl/MxServiceImpl.java | 4 +- .../gysl/service/impl/PjpzServiceImpl.java | 4 +- .../impl/PlanInformationServiceImpl.java | 16 ++- .../impl/ProjectLegendServiceImpl.java | 32 ++++++ .../impl/ProjectMonthInfoServiceImpl.java | 42 +++++++ .../impl/ProjectOtherInfoServiceImpl.java | 30 +++++ .../impl/ProjectRemarkServiceImpl.java | 30 +++++ .../impl/QyrzInformationServiceImpl.java | 30 +++++ .../impl/WysmxInformationServiceImpl.java | 4 +- .../gysl/service/impl/XmxlServiceImpl.java | 32 ++++++ .../mapper/BasicInformationMapper.xml | 21 ++++ .../mapper/BuildingInformationMapper.xml | 15 +++ .../mapper/PlanInformationMapper.xml | 17 +++ .../resources/mapper/ProjectLegendMapper.xml | 15 +++ .../mapper/ProjectMonthInfoMapper.xml | 14 +++ .../mapper/ProjectOtherInfoMapper.xml | 10 ++ .../resources/mapper/ProjectRemarkMapper.xml | 20 ++++ .../mapper/QyrzInformationMapper.xml | 13 +++ .../src/main/resources/mapper/XmxlMapper.xml | 14 +++ .../framework/config/MyMetaObjectHandler.java | 65 +++++++++++ 70 files changed, 1890 insertions(+), 149 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicInformationPageReq.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/RemarkPageReq.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationDao.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationMapper.java rename ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/{EnterpriseDao.java => EnterpriseMapper.java} (78%) rename ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/{MxDao.java => MxMapper.java} (81%) rename ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/{PjpzDao.java => PjpzMapper.java} (81%) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PlanInformationDao.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PlanInformationMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectLegendMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectMonthInfoMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectOtherInfoMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectRemarkMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyrzInformationMapper.java rename ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/{WysmxInformationDao.java => WysmxInformationMapper.java} (77%) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectLegendService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectMonthInfoService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectOtherInfoService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectRemarkService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyrzInformationService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectLegendServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectMonthInfoServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectOtherInfoServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectRemarkServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyrzInformationServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/BuildingInformationMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/PlanInformationMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/ProjectLegendMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/ProjectMonthInfoMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/ProjectOtherInfoMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/ProjectRemarkMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/QyrzInformationMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java index 47c2370..7101568 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java @@ -1,13 +1,15 @@ package com.ruoyi.gysl.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.poi.ChangeExcelUtil; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.request.BasicInformationPageReq; import com.ruoyi.gysl.entity.response.ProjectBuildingExcel; import com.ruoyi.gysl.entity.response.ProjectExcelInfo; import com.ruoyi.gysl.service.BasicInformationService; @@ -15,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.xssf.usermodel.*; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.ServletOutputStream; @@ -46,15 +49,16 @@ public class BasicInformationController extends BaseController { * 分页查询所有数据 * * @param page 分页对象 - * @param basicInformation 查询实体 + * @param basicInformationPageReq 查询实体 * @return 所有数据 */ @ApiOperation(value = "分页查询所有数据", response = BasicInformation.class) @GetMapping("/page") - public AjaxResult selectAll(Page page, BasicInformation basicInformation) { - return success(this.basicInformationService.page(page, new QueryWrapper<>(basicInformation))); + public AjaxResult selectAll(Page page, BasicInformationPageReq basicInformationPageReq) { + return success(basicInformationService.page(page, basicInformationPageReq)); } + /** * 通过主键查询单条数据 * @@ -64,7 +68,7 @@ public class BasicInformationController extends BaseController { @ApiOperation(value = "通过主键查询单条数据", response = BasicInformation.class) @GetMapping("{id}") public AjaxResult selectOne(@PathVariable Serializable id) { - return success(this.basicInformationService.getById(id)); + return success(basicInformationService.getById(id)); } /** @@ -76,7 +80,7 @@ public class BasicInformationController extends BaseController { @ApiOperation("新增数据") @PostMapping("/add") public AjaxResult insert(@RequestBody BasicInformation basicInformation) { - return success(this.basicInformationService.save(basicInformation)); + return success(basicInformationService.save(basicInformation)); } /** @@ -88,7 +92,7 @@ public class BasicInformationController extends BaseController { @ApiOperation("修改数据") @PostMapping("/edit") public AjaxResult update(@RequestBody BasicInformation basicInformation) { - return success(this.basicInformationService.updateById(basicInformation)); + return success(basicInformationService.updateById(basicInformation)); } /** @@ -100,7 +104,25 @@ public class BasicInformationController extends BaseController { @ApiOperation("删除数据") @DeleteMapping("/delete") public AjaxResult delete(@RequestParam("idList") List idList) { - return success(this.basicInformationService.removeByIds(idList)); + return success(basicInformationService.removeByIds(idList)); + } + + /** + * 项目基本信息批量导入 + */ + @ApiOperation(value = "项目基本信息批量导入") + @PostMapping(value = "/import", consumes = "multipart/form-data") + public AjaxResult importTemplateProject(@RequestPart("file") MultipartFile file) throws Exception { + ExcelUtil util = new ExcelUtil<>(BasicInformation.class); + List proList = util.importExcel(file.getInputStream()); + StringBuilder successMsg = new StringBuilder(); + if (proList == null || proList.isEmpty()) { + throw new ServiceException("项目导入数据不能为空"); + } else { + basicInformationService.saveBatch(proList); + successMsg.append("导入成功"); + } + return AjaxResult.success(successMsg); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java index df75ec1..ef5db2c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java @@ -5,11 +5,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.gysl.entity.BuildingInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; import com.ruoyi.gysl.service.BuildingInformationService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.Serializable; @@ -32,16 +39,15 @@ public class BuildingInformationController extends BaseController { private BuildingInformationService buildingInformationService; /** - * 分页查询所有数据 + * 查询所有数据 * - * @param page 分页对象 - * @param buildingInformation 查询实体 + * @param zwIdPageReq 查询实体 * @return 所有数据 */ @GetMapping("/page") - @ApiOperation(value = "分页查询所有数据",response =BuildingInformation.class ) - public AjaxResult selectAll(Page page, BuildingInformation buildingInformation) { - return success(this.buildingInformationService.page(page, new QueryWrapper<>(buildingInformation))); + @ApiOperation(value = "查询所有数据",response = BuildingInformation.class ) + public AjaxResult selectAll(ZwIdPageReq zwIdPageReq) { + return success(buildingInformationService.selectAll(zwIdPageReq)); } /** @@ -53,7 +59,7 @@ public class BuildingInformationController extends BaseController { @GetMapping("{id}") @ApiOperation(value = "通过主键查询单条数据",response =BuildingInformation.class) public AjaxResult selectOne(@PathVariable Serializable id) { - return success(this.buildingInformationService.getById(id)); + return success(buildingInformationService.getById(id)); } /** @@ -65,7 +71,7 @@ public class BuildingInformationController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody BuildingInformation buildingInformation) { - return success(this.buildingInformationService.save(buildingInformation)); + return success(buildingInformationService.save(buildingInformation)); } /** @@ -77,7 +83,7 @@ public class BuildingInformationController extends BaseController { @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody BuildingInformation buildingInformation) { - return success(this.buildingInformationService.updateById(buildingInformation)); + return success(buildingInformationService.updateById(buildingInformation)); } /** @@ -89,7 +95,25 @@ public class BuildingInformationController extends BaseController { @ApiOperation("删除数据") @DeleteMapping("/delete") public AjaxResult delete(@RequestParam("idList") List idList) { - return success(this.buildingInformationService.removeByIds(idList)); + return success(buildingInformationService.removeByIds(idList)); + } + + /** + * 导入项目建筑信息 + */ + @ApiOperation(value = "导入项目建筑信息") + @PostMapping(value = "/importProjectBuilding", consumes = "multipart/form-data") + public AjaxResult importTemplateProject(@RequestPart("file") MultipartFile file) throws Exception { + ExcelUtil util = new ExcelUtil<>(BuildingInformation.class); + List proList = util.importExcel(file.getInputStream()); + StringBuilder successMsg = new StringBuilder(); + if (proList == null || proList.isEmpty()) { + throw new ServiceException("项目建筑信息导入数据不能为空"); + } else { + buildingInformationService.saveBatch(proList); + successMsg.append("导入成功"); + } + return AjaxResult.success(successMsg); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java index 60bdc7e..e9ffe08 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java @@ -1,7 +1,6 @@ package com.ruoyi.gysl.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -35,13 +34,12 @@ public class MxController extends BaseController { * 分页查询所有数据 * * @param page 分页对象 - * @param mx 查询实体 * @return 所有数据 */ @GetMapping("/page") @ApiOperation("分页查询所有数据") - public AjaxResult selectAll(Page page, Mx mx) { - return success(this.mxService.page(page, new QueryWrapper<>(mx))); + public AjaxResult selectAll(Page page) { + return success(mxService.page(page)); } /** @@ -53,7 +51,7 @@ public class MxController extends BaseController { @GetMapping("{id}") @ApiOperation("通过主键查询单条数据") public AjaxResult selectOne(@PathVariable Serializable id) { - return success(this.mxService.getById(id)); + return success(mxService.getById(id)); } /** @@ -65,7 +63,7 @@ public class MxController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody Mx mx) { - return success(this.mxService.save(mx)); + return success(mxService.save(mx)); } /** @@ -77,7 +75,7 @@ public class MxController extends BaseController { @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody Mx mx) { - return success(this.mxService.updateById(mx)); + return success(mxService.updateById(mx)); } /** @@ -89,7 +87,7 @@ public class MxController extends BaseController { @ApiOperation("删除数据") @DeleteMapping("/delete") public AjaxResult delete(@RequestParam("idList") List idList) { - return success(this.mxService.removeByIds(idList)); + return success(mxService.removeByIds(idList)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java index df8206e..cc28b74 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.PlanInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; import com.ruoyi.gysl.service.PlanInformationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -32,29 +33,17 @@ public class PlanInformationController extends BaseController { private PlanInformationService planInformationService; /** - * 分页查询所有数据 + * 根据项目id查询规划信息 * - * @param page 分页对象 - * @param planInformation 查询实体 + * @param zwIdPageReq 查询实体 * @return 所有数据 */ - @GetMapping("/page") - @ApiOperation("分页查询所有数据") - public AjaxResult selectAll(Page page, PlanInformation planInformation) { - return success(this.planInformationService.page(page, new QueryWrapper<>(planInformation))); + @GetMapping("/selectAll") + @ApiOperation("根据项目id查询规划信息") + public AjaxResult selectAll( ZwIdPageReq zwIdPageReq) { + return success(planInformationService.selectAll(zwIdPageReq)); } - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @GetMapping("{id}") - @ApiOperation("通过主键查询单条数据") - public AjaxResult selectOne(@PathVariable Serializable id) { - return success(this.planInformationService.getById(id)); - } /** * 新增数据 @@ -65,7 +54,7 @@ public class PlanInformationController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody PlanInformation planInformation) { - return success(this.planInformationService.save(planInformation)); + return success(planInformationService.save(planInformation)); } /** @@ -77,19 +66,7 @@ public class PlanInformationController extends BaseController { @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody PlanInformation planInformation) { - return success(this.planInformationService.updateById(planInformation)); - } - - /** - * 删除数据 - * - * @param idList 主键结合 - * @return 删除结果 - */ - @ApiOperation("删除数据") - @DeleteMapping("/delete") - public AjaxResult delete(@RequestParam("idList") List idList) { - return success(this.planInformationService.removeByIds(idList)); + return success(planInformationService.updateById(planInformation)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java new file mode 100644 index 0000000..5da248d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java @@ -0,0 +1,95 @@ +package com.ruoyi.gysl.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.gysl.entity.ProjectLegend; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.ProjectLegendService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.List; + +/** + * 项目图例(ProjectLegend)表控制层 + * + * @author makejava + * @since 2025-03-19 10:12:34 + */ +@Api(tags = "项目图例") +@RestController +@RequestMapping("/gysl/projectLegend") +public class ProjectLegendController extends BaseController { + /** + * 服务对象 + */ + @Resource + private ProjectLegendService projectLegendService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param projectLegend 查询实体 + * @return 所有数据 + */ + @ApiOperation("分页查询所有数据") + @GetMapping("/page") + public AjaxResult selectAll(Page page, ZwIdPageReq projectLegend) { + return success(projectLegendService.page(page, projectLegend)); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @ApiOperation("通过主键查询单条数据") + @GetMapping("/{id}") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(projectLegendService.getById(id)); + } + + /** + * 新增数据 + * + * @param projectLegend 实体对象 + * @return 新增结果 + */ + @ApiOperation("新增数据") + @PostMapping("/add") + public AjaxResult insert(@RequestBody ProjectLegend projectLegend) { + return success(projectLegendService.save(projectLegend)); + } + + /** + * 修改数据 + * + * @param projectLegend 实体对象 + * @return 修改结果 + */ + @ApiOperation("修改数据") + @PutMapping("/edit") + public AjaxResult update(@RequestBody ProjectLegend projectLegend) { + return success(projectLegendService.updateById(projectLegend)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(projectLegendService.removeByIds(idList)); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java new file mode 100644 index 0000000..3c3df4a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java @@ -0,0 +1,108 @@ +package com.ruoyi.gysl.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.gysl.entity.ProjectMonthInfo; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.ProjectMonthInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.Serializable; +import java.util.List; + +/** + * 月度进展详情(ProjectMonthInfo)表控制层 + * + * @author makejava + * @since 2025-03-19 10:49:03 + */ +@Api(tags = "月度进展详情") +@RestController +@RequestMapping("/gysl/projectMonthInfo") +public class ProjectMonthInfoController extends BaseController { + /** + * 服务对象 + */ + @Resource + private ProjectMonthInfoService projectMonthInfoService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @ApiOperation("分页查询所有数据") + @GetMapping("/page") + public AjaxResult selectAll(Page page, ZwIdPageReq zwIdPageReq) { + return success(projectMonthInfoService.page(page, zwIdPageReq)); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @ApiOperation("通过主键查询单条数据") + @GetMapping("/{id}") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(projectMonthInfoService.getById(id)); + } + + /** + * 新增数据 + * + * @param projectMonthInfo 实体对象 + * @return 新增结果 + */ + @ApiOperation("新增数据") + @PostMapping("/add") + public AjaxResult insert(@RequestBody ProjectMonthInfo projectMonthInfo) { + return success(projectMonthInfoService.save(projectMonthInfo)); + } + + /** + * 修改数据 + * + * @param projectMonthInfo 实体对象 + * @return 修改结果 + */ + @ApiOperation("修改数据") + @PutMapping("/edit") + public AjaxResult update(@RequestBody ProjectMonthInfo projectMonthInfo) { + return success(projectMonthInfoService.updateById(projectMonthInfo)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(projectMonthInfoService.removeByIds(idList)); + } + + /** + * 根据条件导出月度进展详情 + */ + @ApiOperation(value = "根据条件导出月度进展详情") + @PostMapping(value = "/export") + public void export(HttpServletResponse response, ZwIdPageReq zwIdPageReq) throws Exception { + List filteredList = projectMonthInfoService.page(zwIdPageReq); + ExcelUtil util = new ExcelUtil<>(ProjectMonthInfo.class); + util.exportExcel(response, filteredList, "企业名录数据"); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java new file mode 100644 index 0000000..e59bc20 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java @@ -0,0 +1,81 @@ +package com.ruoyi.gysl.controller; + + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.gysl.entity.ProjectOtherInfo; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.ProjectOtherInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 项目其他信息(ProjectOtherInfo)表控制层 + * + * @author makejava + * @since 2025-03-19 10:49:22 + */ +@Api(tags = "项目其他信息") +@RestController +@RequestMapping("/gysl/projectOtherInfo") +public class ProjectOtherInfoController extends BaseController { + /** + * 服务对象 + */ + @Resource + private ProjectOtherInfoService projectOtherInfoService; + + /** + * 根据项目id查询项目其他信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @ApiOperation("根据项目id查询项目其他信息") + @GetMapping("/searchId") + public AjaxResult selectAll(ZwIdPageReq zwIdPageReq) { + return success(projectOtherInfoService.searchId(zwIdPageReq)); + } + + + /** + * 新增数据 + * + * @param projectOtherInfo 实体对象 + * @return 新增结果 + */ + @ApiOperation("新增数据") + @PostMapping("/add") + public AjaxResult insert(@RequestBody ProjectOtherInfo projectOtherInfo) { + return success(projectOtherInfoService.save(projectOtherInfo)); + } + + /** + * 修改数据 + * + * @param projectOtherInfo 实体对象 + * @return 修改结果 + */ + @ApiOperation("修改数据") + @PutMapping("/edit") + public AjaxResult update(@RequestBody ProjectOtherInfo projectOtherInfo) { + return success(projectOtherInfoService.updateById(projectOtherInfo)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(projectOtherInfoService.removeByIds(idList)); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java new file mode 100644 index 0000000..6f78158 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java @@ -0,0 +1,95 @@ +package com.ruoyi.gysl.controller; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.gysl.entity.ProjectRemark; +import com.ruoyi.gysl.entity.request.RemarkPageReq; +import com.ruoyi.gysl.service.ProjectRemarkService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.List; + +/** + * 项目备忘录(ProjectRemark)表控制层 + * + * @author makejava + * @since 2025-03-19 10:49:35 + */ +@Api(tags = "项目备忘录") +@RestController +@RequestMapping("/gysl/projectRemark") +public class ProjectRemarkController extends BaseController { + /** + * 服务对象 + */ + @Resource + private ProjectRemarkService projectRemarkService; + + /** + * 查询所有数据 + * + * @param projectRemark 查询实体 + * @return 所有数据 + */ + @ApiOperation("查询所有数据") + @GetMapping("/page") + public AjaxResult selectAll( RemarkPageReq projectRemark) { + return success(projectRemarkService.list(projectRemark)); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @ApiOperation("通过主键查询单条数据") + @GetMapping("/{id}") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(projectRemarkService.getById(id)); + } + + /** + * 新增数据 + * + * @param projectRemark 实体对象 + * @return 新增结果 + */ + @ApiOperation("新增数据") + @PostMapping("/add") + public AjaxResult insert(@RequestBody ProjectRemark projectRemark) { + return success(projectRemarkService.save(projectRemark)); + } + + /** + * 修改数据 + * + * @param projectRemark 实体对象 + * @return 修改结果 + */ + @ApiOperation("修改数据") + @PutMapping("/edit") + public AjaxResult update(@RequestBody ProjectRemark projectRemark) { + return success(projectRemarkService.updateById(projectRemark)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(projectRemarkService.removeByIds(idList)); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java new file mode 100644 index 0000000..9d689ac --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java @@ -0,0 +1,81 @@ +package com.ruoyi.gysl.controller; + + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.gysl.entity.QyrzInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.QyrzInformationService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 企业入驻信息(QyrzInformation)表控制层 + * + * @author makejava + * @since 2025-03-19 15:25:17 + */ +@Api(tags = "企业入驻信息") +@RestController +@RequestMapping("/gysl/qyrzInformation") +public class QyrzInformationController extends BaseController { + /** + * 服务对象 + */ + @Resource + private QyrzInformationService qyrzInformationService; + + /** + * 根据项目id查询企业入驻基本信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @ApiOperation("根据项目id查询企业入驻基本信息") + @GetMapping("/list") + public AjaxResult selectAll( ZwIdPageReq zwIdPageReq) { + return success(qyrzInformationService.selectAll(zwIdPageReq)); + } + + + /** + * 新增数据 + * + * @param qyrzInformation 实体对象 + * @return 新增结果 + */ + @ApiOperation("新增数据") + @PostMapping("/add") + public AjaxResult insert(@RequestBody QyrzInformation qyrzInformation) { + return success(qyrzInformationService.save(qyrzInformation)); + } + + /** + * 修改数据 + * + * @param qyrzInformation 实体对象 + * @return 修改结果 + */ + @ApiOperation("修改数据") + @PutMapping("/edit") + public AjaxResult update(@RequestBody QyrzInformation qyrzInformation) { + return success(qyrzInformationService.updateById(qyrzInformation)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(qyrzInformationService.removeByIds(idList)); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java new file mode 100644 index 0000000..20faf9b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java @@ -0,0 +1,95 @@ +package com.ruoyi.gysl.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.gysl.entity.Xmxl; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.XmxlService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.List; + +/** + * 项目巡礼(Xmxl)表控制层 + * + * @author makejava + * @since 2025-03-19 14:19:21 + */ +@Api(tags = "项目巡礼") +@RestController +@RequestMapping("/gysl/xmxl") +public class XmxlController extends BaseController { + /** + * 服务对象 + */ + @Resource + private XmxlService xmxlService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @ApiOperation("分页查询所有数据") + @GetMapping("/page") + public AjaxResult selectAll(Page page, ZwIdPageReq zwIdPageReq) { + return success(xmxlService.page(page, zwIdPageReq)); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @ApiOperation("通过主键查询单条数据") + @GetMapping("/{id}") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(xmxlService.getById(id)); + } + + /** + * 新增数据 + * + * @param xmxl 实体对象 + * @return 新增结果 + */ + @ApiOperation("新增数据") + @PostMapping("/add") + public AjaxResult insert(@RequestBody Xmxl xmxl) { + return success(xmxlService.save(xmxl)); + } + + /** + * 修改数据 + * + * @param xmxl 实体对象 + * @return 修改结果 + */ + @ApiOperation("修改数据") + @PutMapping("/edit") + public AjaxResult update(@RequestBody Xmxl xmxl) { + return success(xmxlService.updateById(xmxl)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(xmxlService.removeByIds(idList)); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java index b403892..4a16301 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java @@ -1,10 +1,12 @@ package com.ruoyi.gysl.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,7 +26,6 @@ import java.util.Date; @Data @ApiModel("基本信息") @TableName(value = "basic_information") -@SuppressWarnings("serial") public class BasicInformation extends Model { @ApiModelProperty("主键id") @@ -32,116 +33,118 @@ public class BasicInformation extends Model { private Integer id; - //项目名称 @NotBlank + @Excel(name = "项目名称") @ApiModelProperty("项目名称") private String name; + @ApiModelProperty("总用地面积") + @TableField(exist = false) + private BigDecimal zydmj; + - //项目法人单位 @NotBlank + @Excel(name = "项目法人单位") @ApiModelProperty("项目法人单位") private String xmfrdwxz; - //项目法人单位性质 @NotBlank + @Excel(name = "项目法人单位性质") @ApiModelProperty("项目法人单位性质") private Integer nature; - //施工单位 @ApiModelProperty("施工单位") + @Excel(name = "施工单位") private String sgdw; - - //设计单位 @ApiModelProperty("设计单位") + @Excel(name = "设计单位") private String sjdw; - - //总投资额 @ApiModelProperty("总投资额") + @Excel(name = "总投资额") private BigDecimal ztze; - - //所属功能区 @NotBlank + @Excel(name = "所属功能区") @ApiModelProperty("所属功能区") private Integer ssgnq; - //建设起止时间 - @ApiModelProperty("建设起止时间") + @ApiModelProperty("建设开始时间") + @Excel(name = "建设开始时间",dateFormat="yyyy-MM-dd") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date begainTime; + @ApiModelProperty("建设结束时间") + @Excel(name = "建设结束时间",dateFormat="yyyy-MM-dd") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date endTime; - //现状分类 @NotBlank + @Excel(name = "现状分类") @ApiModelProperty("现状分类") private Integer xzfl; - - //建设地点 @NotBlank + @Excel(name = "建设地点") @ApiModelProperty("建设地点") private String jsdd; - //重点发展产业 @NotBlank + @Excel(name = "重点发展产业") @ApiModelProperty("重点发展产业") private String prioritize; - - //建设模式 @NotBlank + @Excel(name = "建设模式") @ApiModelProperty("建设模式") private Integer jsms; - //标签 + @Excel(name = "项目标签") @ApiModelProperty("项目标签") private String label; - - //项目负责人 @NotBlank + @Excel(name = "项目负责人") @ApiModelProperty("项目负责人") private String projectLeader; - - //联系方式 @NotBlank + @Excel(name = "联系方式") @ApiModelProperty("联系方式") private String phone; - //施工许可证发放时间 @ApiModelProperty("施工许可证发放时间") + @Excel(name = "施工许可证发放时间") // @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String issuingTime; - //竣工验收时间 - @ApiModelProperty("竣工验收时间") + @ApiModelProperty("施工许可证发放时间") + @Excel(name = "施工许可证发放时间") // @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String acceptanceTime; - //建设进度 @ApiModelProperty("建设进度") + @Excel(name = "建设进度") private String jsjd; - //项目法人单位简介 @NotBlank + @Excel(name = "项目法人单位简介") @ApiModelProperty("项目法人单位简介") private String unitIntroduction; - //项目简介 @NotBlank @ApiModelProperty("项目简介") private String introduction; - //附件 @ApiModelProperty("附件") private String fj; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java index 9c1bb83..4c79c74 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -36,6 +37,7 @@ public class BuildingInformation implements Serializable { /** * 楼栋名称 */ + @Excel(name = "楼栋名称") @ApiModelProperty(value = "楼栋名称") @TableField("name") private String name; @@ -50,6 +52,7 @@ public class BuildingInformation implements Serializable { /** * 层数 */ + @Excel(name = "层数") @ApiModelProperty(value = "层数") @TableField("floor") private Integer floor; @@ -57,6 +60,7 @@ public class BuildingInformation implements Serializable { /** * 总建筑高度 */ + @Excel(name = "总建筑高度") @ApiModelProperty(value = "总建筑高度") @TableField("total_building_height") private BigDecimal totalBuildingHeight; @@ -64,6 +68,7 @@ public class BuildingInformation implements Serializable { /** * 首层高度 */ + @Excel(name = "首层高度") @ApiModelProperty(value = "首层高度") @TableField("scgd") private BigDecimal scgd; @@ -71,6 +76,7 @@ public class BuildingInformation implements Serializable { /** * 2至4层高 */ + @Excel(name = "2至4层高") @ApiModelProperty(value = "2至4层高") @TableField("two_and_four_cg") private BigDecimal twoAndFourCg; @@ -78,6 +84,7 @@ public class BuildingInformation implements Serializable { /** * 4层以上层高 */ + @Excel(name = "4层以上层高") @ApiModelProperty(value = "4层以上层高") @TableField("four_yscg") private BigDecimal fourYscg; @@ -85,6 +92,7 @@ public class BuildingInformation implements Serializable { /** * 首层地面荷载 */ + @Excel(name = "首层地面荷载") @ApiModelProperty(value = "首层地面荷载") @TableField("scdmhz") private BigDecimal scdmhz; @@ -92,6 +100,7 @@ public class BuildingInformation implements Serializable { /** * 二至三层楼面荷载 */ + @Excel(name = "二至三层楼面荷载") @ApiModelProperty(value = "二至三层楼面荷载") @TableField("two_and_three_lmhz") private BigDecimal twoAndThreeLmhz; @@ -99,6 +108,7 @@ public class BuildingInformation implements Serializable { /** * 四层及以上楼面荷载 */ + @Excel(name = "四层及以上楼面荷载") @ApiModelProperty(value = "四层及以上楼面荷载") @TableField("four_yslmhz") private BigDecimal fourYslmhz; @@ -106,6 +116,7 @@ public class BuildingInformation implements Serializable { /** * 标准层面积 */ + @Excel(name = "标准层面积") @ApiModelProperty(value = "标准层面积") @TableField("bzcmj") private BigDecimal bzcmj; @@ -113,23 +124,34 @@ public class BuildingInformation implements Serializable { /** * 柱距 */ + @Excel(name = "柱距") @ApiModelProperty(value = "柱距") @TableField("zj") - private BigDecimal zj; + private String zj; /** * 是否有吊装口 */ - @ApiModelProperty(value = "是否有吊装口") + @Excel(name = "是否有吊装口",readConverterExp="1=是,2=否") + @ApiModelProperty(value = "是否有吊装口 ，1是2否") @TableField("sfydzk") - private BigDecimal sfydzk; + private Integer sfydzk; /** * 是否有汽车盘道 */ - @ApiModelProperty(value = "是否有汽车盘道") + @Excel(name = "是否有汽车盘道",readConverterExp="1=是,2=否") + @ApiModelProperty(value = "是否有汽车盘道 , 1是2否") @TableField("sfyqcpd") - private BigDecimal sfyqcpd; + private Integer sfyqcpd; + + /** + * 是否为重要楼栋 + */ + @Excel(name = "是否为重要楼栋",readConverterExp="1=是,2=否") + @ApiModelProperty(value = "是否有汽车盘道 , 1是2否") + @TableField("sfwzyld") + private Integer sfwzyld; /** * 创建者id diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java index 7cb2dac..baabdf3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java @@ -38,7 +38,7 @@ public class Mx implements Serializable { */ @ApiModelProperty(value = "1:关键要素；2：重要要素") @TableField("type") - private Integer type; + private String type; /** * 要素名称 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java index da77582..7c2d00b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java @@ -148,6 +148,13 @@ public class PlanInformation implements Serializable { @TableField("ghwj") private String ghwj; + /** + * 防火等级 + */ + @ApiModelProperty(value = "防火等级") + @TableField("fhdj") + private String fhdj; + /** * 创建者id */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java new file mode 100644 index 0000000..9edb3f0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java @@ -0,0 +1,41 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 项目图例(ProjectLegend)表实体类 + * + * @author makejava + * @since 2025-03-19 10:12:35 + */ +@Data +public class ProjectLegend extends BaseEntity implements Serializable { + + @TableField("id") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("项目id") + private Long xmId; + + @ApiModelProperty("图片类型") + private Integer imgType; + + @ApiModelProperty("图片") + private String img; + + @ApiModelProperty("经度") + private String longitude; + + @ApiModelProperty("纬度") + private String latitude; +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java new file mode 100644 index 0000000..f3ff4fa --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java @@ -0,0 +1,50 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 月度进展详情(ProjectMonthInfo)表实体类 + * + * @author makejava + * @since 2025-03-19 10:49:03 + */ +@Data +public class ProjectMonthInfo extends BaseEntity implements Serializable { + + @TableField("id") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("项目id") + private Long xmId; + + @ApiModelProperty("进度月份") + private String progressMonth; + + @ApiModelProperty("状态") + private Integer state; + + @ApiModelProperty("当月完成投资") + private String investMonth; + + @ApiModelProperty("累计完成投资") + private String investTotal; + + @ApiModelProperty("截至目前累计建成面积（平方米）") + private Integer finishArea; + + @ApiModelProperty("贷款额度（万元）") + private Integer loans; + + @ApiModelProperty("项目进展详情") + private String projectInfo; +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java new file mode 100644 index 0000000..517d921 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java @@ -0,0 +1,33 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 项目其他信息(ProjectOtherInfo)表实体类 + * + * @author makejava + * @since 2025-03-19 10:49:22 + */ +@Data +public class ProjectOtherInfo extends BaseEntity implements Serializable { + + @TableField("id") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("项目id") + private Long xmId; + + + @ApiModelProperty("其他信息JSON") + private String otherJson; +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java new file mode 100644 index 0000000..c64474d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java @@ -0,0 +1,32 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 项目备忘录(ProjectRemark)表实体类 + * + * @author makejava + * @since 2025-03-19 10:49:35 + */ +@Data +public class ProjectRemark extends BaseEntity implements Serializable { + + @TableField("id") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("项目id") + private Long xmId; + + @ApiModelProperty("备注") + private String remark; +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java new file mode 100644 index 0000000..5268246 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java @@ -0,0 +1,53 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * (QyrzInformation)表实体类 + * + * @author makejava + * @since 2025-03-19 15:25:18 + */ +@Data +public class QyrzInformation extends BaseEntity implements Serializable { + @TableField("id") + @TableId(type = IdType.AUTO) + private Integer id; + + @ApiModelProperty("项目id") + private Integer xmId; + + @ApiModelProperty("入住企业数") + private Integer rzqys; + + @ApiModelProperty("入驻企业行业类型") + private String rzqyhylx; + + @ApiModelProperty("人员数量") + private Integer rysl; + + @ApiModelProperty("入住率") + private Double rzl; + + @ApiModelProperty("已出租（售）面积") + private Double yczmj; + + @ApiModelProperty("空置出租（售）面积") + private Double kzczmj; + + @ApiModelProperty("工业厂房平均租金") + private Double gycfpjzj; + + @ApiModelProperty("工业厂房平均物业费") + private Double gycfpjwyf; + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java new file mode 100644 index 0000000..23c7785 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java @@ -0,0 +1,42 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 项目巡礼(Xmxl)表实体类 + * + * @author makejava + * @since 2025-03-19 14:19:22 + */ +@Data +public class Xmxl extends BaseEntity implements Serializable { + @TableField("id") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("监控名称") + private String jkmc; + + @ApiModelProperty(value = "时间 yyyy-MM-dd") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate sj; + + @ApiModelProperty(value = "当前状态") + private Integer status; + + @ApiModelProperty(value = "附件") + private String fj; +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicInformationPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicInformationPageReq.java new file mode 100644 index 0000000..429eb20 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicInformationPageReq.java @@ -0,0 +1,38 @@ +package com.ruoyi.gysl.entity.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 基本信息分页参数 + * @author du + * @since 2025/3/19 15:07 + */ +@Data +public class BasicInformationPageReq { + + @ApiModelProperty("项目名称") + private String name; + + @ApiModelProperty("项目法人单位") + private String xmfrdwxz; + + @ApiModelProperty("建设起止时间-开始时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date startTime; + + @ApiModelProperty("建设起止时间-结束时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date endTime; + + @ApiModelProperty("现状分类") + private Integer xzfl; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/RemarkPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/RemarkPageReq.java new file mode 100644 index 0000000..6087d5b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/RemarkPageReq.java @@ -0,0 +1,30 @@ +package com.ruoyi.gysl.entity.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; + +/** + * 项目备忘录分页请求类 + * @author du + * @since 2025/3/19 11:21 + */ +@Data +public class RemarkPageReq { + @ApiModelProperty("项目id") + private Long xmId; + + + @ApiModelProperty(value = "查询时间 yyyy-MM-dd") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate startTime; + + @ApiModelProperty(value = "查询时间 yyyy-MM-dd") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate endTime; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java new file mode 100644 index 0000000..714e43b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java @@ -0,0 +1,15 @@ +package com.ruoyi.gysl.entity.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 分页请求类 + * @author du + * @since 2025/3/19 11:20 + */ +@Data +public class ZwIdPageReq { + @ApiModelProperty("项目id") + private Long xmId; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java index 14f4bf0..700ebe9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java @@ -1,9 +1,9 @@ package com.ruoyi.gysl.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.gysl.entity.BasicInformation; -import com.ruoyi.gysl.entity.BuildingInformation; -import com.ruoyi.gysl.entity.response.ProjectBuildingExcel; +import com.ruoyi.gysl.entity.request.BasicInformationPageReq; import com.ruoyi.gysl.entity.response.ProjectExcelInfo; import org.apache.ibatis.annotations.Param; @@ -21,5 +21,14 @@ public interface BasicInformationMapper extends BaseMapper { * 根据基本信息的id列表来查找 */ List selectList(@Param("idList") List idList); + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param req 查询实体 + * @return 所有数据 + */ + Page page(Page page, @Param("req") BasicInformationPageReq req); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationDao.java deleted file mode 100644 index e311e1a..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ruoyi.gysl.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.gysl.entity.BuildingInformation; - -/** - * (BuildingInformation)表数据库访问层 - * - * @author makejava - * @since 2025-02-24 11:10:03 - */ -public interface BuildingInformationDao extends BaseMapper { - -} - diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationMapper.java new file mode 100644 index 0000000..245d5eb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationMapper.java @@ -0,0 +1,25 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.gysl.entity.BuildingInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +import java.util.List; + +/** + * (BuildingInformation)表数据库访问层 + * + * @author makejava + * @since 2025-02-24 11:10:03 + */ +public interface BuildingInformationMapper extends BaseMapper { + + /** + * 查询所有数据 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + List selectAll(ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/EnterpriseDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/EnterpriseMapper.java similarity index 78% rename from ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/EnterpriseDao.java rename to ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/EnterpriseMapper.java index bd96659..3a8293a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/EnterpriseDao.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/EnterpriseMapper.java @@ -9,7 +9,7 @@ import com.ruoyi.gysl.entity.Enterprise; * @author makejava * @since 2025-02-24 11:26:49 */ -public interface EnterpriseDao extends BaseMapper { +public interface EnterpriseMapper extends BaseMapper { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxMapper.java similarity index 81% rename from ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxDao.java rename to ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxMapper.java index b7c9f56..92916d0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxDao.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxMapper.java @@ -10,7 +10,7 @@ import com.ruoyi.gysl.entity.Mx; * @author makejava * @since 2025-02-24 13:40:36 */ -public interface MxDao extends BaseMapper { +public interface MxMapper extends BaseMapper { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzMapper.java similarity index 81% rename from ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzDao.java rename to ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzMapper.java index b1b5d72..a2b0bd5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzDao.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzMapper.java @@ -9,7 +9,7 @@ import com.ruoyi.gysl.entity.Pjpz; * @author makejava * @since 2025-02-24 13:52:56 */ -public interface PjpzDao extends BaseMapper { +public interface PjpzMapper extends BaseMapper { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PlanInformationDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PlanInformationDao.java deleted file mode 100644 index 444a6cc..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PlanInformationDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ruoyi.gysl.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.gysl.entity.PlanInformation; - -/** - * 规划信息(PlanInformation)表数据库访问层 - * - * @author makejava - * @since 2025-02-24 14:21:58 - */ -public interface PlanInformationDao extends BaseMapper { - -} - diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PlanInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PlanInformationMapper.java new file mode 100644 index 0000000..5de2b71 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PlanInformationMapper.java @@ -0,0 +1,24 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.gysl.entity.PlanInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import org.apache.ibatis.annotations.Param; + +/** + * 规划信息(PlanInformation)表数据库访问层 + * + * @author makejava + * @since 2025-02-24 14:21:58 + */ +public interface PlanInformationMapper extends BaseMapper { + + /** + * 根据项目id查询规划信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + PlanInformation selectAll(@Param("req") ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectLegendMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectLegendMapper.java new file mode 100644 index 0000000..3feae45 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectLegendMapper.java @@ -0,0 +1,27 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.gysl.entity.ProjectLegend; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import org.apache.ibatis.annotations.Param; + +/** + * 项目图例(ProjectLegend)表数据库访问层 + * + * @author makejava + * @since 2025-03-19 10:12:34 + */ +public interface ProjectLegendMapper extends BaseMapper { + + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param projectLegend 查询实体 + * @return 所有数据 + */ + Page page(Page page,@Param("req") ZwIdPageReq projectLegend); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectMonthInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectMonthInfoMapper.java new file mode 100644 index 0000000..792181b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectMonthInfoMapper.java @@ -0,0 +1,30 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.gysl.entity.ProjectMonthInfo; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 月度进展详情(ProjectMonthInfo)表数据库访问层 + * + * @author makejava + * @since 2025-03-19 10:49:03 + */ +public interface ProjectMonthInfoMapper extends BaseMapper { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + Page page(Page page,@Param("req") ZwIdPageReq zwIdPageReq); + + List page(@Param("req") ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectOtherInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectOtherInfoMapper.java new file mode 100644 index 0000000..2b06ce2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectOtherInfoMapper.java @@ -0,0 +1,24 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.gysl.entity.ProjectOtherInfo; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import org.apache.ibatis.annotations.Param; + +/** + * 项目其他信息(ProjectOtherInfo)表数据库访问层 + * + * @author makejava + * @since 2025-03-19 10:49:22 + */ +public interface ProjectOtherInfoMapper extends BaseMapper { + + /** + * 根据项目id查询项目其他信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + ProjectOtherInfo searchId(@Param("req") ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectRemarkMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectRemarkMapper.java new file mode 100644 index 0000000..c517ed4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectRemarkMapper.java @@ -0,0 +1,24 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.gysl.entity.ProjectRemark; +import com.ruoyi.gysl.entity.request.RemarkPageReq; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 项目备忘录(ProjectRemark)表数据库访问层 + * + * @author makejava + * @since 2025-03-19 10:49:35 + */ +public interface ProjectRemarkMapper extends BaseMapper { + + + /** + * 查询所有数据 + */ + List list(@Param("req") RemarkPageReq projectRemark); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyrzInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyrzInformationMapper.java new file mode 100644 index 0000000..9bd001a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyrzInformationMapper.java @@ -0,0 +1,23 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.gysl.entity.QyrzInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +/** + * (QyrzInformation)表数据库访问层 + * + * @author makejava + * @since 2025-03-19 15:25:17 + */ +public interface QyrzInformationMapper extends BaseMapper { + + /** + * 根据项目id查询企业入驻基本信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + QyrzInformation selectAll(ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java similarity index 77% rename from ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationDao.java rename to ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java index 2da1932..5f8114b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationDao.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java @@ -9,7 +9,7 @@ import com.ruoyi.gysl.entity.WysmxInformation; * @author makejava * @since 2025-02-25 09:14:22 */ -public interface WysmxInformationDao extends BaseMapper { +public interface WysmxInformationMapper extends BaseMapper { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlMapper.java new file mode 100644 index 0000000..78b315d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlMapper.java @@ -0,0 +1,27 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.gysl.entity.Xmxl; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import org.apache.ibatis.annotations.Param; + +/** + * 项目巡礼(Xmxl)表数据库访问层 + * + * @author makejava + * @since 2025-03-19 14:19:21 + */ +public interface XmxlMapper extends BaseMapper { + + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + Page page(Page page,@Param("req") ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java index 40610eb..7791e72 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java @@ -1,7 +1,9 @@ package com.ruoyi.gysl.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.request.BasicInformationPageReq; import com.ruoyi.gysl.entity.response.ProjectBuildingExcel; import com.ruoyi.gysl.entity.response.ProjectExcelInfo; import org.apache.poi.xssf.usermodel.XSSFCellStyle; @@ -19,11 +21,19 @@ import java.util.Map; public interface BasicInformationService extends IService { /** - * 根据基本信息的id列表来查找 + * 分页查询所有数据 + * + * @param page 分页对象 + * @param req 查询实体 + * @return 所有数据 */ - List selectList(List idList); + Page page(Page page, BasicInformationPageReq req); + /** + * 根据基本信息的id列表来查找 + */ + List selectList(List idList); /** * 填充数据 @@ -31,12 +41,12 @@ public interface BasicInformationService extends IService { void approvalMethodfillInData(XSSFSheet sheet, XSSFCellStyle contentStyle, int rowNum, List info,List sc,List ec,int a) ; /** - * 项目基础信息获取 + * 填充数据-项目基础信息获取 */ String getExcelData(ProjectExcelInfo item,String str); /** - * 项目建筑信息获取 + * 填充数据-项目建筑信息获取 */ String getBuildingData(ProjectBuildingExcel item,String str); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BuildingInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BuildingInformationService.java index ca1ddcd..dffebc0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BuildingInformationService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BuildingInformationService.java @@ -2,6 +2,9 @@ package com.ruoyi.gysl.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.BuildingInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +import java.util.List; /** * (BuildingInformation)表服务接口 @@ -11,5 +14,12 @@ import com.ruoyi.gysl.entity.BuildingInformation; */ public interface BuildingInformationService extends IService { + /** + * 查询所有数据 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + List selectAll(ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/PlanInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/PlanInformationService.java index 4908a6c..c72f69c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/PlanInformationService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/PlanInformationService.java @@ -2,6 +2,7 @@ package com.ruoyi.gysl.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.PlanInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; /** * 规划信息(PlanInformation)表服务接口 @@ -11,5 +12,12 @@ import com.ruoyi.gysl.entity.PlanInformation; */ public interface PlanInformationService extends IService { + /** + * 根据项目id查询规划信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + PlanInformation selectAll(ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectLegendService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectLegendService.java new file mode 100644 index 0000000..9f638d7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectLegendService.java @@ -0,0 +1,25 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.ProjectLegend; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +/** + * 项目图例(ProjectLegend)表服务接口 + * + * @author makejava + * @since 2025-03-19 10:12:35 + */ +public interface ProjectLegendService extends IService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param projectLegend 查询实体 + * @return 所有数据 + */ + Page page(Page page, ZwIdPageReq projectLegend); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectMonthInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectMonthInfoService.java new file mode 100644 index 0000000..1656e80 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectMonthInfoService.java @@ -0,0 +1,29 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.ProjectMonthInfo; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +import java.util.List; + +/** + * 月度进展详情(ProjectMonthInfo)表服务接口 + * + * @author makejava + * @since 2025-03-19 10:49:03 + */ +public interface ProjectMonthInfoService extends IService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + Page page(Page page, ZwIdPageReq zwIdPageReq); + + List page(ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectOtherInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectOtherInfoService.java new file mode 100644 index 0000000..f85537a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectOtherInfoService.java @@ -0,0 +1,23 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.ProjectOtherInfo; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +/** + * 项目其他信息(ProjectOtherInfo)表服务接口 + * + * @author makejava + * @since 2025-03-19 10:49:22 + */ +public interface ProjectOtherInfoService extends IService { + + /** + * 根据项目id查询项目其他信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + ProjectOtherInfo searchId(ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectRemarkService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectRemarkService.java new file mode 100644 index 0000000..90fdcc5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectRemarkService.java @@ -0,0 +1,22 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.ProjectRemark; +import com.ruoyi.gysl.entity.request.RemarkPageReq; + +import java.util.List; + +/** + * 项目备忘录(ProjectRemark)表服务接口 + * + * @author makejava + * @since 2025-03-19 10:49:36 + */ +public interface ProjectRemarkService extends IService { + + /** + * 查询所有数据 + */ + List list(RemarkPageReq projectRemark); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyrzInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyrzInformationService.java new file mode 100644 index 0000000..0affd2f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyrzInformationService.java @@ -0,0 +1,23 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.QyrzInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +/** + * (QyrzInformation)表服务接口 + * + * @author makejava + * @since 2025-03-19 15:25:18 + */ +public interface QyrzInformationService extends IService { + + /** + * 根据项目id查询企业入驻基本信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + QyrzInformation selectAll(ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java new file mode 100644 index 0000000..2f2e2fd --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java @@ -0,0 +1,25 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.Xmxl; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +/** + * 项目巡礼(Xmxl)表服务接口 + * + * @author makejava + * @since 2025-03-19 14:19:22 + */ +public interface XmxlService extends IService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + Page page(Page page , ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java index a89765f..34891aa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java @@ -1,8 +1,10 @@ package com.ruoyi.gysl.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.annotation.Excel; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.request.BasicInformationPageReq; import com.ruoyi.gysl.entity.response.ProjectBuildingExcel; import com.ruoyi.gysl.entity.response.ProjectExcelInfo; import com.ruoyi.gysl.mapper.BasicInformationMapper; @@ -26,6 +28,18 @@ import java.util.Objects; @Service("basicInformationService") public class BasicInformationServiceImpl extends ServiceImpl implements BasicInformationService { + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param req 查询实体 + * @return 所有数据 + */ + @Override + public Page page(Page page, BasicInformationPageReq req) { + return baseMapper.page(page,req); + } + /** * 根据基本信息的id列表来查找 */ @@ -92,7 +106,9 @@ public class BasicInformationServiceImpl extends ServiceImpl implements BuildingInformationService { +public class BuildingInformationServiceImpl extends ServiceImpl implements BuildingInformationService { + /** + * 查询所有数据 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @Override + public List selectAll(ZwIdPageReq zwIdPageReq) { + return baseMapper.selectAll(zwIdPageReq); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/EnterpriseServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/EnterpriseServiceImpl.java index 511be8a..c8826e0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/EnterpriseServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/EnterpriseServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.gysl.mapper.EnterpriseDao; +import com.ruoyi.gysl.mapper.EnterpriseMapper; import com.ruoyi.gysl.entity.Enterprise; import com.ruoyi.gysl.service.EnterpriseService; import org.springframework.stereotype.Service; @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; * @since 2025-02-24 11:26:49 */ @Service("enterpriseService") -public class EnterpriseServiceImpl extends ServiceImpl implements EnterpriseService { +public class EnterpriseServiceImpl extends ServiceImpl implements EnterpriseService { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java index 184187b..aafd2e0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java @@ -2,7 +2,7 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.gysl.entity.Mx; -import com.ruoyi.gysl.mapper.MxDao; +import com.ruoyi.gysl.mapper.MxMapper; import com.ruoyi.gysl.service.MxService; import org.springframework.stereotype.Service; @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; * @since 2025-02-24 13:40:40 */ @Service("mxService") -public class MxServiceImpl extends ServiceImpl implements MxService { +public class MxServiceImpl extends ServiceImpl implements MxService { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PjpzServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PjpzServiceImpl.java index e140458..648c191 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PjpzServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PjpzServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.gysl.mapper.PjpzDao; +import com.ruoyi.gysl.mapper.PjpzMapper; import com.ruoyi.gysl.entity.Pjpz; import com.ruoyi.gysl.service.PjpzService; import org.springframework.stereotype.Service; @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; * @since 2025-02-24 13:52:56 */ @Service("pjpzService") -public class PjpzServiceImpl extends ServiceImpl implements PjpzService { +public class PjpzServiceImpl extends ServiceImpl implements PjpzService { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PlanInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PlanInformationServiceImpl.java index 1eba9f7..8fa53ba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PlanInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PlanInformationServiceImpl.java @@ -1,7 +1,8 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.gysl.mapper.PlanInformationDao; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.mapper.PlanInformationMapper; import com.ruoyi.gysl.entity.PlanInformation; import com.ruoyi.gysl.service.PlanInformationService; import org.springframework.stereotype.Service; @@ -13,7 +14,18 @@ import org.springframework.stereotype.Service; * @since 2025-02-24 14:21:58 */ @Service("planInformationService") -public class PlanInformationServiceImpl extends ServiceImpl implements PlanInformationService { +public class PlanInformationServiceImpl extends ServiceImpl implements PlanInformationService { + + /** + * 根据项目id查询规划信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @Override + public PlanInformation selectAll(ZwIdPageReq zwIdPageReq) { + return baseMapper.selectAll(zwIdPageReq); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectLegendServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectLegendServiceImpl.java new file mode 100644 index 0000000..8f7c37e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectLegendServiceImpl.java @@ -0,0 +1,32 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.mapper.ProjectLegendMapper; +import com.ruoyi.gysl.entity.ProjectLegend; +import com.ruoyi.gysl.service.ProjectLegendService; +import org.springframework.stereotype.Service; + +/** + * 项目图例(ProjectLegend)表服务实现类 + * + * @author makejava + * @since 2025-03-19 10:12:35 + */ +@Service("projectLegendService") +public class ProjectLegendServiceImpl extends ServiceImpl implements ProjectLegendService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param projectLegend 查询实体 + * @return 所有数据 + */ + @Override + public Page page(Page page, ZwIdPageReq projectLegend) { + return baseMapper.page(page,projectLegend); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectMonthInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectMonthInfoServiceImpl.java new file mode 100644 index 0000000..3475af6 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectMonthInfoServiceImpl.java @@ -0,0 +1,42 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.mapper.ProjectMonthInfoMapper; +import com.ruoyi.gysl.entity.ProjectMonthInfo; +import com.ruoyi.gysl.service.ProjectMonthInfoService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 月度进展详情(ProjectMonthInfo)表服务实现类 + * + * @author makejava + * @since 2025-03-19 10:49:03 + */ +@Service("projectMonthInfoService") +public class ProjectMonthInfoServiceImpl extends ServiceImpl implements ProjectMonthInfoService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @Override + public Page page(Page page, ZwIdPageReq zwIdPageReq) { + return baseMapper.page(page,zwIdPageReq); + } + + /** + * 查询所有数据 + */ + @Override + public List page(ZwIdPageReq zwIdPageReq) { + return baseMapper.page(zwIdPageReq); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectOtherInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectOtherInfoServiceImpl.java new file mode 100644 index 0000000..3699003 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectOtherInfoServiceImpl.java @@ -0,0 +1,30 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.mapper.ProjectOtherInfoMapper; +import com.ruoyi.gysl.entity.ProjectOtherInfo; +import com.ruoyi.gysl.service.ProjectOtherInfoService; +import org.springframework.stereotype.Service; + +/** + * 项目其他信息(ProjectOtherInfo)表服务实现类 + * + * @author makejava + * @since 2025-03-19 10:49:22 + */ +@Service("projectOtherInfoService") +public class ProjectOtherInfoServiceImpl extends ServiceImpl implements ProjectOtherInfoService { + + /** + * 根据项目id查询项目其他信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @Override + public ProjectOtherInfo searchId(ZwIdPageReq zwIdPageReq) { + return baseMapper.searchId(zwIdPageReq); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectRemarkServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectRemarkServiceImpl.java new file mode 100644 index 0000000..505c697 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectRemarkServiceImpl.java @@ -0,0 +1,30 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.request.RemarkPageReq; +import com.ruoyi.gysl.mapper.ProjectRemarkMapper; +import com.ruoyi.gysl.entity.ProjectRemark; +import com.ruoyi.gysl.service.ProjectRemarkService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 项目备忘录(ProjectRemark)表服务实现类 + * + * @author makejava + * @since 2025-03-19 10:49:36 + */ +@Service("projectRemarkService") +public class ProjectRemarkServiceImpl extends ServiceImpl implements ProjectRemarkService { + + + /** + * 查询所有数据 + */ + @Override + public List list(RemarkPageReq projectRemark) { + return baseMapper.list(projectRemark); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyrzInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyrzInformationServiceImpl.java new file mode 100644 index 0000000..82fc63b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyrzInformationServiceImpl.java @@ -0,0 +1,30 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.mapper.QyrzInformationMapper; +import com.ruoyi.gysl.entity.QyrzInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.QyrzInformationService; +import org.springframework.stereotype.Service; + +/** + * (QyrzInformation)表服务实现类 + * + * @author makejava + * @since 2025-03-19 15:25:18 + */ +@Service("qyrzInformationService") +public class QyrzInformationServiceImpl extends ServiceImpl implements QyrzInformationService { + + /** + * 根据项目id查询企业入驻基本信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @Override + public QyrzInformation selectAll(ZwIdPageReq zwIdPageReq) { + return baseMapper.selectAll(zwIdPageReq); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java index 3e0a774..9341504 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.gysl.entity.WysmxInformation; -import com.ruoyi.gysl.mapper.WysmxInformationDao; +import com.ruoyi.gysl.mapper.WysmxInformationMapper; import com.ruoyi.gysl.service.WysmxInformationService; import org.springframework.stereotype.Service; @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; * @since 2025-02-24 14:29:58 */ @Service("wysmxInformationService") -public class WysmxInformationServiceImpl extends ServiceImpl implements WysmxInformationService { +public class WysmxInformationServiceImpl extends ServiceImpl implements WysmxInformationService { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java new file mode 100644 index 0000000..c60784e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java @@ -0,0 +1,32 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.mapper.XmxlMapper; +import com.ruoyi.gysl.entity.Xmxl; +import com.ruoyi.gysl.service.XmxlService; +import org.springframework.stereotype.Service; + +/** + * 项目巡礼(Xmxl)表服务实现类 + * + * @author makejava + * @since 2025-03-19 14:19:22 + */ +@Service("xmxlService") +public class XmxlServiceImpl extends ServiceImpl implements XmxlService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @Override + public Page page(Page page, ZwIdPageReq zwIdPageReq) { + return baseMapper.page(page,zwIdPageReq); + } +} + diff --git a/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml index 7c35ab9..ea45a6c 100644 --- a/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml @@ -56,4 +56,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item} + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/BuildingInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/BuildingInformationMapper.xml new file mode 100644 index 0000000..3a285eb --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/BuildingInformationMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/PlanInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/PlanInformationMapper.xml new file mode 100644 index 0000000..1427e6d --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/PlanInformationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/ProjectLegendMapper.xml b/ruoyi-admin/src/main/resources/mapper/ProjectLegendMapper.xml new file mode 100644 index 0000000..b335771 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/ProjectLegendMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/ProjectMonthInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/ProjectMonthInfoMapper.xml new file mode 100644 index 0000000..f7dbf74 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/ProjectMonthInfoMapper.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/ProjectOtherInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/ProjectOtherInfoMapper.xml new file mode 100644 index 0000000..a161864 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/ProjectOtherInfoMapper.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/ProjectRemarkMapper.xml b/ruoyi-admin/src/main/resources/mapper/ProjectRemarkMapper.xml new file mode 100644 index 0000000..290bdce --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/ProjectRemarkMapper.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/QyrzInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/QyrzInformationMapper.xml new file mode 100644 index 0000000..f984207 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/QyrzInformationMapper.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml b/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml new file mode 100644 index 0000000..51beeb8 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java new file mode 100644 index 0000000..9305725 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java @@ -0,0 +1,65 @@ +package com.ruoyi.framework.config; + + +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.utils.SecurityUtils; +import org.apache.ibatis.reflection.MetaObject; +import org.springframework.stereotype.Component; + +import java.util.Date; +import java.util.Objects; + +/** + * 自动注入 + * + * @author wu + * @since 2023/5/4 10:16 + */ +@Component +public class MyMetaObjectHandler implements MetaObjectHandler { + + @Override + public void insertFill(MetaObject metaObject) { + // 获取当前登录用户 + + String userName = null; + Long userId = null; + try { + LoginUser loginUser = SecurityUtils.getLoginUser(); + userName = loginUser.getUser().getNickName(); + userId = SecurityUtils.getUserId(); + } catch (Exception ignored) { + } + if (!Objects.equals(userName, "")) { + this.strictInsertFill(metaObject, "createBy", String.class, userName); + this.strictInsertFill(metaObject, "updateBy", String.class, userName); + } + if (userId != null) { + this.strictInsertFill(metaObject, "createId", Long.class, userId); + this.strictInsertFill(metaObject, "updateId", Long.class, userId); + } + this.strictInsertFill(metaObject, "createTime", Date.class, new Date()); + this.strictInsertFill(metaObject, "updateTime", Date.class, new Date()); + } + + @Override + public void updateFill(MetaObject metaObject) { + // 获取当前登录用户 + String userName = null; + Long userId = null; + try { + LoginUser loginUser = SecurityUtils.getLoginUser(); + userName = loginUser.getUser().getNickName(); + userId = SecurityUtils.getUserId(); + } catch (Exception ignored) { + } + if (userId != null) { + this.strictUpdateFill(metaObject, "updateId", Long.class, userId); + } + if (!Objects.equals(userName, "")) { + this.strictUpdateFill(metaObject, "updateBy", String.class, userName); + } + this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date()); + } +} From 4b528ea63b8b5017626412c220ded3cc5e12c903 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Sat, 22 Mar 2025 09:14:59 +0800 Subject: [PATCH 3/5] bugfix --- .../BuildingInformationController.java | 3 +- .../ruoyi/gysl/controller/MxController.java | 13 +- .../ruoyi/gysl/controller/PjpzController.java | 13 +- .../controller/PlanInformationController.java | 3 +- .../controller/ProjectLegendController.java | 11 +- .../ProjectMonthInfoController.java | 3 +- .../ProjectOtherInfoController.java | 3 +- .../controller/ProjectRemarkController.java | 3 +- .../WysmxInformationController.java | 45 +-- .../ruoyi/gysl/controller/XmxlController.java | 23 +- .../gysl/controller/XmzskController.java | 15 +- .../gysl/entity/BaseModel/BaseModel.java | 40 +++ .../ruoyi/gysl/entity/BasicInformation.java | 36 +-- .../gysl/entity/BuildingInformation.java | 2 +- .../main/java/com/ruoyi/gysl/entity/Mx.java | 52 +--- .../main/java/com/ruoyi/gysl/entity/Pjpz.java | 46 +--- .../com/ruoyi/gysl/entity/ProjectLegend.java | 9 +- .../ruoyi/gysl/entity/ProjectMonthInfo.java | 5 +- .../ruoyi/gysl/entity/ProjectOtherInfo.java | 12 +- .../com/ruoyi/gysl/entity/ProjectRemark.java | 7 +- .../ruoyi/gysl/entity/WysmxInformation.java | 118 +------- .../main/java/com/ruoyi/gysl/entity/Xmxl.java | 43 ++- .../java/com/ruoyi/gysl/entity/Xmzsk.java | 58 +--- .../gysl/entity/request/PjpzRequest.java | 20 ++ .../gysl/entity/request/XmzskPageReq.java | 26 ++ .../gysl/entity/request/ZwIdPageReq.java | 4 + .../response/ImgResponse/ImgResponse.java | 18 ++ .../response/ProjectLegendResponse.java | 24 ++ .../mapper/BuildingInformationMapper.java | 3 +- .../com/ruoyi/gysl/mapper/PjpzMapper.java | 11 + .../gysl/mapper/ProjectLegendMapper.java | 6 +- .../gysl/mapper/WysmxInformationMapper.java | 12 + .../com/ruoyi/gysl/mapper/XmxlMapper.java | 5 +- .../java/com/ruoyi/gysl/mapper/XmzskDao.java | 15 - .../com/ruoyi/gysl/mapper/XmzskMapper.java | 26 ++ .../com/ruoyi/gysl/service/MxService.java | 7 + .../com/ruoyi/gysl/service/PjpzService.java | 10 + .../gysl/service/ProjectLegendService.java | 9 +- .../gysl/service/WysmxInformationService.java | 10 + .../com/ruoyi/gysl/service/XmxlService.java | 14 +- .../com/ruoyi/gysl/service/XmzskService.java | 9 + .../gysl/service/impl/MxServiceImpl.java | 10 + .../gysl/service/impl/PjpzServiceImpl.java | 13 + .../impl/ProjectLegendServiceImpl.java | 34 ++- .../impl/WysmxInformationServiceImpl.java | 13 + .../gysl/service/impl/XmxlServiceImpl.java | 17 +- .../gysl/service/impl/XmzskServiceImpl.java | 17 +- .../src/main/resources/application-druid.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/mapper/PjpzMapper.xml | 14 + .../mapper/WysmxInfomationMapper.xml | 14 + .../src/main/resources/mapper/XmxlMapper.xml | 2 +- .../src/main/resources/mapper/XmzskMapper.xml | 17 ++ .../ruoyi/common/core/domain/BaseEntity.java | 4 + .../ruoyi/framework/config/MyBatisConfig.java | 260 +++++++++--------- .../framework/config/MyMetaObjectHandler.java | 7 +- .../framework/config/MybatisPlusConfig.java | 126 ++++----- 57 files changed, 730 insertions(+), 614 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BaseModel/BaseModel.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/PjpzRequest.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmzskPageReq.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ImgResponse/ImgResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectLegendResponse.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskDao.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskMapper.java create mode 100644 ruoyi-admin/src/main/resources/mapper/PjpzMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/WysmxInfomationMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/XmzskMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java index ef5db2c..f81ebc4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; @@ -46,7 +47,7 @@ public class BuildingInformationController extends BaseController { */ @GetMapping("/page") @ApiOperation(value = "查询所有数据",response = BuildingInformation.class ) - public AjaxResult selectAll(ZwIdPageReq zwIdPageReq) { + public AjaxResult selectAll(@Valid ZwIdPageReq zwIdPageReq) { return success(buildingInformationService.selectAll(zwIdPageReq)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java index e9ffe08..6644b1a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java @@ -24,6 +24,8 @@ import java.util.List; @RestController @RequestMapping("/gysl/mx") public class MxController extends BaseController { + + /** * 服务对象 */ @@ -31,15 +33,14 @@ public class MxController extends BaseController { private MxService mxService; /** - * 分页查询所有数据 + * 查询所有模型数据 * - * @param page 分页对象 * @return 所有数据 */ @GetMapping("/page") - @ApiOperation("分页查询所有数据") - public AjaxResult selectAll(Page page) { - return success(mxService.page(page)); + @ApiOperation("查询所有模型数据") + public AjaxResult selectAll() { + return success(mxService.list()); } /** @@ -63,7 +64,7 @@ public class MxController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody Mx mx) { - return success(mxService.save(mx)); + return success(mxService.add(mx)); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PjpzController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PjpzController.java index 5831190..3f8eb42 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PjpzController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PjpzController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.Pjpz; +import com.ruoyi.gysl.entity.request.PjpzRequest; import com.ruoyi.gysl.service.PjpzService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -40,8 +41,8 @@ public class PjpzController extends BaseController { */ @GetMapping("/page") @ApiOperation("分页查询所有数据") - public AjaxResult selectAll(Page page, Pjpz pjpz) { - return success(this.pjpzService.page(page, new QueryWrapper<>(pjpz))); + public AjaxResult selectAll(Page page, PjpzRequest pjpz) { + return success(pjpzService.page(page, pjpz)); } /** @@ -53,7 +54,7 @@ public class PjpzController extends BaseController { @GetMapping("{id}") @ApiOperation("通过主键查询单条数据") public AjaxResult selectOne(@PathVariable Serializable id) { - return success(this.pjpzService.getById(id)); + return success(pjpzService.getById(id)); } /** @@ -65,7 +66,7 @@ public class PjpzController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody Pjpz pjpz) { - return success(this.pjpzService.save(pjpz)); + return success(pjpzService.save(pjpz)); } /** @@ -77,7 +78,7 @@ public class PjpzController extends BaseController { @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody Pjpz pjpz) { - return success(this.pjpzService.updateById(pjpz)); + return success(pjpzService.updateById(pjpz)); } /** @@ -89,7 +90,7 @@ public class PjpzController extends BaseController { @ApiOperation("删除数据") @DeleteMapping("/delete") public AjaxResult delete(@RequestParam("idList") List idList) { - return success(this.pjpzService.removeByIds(idList)); + return success(pjpzService.removeByIds(idList)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java index cc28b74..f381f67 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; @@ -40,7 +41,7 @@ public class PlanInformationController extends BaseController { */ @GetMapping("/selectAll") @ApiOperation("根据项目id查询规划信息") - public AjaxResult selectAll( ZwIdPageReq zwIdPageReq) { + public AjaxResult selectAll(@Valid ZwIdPageReq zwIdPageReq) { return success(planInformationService.selectAll(zwIdPageReq)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java index 5da248d..e39ed49 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java @@ -1,7 +1,6 @@ package com.ruoyi.gysl.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.ProjectLegend; @@ -12,6 +11,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; @@ -32,16 +32,15 @@ public class ProjectLegendController extends BaseController { private ProjectLegendService projectLegendService; /** - * 分页查询所有数据 + * 根据项目id查询所有数据 * - * @param page 分页对象 * @param projectLegend 查询实体 * @return 所有数据 */ - @ApiOperation("分页查询所有数据") + @ApiOperation("根据项目id查询所有数据") @GetMapping("/page") - public AjaxResult selectAll(Page page, ZwIdPageReq projectLegend) { - return success(projectLegendService.page(page, projectLegend)); + public AjaxResult selectAll(@Valid ZwIdPageReq projectLegend) { + return success(projectLegendService.page(projectLegend)); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java index 3c3df4a..67c95be 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; @@ -42,7 +43,7 @@ public class ProjectMonthInfoController extends BaseController { */ @ApiOperation("分页查询所有数据") @GetMapping("/page") - public AjaxResult selectAll(Page page, ZwIdPageReq zwIdPageReq) { + public AjaxResult selectAll(Page page,@Valid ZwIdPageReq zwIdPageReq) { return success(projectMonthInfoService.page(page, zwIdPageReq)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java index e59bc20..caf0117 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java @@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; /** @@ -37,7 +38,7 @@ public class ProjectOtherInfoController extends BaseController { */ @ApiOperation("根据项目id查询项目其他信息") @GetMapping("/searchId") - public AjaxResult selectAll(ZwIdPageReq zwIdPageReq) { + public AjaxResult selectAll(@Valid ZwIdPageReq zwIdPageReq) { return success(projectOtherInfoService.searchId(zwIdPageReq)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java index 6f78158..d6d48e7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; @@ -40,7 +41,7 @@ public class ProjectRemarkController extends BaseController { */ @ApiOperation("查询所有数据") @GetMapping("/page") - public AjaxResult selectAll( RemarkPageReq projectRemark) { + public AjaxResult selectAll(@Valid RemarkPageReq projectRemark) { return success(projectRemarkService.list(projectRemark)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/WysmxInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/WysmxInformationController.java index 9450e3e..734940f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/WysmxInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/WysmxInformationController.java @@ -6,12 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.WysmxInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; import com.ruoyi.gysl.service.WysmxInformationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; @@ -21,7 +23,7 @@ import java.util.List; * @author makejava * @since 2025-02-24 14:29:58 */ -@Api(tags ="五要素模型信息" ) +@Api(tags ="五要素模型信息。" ) @RestController @RequestMapping("/gysl/wysmxInformation") public class WysmxInformationController extends BaseController { @@ -32,28 +34,15 @@ public class WysmxInformationController extends BaseController { private WysmxInformationService wysmxInformationService; /** - * 分页查询所有数据 + * 根据项目id查询该项目的五要素模型信息 * - * @param page 分页对象 - * @param wysmxInformation 查询实体 + * @param zwIdPageReq 查询实体 * @return 所有数据 */ - @GetMapping("/page") - @ApiOperation("分页查询所有数据") - public AjaxResult selectAll(Page page, WysmxInformation wysmxInformation) { - return success(this.wysmxInformationService.page(page, new QueryWrapper<>(wysmxInformation))); - } - - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @GetMapping("{id}") - @ApiOperation("通过主键查询单条数据") - public AjaxResult selectOne(@PathVariable Serializable id) { - return success(this.wysmxInformationService.getById(id)); + @GetMapping("/selectOne") + @ApiOperation("根据项目id查询该项目的五要素模型信息") + public AjaxResult selectOne(@Valid ZwIdPageReq zwIdPageReq) { + return success(wysmxInformationService.selectOne(zwIdPageReq)); } /** @@ -65,7 +54,7 @@ public class WysmxInformationController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody WysmxInformation wysmxInformation) { - return success(this.wysmxInformationService.save(wysmxInformation)); + return success(wysmxInformationService.save(wysmxInformation)); } /** @@ -77,19 +66,7 @@ public class WysmxInformationController extends BaseController { @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody WysmxInformation wysmxInformation) { - return success(this.wysmxInformationService.updateById(wysmxInformation)); - } - - /** - * 删除数据 - * - * @param idList 主键结合 - * @return 删除结果 - */ - @ApiOperation("删除数据") - @DeleteMapping("/delete") - public AjaxResult delete(@RequestParam("idList") List idList) { - return success(this.wysmxInformationService.removeByIds(idList)); + return success(wysmxInformationService.updateById(wysmxInformation)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java index 20faf9b..ee6b9cb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java @@ -1,7 +1,6 @@ package com.ruoyi.gysl.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.Xmxl; @@ -12,6 +11,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; @@ -19,9 +19,9 @@ import java.util.List; * 项目巡礼(Xmxl)表控制层 * * @author makejava - * @since 2025-03-19 14:19:21 + * @since 2025-03-21 14:15:34 */ -@Api(tags = "项目巡礼") +@Api(tags ="项目巡礼" ) @RestController @RequestMapping("/gysl/xmxl") public class XmxlController extends BaseController { @@ -32,16 +32,15 @@ public class XmxlController extends BaseController { private XmxlService xmxlService; /** - * 分页查询所有数据 + * 根据项目id查询所有数据 * - * @param page 分页对象 * @param zwIdPageReq 查询实体 * @return 所有数据 */ - @ApiOperation("分页查询所有数据") - @GetMapping("/page") - public AjaxResult selectAll(Page page, ZwIdPageReq zwIdPageReq) { - return success(xmxlService.page(page, zwIdPageReq)); + @GetMapping("/list") + @ApiOperation("根据项目id查询所有数据") + public AjaxResult selectAll(@Valid ZwIdPageReq zwIdPageReq) { + return success(xmxlService.list(zwIdPageReq)); } /** @@ -50,8 +49,8 @@ public class XmxlController extends BaseController { * @param id 主键 * @return 单条数据 */ - @ApiOperation("通过主键查询单条数据") @GetMapping("/{id}") + @ApiOperation("通过主键查询单条数据") public AjaxResult selectOne(@PathVariable Serializable id) { return success(xmxlService.getById(id)); } @@ -62,8 +61,8 @@ public class XmxlController extends BaseController { * @param xmxl 实体对象 * @return 新增结果 */ - @ApiOperation("新增数据") @PostMapping("/add") + @ApiOperation("新增数据") public AjaxResult insert(@RequestBody Xmxl xmxl) { return success(xmxlService.save(xmxl)); } @@ -74,8 +73,8 @@ public class XmxlController extends BaseController { * @param xmxl 实体对象 * @return 修改结果 */ + @PostMapping("/edit") @ApiOperation("修改数据") - @PutMapping("/edit") public AjaxResult update(@RequestBody Xmxl xmxl) { return success(xmxlService.updateById(xmxl)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java index 8fd6fa3..bfe0123 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java @@ -1,11 +1,11 @@ package com.ruoyi.gysl.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.Xmzsk; +import com.ruoyi.gysl.entity.request.XmzskPageReq; import com.ruoyi.gysl.service.XmzskService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -35,13 +35,12 @@ public class XmzskController extends BaseController { * 分页查询所有数据 * * @param page 分页对象 - * @param xmzsk 查询实体 * @return 所有数据 */ @GetMapping("/page") @ApiOperation("分页查询所有数据") - public AjaxResult selectAll(Page page, Xmzsk xmzsk) { - return success(this.xmzskService.page(page, new QueryWrapper<>(xmzsk))); + public AjaxResult selectAll(Page page,XmzskPageReq req) { + return success(xmzskService.page(page,req)); } /** @@ -53,7 +52,7 @@ public class XmzskController extends BaseController { @GetMapping("{id}") @ApiOperation("通过主键查询单条数据") public AjaxResult selectOne(@PathVariable Serializable id) { - return success(this.xmzskService.getById(id)); + return success(xmzskService.getById(id)); } /** @@ -65,7 +64,7 @@ public class XmzskController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody Xmzsk xmzsk) { - return success(this.xmzskService.save(xmzsk)); + return success(xmzskService.save(xmzsk)); } /** @@ -77,7 +76,7 @@ public class XmzskController extends BaseController { @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody Xmzsk xmzsk) { - return success(this.xmzskService.updateById(xmzsk)); + return success(xmzskService.updateById(xmzsk)); } /** @@ -89,7 +88,7 @@ public class XmzskController extends BaseController { @ApiOperation("删除数据") @DeleteMapping("/delete") public AjaxResult delete(@RequestParam("idList") List idList) { - return success(this.xmzskService.removeByIds(idList)); + return success(xmzskService.removeByIds(idList)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BaseModel/BaseModel.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BaseModel/BaseModel.java new file mode 100644 index 0000000..fa3d93d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BaseModel/BaseModel.java @@ -0,0 +1,40 @@ +package com.ruoyi.gysl.entity.BaseModel; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; +import java.util.Date; + +/** + * 公共实体类 + * @author du + * @since 2025/3/21 13:48 + */ +@Data +public class BaseModel { + @TableField(fill = FieldFill.INSERT) + private String createBy; + + @TableField(fill = FieldFill.INSERT) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + @TableField(fill = FieldFill.INSERT) + private Long createId; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long updateId; + + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java index 4a16301..8b21fbc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -26,7 +27,7 @@ import java.util.Date; @Data @ApiModel("基本信息") @TableName(value = "basic_information") -public class BasicInformation extends Model { +public class BasicInformation extends BaseModel { @ApiModelProperty("主键id") @TableId(value = "id", type = IdType.AUTO) @@ -148,36 +149,11 @@ public class BasicInformation extends Model { @ApiModelProperty("附件") private String fj; + @ApiModelProperty("经度") + private String longitude; - //创建者id - @ApiModelProperty("创建者id") - private Integer createId; - - //创建时间 - @ApiModelProperty("创建时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; - - - //创建者 - @ApiModelProperty("创建者") - private String createBy; - - //更新者ID - @ApiModelProperty("更新者ID") - private Long updateId; - - //更新者 - @ApiModelProperty("更新者") - private String updateBy; - - //更新时间 - @ApiModelProperty("更新时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; - + @ApiModelProperty("纬度") + private String latitude; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java index 4c79c74..6e21a20 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java @@ -149,7 +149,7 @@ public class BuildingInformation implements Serializable { * 是否为重要楼栋 */ @Excel(name = "是否为重要楼栋",readConverterExp="1=是,2=否") - @ApiModelProperty(value = "是否有汽车盘道 , 1是2否") + @ApiModelProperty(value = "是否为重要楼栋 , 1是2否") @TableField("sfwzyld") private Integer sfwzyld; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java index baabdf3..b1b839d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java @@ -4,9 +4,12 @@ import java.time.LocalDateTime; import java.util.Date; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,7 +26,7 @@ import org.springframework.format.annotation.DateTimeFormat; @EqualsAndHashCode(callSuper = false) @TableName("mx") @ApiModel(value = "Mx", description = "模型管理") -public class Mx implements Serializable { +public class Mx extends BaseModel implements Serializable { private static final long serialVersionUID = -78397958900753109L; /** @@ -31,7 +34,8 @@ public class Mx implements Serializable { */ @ApiModelProperty(value = "主键id") @TableField("id") - private Integer id; + @TableId(type = IdType.AUTO) + private Long id; /** * 1:关键要素；2：重要要素 @@ -60,48 +64,4 @@ public class Mx implements Serializable { @ApiModelProperty(value = "详细要求") @TableField("xxyq") private String xxyq; - - /** - * 创建者id - */ - @ApiModelProperty(value = "创建者id") - @TableField("create_id") - private Integer createId; - - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - @TableField("create_time") - private Date createTime; - - /** - * 创建者 - */ - @ApiModelProperty(value = "创建者") - @TableField("create_by") - private String createBy; - - /** - * 更新者ID - */ - @ApiModelProperty(value = "更新者ID") - @TableField("update_id") - private Long updateId; - - /** - * 更新者 - */ - @ApiModelProperty(value = "更新者") - @TableField("update_by") - private String updateBy; - - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - @TableField("update_time") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java index 657ee7e..426260f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java @@ -3,8 +3,11 @@ package com.ruoyi.gysl.entity; import java.util.Date; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,7 +23,7 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) @TableName("pjpz") @ApiModel(value = "Pjpz", description = "项目评价配置") -public class Pjpz implements Serializable { +public class Pjpz extends BaseModel implements Serializable { private static final long serialVersionUID = -25318153790915105L; /** @@ -28,6 +31,7 @@ public class Pjpz implements Serializable { */ @ApiModelProperty(value = "主键id") @TableField("id") + @TableId(type = IdType.AUTO) private Integer id; /** @@ -44,45 +48,5 @@ public class Pjpz implements Serializable { @TableField("pfgz") private String pfgz; - /** - * 创建者id - */ - @ApiModelProperty(value = "创建者id") - @TableField("create_id") - private Integer createId; - - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - @TableField("create_time") - private Date createTime; - - /** - * 创建者 - */ - @ApiModelProperty(value = "创建者") - @TableField("create_by") - private String createBy; - /** - * 更新者ID - */ - @ApiModelProperty(value = "更新者ID") - @TableField("update_id") - private Long updateId; - - /** - * 更新者 - */ - @ApiModelProperty(value = "更新者") - @TableField("update_by") - private String updateBy; - - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - @TableField("update_time") - private Date updateTime; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java index 9edb3f0..756203e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java @@ -4,9 +4,12 @@ package com.ruoyi.gysl.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; @@ -16,8 +19,10 @@ import java.io.Serializable; * @author makejava * @since 2025-03-19 10:12:35 */ +@EqualsAndHashCode(callSuper = true) @Data -public class ProjectLegend extends BaseEntity implements Serializable { +@TableName(value = "project_legend") +public class ProjectLegend extends BaseModel implements Serializable { @TableField("id") @TableId(type = IdType.AUTO) @@ -26,7 +31,7 @@ public class ProjectLegend extends BaseEntity implements Serializable { @ApiModelProperty("项目id") private Long xmId; - @ApiModelProperty("图片类型") + @ApiModelProperty("图片类型 1外部 2内部") private Integer imgType; @ApiModelProperty("图片") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java index f3ff4fa..4cccfa8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java @@ -4,7 +4,9 @@ package com.ruoyi.gysl.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,8 +18,9 @@ import java.io.Serializable; * @author makejava * @since 2025-03-19 10:49:03 */ +@TableName("project_month_info") @Data -public class ProjectMonthInfo extends BaseEntity implements Serializable { +public class ProjectMonthInfo extends BaseModel implements Serializable { @TableField("id") @TableId(type = IdType.AUTO) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java index 517d921..c588ff8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java @@ -4,7 +4,9 @@ package com.ruoyi.gysl.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,8 +18,10 @@ import java.io.Serializable; * @author makejava * @since 2025-03-19 10:49:22 */ + +@TableName("project_other_info") @Data -public class ProjectOtherInfo extends BaseEntity implements Serializable { +public class ProjectOtherInfo extends BaseModel implements Serializable { @TableField("id") @TableId(type = IdType.AUTO) @@ -26,8 +30,10 @@ public class ProjectOtherInfo extends BaseEntity implements Serializable { @ApiModelProperty("项目id") private Long xmId; + @ApiModelProperty("键") + private String zdname; - @ApiModelProperty("其他信息JSON") - private String otherJson; + @ApiModelProperty("值") + private String zdinfor; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java index c64474d..e9742ea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java @@ -4,9 +4,12 @@ package com.ruoyi.gysl.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; @@ -16,8 +19,10 @@ import java.io.Serializable; * @author makejava * @since 2025-03-19 10:49:35 */ +@EqualsAndHashCode(callSuper = true) @Data -public class ProjectRemark extends BaseEntity implements Serializable { +@TableName("project_remark") +public class ProjectRemark extends BaseModel implements Serializable { @TableField("id") @TableId(type = IdType.AUTO) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java index 7fc6886..f8198bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java @@ -1,18 +1,16 @@ package com.ruoyi.gysl.entity; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Date; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** * 五要素模型信息(WysmxInformation)实体类 @@ -24,11 +22,12 @@ import org.springframework.format.annotation.DateTimeFormat; @EqualsAndHashCode(callSuper = false) @TableName("wysmx_information") @ApiModel(value = "WysmxInformation", description = "五要素模型信息") -public class WysmxInformation implements Serializable { +public class WysmxInformation extends BaseModel implements Serializable { private static final long serialVersionUID = 285216252862855830L; @ApiModelProperty(value = "${column.comment}") @TableField("id") + @TableId(type = IdType.AUTO) private Integer id; /** @@ -38,105 +37,10 @@ public class WysmxInformation implements Serializable { @TableField("xm_id") private Integer xmId; - /** - * 环境保护 - */ - @ApiModelProperty(value = "环境保护") - @TableField("hjbh") - private String hjbh; - - /** - * 设备载重 - */ - @ApiModelProperty(value = "设备载重") - @TableField("sbzz") - private BigDecimal sbzz; - - /** - * 货梯要求 - */ - @ApiModelProperty(value = "货梯要求") - @TableField("htyq") - private String htyq; - - /** - * 员工密度 - */ - @ApiModelProperty(value = "员工密度") - @TableField("ygmd") - private BigDecimal ygmd; + @ApiModelProperty("键") + private String zdname; - /** - * 加工精度 - */ - @ApiModelProperty(value = "加工精度") - @TableField("jgjd") - private BigDecimal jgjd; + @ApiModelProperty("值") + private String zdinfor; - /** - * 减振措施 - */ - @ApiModelProperty(value = "减振措施") - @TableField("jzcs") - private String jzcs; - - /** - * 生产类型 - */ - @ApiModelProperty(value = "生产类型") - @TableField("sclx") - private String sclx; - - /** - * 层高要求 - */ - @ApiModelProperty(value = "层高要求") - @TableField("cgyq") - private String cgyq; - - /** - * 创建者id - */ - @ApiModelProperty(value = "创建者id") - @TableField("create_id") - private Integer createId; - - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - @TableField("create_time") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; - - /** - * 创建者 - */ - @ApiModelProperty(value = "创建者") - @TableField("create_by") - private String createBy; - - /** - * 更新者ID - */ - @ApiModelProperty(value = "更新者ID") - @TableField("update_id") - private Long updateId; - - /** - * 更新者 - */ - @ApiModelProperty(value = "更新者") - @TableField("update_by") - private String updateBy; - - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - @TableField("update_time") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java index 23c7785..0ae6c14 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java @@ -4,10 +4,12 @@ package com.ruoyi.gysl.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; @@ -17,26 +19,49 @@ import java.time.LocalDate; * 项目巡礼(Xmxl)表实体类 * * @author makejava - * @since 2025-03-19 14:19:22 + * @since 2025-03-21 14:15:38 */ +@EqualsAndHashCode(callSuper = true) @Data -public class Xmxl extends BaseEntity implements Serializable { +@TableName("xmxl") +public class Xmxl extends BaseModel implements Serializable { @TableField("id") @TableId(type = IdType.AUTO) private Long id; - @ApiModelProperty("监控名称") - private String jkmc; + @ApiModelProperty("项目id") + private Long xmId; - @ApiModelProperty(value = "时间 yyyy-MM-dd") + @ApiModelProperty("项目名称") + private String xmmc; + + @ApiModelProperty("年度") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy") + private LocalDate year; + + @ApiModelProperty("网页地址") + private String webUrl; + + @ApiModelProperty("时间") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate sj; - @ApiModelProperty(value = "当前状态") - private Integer status; + @ApiModelProperty("图片上传") + private String img; + + @ApiModelProperty("说明") + private String content; - @ApiModelProperty(value = "附件") + @ApiModelProperty("大事记") + private String bigEvent; + + @ApiModelProperty("新闻事件") + private String newsEvent; + + @ApiModelProperty("附件上传") private String fj; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java index 43c8044..4cb7368 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java @@ -4,9 +4,12 @@ import java.time.LocalDateTime; import java.util.Date; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,7 +26,7 @@ import org.springframework.format.annotation.DateTimeFormat; @EqualsAndHashCode(callSuper = false) @TableName("xmzsk") @ApiModel(value = "Xmzsk", description = "$tableInfo.comment") -public class Xmzsk implements Serializable { +public class Xmzsk extends BaseModel implements Serializable { private static final long serialVersionUID = 442554812871200496L; /** @@ -31,6 +34,7 @@ public class Xmzsk implements Serializable { */ @ApiModelProperty(value = "主键id") @TableField("id") + @TableId(type = IdType.AUTO) private Integer id; /** @@ -47,6 +51,13 @@ public class Xmzsk implements Serializable { @TableField("lx") private String lx; + /** + * 网址 + */ + @ApiModelProperty(value = "类型") + @TableField("wz") + private String wz; + /** * 附件 */ @@ -68,49 +79,4 @@ public class Xmzsk implements Serializable { @TableField("scsj") private Date scsj; - /** - * 创建者id - */ - @ApiModelProperty(value = "创建者id") - @TableField("create_id") - private Integer createId; - - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - @TableField("create_time") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; - - /** - * 创建者 - */ - @ApiModelProperty(value = "创建者") - @TableField("create_by") - private String createBy; - - /** - * 更新者ID - */ - @ApiModelProperty(value = "更新者ID") - @TableField("update_id") - private Long updateId; - - /** - * 更新者 - */ - @ApiModelProperty(value = "更新者") - @TableField("update_by") - private String updateBy; - - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - @TableField("update_time") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/PjpzRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/PjpzRequest.java new file mode 100644 index 0000000..cd50cdb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/PjpzRequest.java @@ -0,0 +1,20 @@ +package com.ruoyi.gysl.entity.request; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目评价配置请求参数 + * @author du + * @since 2025/3/21 17:13 + */ +@Data +public class PjpzRequest { + + /** + * 评价要素 + */ + @ApiModelProperty(value = "评价要素") + private String pjys; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmzskPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmzskPageReq.java new file mode 100644 index 0000000..0210313 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmzskPageReq.java @@ -0,0 +1,26 @@ +package com.ruoyi.gysl.entity.request; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目知识库分页请求类 + * @author du + * @since 2025/3/21 14:37 + */ +@Data +public class XmzskPageReq { + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称") + private String name; + + /** + * 类型 + */ + @ApiModelProperty(value = "类型") + private String lx; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java index 714e43b..3f8ae01 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java @@ -3,6 +3,8 @@ package com.ruoyi.gysl.entity.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; + /** * 分页请求类 * @author du @@ -10,6 +12,8 @@ import lombok.Data; */ @Data public class ZwIdPageReq { + + @NotNull @ApiModelProperty("项目id") private Long xmId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ImgResponse/ImgResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ImgResponse/ImgResponse.java new file mode 100644 index 0000000..af9907e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ImgResponse/ImgResponse.java @@ -0,0 +1,18 @@ +package com.ruoyi.gysl.entity.response.ImgResponse; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 项目图例组装实体类 + * @author du + * @since 2025/3/21 16:03 + */ +@Data +public class ImgResponse { + + @ApiModelProperty("图片") + private String[] images; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectLegendResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectLegendResponse.java new file mode 100644 index 0000000..185c2bc --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectLegendResponse.java @@ -0,0 +1,24 @@ +package com.ruoyi.gysl.entity.response; + +import com.ruoyi.gysl.entity.response.ImgResponse.ImgResponse; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目图例分页返回类 + * @author du + * @since 2025/3/21 15:52 + */ +@Data +public class ProjectLegendResponse { + + @ApiModelProperty("id") + private Long id; + + @ApiModelProperty("图片类型1") + private ImgResponse type1; + + @ApiModelProperty("图片类型2") + private ImgResponse type2; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationMapper.java index 245d5eb..b8193a7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.gysl.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.gysl.entity.BuildingInformation; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,6 +21,6 @@ public interface BuildingInformationMapper extends BaseMapper selectAll(ZwIdPageReq zwIdPageReq); + List selectAll(@Param("req") ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzMapper.java index a2b0bd5..ee0542a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzMapper.java @@ -1,7 +1,10 @@ package com.ruoyi.gysl.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.gysl.entity.Pjpz; +import com.ruoyi.gysl.entity.request.PjpzRequest; +import org.apache.ibatis.annotations.Param; /** * 项目评价配置(Pjpz)表数据库访问层 @@ -11,5 +14,13 @@ import com.ruoyi.gysl.entity.Pjpz; */ public interface PjpzMapper extends BaseMapper { + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param pjpz 查询实体 + * @return 所有数据 + */ + Page page(Page page,@Param("req") PjpzRequest pjpz); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectLegendMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectLegendMapper.java index 3feae45..685e9e3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectLegendMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectLegendMapper.java @@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.gysl.entity.ProjectLegend; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.entity.response.ProjectLegendResponse; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 项目图例(ProjectLegend)表数据库访问层 * @@ -18,10 +21,9 @@ public interface ProjectLegendMapper extends BaseMapper { /** * 分页查询所有数据 * - * @param page 分页对象 * @param projectLegend 查询实体 * @return 所有数据 */ - Page page(Page page,@Param("req") ZwIdPageReq projectLegend); + List page(@Param("req") ZwIdPageReq projectLegend); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java index 5f8114b..c113ac7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java @@ -2,6 +2,10 @@ package com.ruoyi.gysl.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.gysl.entity.WysmxInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 五要素模型信息(WysmxInformation)表数据库访问层 @@ -11,5 +15,13 @@ import com.ruoyi.gysl.entity.WysmxInformation; */ public interface WysmxInformationMapper extends BaseMapper { + + /** + * 根据项目id查询该项目的五要素模型信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + List selectOne(@Param("req") ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlMapper.java index 78b315d..a96f5b7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlMapper.java @@ -6,6 +6,8 @@ import com.ruoyi.gysl.entity.Xmxl; import com.ruoyi.gysl.entity.request.ZwIdPageReq; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 项目巡礼(Xmxl)表数据库访问层 * @@ -18,10 +20,9 @@ public interface XmxlMapper extends BaseMapper { /** * 分页查询所有数据 * - * @param page 分页对象 * @param zwIdPageReq 查询实体 * @return 所有数据 */ - Page page(Page page,@Param("req") ZwIdPageReq zwIdPageReq); + List list( @Param("req") ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskDao.java deleted file mode 100644 index 4bd4080..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ruoyi.gysl.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.gysl.entity.Xmzsk; - -/** - * (Xmzsk)表数据库访问层 - * - * @author makejava - * @since 2025-02-24 14:31:17 - */ -public interface XmzskDao extends BaseMapper { - -} - diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskMapper.java new file mode 100644 index 0000000..bb0be24 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskMapper.java @@ -0,0 +1,26 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.gysl.entity.Xmzsk; +import com.ruoyi.gysl.entity.request.XmzskPageReq; +import org.apache.ibatis.annotations.Param; + +/** + * (Xmzsk)表数据库访问层 + * + * @author makejava + * @since 2025-02-24 14:31:17 + */ +public interface XmzskMapper extends BaseMapper { + + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @return 所有数据 + */ + Page page(Page page,@Param("req") XmzskPageReq req); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java index fbc9a12..42e8344 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java @@ -12,5 +12,12 @@ import com.ruoyi.gysl.entity.Mx; */ public interface MxService extends IService { + /** + * 新增数据 + * + * @param mx 实体对象 + * @return 新增结果 + */ + int add(Mx mx); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/PjpzService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/PjpzService.java index 9977b19..ba4154a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/PjpzService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/PjpzService.java @@ -1,7 +1,9 @@ package com.ruoyi.gysl.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.Pjpz; +import com.ruoyi.gysl.entity.request.PjpzRequest; /** * 项目评价配置(Pjpz)表服务接口 @@ -11,5 +13,13 @@ import com.ruoyi.gysl.entity.Pjpz; */ public interface PjpzService extends IService { + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param pjpz 查询实体 + * @return 所有数据 + */ + Page page (Page page, PjpzRequest pjpz); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectLegendService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectLegendService.java index 9f638d7..e5ade5d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectLegendService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectLegendService.java @@ -1,9 +1,11 @@ package com.ruoyi.gysl.service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.ProjectLegend; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.entity.response.ProjectLegendResponse; + +import java.util.List; /** * 项目图例(ProjectLegend)表服务接口 @@ -14,12 +16,11 @@ import com.ruoyi.gysl.entity.request.ZwIdPageReq; public interface ProjectLegendService extends IService { /** - * 分页查询所有数据 + * 根据项目id查询所有数据 * - * @param page 分页对象 * @param projectLegend 查询实体 * @return 所有数据 */ - Page page(Page page, ZwIdPageReq projectLegend); + List page( ZwIdPageReq projectLegend); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java index e200ffe..ab0c183 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java @@ -2,6 +2,9 @@ package com.ruoyi.gysl.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.WysmxInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +import java.util.List; /** * 五要素模型信息(WysmxInformation)表服务接口 @@ -11,5 +14,12 @@ import com.ruoyi.gysl.entity.WysmxInformation; */ public interface WysmxInformationService extends IService { + /** + * 根据项目id查询该项目的五要素模型信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + List selectOne(ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java index 2f2e2fd..71eaaa4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java @@ -1,25 +1,23 @@ package com.ruoyi.gysl.service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.Xmxl; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import java.util.List; + /** * 项目巡礼(Xmxl)表服务接口 * * @author makejava - * @since 2025-03-19 14:19:22 + * @since 2025-03-21 14:15:40 */ public interface XmxlService extends IService { + /** - * 分页查询所有数据 - * - * @param page 分页对象 - * @param zwIdPageReq 查询实体 - * @return 所有数据 + * 查询所有数据 */ - Page page(Page page , ZwIdPageReq zwIdPageReq); + List list(ZwIdPageReq projectRemark); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmzskService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmzskService.java index 9171059..05112b7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmzskService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmzskService.java @@ -1,7 +1,9 @@ package com.ruoyi.gysl.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.Xmzsk; +import com.ruoyi.gysl.entity.request.XmzskPageReq; /** * (Xmzsk)表服务接口 @@ -11,5 +13,12 @@ import com.ruoyi.gysl.entity.Xmzsk; */ public interface XmzskService extends IService { + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @return 所有数据 + */ + Page page(Page page, XmzskPageReq req); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java index aafd2e0..3bfaaf9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java @@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.gysl.entity.Mx; import com.ruoyi.gysl.mapper.MxMapper; import com.ruoyi.gysl.service.MxService; +import com.ruoyi.gysl.service.WysmxInformationService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + /** * 模型管理(Mx)表服务实现类 * @@ -15,6 +18,13 @@ import org.springframework.stereotype.Service; @Service("mxService") public class MxServiceImpl extends ServiceImpl implements MxService { + @Resource + private WysmxInformationService wysmxInformationService; + @Override + public int add(Mx mx) { + //新增一条模型信息,就要修改一次 + return 0; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PjpzServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PjpzServiceImpl.java index 648c191..92055df 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PjpzServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PjpzServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.gysl.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.request.PjpzRequest; import com.ruoyi.gysl.mapper.PjpzMapper; import com.ruoyi.gysl.entity.Pjpz; import com.ruoyi.gysl.service.PjpzService; @@ -15,5 +17,16 @@ import org.springframework.stereotype.Service; @Service("pjpzService") public class PjpzServiceImpl extends ServiceImpl implements PjpzService { + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param pjpz 查询实体 + * @return 所有数据 + */ + @Override + public Page page(Page page, PjpzRequest pjpz) { + return baseMapper.page(page,pjpz); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectLegendServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectLegendServiceImpl.java index 8f7c37e..9aaf848 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectLegendServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectLegendServiceImpl.java @@ -1,13 +1,17 @@ package com.ruoyi.gysl.service.impl; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.ProjectLegend; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.entity.response.ImgResponse.ImgResponse; +import com.ruoyi.gysl.entity.response.ProjectLegendResponse; import com.ruoyi.gysl.mapper.ProjectLegendMapper; -import com.ruoyi.gysl.entity.ProjectLegend; import com.ruoyi.gysl.service.ProjectLegendService; import org.springframework.stereotype.Service; +import java.util.*; +import java.util.stream.Collectors; + /** * 项目图例(ProjectLegend)表服务实现类 * @@ -20,13 +24,33 @@ public class ProjectLegendServiceImpl extends ServiceImpl page(Page page, ZwIdPageReq projectLegend) { - return baseMapper.page(page,projectLegend); + public List page(ZwIdPageReq projectLegend) { + List a1 = new ArrayList<>(); + List page = baseMapper.page(projectLegend); + // 按 id 分组 + Map> grouped = page.stream() + .collect(Collectors.groupingBy(ProjectLegend::getXmId)); + for (Long id : grouped.keySet()) { + List legends = grouped.get(id); + ProjectLegendResponse ps = new ProjectLegendResponse(); + + legends.forEach(x -> { + ImgResponse imgResponse = new ImgResponse(); + imgResponse.setImages(x.getImg().split(",")); + if(x.getImgType() == 1){ + ps.setType1(imgResponse); + }else { + ps.setType2(imgResponse); + } + }); + ps.setId(id); + a1.add(ps); + } + return a1; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java index 9341504..e386556 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java @@ -3,10 +3,13 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.gysl.entity.WysmxInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; import com.ruoyi.gysl.mapper.WysmxInformationMapper; import com.ruoyi.gysl.service.WysmxInformationService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 五要素模型信息(WysmxInformation)表服务实现类 * @@ -16,5 +19,15 @@ import org.springframework.stereotype.Service; @Service("wysmxInformationService") public class WysmxInformationServiceImpl extends ServiceImpl implements WysmxInformationService { + /** + * 根据项目id查询该项目的五要素模型信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @Override + public List selectOne(ZwIdPageReq zwIdPageReq) { + return baseMapper.selectOne(zwIdPageReq); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java index c60784e..76aa7cf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java @@ -1,32 +1,29 @@ package com.ruoyi.gysl.service.impl; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.Xmxl; import com.ruoyi.gysl.entity.request.ZwIdPageReq; import com.ruoyi.gysl.mapper.XmxlMapper; -import com.ruoyi.gysl.entity.Xmxl; import com.ruoyi.gysl.service.XmxlService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 项目巡礼(Xmxl)表服务实现类 * * @author makejava - * @since 2025-03-19 14:19:22 + * @since 2025-03-21 14:15:41 */ @Service("xmxlService") public class XmxlServiceImpl extends ServiceImpl implements XmxlService { /** - * 分页查询所有数据 - * - * @param page 分页对象 - * @param zwIdPageReq 查询实体 - * @return 所有数据 + * 查询所有数据 */ @Override - public Page page(Page page, ZwIdPageReq zwIdPageReq) { - return baseMapper.page(page,zwIdPageReq); + public List list(ZwIdPageReq projectRemark) { + return baseMapper.list(projectRemark); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmzskServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmzskServiceImpl.java index b13942d..6f13620 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmzskServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmzskServiceImpl.java @@ -1,7 +1,9 @@ package com.ruoyi.gysl.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.gysl.mapper.XmzskDao; +import com.ruoyi.gysl.entity.request.XmzskPageReq; +import com.ruoyi.gysl.mapper.XmzskMapper; import com.ruoyi.gysl.entity.Xmzsk; import com.ruoyi.gysl.service.XmzskService; import org.springframework.stereotype.Service; @@ -13,7 +15,18 @@ import org.springframework.stereotype.Service; * @since 2025-02-24 14:31:18 */ @Service("xmzskService") -public class XmzskServiceImpl extends ServiceImpl implements XmzskService { +public class XmzskServiceImpl extends ServiceImpl implements XmzskService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @return 所有数据 + */ + @Override + public Page page(Page page, XmzskPageReq req) { + return baseMapper.page(page,req); + } } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index ae66616..09b29ed 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -8,7 +8,7 @@ spring: master: url: jdbc:mysql://localhost:3306/gysl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: adminadmin + password: root # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index dba8e64..019a6eb 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -64,7 +64,7 @@ spring: devtools: restart: # 热部署开关 - enabled: true + enabled: false # redis 配置 redis: # 地址 diff --git a/ruoyi-admin/src/main/resources/mapper/PjpzMapper.xml b/ruoyi-admin/src/main/resources/mapper/PjpzMapper.xml new file mode 100644 index 0000000..6d1e3d9 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/PjpzMapper.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/WysmxInfomationMapper.xml b/ruoyi-admin/src/main/resources/mapper/WysmxInfomationMapper.xml new file mode 100644 index 0000000..5f85807 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/WysmxInfomationMapper.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml b/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml index 51beeb8..4792008 100644 --- a/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml @@ -1,7 +1,7 @@ - select * from xmxl diff --git a/ruoyi-admin/src/main/resources/mapper/XmzskMapper.xml b/ruoyi-admin/src/main/resources/mapper/XmzskMapper.xml new file mode 100644 index 0000000..3121d36 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/XmzskMapper.xml @@ -0,0 +1,17 @@ + + + + + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index 15bf66b..c3ade7b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -4,6 +4,8 @@ import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; @@ -36,10 +38,12 @@ public class BaseEntity implements Serializable private Date updateTime; /** 备注 */ + @TableField(exist = false) private String remark; /** 请求参数 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) private Map params; public String getSearchValue() diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java index bc6618a..e6f9de2 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java @@ -1,132 +1,128 @@ -//package com.ruoyi.framework.config; -// -//import java.io.IOException; -//import java.util.ArrayList; -//import java.util.Arrays; -//import java.util.HashSet; -//import java.util.List; -//import javax.sql.DataSource; -//import org.apache.ibatis.io.VFS; -//import org.apache.ibatis.session.SqlSessionFactory; -//import org.mybatis.spring.SqlSessionFactoryBean; -//import org.mybatis.spring.boot.autoconfigure.SpringBootVFS; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -//import org.springframework.core.env.Environment; -//import org.springframework.core.io.DefaultResourceLoader; -//import org.springframework.core.io.Resource; -//import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -//import org.springframework.core.io.support.ResourcePatternResolver; -//import org.springframework.core.type.classreading.CachingMetadataReaderFactory; -//import org.springframework.core.type.classreading.MetadataReader; -//import org.springframework.core.type.classreading.MetadataReaderFactory; -//import org.springframework.util.ClassUtils; -//import com.ruoyi.common.utils.StringUtils; -// -///** -// * Mybatis支持*匹配扫描包 -// * -// * @author ruoyi -// */ -//@Configuration -//public class MyBatisConfig -//{ -// @Autowired -// private Environment env; -// -// static final String DEFAULT_RESOURCE_PATTERN = "**/*.class"; -// -// public static String setTypeAliasesPackage(String typeAliasesPackage) -// { -// ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver(); -// MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver); -// List allResult = new ArrayList(); -// try -// { -// for (String aliasesPackage : typeAliasesPackage.split(",")) -// { -// List result = new ArrayList(); -// aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX -// + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN; -// Resource[] resources = resolver.getResources(aliasesPackage); -// if (resources != null && resources.length > 0) -// { -// MetadataReader metadataReader = null; -// for (Resource resource : resources) -// { -// if (resource.isReadable()) -// { -// metadataReader = metadataReaderFactory.getMetadataReader(resource); -// try -// { -// result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName()); -// } -// catch (ClassNotFoundException e) -// { -// e.printStackTrace(); -// } -// } -// } -// } -// if (result.size() > 0) -// { -// HashSet hashResult = new HashSet(result); -// allResult.addAll(hashResult); -// } -// } -// if (allResult.size() > 0) -// { -// typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0])); -// } -// else -// { -// throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包"); -// } -// } -// catch (IOException e) -// { -// e.printStackTrace(); -// } -// return typeAliasesPackage; -// } -// -// public Resource[] resolveMapperLocations(String[] mapperLocations) -// { -// ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver(); -// List resources = new ArrayList(); -// if (mapperLocations != null) -// { -// for (String mapperLocation : mapperLocations) -// { -// try -// { -// Resource[] mappers = resourceResolver.getResources(mapperLocation); -// resources.addAll(Arrays.asList(mappers)); -// } -// catch (IOException e) -// { -// // ignore -// } -// } -// } -// return resources.toArray(new Resource[resources.size()]); -// } -// -// @Bean -// public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception -// { -// String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage"); -// String mapperLocations = env.getProperty("mybatis.mapperLocations"); -// String configLocation = env.getProperty("mybatis.configLocation"); -// typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage); -// VFS.addImplClass(SpringBootVFS.class); -// -// final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); -// sessionFactory.setDataSource(dataSource); -// sessionFactory.setTypeAliasesPackage(typeAliasesPackage); -// sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ","))); -// sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation)); -// return sessionFactory.getObject(); -// } -//} \ No newline at end of file +package com.ruoyi.framework.config; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import javax.sql.DataSource; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.apache.ibatis.io.VFS; +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.boot.autoconfigure.SpringBootVFS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; +import org.springframework.core.io.DefaultResourceLoader; +import org.springframework.core.io.Resource; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.core.io.support.ResourcePatternResolver; +import org.springframework.core.type.classreading.CachingMetadataReaderFactory; +import org.springframework.core.type.classreading.MetadataReader; +import org.springframework.core.type.classreading.MetadataReaderFactory; +import org.springframework.util.ClassUtils; +import com.ruoyi.common.utils.StringUtils; + +/** + * Mybatis支持*匹配扫描包 + * + * @author ruoyi + */ +@Configuration +public class MyBatisConfig +{ + @Autowired + private Environment env; + + static final String DEFAULT_RESOURCE_PATTERN = "**/*.class"; + + public static String setTypeAliasesPackage(String typeAliasesPackage) + { + ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver(); + MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver); + List allResult = new ArrayList(); + try + { + for (String aliasesPackage : typeAliasesPackage.split(",")) + { + List result = new ArrayList(); + aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN; + Resource[] resources = resolver.getResources(aliasesPackage); + if (resources != null && resources.length > 0) + { + MetadataReader metadataReader = null; + for (Resource resource : resources) + { + if (resource.isReadable()) + { + metadataReader = metadataReaderFactory.getMetadataReader(resource); + try + { + result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName()); + } + catch (ClassNotFoundException e) + { + e.printStackTrace(); + } + } + } + } + if (result.size() > 0) + { + HashSet hashResult = new HashSet(result); + allResult.addAll(hashResult); + } + } + if (allResult.size() > 0) + { + typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0])); + } + else + { + throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包"); + } + } + catch (IOException e) + { + e.printStackTrace(); + } + return typeAliasesPackage; + } + + public Resource[] resolveMapperLocations(String[] mapperLocations) + { + ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver(); + List resources = new ArrayList(); + if (mapperLocations != null) + { + for (String mapperLocation : mapperLocations) + { + try + { + Resource[] mappers = resourceResolver.getResources(mapperLocation); + resources.addAll(Arrays.asList(mappers)); + } + catch (IOException e) + { + // ignore + } + } + } + return resources.toArray(new Resource[resources.size()]); + } + + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor()); + return interceptor; + } +} \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java index 9305725..7f44f8b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java @@ -7,6 +7,7 @@ import com.ruoyi.common.utils.SecurityUtils; import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Component; +import java.time.LocalDateTime; import java.util.Date; import java.util.Objects; @@ -39,8 +40,8 @@ public class MyMetaObjectHandler implements MetaObjectHandler { this.strictInsertFill(metaObject, "createId", Long.class, userId); this.strictInsertFill(metaObject, "updateId", Long.class, userId); } - this.strictInsertFill(metaObject, "createTime", Date.class, new Date()); - this.strictInsertFill(metaObject, "updateTime", Date.class, new Date()); + this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now()); + this.strictInsertFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); } @Override @@ -60,6 +61,6 @@ public class MyMetaObjectHandler implements MetaObjectHandler { if (!Objects.equals(userName, "")) { this.strictUpdateFill(metaObject, "updateBy", String.class, userName); } - this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date()); + this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java index 794da73..3623b71 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java @@ -1,63 +1,63 @@ -package com.ruoyi.framework.config; - - -import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -/** - * Mybatis Plus 配置 - * - * @author ruoyi - */ -@EnableTransactionManagement(proxyTargetClass = true) -@Configuration -public class MybatisPlusConfig -{ - @Bean - public MybatisPlusInterceptor mybatisPlusInterceptor() - { - MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - // 分页插件 - interceptor.addInnerInterceptor(paginationInnerInterceptor()); - // 乐观锁插件 - interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor()); - // 阻断插件 - interceptor.addInnerInterceptor(blockAttackInnerInterceptor()); - return interceptor; - } - - /** - * 分页插件，自动识别数据库类型 https://baomidou.com/guide/interceptor-pagination.html - */ - public PaginationInnerInterceptor paginationInnerInterceptor() - { - PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); - // 设置数据库类型为mysql - paginationInnerInterceptor.setDbType(DbType.MYSQL); - // 设置最大单页限制数量，默认 500 条，-1 不受限制 - paginationInnerInterceptor.setMaxLimit(-1L); - return paginationInnerInterceptor; - } - - /** - * 乐观锁插件 https://baomidou.com/guide/interceptor-optimistic-locker.html - */ - public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() - { - return new OptimisticLockerInnerInterceptor(); - } - - /** - * 如果是对全表的删除或更新操作，就会终止该操作 https://baomidou.com/guide/interceptor-block-attack.html - */ - public BlockAttackInnerInterceptor blockAttackInnerInterceptor() - { - return new BlockAttackInnerInterceptor(); - } -} \ No newline at end of file +//package com.ruoyi.framework.config; +// +// +//import com.baomidou.mybatisplus.annotation.DbType; +//import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +//import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; +//import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; +//import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.transaction.annotation.EnableTransactionManagement; +// +///** +// * Mybatis Plus 配置 +// * +// * @author ruoyi +// */ +//@EnableTransactionManagement(proxyTargetClass = true) +//@Configuration +//public class MybatisPlusConfig +//{ +// @Bean +// public MybatisPlusInterceptor mybatisPlusInterceptor() +// { +// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); +// // 分页插件 +// interceptor.addInnerInterceptor(paginationInnerInterceptor()); +// // 乐观锁插件 +// interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor()); +// // 阻断插件 +// interceptor.addInnerInterceptor(blockAttackInnerInterceptor()); +// return interceptor; +// } +// +// /** +// * 分页插件，自动识别数据库类型 https://baomidou.com/guide/interceptor-pagination.html +// */ +// public PaginationInnerInterceptor paginationInnerInterceptor() +// { +// PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); +// // 设置数据库类型为mysql +// paginationInnerInterceptor.setDbType(DbType.MYSQL); +// // 设置最大单页限制数量，默认 500 条，-1 不受限制 +// paginationInnerInterceptor.setMaxLimit(-1L); +// return paginationInnerInterceptor; +// } +// +// /** +// * 乐观锁插件 https://baomidou.com/guide/interceptor-optimistic-locker.html +// */ +// public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() +// { +// return new OptimisticLockerInnerInterceptor(); +// } +// +// /** +// * 如果是对全表的删除或更新操作，就会终止该操作 https://baomidou.com/guide/interceptor-block-attack.html +// */ +// public BlockAttackInnerInterceptor blockAttackInnerInterceptor() +// { +// return new BlockAttackInnerInterceptor(); +// } +//} \ No newline at end of file From 0ee71e0920a1d31028147bfe4139c51551bced33 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Sun, 23 Mar 2025 16:51:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicInformationController.java | 170 ++++++++++---- .../BuildingInformationController.java | 44 ++-- .../gysl/controller/DpclglController.java | 97 ++++++++ .../gysl/controller/EnterpriseController.java | 14 +- .../ruoyi/gysl/controller/MlController.java | 129 +++++++++++ .../ruoyi/gysl/controller/MxController.java | 7 +- .../ruoyi/gysl/controller/PjpzController.java | 3 +- .../controller/PlanInformationController.java | 25 +- .../controller/ProjectLegendController.java | 19 +- .../ProjectMonthInfoController.java | 21 +- .../ProjectOtherInfoController.java | 23 ++ .../controller/ProjectRemarkController.java | 21 +- .../gysl/controller/QyStatsController.java | 59 +++++ .../controller/QyrzInformationController.java | 15 +- .../WysmxInformationController.java | 21 +- .../gysl/controller/XfcyglController.java | 131 +++++++++++ .../gysl/controller/XmpjqdController.java | 96 ++++++++ .../ruoyi/gysl/controller/XmxlController.java | 21 +- .../gysl/controller/XmzskController.java | 4 +- .../gysl/controller/ZwStatsController.java | 73 ++++++ .../ruoyi/gysl/entity/BasicInformation.java | 49 ++-- .../gysl/entity/BuildingInformation.java | 2 +- .../java/com/ruoyi/gysl/entity/Dpclgl.java | 41 ++++ .../main/java/com/ruoyi/gysl/entity/Ml.java | 44 ++++ .../main/java/com/ruoyi/gysl/entity/Mx.java | 6 +- .../java/com/ruoyi/gysl/entity/Notice.java | 49 ++++ .../main/java/com/ruoyi/gysl/entity/Pjpz.java | 3 +- .../ruoyi/gysl/entity/PlanInformation.java | 6 +- .../com/ruoyi/gysl/entity/ProjectLegend.java | 3 +- .../ruoyi/gysl/entity/ProjectMonthInfo.java | 3 +- .../ruoyi/gysl/entity/ProjectOtherInfo.java | 3 +- .../com/ruoyi/gysl/entity/ProjectRemark.java | 3 +- .../ruoyi/gysl/entity/QyrzInformation.java | 17 +- .../ruoyi/gysl/entity/WysmxInformation.java | 9 +- .../java/com/ruoyi/gysl/entity/Xfcygl.java | 43 ++++ .../java/com/ruoyi/gysl/entity/Xmpjqd.java | 58 +++++ .../main/java/com/ruoyi/gysl/entity/Xmxl.java | 2 +- .../java/com/ruoyi/gysl/entity/Xmzsk.java | 5 +- .../{BaseModel => baseModel}/BaseModel.java | 3 +- .../gysl/entity/request/AuditRequest.java | 31 +++ .../request/BasicInformationPageReq.java | 3 + .../gysl/entity/request/DpclglPageReq.java | 25 ++ .../ruoyi/gysl/entity/request/MlPageReq.java | 36 +++ .../gysl/entity/request/XfcyglPageReq.java | 36 +++ .../gysl/entity/request/XmpjqdPageReq.java | 37 +++ .../response/BasicInformationResponse.java | 44 ++++ .../MxPageDetailedInfo.java | 26 +++ .../gysl/entity/response/MxPageResponse.java | 32 +++ .../response/WysmxDetail/WysmxDetail.java | 19 ++ .../gysl/entity/response/WysmxResponse.java | 29 +++ .../gysl/entity/stats/AllProjectResponse.java | 44 ++++ .../gysl/entity/stats/RibbonResponse.java | 20 ++ .../gysl/mapper/BasicInformationMapper.java | 5 + .../com/ruoyi/gysl/mapper/DpclglMapper.java | 28 +++ .../java/com/ruoyi/gysl/mapper/MlMapper.java | 34 +++ .../java/com/ruoyi/gysl/mapper/MxMapper.java | 4 + .../com/ruoyi/gysl/mapper/NoticeMapper.java | 35 +++ .../gysl/mapper/ProjectOtherInfoMapper.java | 4 +- .../com/ruoyi/gysl/mapper/QyStatsMapper.java | 27 +++ .../gysl/mapper/QyrzInformationMapper.java | 3 +- .../gysl/mapper/WysmxInformationMapper.java | 2 +- .../com/ruoyi/gysl/mapper/XfcyglMapper.java | 35 +++ .../com/ruoyi/gysl/mapper/XmpjqdMapper.java | 27 +++ .../com/ruoyi/gysl/mapper/ZwStatsMapper.java | 30 +++ .../com/ruoyi/gysl/regular/NoticeTiming.java | 33 +++ .../gysl/service/BasicInformationService.java | 31 +++ .../com/ruoyi/gysl/service/DpclglService.java | 26 +++ .../com/ruoyi/gysl/service/MlService.java | 33 +++ .../com/ruoyi/gysl/service/MxService.java | 10 +- .../com/ruoyi/gysl/service/NoticeService.java | 15 ++ .../gysl/service/ProjectOtherInfoService.java | 4 +- .../ruoyi/gysl/service/QyStatsService.java | 29 +++ .../gysl/service/WysmxInformationService.java | 3 +- .../com/ruoyi/gysl/service/XfcyglService.java | 36 +++ .../com/ruoyi/gysl/service/XmpjqdService.java | 24 ++ .../ruoyi/gysl/service/ZwStatsService.java | 31 +++ .../impl/BasicInformationServiceImpl.java | 216 +++++++++++++++++- .../gysl/service/impl/DpclglServiceImpl.java | 32 +++ .../gysl/service/impl/MlServiceImpl.java | 44 ++++ .../gysl/service/impl/MxServiceImpl.java | 42 +++- .../gysl/service/impl/NoticeServiceImpl.java | 19 ++ .../impl/ProjectOtherInfoServiceImpl.java | 4 +- .../gysl/service/impl/QyStatsServiceImpl.java | 43 ++++ .../impl/WysmxInformationServiceImpl.java | 30 ++- .../gysl/service/impl/XfcyglServiceImpl.java | 45 ++++ .../gysl/service/impl/XmpjqdServiceImpl.java | 31 +++ .../gysl/service/impl/ZwStatsServiceImpl.java | 46 ++++ .../src/main/resources/application-druid.yml | 4 +- .../mapper/BasicInformationMapper.xml | 9 + .../main/resources/mapper/DpclglMapper.xml | 17 ++ .../src/main/resources/mapper/MlMapper.xml | 26 +++ .../src/main/resources/mapper/MxMapper.xml | 7 + .../main/resources/mapper/NoticeMapper.xml | 37 +++ .../main/resources/mapper/QyStatsMapper.xml | 33 +++ .../mapper/WysmxInfomationMapper.xml | 2 +- .../main/resources/mapper/XfcyglMapper.xml | 26 +++ .../main/resources/mapper/XmpjqdMapper.xml | 26 +++ .../main/resources/mapper/ZwStatsMapper.xml | 43 ++++ 98 files changed, 2773 insertions(+), 242 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/DpclglController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MlController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XfcyglController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmpjqdController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Dpclgl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xfcygl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java rename ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/{BaseModel => baseModel}/BaseModel.java (94%) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/AuditRequest.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/DpclglPageReq.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/MlPageReq.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XfcyglPageReq.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmpjqdPageReq.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/BasicInformationResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/MxPageDetailedInfo/MxPageDetailedInfo.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/MxPageResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/WysmxDetail/WysmxDetail.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/WysmxResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/stats/AllProjectResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/stats/RibbonResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/DpclglMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MlMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/NoticeMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XfcyglMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmpjqdMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/DpclglService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MlService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/NoticeService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XfcyglService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmpjqdService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/DpclglServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MlServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/NoticeServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XfcyglServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmpjqdServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/DpclglMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/MlMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/MxMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/NoticeMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/XfcyglMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java index 7101568..1c86e3a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java @@ -6,16 +6,20 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.poi.ChangeExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.*; +import com.ruoyi.gysl.entity.request.AuditRequest; import com.ruoyi.gysl.entity.request.BasicInformationPageReq; +import com.ruoyi.gysl.entity.response.BasicInformationResponse; import com.ruoyi.gysl.entity.response.ProjectBuildingExcel; import com.ruoyi.gysl.entity.response.ProjectExcelInfo; -import com.ruoyi.gysl.service.BasicInformationService; +import com.ruoyi.gysl.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.xssf.usermodel.*; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -23,7 +27,6 @@ import javax.annotation.Resource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.Serializable; import java.lang.reflect.Field; import java.net.URLEncoder; import java.util.*; @@ -43,58 +46,90 @@ public class BasicInformationController extends BaseController { */ @Resource + /** + * 基本信息 + */ private BasicInformationService basicInformationService; + /** + * 规划信息 + */ + @Resource + private PlanInformationService planInformationService; + + /** + * 模型信息 + */ + @Resource + private MxService mxService; + + /** + * 五要素模型信息 + */ + @Resource + private WysmxInformationService wysmxInformationService; + + + /** + * 企业入驻信息 + */ + @Resource + private QyrzInformationService qyrzInformationService; + /** * 分页查询所有数据 * - * @param page 分页对象 + * @param page 分页对象 * @param basicInformationPageReq 查询实体 * @return 所有数据 */ @ApiOperation(value = "分页查询所有数据", response = BasicInformation.class) @GetMapping("/page") public AjaxResult selectAll(Page page, BasicInformationPageReq basicInformationPageReq) { + // 获取当前登录用户是否是企业端 + try { + if (SecurityUtils.hasRole("company")) { + basicInformationPageReq.setTyshxydm(SecurityUtils.getUsername()); + } + } catch (Exception ignored) { + } return success(basicInformationService.page(page, basicInformationPageReq)); } - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 + * 企业端提交填报 */ - @ApiOperation(value = "通过主键查询单条数据", response = BasicInformation.class) - @GetMapping("{id}") - public AjaxResult selectOne(@PathVariable Serializable id) { - return success(basicInformationService.getById(id)); + @PreAuthorize("@ss.hasAnyRoles('company')") + @ApiOperation(value = "企业端提交填报") + @PostMapping("/fill") + public AjaxResult fill(@RequestBody AuditRequest req) { + return success(basicInformationService.audit(req,2)); } /** - * 新增数据 - * - * @param basicInformation 实体对象 - * @return 新增结果 + * 政务端审核 */ - @ApiOperation("新增数据") - @PostMapping("/add") - public AjaxResult insert(@RequestBody BasicInformation basicInformation) { - return success(basicInformationService.save(basicInformation)); + @PreAuthorize("@ss.hasAnyRoles('admin,common')") + @ApiOperation(value = "政务端审核") + @PostMapping("/audit") + public AjaxResult audit(@RequestBody AuditRequest req) { + return success(basicInformationService.audit(req,3)); } + /** - * 修改数据 + * 通过主键查询单条项目所有数据 * - * @param basicInformation 实体对象 - * @return 修改结果 + * @param id 主键 + * @return 单条数据 */ - @ApiOperation("修改数据") - @PostMapping("/edit") - public AjaxResult update(@RequestBody BasicInformation basicInformation) { - return success(basicInformationService.updateById(basicInformation)); + @ApiOperation(value = "通过主键查询单条项目所有数据",response = BasicInformationResponse.class) + @GetMapping("/{id}") + public AjaxResult selectOne(@PathVariable Long id) { + return success(basicInformationService.selectOne(id)); } + /** * 删除数据 * @@ -104,13 +139,16 @@ public class BasicInformationController extends BaseController { @ApiOperation("删除数据") @DeleteMapping("/delete") public AjaxResult delete(@RequestParam("idList") List idList) { - return success(basicInformationService.removeByIds(idList)); + //要删除其余所有表对应的数据 + basicInformationService.removeByXmIds(idList); + return success(); } /** * 项目基本信息批量导入 */ @ApiOperation(value = "项目基本信息批量导入") +// @PreAuthorize("@ss.hasAnyRoles('admin,common')") @PostMapping(value = "/import", consumes = "multipart/form-data") public AjaxResult importTemplateProject(@RequestPart("file") MultipartFile file) throws Exception { ExcelUtil util = new ExcelUtil<>(BasicInformation.class); @@ -120,6 +158,37 @@ public class BasicInformationController extends BaseController { throw new ServiceException("项目导入数据不能为空"); } else { basicInformationService.saveBatch(proList); + List list = mxService.list(); + proList.forEach(x -> { + x.setStatus(1); + //添加项目规划信息 + PlanInformation planInformation = new PlanInformation(); + planInformation.setXmId(x.getId()); + planInformationService.save(planInformation); + //添加五要素模型信息 + List wys = new ArrayList<>(); + list.forEach(y -> { + WysmxInformation wysmxInformation = new WysmxInformation(); + wysmxInformation.setYsmc(y.getName()); + wysmxInformation.setZdname(y.getName()); + wysmxInformation.setXmId(x.getId()); + wys.add(wysmxInformation); + }); + wysmxInformationService.saveBatch(wys); + //企业入驻信息 + QyrzInformation qyrzInformation = new QyrzInformation(); + qyrzInformation.setXmId(x.getId()); + qyrzInformationService.save(qyrzInformation); + //基本信息 + String[] otherInfo = {"改造前容积率","改造后容积率","亩均税收(万元/每亩)","亩均销售(万元/每亩)","贷款情况","荣誉情况"}; + List saveOther = new ArrayList<>(); + Arrays.asList(otherInfo).forEach(y->{ + ProjectOtherInfo projectOtherInfo = new ProjectOtherInfo(); + projectOtherInfo.setXmId(x.getId()); + projectOtherInfo.setZdname(y); + saveOther.add(projectOtherInfo); + }); + }); successMsg.append("导入成功"); } return AjaxResult.success(successMsg); @@ -128,6 +197,7 @@ public class BasicInformationController extends BaseController { /** * 动态导出基本信息 */ + @PreAuthorize("@ss.hasAnyRoles('admin,common')") @ApiOperation("动态导出基本信息") @PostMapping("/exportInfo") public void exportInfo(HttpServletResponse response, @RequestParam List idList) throws NoSuchFieldException, IOException, IllegalAccessException { @@ -174,39 +244,39 @@ public class BasicInformationController extends BaseController { for (ProjectBuildingExcel xmjzxx : info.get(i).getXmjzxx()) { switch (xmjzxx.getFloor()) { case 1: - if(!ec.contains("一层厂房")){ + if (!ec.contains("一层厂房")) { ec.add("一层厂房"); - cfsl+=1; + cfsl += 1; } break; case 2: - if(!ec.contains("双层厂房")){ + if (!ec.contains("双层厂房")) { ec.add("双层厂房"); - cfsl+=1; + cfsl += 1; } break; case 3: - if(!ec.contains("三层厂房")){ + if (!ec.contains("三层厂房")) { ec.add("三层厂房"); - cfsl+=1; + cfsl += 1; } break; case 4: - if(!ec.contains("四层厂房")){ + if (!ec.contains("四层厂房")) { ec.add("四层厂房"); - cfsl+=1; + cfsl += 1; } break; case 5: - if(!ec.contains("五层厂房")){ + if (!ec.contains("五层厂房")) { ec.add("五层厂房"); - cfsl+=1; + cfsl += 1; } break; default: - if(!ec.contains("六层及以上厂房")){ + if (!ec.contains("六层及以上厂房")) { ec.add("六层及以上厂房"); - cfsl+=1; + cfsl += 1; } } for (Field field : classBuilding.getDeclaredFields()) { @@ -219,10 +289,10 @@ public class BasicInformationController extends BaseController { } ec.add(""); sc.add(excelColumn.name()); - sczdData+=1; + sczdData += 1; } } - ec.remove(ec.size()-1); + ec.remove(ec.size() - 1); } } //=======================sheet处理 @@ -248,7 +318,7 @@ public class BasicInformationController extends BaseController { XSSFRow row2 = sheet.createRow(rowNum++); row2.setHeight((short) 1000); //合并单元格:excel,除了项目建筑信息的其余字段数量,项目建筑信息数据所有字段数量,一共有几组厂房,不包括重复 - ChangeExcelUtil.extracted(sheet, zdsl,sczdData,cfsl); + ChangeExcelUtil.extracted(sheet, zdsl, sczdData, cfsl); // 创建第一行单元格 for (int i = 0; i < yc.size(); i++) { @@ -269,7 +339,7 @@ public class BasicInformationController extends BaseController { tempCell.setCellStyle(headerStyle); } //填充数据 - basicInformationService.approvalMethodfillInData(sheet, contentStyle, rowNum, info,sc,ec,sczdData/cfsl); + basicInformationService.approvalMethodfillInData(sheet, contentStyle, rowNum, info, sc, ec, sczdData / cfsl); // 1. 设置响应头（必须） response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); @@ -286,5 +356,15 @@ public class BasicInformationController extends BaseController { } } + + /** + * 模板信息 + */ + @ApiOperation("导出基本信息模板") + @PostMapping("/importTemplate") + public void importTemplate(HttpServletResponse response) { + ExcelUtil util = new ExcelUtil<>(BasicInformation.class); + util.importTemplateExcel(response, "项目数据"); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java index f81ebc4..0e68faa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java @@ -1,18 +1,17 @@ package com.ruoyi.gysl.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.gysl.entity.BasicInformation; import com.ruoyi.gysl.entity.BuildingInformation; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.BasicInformationService; import com.ruoyi.gysl.service.BuildingInformationService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -22,6 +21,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.io.Serializable; import java.util.List; +import java.util.Objects; /** * 建筑信息表(BuildingInformation)表控制层 @@ -40,28 +40,23 @@ public class BuildingInformationController extends BaseController { private BuildingInformationService buildingInformationService; /** - * 查询所有数据 + * 基本信息 + */ + @Resource + private BasicInformationService basicInformationService; + /** + * 根据项目id查询建筑信息列表 * * @param zwIdPageReq 查询实体 * @return 所有数据 */ @GetMapping("/page") - @ApiOperation(value = "查询所有数据",response = BuildingInformation.class ) + @ApiOperation(value = "根据项目id查询建筑信息列表",response = BuildingInformation.class ) public AjaxResult selectAll(@Valid ZwIdPageReq zwIdPageReq) { + basicInformationService.testXmId(zwIdPageReq.getXmId()); return success(buildingInformationService.selectAll(zwIdPageReq)); } - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @GetMapping("{id}") - @ApiOperation(value = "通过主键查询单条数据",response =BuildingInformation.class) - public AjaxResult selectOne(@PathVariable Serializable id) { - return success(buildingInformationService.getById(id)); - } /** * 新增数据 @@ -69,9 +64,11 @@ public class BuildingInformationController extends BaseController { * @param buildingInformation 实体对象 * @return 新增结果 */ + @PreAuthorize("@ss.hasAnyRoles('company')") @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody BuildingInformation buildingInformation) { + basicInformationService.testXmId(buildingInformation.getXmId()); return success(buildingInformationService.save(buildingInformation)); } @@ -81,22 +78,24 @@ public class BuildingInformationController extends BaseController { * @param buildingInformation 实体对象 * @return 修改结果 */ + @PreAuthorize("@ss.hasAnyRoles('company')") @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody BuildingInformation buildingInformation) { + basicInformationService.testXmId(buildingInformation.getXmId()); return success(buildingInformationService.updateById(buildingInformation)); } /** * 删除数据 * - * @param idList 主键结合 + * @param id 主键 * @return 删除结果 */ @ApiOperation("删除数据") @DeleteMapping("/delete") - public AjaxResult delete(@RequestParam("idList") List idList) { - return success(buildingInformationService.removeByIds(idList)); + public AjaxResult delete(@RequestParam("idList") Long id) { + return success(buildingInformationService.removeById(id)); } /** @@ -104,13 +103,16 @@ public class BuildingInformationController extends BaseController { */ @ApiOperation(value = "导入项目建筑信息") @PostMapping(value = "/importProjectBuilding", consumes = "multipart/form-data") - public AjaxResult importTemplateProject(@RequestPart("file") MultipartFile file) throws Exception { + public AjaxResult importTemplateProject(@RequestPart("file") MultipartFile file,@RequestParam Long xmId) throws Exception { ExcelUtil util = new ExcelUtil<>(BuildingInformation.class); List proList = util.importExcel(file.getInputStream()); StringBuilder successMsg = new StringBuilder(); if (proList == null || proList.isEmpty()) { throw new ServiceException("项目建筑信息导入数据不能为空"); } else { + proList.forEach(x->{ + x.setXmId(xmId); + }); buildingInformationService.saveBatch(proList); successMsg.append("导入成功"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/DpclglController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/DpclglController.java new file mode 100644 index 0000000..392f0f4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/DpclglController.java @@ -0,0 +1,97 @@ +package com.ruoyi.gysl.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.gysl.entity.Dpclgl; +import com.ruoyi.gysl.entity.request.DpclglPageReq; +import com.ruoyi.gysl.service.DpclglService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.List; + +/** + * 单片材料管理(Dpclgl)表控制层 + * + * @author makejava + * @since 2025-03-22 11:11:55 + */ +@Api(tags ="单片材料管理" ) +@RestController +@RequestMapping("/gysl/dpclgl") +@PreAuthorize("@ss.hasAnyRoles('admin,common')") +public class DpclglController extends BaseController { + /** + * 服务对象 + */ + @Resource + private DpclglService dpclglService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param dpclgl 查询实体 + * @return 所有数据 + */ + @ApiOperation("分页查询所有数据") + @GetMapping("/page") + public AjaxResult selectAll(Page page, DpclglPageReq dpclgl) { + return success(dpclglService.page(page, dpclgl)); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @ApiOperation("通过主键查询单条数据") + @GetMapping("/{id}") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(dpclglService.getById(id)); + } + + /** + * 新增数据 + * + * @param dpclgl 实体对象 + * @return 新增结果 + */ + @ApiOperation("新增数据") + @PostMapping("/add") + public AjaxResult insert(@RequestBody Dpclgl dpclgl) { + return success(dpclglService.save(dpclgl)); + } + + /** + * 修改数据 + * + * @param dpclgl 实体对象 + * @return 修改结果 + */ + @ApiOperation("修改数据") + @PutMapping("/edit") + public AjaxResult update(@RequestBody Dpclgl dpclgl) { + return success(dpclglService.updateById(dpclgl)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(dpclglService.removeByIds(idList)); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/EnterpriseController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/EnterpriseController.java index 0db2d96..60566af 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/EnterpriseController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/EnterpriseController.java @@ -9,6 +9,7 @@ import com.ruoyi.gysl.entity.Enterprise; import com.ruoyi.gysl.service.EnterpriseService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -24,7 +25,8 @@ import java.util.List; @Api(tags = "企业基本信息") @RestController -@RequestMapping("enterprise") +@RequestMapping("/gysl/enterprise") +@PreAuthorize("@ss.hasAnyRoles('admin,common')") public class EnterpriseController extends BaseController { /** * 服务对象 @@ -42,7 +44,7 @@ public class EnterpriseController extends BaseController { @GetMapping("/page") @ApiOperation(value = "分页查询所有数据",response =Enterprise.class ) public AjaxResult selectAll(Page page, Enterprise enterprise) { - return success(this.enterpriseService.page(page, new QueryWrapper<>(enterprise))); + return success(enterpriseService.page(page, new QueryWrapper<>(enterprise))); } /** @@ -54,7 +56,7 @@ public class EnterpriseController extends BaseController { @GetMapping("{id}") @ApiOperation(value = "通过主键查询单条数据",response =Enterprise.class ) public AjaxResult selectOne(@PathVariable Serializable id) { - return success(this.enterpriseService.getById(id)); + return success(enterpriseService.getById(id)); } /** @@ -66,7 +68,7 @@ public class EnterpriseController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody Enterprise enterprise) { - return success(this.enterpriseService.save(enterprise)); + return success(enterpriseService.save(enterprise)); } /** @@ -78,7 +80,7 @@ public class EnterpriseController extends BaseController { @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody Enterprise enterprise) { - return success(this.enterpriseService.updateById(enterprise)); + return success(enterpriseService.updateById(enterprise)); } /** @@ -90,7 +92,7 @@ public class EnterpriseController extends BaseController { @ApiOperation("删除数据") @DeleteMapping("/delete") public AjaxResult delete(@RequestParam("idList") List idList) { - return success(this.enterpriseService.removeByIds(idList)); + return success(enterpriseService.removeByIds(idList)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MlController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MlController.java new file mode 100644 index 0000000..bf8b947 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MlController.java @@ -0,0 +1,129 @@ +package com.ruoyi.gysl.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.gysl.entity.Ml; +import com.ruoyi.gysl.entity.request.MlPageReq; +import com.ruoyi.gysl.service.MlService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.Serializable; +import java.util.List; + +/** + * 目录管理(Ml)表控制层 + * + * @author makejava + * @since 2025-03-22 09:21:57 + */ +@RestController +@RequestMapping("/gysl/ml") +@Api(tags = "目录管理") +@PreAuthorize("@ss.hasAnyRoles('admin,common')") +public class MlController extends BaseController { + /** + * 服务对象 + */ + @Resource + private MlService mlService; + + /** + * 分页查询所有目录 + * + * @param page 分页对象 + * @return 所有数据 + */ + @GetMapping("/page") + @ApiOperation(value = "分页查询所有目录",response = Ml.class ) + public AjaxResult selectAll(Page page, MlPageReq req) { + return success(mlService.page(page,req)); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/{id}") + @ApiOperation(value = "通过主键查询单条数据",response = Ml.class ) + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(mlService.getById(id)); + } + + /** + * 新增数据 + * + * @param ml 实体对象 + * @return 新增结果 + */ + @PostMapping("/add") + @ApiOperation("新增数据") + public AjaxResult insert(@RequestBody Ml ml) { + return success(mlService.save(ml)); + } + + /** + * 修改数据 + * + * @param ml 实体对象 + * @return 修改结果 + */ + @PostMapping("/edit") + @ApiOperation("修改数据") + public AjaxResult update(@RequestBody Ml ml) { + return success(mlService.updateById(ml)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(mlService.removeByIds(idList)); + } + + /** + * 根据条件导出所有目录 + */ + @ApiOperation(value = "根据条件导出所有目录") + @PostMapping(value = "/exportMl") + public void exportMl(HttpServletResponse response, MlPageReq req) throws Exception { + List filteredList = mlService.page(req); + ExcelUtil util = new ExcelUtil<>(Ml.class); + util.exportExcel(response, filteredList, "目录数据"); + } + + /** + * 导入已有的目录数据 + */ + @ApiOperation(value = "导入已有的目录数据") + @PostMapping(value = "/importMl", consumes = "multipart/form-data") + public AjaxResult importMl(@RequestPart("file") MultipartFile file) throws Exception { + ExcelUtil util = new ExcelUtil<>(Ml.class); + List proList = util.importExcel(file.getInputStream()); + StringBuilder successMsg = new StringBuilder(); + if (proList == null || proList.isEmpty()) { + throw new ServiceException("导入数据不能为空"); + } else { + mlService.saveBatch(proList); + successMsg.append("导入成功"); + } + return AjaxResult.success(successMsg); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java index 6644b1a..d725939 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java @@ -1,13 +1,13 @@ package com.ruoyi.gysl.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.Mx; import com.ruoyi.gysl.service.MxService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -23,6 +23,7 @@ import java.util.List; @Api(tags = "模型管理") @RestController @RequestMapping("/gysl/mx") +@PreAuthorize("@ss.hasAnyRoles('admin,common')") public class MxController extends BaseController { @@ -40,7 +41,7 @@ public class MxController extends BaseController { @GetMapping("/page") @ApiOperation("查询所有模型数据") public AjaxResult selectAll() { - return success(mxService.list()); + return success(mxService.selectAll()); } /** @@ -64,7 +65,7 @@ public class MxController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody Mx mx) { - return success(mxService.add(mx)); + return success(mxService.save(mx)); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PjpzController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PjpzController.java index 3f8eb42..6fed36d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PjpzController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PjpzController.java @@ -1,7 +1,6 @@ package com.ruoyi.gysl.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -10,6 +9,7 @@ import com.ruoyi.gysl.entity.request.PjpzRequest; import com.ruoyi.gysl.service.PjpzService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -25,6 +25,7 @@ import java.util.List; @Api(tags = "项目评价配置") @RestController @RequestMapping("/gysl/pjpz") +@PreAuthorize("@ss.hasAnyRoles('admin,common')") public class PjpzController extends BaseController { /** * 服务对象 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java index f381f67..453ca02 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java @@ -1,21 +1,20 @@ package com.ruoyi.gysl.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.exception.ServiceException; import com.ruoyi.gysl.entity.PlanInformation; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.BasicInformationService; import com.ruoyi.gysl.service.PlanInformationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; -import java.io.Serializable; -import java.util.List; /** * 规划信息(PlanInformation)表控制层 @@ -23,7 +22,7 @@ import java.util.List; * @author makejava * @since 2025-02-24 14:21:57 */ -@Api(tags = "规划信息") +@Api(tags = "规划信息 no") @RestController @RequestMapping("/gysl/planInformation") public class PlanInformationController extends BaseController { @@ -33,6 +32,9 @@ public class PlanInformationController extends BaseController { @Resource private PlanInformationService planInformationService; + @Resource + private BasicInformationService basicInformationService; + /** * 根据项目id查询规划信息 * @@ -42,6 +44,7 @@ public class PlanInformationController extends BaseController { @GetMapping("/selectAll") @ApiOperation("根据项目id查询规划信息") public AjaxResult selectAll(@Valid ZwIdPageReq zwIdPageReq) { + basicInformationService.testXmId(zwIdPageReq.getXmId()); return success(planInformationService.selectAll(zwIdPageReq)); } @@ -52,10 +55,19 @@ public class PlanInformationController extends BaseController { * @param planInformation 实体对象 * @return 新增结果 */ + @PreAuthorize("@ss.hasAnyRoles('admin,common')") @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody PlanInformation planInformation) { - return success(planInformationService.save(planInformation)); + + PlanInformation one = planInformationService.lambdaQuery() + .eq(PlanInformation::getXmId, planInformation.getId()).one(); + if (one!=null){ + throw new ServiceException("该项目已有规划!"); + }else { + planInformationService.save(planInformation); + } + return success(); } /** @@ -67,6 +79,7 @@ public class PlanInformationController extends BaseController { @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody PlanInformation planInformation) { + basicInformationService.testXmId(planInformation.getXmId()); return success(planInformationService.updateById(planInformation)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java index e39ed49..06751eb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java @@ -5,9 +5,11 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.ProjectLegend; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.BasicInformationService; import com.ruoyi.gysl.service.ProjectLegendService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -31,6 +33,9 @@ public class ProjectLegendController extends BaseController { @Resource private ProjectLegendService projectLegendService; + @Resource + private BasicInformationService basicInformationService; + /** * 根据项目id查询所有数据 * @@ -40,20 +45,10 @@ public class ProjectLegendController extends BaseController { @ApiOperation("根据项目id查询所有数据") @GetMapping("/page") public AjaxResult selectAll(@Valid ZwIdPageReq projectLegend) { + basicInformationService.testXmId(projectLegend.getXmId()); return success(projectLegendService.page(projectLegend)); } - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @ApiOperation("通过主键查询单条数据") - @GetMapping("/{id}") - public AjaxResult selectOne(@PathVariable Serializable id) { - return success(projectLegendService.getById(id)); - } /** * 新增数据 @@ -64,6 +59,7 @@ public class ProjectLegendController extends BaseController { @ApiOperation("新增数据") @PostMapping("/add") public AjaxResult insert(@RequestBody ProjectLegend projectLegend) { + basicInformationService.testXmId(projectLegend.getXmId()); return success(projectLegendService.save(projectLegend)); } @@ -76,6 +72,7 @@ public class ProjectLegendController extends BaseController { @ApiOperation("修改数据") @PutMapping("/edit") public AjaxResult update(@RequestBody ProjectLegend projectLegend) { + basicInformationService.testXmId(projectLegend.getXmId()); return success(projectLegendService.updateById(projectLegend)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java index 67c95be..00dbb34 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java @@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.gysl.entity.ProjectMonthInfo; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.BasicInformationService; import com.ruoyi.gysl.service.ProjectMonthInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -15,7 +16,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.io.Serializable; import java.util.List; /** @@ -34,6 +34,12 @@ public class ProjectMonthInfoController extends BaseController { @Resource private ProjectMonthInfoService projectMonthInfoService; + /** + * 基本信息 + */ + @Resource + private BasicInformationService basicInformationService; + /** * 分页查询所有数据 * @@ -47,17 +53,6 @@ public class ProjectMonthInfoController extends BaseController { return success(projectMonthInfoService.page(page, zwIdPageReq)); } - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @ApiOperation("通过主键查询单条数据") - @GetMapping("/{id}") - public AjaxResult selectOne(@PathVariable Serializable id) { - return success(projectMonthInfoService.getById(id)); - } /** * 新增数据 @@ -68,6 +63,7 @@ public class ProjectMonthInfoController extends BaseController { @ApiOperation("新增数据") @PostMapping("/add") public AjaxResult insert(@RequestBody ProjectMonthInfo projectMonthInfo) { + basicInformationService.testXmId(projectMonthInfo.getXmId()); return success(projectMonthInfoService.save(projectMonthInfo)); } @@ -80,6 +76,7 @@ public class ProjectMonthInfoController extends BaseController { @ApiOperation("修改数据") @PutMapping("/edit") public AjaxResult update(@RequestBody ProjectMonthInfo projectMonthInfo) { + basicInformationService.testXmId(projectMonthInfo.getXmId()); return success(projectMonthInfoService.updateById(projectMonthInfo)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java index caf0117..d157b28 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java @@ -3,14 +3,17 @@ package com.ruoyi.gysl.controller; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.gysl.entity.ProjectOtherInfo; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.BasicInformationService; import com.ruoyi.gysl.service.ProjectOtherInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -30,6 +33,12 @@ public class ProjectOtherInfoController extends BaseController { @Resource private ProjectOtherInfoService projectOtherInfoService; + /** + * 基本信息 + */ + @Resource + private BasicInformationService basicInformationService; + /** * 根据项目id查询项目其他信息 * @@ -39,6 +48,7 @@ public class ProjectOtherInfoController extends BaseController { @ApiOperation("根据项目id查询项目其他信息") @GetMapping("/searchId") public AjaxResult selectAll(@Valid ZwIdPageReq zwIdPageReq) { + basicInformationService.testXmId(zwIdPageReq.getXmId()); return success(projectOtherInfoService.searchId(zwIdPageReq)); } @@ -52,6 +62,7 @@ public class ProjectOtherInfoController extends BaseController { @ApiOperation("新增数据") @PostMapping("/add") public AjaxResult insert(@RequestBody ProjectOtherInfo projectOtherInfo) { + basicInformationService.testXmId(projectOtherInfo.getXmId()); return success(projectOtherInfoService.save(projectOtherInfo)); } @@ -64,6 +75,7 @@ public class ProjectOtherInfoController extends BaseController { @ApiOperation("修改数据") @PutMapping("/edit") public AjaxResult update(@RequestBody ProjectOtherInfo projectOtherInfo) { + basicInformationService.testXmId(projectOtherInfo.getXmId()); return success(projectOtherInfoService.updateById(projectOtherInfo)); } @@ -78,5 +90,16 @@ public class ProjectOtherInfoController extends BaseController { public AjaxResult delete(@RequestParam("idList") List idList) { return success(projectOtherInfoService.removeByIds(idList)); } + + /** + * 根据条件导出项目其他信息 + */ + @ApiOperation(value = "根据条件导出项目其他信息") + @PostMapping(value = "/export") + public void export(HttpServletResponse response, ZwIdPageReq zwIdPageReq) throws Exception { + List filteredList = projectOtherInfoService.searchId(zwIdPageReq); + ExcelUtil util = new ExcelUtil<>(ProjectOtherInfo.class); + util.exportExcel(response, filteredList, "项目其他信息"); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java index d6d48e7..abf7e26 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java @@ -1,12 +1,11 @@ package com.ruoyi.gysl.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.ProjectRemark; import com.ruoyi.gysl.entity.request.RemarkPageReq; +import com.ruoyi.gysl.service.BasicInformationService; import com.ruoyi.gysl.service.ProjectRemarkService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -33,6 +32,11 @@ public class ProjectRemarkController extends BaseController { @Resource private ProjectRemarkService projectRemarkService; + /** + * 基本信息 + */ + @Resource + private BasicInformationService basicInformationService; /** * 查询所有数据 * @@ -42,20 +46,10 @@ public class ProjectRemarkController extends BaseController { @ApiOperation("查询所有数据") @GetMapping("/page") public AjaxResult selectAll(@Valid RemarkPageReq projectRemark) { + basicInformationService.testXmId(projectRemark.getXmId()); return success(projectRemarkService.list(projectRemark)); } - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @ApiOperation("通过主键查询单条数据") - @GetMapping("/{id}") - public AjaxResult selectOne(@PathVariable Serializable id) { - return success(projectRemarkService.getById(id)); - } /** * 新增数据 @@ -78,6 +72,7 @@ public class ProjectRemarkController extends BaseController { @ApiOperation("修改数据") @PutMapping("/edit") public AjaxResult update(@RequestBody ProjectRemark projectRemark) { + basicInformationService.testXmId(projectRemark.getXmId()); return success(projectRemarkService.updateById(projectRemark)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java new file mode 100644 index 0000000..f5e546b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java @@ -0,0 +1,59 @@ +package com.ruoyi.gysl.controller; + + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.gysl.service.QyStatsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 企业统计控制层 + * + * @author makejava + * @since 2025-02-24 09:25:51 + */ +@Api(tags = "企业统计") +@RestController +@RequestMapping("/gysl/qyStats") +@PreAuthorize("@ss.hasAnyRoles('company')") +public class QyStatsController extends BaseController { + + @Resource + private QyStatsService qyStatsService; + + /** + * 整体项目情况 + */ + @ApiOperation("整体项目情况") + @GetMapping("/allProject") + public AjaxResult allProject() { + return success(qyStatsService.allProject(SecurityUtils.getUsername())); + } + + /** + * 关联项目 + */ + @ApiOperation("整体项目情况") + @GetMapping("/relationalProject") + public AjaxResult relationalProject() { + return success(qyStatsService.relationalProject(SecurityUtils.getUsername())); + } + +// /** +// * 消息通知 +// */ +// @ApiOperation("消息通知") +// @GetMapping("/qyNotice") +// public AjaxResult qyNotice() { +// return success(qyStatsService.qyNotice(SecurityUtils.getUsername())); +// } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java index 9d689ac..b4359e6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java @@ -19,7 +19,7 @@ import java.util.List; * @author makejava * @since 2025-03-19 15:25:17 */ -@Api(tags = "企业入驻信息") +@Api(tags = "企业入驻信息 no") @RestController @RequestMapping("/gysl/qyrzInformation") public class QyrzInformationController extends BaseController { @@ -41,7 +41,6 @@ public class QyrzInformationController extends BaseController { return success(qyrzInformationService.selectAll(zwIdPageReq)); } - /** * 新增数据 * @@ -65,17 +64,5 @@ public class QyrzInformationController extends BaseController { public AjaxResult update(@RequestBody QyrzInformation qyrzInformation) { return success(qyrzInformationService.updateById(qyrzInformation)); } - - /** - * 删除数据 - * - * @param idList 主键结合 - * @return 删除结果 - */ - @ApiOperation("删除数据") - @DeleteMapping("/delete") - public AjaxResult delete(@RequestParam("idList") List idList) { - return success(qyrzInformationService.removeByIds(idList)); - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/WysmxInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/WysmxInformationController.java index 734940f..20a3bcb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/WysmxInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/WysmxInformationController.java @@ -1,21 +1,19 @@ package com.ruoyi.gysl.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.WysmxInformation; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.BasicInformationService; import com.ruoyi.gysl.service.WysmxInformationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; -import java.io.Serializable; -import java.util.List; /** * 五要素模型信息(WysmxInformation)表控制层 @@ -23,7 +21,7 @@ import java.util.List; * @author makejava * @since 2025-02-24 14:29:58 */ -@Api(tags ="五要素模型信息。" ) +@Api(tags ="五要素模型信息 no" ) @RestController @RequestMapping("/gysl/wysmxInformation") public class WysmxInformationController extends BaseController { @@ -33,6 +31,12 @@ public class WysmxInformationController extends BaseController { @Resource private WysmxInformationService wysmxInformationService; + /** + * 基本信息 + */ + @Resource + private BasicInformationService basicInformationService; + /** * 根据项目id查询该项目的五要素模型信息 * @@ -41,8 +45,9 @@ public class WysmxInformationController extends BaseController { */ @GetMapping("/selectOne") @ApiOperation("根据项目id查询该项目的五要素模型信息") - public AjaxResult selectOne(@Valid ZwIdPageReq zwIdPageReq) { - return success(wysmxInformationService.selectOne(zwIdPageReq)); + public AjaxResult list(@Valid ZwIdPageReq zwIdPageReq) { + basicInformationService.testXmId(zwIdPageReq.getXmId()); + return success(wysmxInformationService.list(zwIdPageReq)); } /** @@ -51,6 +56,7 @@ public class WysmxInformationController extends BaseController { * @param wysmxInformation 实体对象 * @return 新增结果 */ + @PreAuthorize("@ss.hasAnyRoles('admin,common')") @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody WysmxInformation wysmxInformation) { @@ -66,6 +72,7 @@ public class WysmxInformationController extends BaseController { @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody WysmxInformation wysmxInformation) { + basicInformationService.testXmId(wysmxInformation.getXmId()); return success(wysmxInformationService.updateById(wysmxInformation)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XfcyglController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XfcyglController.java new file mode 100644 index 0000000..44b8e87 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XfcyglController.java @@ -0,0 +1,131 @@ +package com.ruoyi.gysl.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.gysl.entity.Xfcygl; +import com.ruoyi.gysl.entity.request.XfcyglPageReq; +import com.ruoyi.gysl.service.XfcyglService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.Serializable; +import java.util.List; + +/** + * 细分产业管理(Xfcygl)表控制层 + * + * @author makejava + * @since 2025-03-22 10:39:43 + */ +@Api(tags ="细分产业管理" ) +@RestController +@RequestMapping("/gysl/xfcygl") +@PreAuthorize("@ss.hasAnyRoles('admin,common')") +public class XfcyglController extends BaseController { + /** + * 服务对象 + */ + @Resource + private XfcyglService xfcyglService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param req 查询实体 + * @return 所有数据 + */ + @ApiOperation("分页查询所有数据") + @GetMapping("/page") + public AjaxResult selectAll(Page page, XfcyglPageReq req) { + return success(xfcyglService.page(page, req)); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @ApiOperation("通过主键查询单条数据") + @GetMapping("/{id}") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(xfcyglService.getById(id)); + } + + /** + * 新增数据 + * + * @param xfcygl 实体对象 + * @return 新增结果 + */ + @ApiOperation("新增数据") + @PostMapping("/add") + public AjaxResult insert(@RequestBody Xfcygl xfcygl) { + return success(xfcyglService.save(xfcygl)); + } + + /** + * 修改数据 + * + * @param xfcygl 实体对象 + * @return 修改结果 + */ + @ApiOperation("修改数据") + @PutMapping("/edit") + public AjaxResult update(@RequestBody Xfcygl xfcygl) { + return success(xfcyglService.updateById(xfcygl)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(xfcyglService.removeByIds(idList)); + } + + + /** + * 根据条件导出所有细分产业 + */ + @ApiOperation(value = "根据条件导出所有细分产业") + @PostMapping(value = "/exportXfcy") + public void exportXfcy(HttpServletResponse response, XfcyglPageReq req) throws Exception { + List filteredList = xfcyglService.page(req); + ExcelUtil util = new ExcelUtil<>(Xfcygl.class); + util.exportExcel(response, filteredList, "细分产业数据"); + } + + /** + * 导入已有的细分产业数据 + */ + @ApiOperation(value = "导入已有的细分产业数据") + @PostMapping(value = "/imporXfcy", consumes = "multipart/form-data") + public AjaxResult imporXfcy(@RequestPart("file") MultipartFile file) throws Exception { + ExcelUtil util = new ExcelUtil<>(Xfcygl.class); + List proList = util.importExcel(file.getInputStream()); + StringBuilder successMsg = new StringBuilder(); + if (proList == null || proList.isEmpty()) { + throw new ServiceException("导入数据不能为空"); + } else { + xfcyglService.saveBatch(proList); + successMsg.append("导入成功"); + } + return AjaxResult.success(successMsg); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmpjqdController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmpjqdController.java new file mode 100644 index 0000000..87f74ee --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmpjqdController.java @@ -0,0 +1,96 @@ +package com.ruoyi.gysl.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.gysl.entity.Xmpjqd; +import com.ruoyi.gysl.entity.request.XmpjqdPageReq; +import com.ruoyi.gysl.service.XmpjqdService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.List; + +/** + * 项目评价清单(Xmpjqd)表控制层 + * + * @author makejava + * @since 2025-03-22 09:22:33 + */ +@Api(tags ="项目评价清单" ) +@RestController +@RequestMapping("/gysl/xmpjqd") +@PreAuthorize("@ss.hasAnyRoles('admin,common')") +public class XmpjqdController extends BaseController { + /** + * 服务对象 + */ + @Resource + private XmpjqdService xmpjqdService; + + /** + * 分页查询所有目录 + * + * @param page 分页对象 + * @return 所有数据 + */ + @ApiOperation("分页查询所有目录") + @GetMapping("/page") + public AjaxResult selectAll(Page page, XmpjqdPageReq req) { + return success(xmpjqdService.page(page, req)); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @ApiOperation("通过主键查询单条数据") + @GetMapping("/{id}") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(xmpjqdService.getById(id)); + } + + /** + * 新增数据 + * + * @param xmpjqd 实体对象 + * @return 新增结果 + */ + @ApiOperation("新增数据") + @PostMapping("/add") + public AjaxResult insert(@RequestBody Xmpjqd xmpjqd) { + return success(xmpjqdService.save(xmpjqd)); + } + + /** + * 修改数据 + * + * @param xmpjqd 实体对象 + * @return 修改结果 + */ + @ApiOperation("修改数据") + @PutMapping("/edit") + public AjaxResult update(@RequestBody Xmpjqd xmpjqd) { + return success(xmpjqdService.updateById(xmpjqd)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(xmpjqdService.removeByIds(idList)); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java index ee6b9cb..62bf4db 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java @@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.Xmxl; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.BasicInformationService; import com.ruoyi.gysl.service.XmxlService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -31,6 +32,12 @@ public class XmxlController extends BaseController { @Resource private XmxlService xmxlService; + /** + * 基本信息 + */ + @Resource + private BasicInformationService basicInformationService; + /** * 根据项目id查询所有数据 * @@ -40,20 +47,10 @@ public class XmxlController extends BaseController { @GetMapping("/list") @ApiOperation("根据项目id查询所有数据") public AjaxResult selectAll(@Valid ZwIdPageReq zwIdPageReq) { + basicInformationService.testXmId(zwIdPageReq.getXmId()); return success(xmxlService.list(zwIdPageReq)); } - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @GetMapping("/{id}") - @ApiOperation("通过主键查询单条数据") - public AjaxResult selectOne(@PathVariable Serializable id) { - return success(xmxlService.getById(id)); - } /** * 新增数据 @@ -64,6 +61,7 @@ public class XmxlController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody Xmxl xmxl) { + basicInformationService.testXmId(xmxl.getXmId()); return success(xmxlService.save(xmxl)); } @@ -76,6 +74,7 @@ public class XmxlController extends BaseController { @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody Xmxl xmxl) { + basicInformationService.testXmId(xmxl.getXmId()); return success(xmxlService.updateById(xmxl)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java index bfe0123..618a5b3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java @@ -9,6 +9,7 @@ import com.ruoyi.gysl.entity.request.XmzskPageReq; import com.ruoyi.gysl.service.XmzskService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -16,7 +17,7 @@ import java.io.Serializable; import java.util.List; /** - * (Xmzsk)表控制层 + * 项目知识库(Xmzsk)表控制层 * * @author makejava * @since 2025-02-24 14:31:17 @@ -24,6 +25,7 @@ import java.util.List; @Api(tags = "项目知识库") @RestController @RequestMapping("/gysl/xmzsk") +@PreAuthorize("@ss.hasAnyRoles('admin,common')") public class XmzskController extends BaseController { /** * 服务对象 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java new file mode 100644 index 0000000..856ea61 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java @@ -0,0 +1,73 @@ +package com.ruoyi.gysl.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.service.BasicInformationService; +import com.ruoyi.gysl.service.ZwStatsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 政务统计控制层 + * + * @author makejava + * @since 2025-02-24 09:25:51 + */ +@Api(tags = "政务统计") +@RestController +@RequestMapping("/gysl/zwStats") +@PreAuthorize("@ss.hasAnyRoles('admin,common')") +public class ZwStatsController extends BaseController { + + @Resource + private ZwStatsService zwStatsService; + + @Resource + private BasicInformationService basicInformationService; + + /** + * 项目情况 + */ + @ApiOperation("整体项目情况") + @GetMapping("/allProject") + public AjaxResult allProject() { + return success(zwStatsService.allProject()); + } + + /** + * 功能区 + */ + @ApiOperation("功能区") + @GetMapping("/ribbon") + public AjaxResult ribbon() { + return success(zwStatsService.ribbon()); + } + + /** + * 投资主体 + */ + @ApiOperation("投资主体") + @GetMapping("/investors") + public AjaxResult investors() { + return success(zwStatsService.investors()); + } + + /** + * 有经纬度的项目列表 + */ + @ApiOperation("有经纬度的项目列表") + @GetMapping("/projectList") + public AjaxResult projectList(Page page) { + return success(basicInformationService.projectList(page)); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java index 8b21fbc..b54b628 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java @@ -4,10 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; -import com.ruoyi.gysl.entity.BaseModel.BaseModel; +import com.ruoyi.gysl.entity.baseModel.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,6 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; import java.math.BigDecimal; -import java.time.LocalDateTime; import java.util.Date; /** @@ -31,114 +29,106 @@ public class BasicInformation extends BaseModel { @ApiModelProperty("主键id") @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; + + + @Excel(name = "统一社会信用代码", sort = 2) + @ApiModelProperty("统一社会信用代码") + private String tyshxydm; @NotBlank - @Excel(name = "项目名称") + @Excel(name = "项目名称", sort = 2) @ApiModelProperty("项目名称") private String name; @ApiModelProperty("总用地面积") + @Excel(name = "总用地面积", sort = 8) @TableField(exist = false) private BigDecimal zydmj; + @ApiModelProperty("总建筑面积") + @TableField(exist = false) + private BigDecimal zjzmj; + @NotBlank - @Excel(name = "项目法人单位") + @Excel(name = "项目法人单位", sort = 4) @ApiModelProperty("项目法人单位") private String xmfrdwxz; @NotBlank - @Excel(name = "项目法人单位性质") @ApiModelProperty("项目法人单位性质") private Integer nature; @ApiModelProperty("施工单位") - @Excel(name = "施工单位") private String sgdw; @ApiModelProperty("设计单位") - @Excel(name = "设计单位") private String sjdw; @ApiModelProperty("总投资额") - @Excel(name = "总投资额") + @Excel(name = "总投资额", sort = 7) private BigDecimal ztze; @NotBlank - @Excel(name = "所属功能区") @ApiModelProperty("所属功能区") private Integer ssgnq; @ApiModelProperty("建设开始时间") - @Excel(name = "建设开始时间",dateFormat="yyyy-MM-dd") + @Excel(name = "建设开始时间", dateFormat = "yyyy-MM-dd", sort = 5) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date begainTime; @ApiModelProperty("建设结束时间") - @Excel(name = "建设结束时间",dateFormat="yyyy-MM-dd") + @Excel(name = "建设结束时间", dateFormat = "yyyy-MM-dd", sort = 6) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endTime; @NotBlank - @Excel(name = "现状分类") + @Excel(name = "现状分类", sort = 3, dictType = "xzfl", comboReadDict = true) @ApiModelProperty("现状分类") private Integer xzfl; @NotBlank - @Excel(name = "建设地点") @ApiModelProperty("建设地点") private String jsdd; @NotBlank - @Excel(name = "重点发展产业") @ApiModelProperty("重点发展产业") private String prioritize; @NotBlank - @Excel(name = "建设模式") @ApiModelProperty("建设模式") private Integer jsms; - @Excel(name = "项目标签") @ApiModelProperty("项目标签") private String label; @NotBlank - @Excel(name = "项目负责人") @ApiModelProperty("项目负责人") private String projectLeader; @NotBlank - @Excel(name = "联系方式") @ApiModelProperty("联系方式") private String phone; @ApiModelProperty("施工许可证发放时间") - @Excel(name = "施工许可证发放时间") -// @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") -// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String issuingTime; @ApiModelProperty("施工许可证发放时间") - @Excel(name = "施工许可证发放时间") -// @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") -// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String acceptanceTime; @ApiModelProperty("建设进度") - @Excel(name = "建设进度") private String jsjd; @NotBlank - @Excel(name = "项目法人单位简介") @ApiModelProperty("项目法人单位简介") private String unitIntroduction; @@ -155,5 +145,8 @@ public class BasicInformation extends BaseModel { @ApiModelProperty("纬度") private String latitude; + @ApiModelProperty("状态 1待填报 2待审核 3审核通过") + private Integer status; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java index 6e21a20..15cb8e2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java @@ -47,7 +47,7 @@ public class BuildingInformation implements Serializable { */ @ApiModelProperty(value = "项目id") @TableField("xm_id") - private Integer xmId; + private Long xmId; /** * 层数 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Dpclgl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Dpclgl.java new file mode 100644 index 0000000..4fca0b0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Dpclgl.java @@ -0,0 +1,41 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.gysl.entity.baseModel.BaseModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * 单片材料管理(Dpclgl)表实体类 + * + * @author makejava + * @since 2025-03-22 11:11:55 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@TableName("dpclgl") +public class Dpclgl extends BaseModel implements Serializable{ + + @ApiModelProperty(value = "主键id") + @TableField("id") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("文件标题") + private String fileTitle; + + @ApiModelProperty("发布单位") + private String unit; + + @ApiModelProperty("文件内容") + private String content; + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java new file mode 100644 index 0000000..d5b533f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java @@ -0,0 +1,44 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.gysl.entity.baseModel.BaseModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * 目录管理(Ml)表实体类 + * + * @author makejava + * @since 2025-03-22 09:21:57 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@TableName("ml") +public class Ml extends BaseModel implements Serializable{ + + @ApiModelProperty(value = "主键id") + @TableField("id") + @TableId(type = IdType.AUTO) + private Long id; + + @Excel(name = "上楼目录类别") + @ApiModelProperty("上楼目录类别") + private Integer slmllb; + + @Excel(name = "工业大类") + @ApiModelProperty("工业大类") + private String gydl; + + @Excel(name = "产业") + @ApiModelProperty("产业") + private String cy; +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java index b1b839d..1ba1a64 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java @@ -1,20 +1,16 @@ package com.ruoyi.gysl.entity; -import java.time.LocalDateTime; -import java.util.Date; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.gysl.entity.BaseModel.BaseModel; +import com.ruoyi.gysl.entity.baseModel.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; /** * 模型管理(Mx)实体类 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java new file mode 100644 index 0000000..ccf4237 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java @@ -0,0 +1,49 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 项目通知(Notice)表实体类 + * + * @author makejava + * @since 2025-03-23 16:34:27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("mx") +@ApiModel(value = "Mx", description = "项目通知") +public class Notice implements Serializable { + + /** + * 主键id + */ + @ApiModelProperty(value = "主键id") + @TableField("id") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty(value = "1政务通知 2企业通知") + private Integer type; + + @ApiModelProperty(value = "通知内容") + private String content; + + @ApiModelProperty(value = "统一社会信用代码") + private String tyshxydm; + + @TableField(fill = FieldFill.INSERT) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java index 426260f..433d60f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java @@ -1,13 +1,12 @@ package com.ruoyi.gysl.entity; -import java.util.Date; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.gysl.entity.BaseModel.BaseModel; +import com.ruoyi.gysl.entity.baseModel.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java index 7c2d00b..6fc015d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java @@ -1,6 +1,8 @@ package com.ruoyi.gysl.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -28,6 +30,7 @@ public class PlanInformation implements Serializable { @ApiModelProperty(value = "${column.comment}") @TableField("id") + @TableId(type = IdType.AUTO) private Integer id; /** @@ -35,11 +38,10 @@ public class PlanInformation implements Serializable { */ @ApiModelProperty(value = "项目id") @TableField("xm_id") - private Integer xmId; + private Long xmId; /** * 总用地面积 - *  */ @ApiModelProperty(value = "总用地面积 ") @TableField("zydmj") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java index 756203e..49edb04 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java @@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.gysl.entity.BaseModel.BaseModel; +import com.ruoyi.gysl.entity.baseModel.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java index 4cccfa8..a9b84b3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java @@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.gysl.entity.BaseModel.BaseModel; +import com.ruoyi.gysl.entity.baseModel.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java index c588ff8..ec5db90 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java @@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.gysl.entity.BaseModel.BaseModel; +import com.ruoyi.gysl.entity.baseModel.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java index e9742ea..d2a8889 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java @@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.gysl.entity.BaseModel.BaseModel; +import com.ruoyi.gysl.entity.baseModel.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java index 5268246..e78090a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java @@ -4,11 +4,14 @@ package com.ruoyi.gysl.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.math.BigDecimal; /** * (QyrzInformation)表实体类 @@ -16,14 +19,16 @@ import java.io.Serializable; * @author makejava * @since 2025-03-19 15:25:18 */ +@EqualsAndHashCode(callSuper = true) @Data +@TableName("qyrz_information") public class QyrzInformation extends BaseEntity implements Serializable { @TableField("id") @TableId(type = IdType.AUTO) private Integer id; @ApiModelProperty("项目id") - private Integer xmId; + private Long xmId; @ApiModelProperty("入住企业数") private Integer rzqys; @@ -35,19 +40,19 @@ public class QyrzInformation extends BaseEntity implements Serializable { private Integer rysl; @ApiModelProperty("入住率") - private Double rzl; + private BigDecimal rzl; @ApiModelProperty("已出租（售）面积") - private Double yczmj; + private BigDecimal yczmj; @ApiModelProperty("空置出租（售）面积") - private Double kzczmj; + private BigDecimal kzczmj; @ApiModelProperty("工业厂房平均租金") - private Double gycfpjzj; + private BigDecimal gycfpjzj; @ApiModelProperty("工业厂房平均物业费") - private Double gycfpjwyf; + private BigDecimal gycfpjwyf; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java index f8198bf..c6e0a7b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.gysl.entity.BaseModel.BaseModel; +import com.ruoyi.gysl.entity.baseModel.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -28,14 +28,17 @@ public class WysmxInformation extends BaseModel implements Serializable { @ApiModelProperty(value = "${column.comment}") @TableField("id") @TableId(type = IdType.AUTO) - private Integer id; + private Long id; /** * 项目id */ @ApiModelProperty(value = "项目id") @TableField("xm_id") - private Integer xmId; + private Long xmId; + + @ApiModelProperty("要素名称") + private String ysmc; @ApiModelProperty("键") private String zdname; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xfcygl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xfcygl.java new file mode 100644 index 0000000..a9315f3 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xfcygl.java @@ -0,0 +1,43 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.gysl.entity.baseModel.BaseModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * 细分产业管理(Xfcygl)表实体类 + * + * @author makejava + * @since 2025-03-22 10:39:47 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@TableName("xmpjqd") +public class Xfcygl extends BaseModel implements Serializable { + + @ApiModelProperty(value = "主键id") + @TableField("id") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty(value = "产业类别") + private String cylb; + + @ApiModelProperty(value = "产业细分") + private String cyxf; + + @ApiModelProperty(value = "原材料及生产环节") + private String ycljschj; + + @ApiModelProperty(value = "上楼适应性") + private Integer slsyx; +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java new file mode 100644 index 0000000..8c3fa41 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java @@ -0,0 +1,58 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.gysl.entity.baseModel.BaseModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 项目评价清单(Xmpjqd)表实体类 + * + * @author makejava + * @since 2025-03-22 09:22:33 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@TableName("xmpjqd") +public class Xmpjqd extends BaseModel implements Serializable { + @ApiModelProperty(value = "主键id") + @TableField("id") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty(value = "项目名称") + private String xmmc; + + @ApiModelProperty(value = "项目建设开始时间 yyyy-MM") + @DateTimeFormat(pattern = "yyyy-MM") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM", timezone = "GMT+8") + private LocalDate xmqzsj; + + @ApiModelProperty(value = "项目建设结束时间 yyyy-MM") + @DateTimeFormat(pattern = "yyyy-MM") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM", timezone = "GMT+8") + private LocalDate xmjssj; + + @ApiModelProperty(value = "现状分类") + private Integer xzfl; + + @ApiModelProperty(value = "评价等级") + private Integer pjdj; + + @ApiModelProperty(value = "项目法人单位") + private String xmfrdw; + + @ApiModelProperty(value = "项目评价") + private String xmpj; +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java index 0ae6c14..abbb95d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.gysl.entity.BaseModel.BaseModel; +import com.ruoyi.gysl.entity.baseModel.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java index 4cb7368..778a992 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java @@ -1,6 +1,5 @@ package com.ruoyi.gysl.entity; -import java.time.LocalDateTime; import java.util.Date; import java.io.Serializable; @@ -8,13 +7,11 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.gysl.entity.BaseModel.BaseModel; +import com.ruoyi.gysl.entity.baseModel.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; /** * (Xmzsk)实体类 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BaseModel/BaseModel.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/baseModel/BaseModel.java similarity index 94% rename from ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BaseModel/BaseModel.java rename to ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/baseModel/BaseModel.java index fa3d93d..1c48fe8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BaseModel/BaseModel.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/baseModel/BaseModel.java @@ -1,4 +1,4 @@ -package com.ruoyi.gysl.entity.BaseModel; +package com.ruoyi.gysl.entity.baseModel; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; @@ -7,7 +7,6 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import java.util.Date; /** * 公共实体类 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/AuditRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/AuditRequest.java new file mode 100644 index 0000000..8b7f21c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/AuditRequest.java @@ -0,0 +1,31 @@ +package com.ruoyi.gysl.entity.request; + +import com.ruoyi.gysl.entity.*; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 企业提交审核实体类 + * @author du + * @since 2025/3/22 18:21 + */ +@Data +public class AuditRequest { + + @ApiModelProperty("项目基本信息") + private BasicInformation basicInformation; + + @ApiModelProperty("项目规划信息") + private PlanInformation planInformation; + + @ApiModelProperty("五要素模型信息") + private List wysmxInformations; + + @ApiModelProperty("企业入驻信息") + private QyrzInformation qyrzInformation; + + @ApiModelProperty("项目其他信息") + private List projectOtherInfos; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicInformationPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicInformationPageReq.java index 429eb20..9889a7a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicInformationPageReq.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicInformationPageReq.java @@ -35,4 +35,7 @@ public class BasicInformationPageReq { @ApiModelProperty("现状分类") private Integer xzfl; + + @ApiModelProperty("统一社会信用代码") + private String tyshxydm; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/DpclglPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/DpclglPageReq.java new file mode 100644 index 0000000..0488189 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/DpclglPageReq.java @@ -0,0 +1,25 @@ +package com.ruoyi.gysl.entity.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; + +/** + * 单片材料管理分页参数 + * @author du + * @since 2025/3/22 11:28 + */ +@Data +public class DpclglPageReq { + + @ApiModelProperty("文件标题") + private String fileTitle; + + @ApiModelProperty(value = "发布时间 yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + private LocalDate startTime; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/MlPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/MlPageReq.java new file mode 100644 index 0000000..5f3ff5d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/MlPageReq.java @@ -0,0 +1,36 @@ +package com.ruoyi.gysl.entity.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * 目录分页查询参数 + * @author du + * @since 2025/3/22 9:50 + */ +@Data +public class MlPageReq { + + @ApiModelProperty("上楼目录类别") + private Integer slmllb; + + @ApiModelProperty("工业大类") + private String gydl; + + @ApiModelProperty("产业") + private String cy; + + @ApiModelProperty(value = "更新开始时间 yyyy-MM-dd HH:mm:ss") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDateTime startTime; + + @ApiModelProperty(value = "更新结束时间 yyyy-MM-dd HH:mm:ss") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endTime; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XfcyglPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XfcyglPageReq.java new file mode 100644 index 0000000..6153cac --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XfcyglPageReq.java @@ -0,0 +1,36 @@ +package com.ruoyi.gysl.entity.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * 细分产业管理分页参数 + * @author du + * @since 2025/3/22 10:53 + */ +@Data +public class XfcyglPageReq { + + @ApiModelProperty(value = "产业类别") + private String cylb; + + @ApiModelProperty(value = "产业细分") + private String cyxf; + + @ApiModelProperty(value = "上楼适应性") + private Integer slsyx; + + @ApiModelProperty(value = "更新开始时间 yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime startTime; + + @ApiModelProperty(value = "更新结束时间 yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime endTime; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmpjqdPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmpjqdPageReq.java new file mode 100644 index 0000000..8507d3a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmpjqdPageReq.java @@ -0,0 +1,37 @@ +package com.ruoyi.gysl.entity.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; + +/** + * 项目评价清单分页参数 + * @author du + * @since 2025/3/22 10:10 + */ +@Data +public class XmpjqdPageReq { + + @ApiModelProperty(value = "现状分类") + private Integer xzfl; + + @ApiModelProperty(value = "评价等级") + private Integer pjdj; + + @ApiModelProperty(value = "项目名称") + private String xmmc; + + @ApiModelProperty(value = "项目建设开始时间 yyyy-MM") + @DateTimeFormat(pattern = "yyyy-MM") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM", timezone = "GMT+8") + private LocalDate xmqzsj; + + @ApiModelProperty(value = "项目建设结束时间 yyyy-MM") + @DateTimeFormat(pattern = "yyyy-MM") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM", timezone = "GMT+8") + private LocalDate xmjssj; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/BasicInformationResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/BasicInformationResponse.java new file mode 100644 index 0000000..f30b610 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/BasicInformationResponse.java @@ -0,0 +1,44 @@ +package com.ruoyi.gysl.entity.response; + +import com.ruoyi.gysl.entity.*; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 项目的所有信息返回实体类 + * + * @author du + * @since 2025/3/23 13:22 + */ +@Data +public class BasicInformationResponse { + + @ApiModelProperty("项目基本信息") + private BasicInformation basicInformation; + + @ApiModelProperty("项目规划信息") + private PlanInformation planInformation; + + @ApiModelProperty("项目建筑信息") + private List buildingInformation; + + @ApiModelProperty("五要素模型信息") + private List wysmxResponses; + + @ApiModelProperty("企业入驻信息") + private QyrzInformation qyrzInformation; + + @ApiModelProperty("项目图例信息") + private List projectLegendResponses; + + @ApiModelProperty("项目巡礼信息") + private List xmxl; + + @ApiModelProperty("项目备忘录") + private List projectRemarks; + + @ApiModelProperty("其他信息") + private List projectOtherInfos; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/MxPageDetailedInfo/MxPageDetailedInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/MxPageDetailedInfo/MxPageDetailedInfo.java new file mode 100644 index 0000000..4a6e089 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/MxPageDetailedInfo/MxPageDetailedInfo.java @@ -0,0 +1,26 @@ +package com.ruoyi.gysl.entity.response.MxPageDetailedInfo; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 分页模型具体数据 + * @author du + * @since 2025/3/22 17:11 + */ +@Data +public class MxPageDetailedInfo { + + /** + * 具体指标 + */ + @ApiModelProperty(value = "具体指标") + private String jtzb; + + /** + * 详细要求 + */ + @ApiModelProperty(value = "详细要求") + private String xxyq; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/MxPageResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/MxPageResponse.java new file mode 100644 index 0000000..ddf4a72 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/MxPageResponse.java @@ -0,0 +1,32 @@ +package com.ruoyi.gysl.entity.response; + +import com.ruoyi.gysl.entity.response.MxPageDetailedInfo.MxPageDetailedInfo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 分页模型数据 + * @author du + * @since 2025/3/22 17:04 + */ +@Data +public class MxPageResponse { + + /** + * 1:关键要素；2：重要要素 + */ + @ApiModelProperty(value = "1:关键要素；2：重要要素") + private String type; + + /** + * 要素名称 + */ + @ApiModelProperty(value = "要素名称") + private String name; + + + @ApiModelProperty(value = "list数据") + private List list; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/WysmxDetail/WysmxDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/WysmxDetail/WysmxDetail.java new file mode 100644 index 0000000..30c98cd --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/WysmxDetail/WysmxDetail.java @@ -0,0 +1,19 @@ +package com.ruoyi.gysl.entity.response.WysmxDetail; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 五要素模型具体键值实体类 + * @author du + * @since 2025/3/23 13:43 + */ +@Data +public class WysmxDetail { + + @ApiModelProperty("键") + private String zdname; + + @ApiModelProperty("值") + private String zdinfor; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/WysmxResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/WysmxResponse.java new file mode 100644 index 0000000..4c93742 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/WysmxResponse.java @@ -0,0 +1,29 @@ +package com.ruoyi.gysl.entity.response; + +import com.ruoyi.gysl.entity.response.WysmxDetail.WysmxDetail; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 五要素模型返回体 + * @author du + * @since 2025/3/23 13:41 + */ +@Data +public class WysmxResponse { + + @ApiModelProperty(value = "主键id") + private Long id; + + @ApiModelProperty(value = "项目id") + private Long xmId; + + @ApiModelProperty("要素名称") + private String ysmc; + + @ApiModelProperty("键值列表") + private List list; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/stats/AllProjectResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/stats/AllProjectResponse.java new file mode 100644 index 0000000..24d67a4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/stats/AllProjectResponse.java @@ -0,0 +1,44 @@ +package com.ruoyi.gysl.entity.stats; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 整体项目返回实体类 + * + * @author du + * @since 2025/3/22 13:19 + */ +@Data +public class AllProjectResponse { + + @ApiModelProperty("项目总数") + private Integer allProject; + + @ApiModelProperty("建筑面积") + private BigDecimal allGrossArea; + + @ApiModelProperty("已建数量") + private Integer allBuilding1; + + @ApiModelProperty("在建数量") + private Integer allBuilding2; + + @ApiModelProperty("拟建数量") + private Integer allBuilding3; + + + @ApiModelProperty("当年_新开工项目数") + private Integer currentYearProject; + + @ApiModelProperty("当年_建筑面积") + private BigDecimal currentYearGrossArea; + + @ApiModelProperty("当年_已建数量") + private Integer currentYearBuilding1; + + @ApiModelProperty("当年_在建数量") + private Integer currentBuilding2; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/stats/RibbonResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/stats/RibbonResponse.java new file mode 100644 index 0000000..e093d8a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/stats/RibbonResponse.java @@ -0,0 +1,20 @@ +package com.ruoyi.gysl.entity.stats; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 功能区返回实体类 + * + * @author du + * @since 2025/3/22 14:09 + */ +@Data +public class RibbonResponse { + + @ApiModelProperty("所属功能区 / 单位性质") + private Integer ssgnq; + + @ApiModelProperty("数量") + private Integer count; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java index 700ebe9..b3437a0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java @@ -30,5 +30,10 @@ public interface BasicInformationMapper extends BaseMapper { * @return 所有数据 */ Page page(Page page, @Param("req") BasicInformationPageReq req); + + /** + * 有经纬度的项目列表 + */ + Page projectList(Page page); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/DpclglMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/DpclglMapper.java new file mode 100644 index 0000000..e91041b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/DpclglMapper.java @@ -0,0 +1,28 @@ +package com.ruoyi.gysl.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.gysl.entity.request.DpclglPageReq; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.gysl.entity.Dpclgl; + +/** + * 单片材料管理(Dpclgl)表数据库访问层 + * + * @author makejava + * @since 2025-03-22 11:11:55 + */ +public interface DpclglMapper extends BaseMapper { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param dpclgl 查询实体 + * @return 所有数据 + */ + Page page(Page page,@Param("req") DpclglPageReq dpclgl); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MlMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MlMapper.java new file mode 100644 index 0000000..a541dc2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MlMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.gysl.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.gysl.entity.request.MlPageReq; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.gysl.entity.Ml; + +/** + * 目录管理(Ml)表数据库访问层 + * + * @author makejava + * @since 2025-03-22 09:21:57 + */ +public interface MlMapper extends BaseMapper { + + /** + * 分页查询所有目录 + * + * @param page 分页对象 + * @return 所有数据 + */ + Page page(Page page,@Param("req") MlPageReq req); + + /** + * 查询所有目录 + * + * @return 所有数据 + */ + List page(@Param("req") MlPageReq req); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxMapper.java index 92916d0..8c87866 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxMapper.java @@ -2,6 +2,9 @@ package com.ruoyi.gysl.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.gysl.entity.Mx; +import com.ruoyi.gysl.entity.response.MxPageResponse; + +import java.util.List; /** @@ -12,5 +15,6 @@ import com.ruoyi.gysl.entity.Mx; */ public interface MxMapper extends BaseMapper { + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/NoticeMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/NoticeMapper.java new file mode 100644 index 0000000..6f79f67 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/NoticeMapper.java @@ -0,0 +1,35 @@ +package com.ruoyi.gysl.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.gysl.entity.Notice; + +/** + * 项目通知(Notice)表数据库访问层 + * + * @author makejava + * @since 2025-03-23 16:34:27 + */ +public interface NoticeMapper extends BaseMapper { + +/** +* 批量新增数据（MyBatis原生foreach方法） +* +* @param entities List 实例对象列表 +* @return 影响行数 +*/ +int insertBatch(@Param("entities") List entities); + +/** +* 批量新增或按主键更新数据（MyBatis原生foreach方法） +* +* @param entities List 实例对象列表 +* @return 影响行数 +* @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参 +*/ +int insertOrUpdateBatch(@Param("entities") List entities); + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectOtherInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectOtherInfoMapper.java index 2b06ce2..daeae61 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectOtherInfoMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectOtherInfoMapper.java @@ -5,6 +5,8 @@ import com.ruoyi.gysl.entity.ProjectOtherInfo; import com.ruoyi.gysl.entity.request.ZwIdPageReq; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 项目其他信息(ProjectOtherInfo)表数据库访问层 * @@ -19,6 +21,6 @@ public interface ProjectOtherInfoMapper extends BaseMapper { * @param zwIdPageReq 查询实体 * @return 所有数据 */ - ProjectOtherInfo searchId(@Param("req") ZwIdPageReq zwIdPageReq); + List searchId(@Param("req") ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java new file mode 100644 index 0000000..eb81424 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java @@ -0,0 +1,27 @@ +package com.ruoyi.gysl.mapper; + +import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.stats.AllProjectResponse; +import com.ruoyi.gysl.entity.stats.RibbonResponse; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 企业统计数据库访问层 + * + * @author makejava + * @since 2025-03-22 11:11:55 + */ +public interface QyStatsMapper { + /** + * 项目情况 + */ + AllProjectResponse allProject(@Param("userName") String userName); + + /** + * 关联项目 + */ + List relationalProject(String username); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyrzInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyrzInformationMapper.java index 9bd001a..a4fb128 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyrzInformationMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyrzInformationMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.gysl.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.gysl.entity.QyrzInformation; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import org.apache.ibatis.annotations.Param; /** * (QyrzInformation)表数据库访问层 @@ -18,6 +19,6 @@ public interface QyrzInformationMapper extends BaseMapper { * @param zwIdPageReq 查询实体 * @return 所有数据 */ - QyrzInformation selectAll(ZwIdPageReq zwIdPageReq); + QyrzInformation selectAll(@Param("req") ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java index c113ac7..8f1d13b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java @@ -22,6 +22,6 @@ public interface WysmxInformationMapper extends BaseMapper { * @param zwIdPageReq 查询实体 * @return 所有数据 */ - List selectOne(@Param("req") ZwIdPageReq zwIdPageReq); + List list(@Param("req") ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XfcyglMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XfcyglMapper.java new file mode 100644 index 0000000..86e5855 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XfcyglMapper.java @@ -0,0 +1,35 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.gysl.entity.Xfcygl; +import com.ruoyi.gysl.entity.request.XfcyglPageReq; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 细分产业管理(Xfcygl)表数据库访问层 + * + * @author makejava + * @since 2025-03-22 10:39:43 + */ +public interface XfcyglMapper extends BaseMapper { + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param req 查询实体 + * @return 所有数据 + */ + Page page(Page page,@Param("req") XfcyglPageReq req); + + /** + * 查询所有数据 + * + * @param req 查询实体 + * @return 所有数据 + */ + List page(@Param("req") XfcyglPageReq req); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmpjqdMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmpjqdMapper.java new file mode 100644 index 0000000..77d5f3c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmpjqdMapper.java @@ -0,0 +1,27 @@ +package com.ruoyi.gysl.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.gysl.entity.request.XmpjqdPageReq; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.gysl.entity.Xmpjqd; + +/** + * 项目评价清单(Xmpjqd)表数据库访问层 + * + * @author makejava + * @since 2025-03-22 09:22:33 + */ +public interface XmpjqdMapper extends BaseMapper { + + /** + * 分页查询所有目录 + * + * @param page 分页对象 + * @return 所有数据 + */ + Page page(Page page, @Param("req") XmpjqdPageReq req); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java new file mode 100644 index 0000000..77105a0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java @@ -0,0 +1,30 @@ +package com.ruoyi.gysl.mapper; + +import com.ruoyi.gysl.entity.stats.AllProjectResponse; +import com.ruoyi.gysl.entity.stats.RibbonResponse; + +import java.util.List; + +/** + * 政务统计数据库访问层 + * + * @author makejava + * @since 2025-03-22 11:11:55 + */ +public interface ZwStatsMapper { + /** + * 项目情况 + */ + AllProjectResponse allProject(); + + /** + * 功能区 + */ + List ribbon(); + + /** + * 投资主体 + */ + List investors(); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java new file mode 100644 index 0000000..0c3a005 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java @@ -0,0 +1,33 @@ +package com.ruoyi.gysl.regular; + +import com.ruoyi.gysl.entity.Notice; +import com.ruoyi.gysl.service.NoticeService; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; + +import javax.annotation.Resource; + +/** + * 每月固定时间定时任务 + * @author du + * @since 2025/3/23 16:35 + */ +@Configuration +@EnableScheduling +public class NoticeTiming { + + @Resource + private NoticeService noticeService; + + /** + * 每个月固定发一次政务通知 + */ +// @Scheduled(cron = "1 0 0 * * *") +// private void configureTasks() { +// Notice notice = new Notice(); +// notice.setType(1); +// +// noticeService.save(notice); +// } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java index 7791e72..160fbae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java @@ -3,12 +3,15 @@ package com.ruoyi.gysl.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.request.AuditRequest; import com.ruoyi.gysl.entity.request.BasicInformationPageReq; +import com.ruoyi.gysl.entity.response.BasicInformationResponse; import com.ruoyi.gysl.entity.response.ProjectBuildingExcel; import com.ruoyi.gysl.entity.response.ProjectExcelInfo; import org.apache.poi.xssf.usermodel.XSSFCellStyle; import org.apache.poi.xssf.usermodel.XSSFSheet; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -49,5 +52,33 @@ public interface BasicInformationService extends IService { * 填充数据-项目建筑信息获取 */ String getBuildingData(ProjectBuildingExcel item,String str); + + /** + * 有经纬度的项目列表 + */ + Page projectList(Page page); + + /** + * 查看当前用户是否有权限查看或者修改新增 + */ + BasicInformation testXmId(Serializable xmId); + + /** + * 企业端和政务端信息修改 + */ + Long audit(AuditRequest req,int status); + /** + * 通过主键查询单条项目所有数据 + * + * @param id 主键 + * @return 单条数据 + */ + BasicInformationResponse selectOne(Long id); + + + /** + * 删除项目id对应的所有数据 + */ + void removeByXmIds(List idList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/DpclglService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/DpclglService.java new file mode 100644 index 0000000..2795d9b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/DpclglService.java @@ -0,0 +1,26 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.Dpclgl; +import com.ruoyi.gysl.entity.request.DpclglPageReq; + +/** + * 单片材料管理(Dpclgl)表服务接口 + * + * @author makejava + * @since 2025-03-22 11:11:55 + */ +public interface DpclglService extends IService { + + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param dpclgl 查询实体 + * @return 所有数据 + */ + Page page(Page page, DpclglPageReq dpclgl); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MlService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MlService.java new file mode 100644 index 0000000..e5b98a0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MlService.java @@ -0,0 +1,33 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.Ml; +import com.ruoyi.gysl.entity.request.MlPageReq; + +import java.util.List; + +/** + * 目录管理(Ml)表服务接口 + * + * @author makejava + * @since 2025-03-22 09:21:57 + */ +public interface MlService extends IService { + + /** + * 分页查询所有目录 + * + * @param page 分页对象 + * @return 所有数据 + */ + Page page(Page page, MlPageReq req); + + /** + * 查询所有目录 + * + * @return 所有数据 + */ + List page(MlPageReq req); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java index 42e8344..c21e171 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java @@ -2,6 +2,9 @@ package com.ruoyi.gysl.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.Mx; +import com.ruoyi.gysl.entity.response.MxPageResponse; + +import java.util.List; /** @@ -13,11 +16,10 @@ import com.ruoyi.gysl.entity.Mx; public interface MxService extends IService { /** - * 新增数据 + * 查询所有模型数据 * - * @param mx 实体对象 - * @return 新增结果 + * @return 所有数据 */ - int add(Mx mx); + List selectAll(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/NoticeService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/NoticeService.java new file mode 100644 index 0000000..355d22f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/NoticeService.java @@ -0,0 +1,15 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.Notice; + +/** + * 项目通知(Notice)表服务接口 + * + * @author makejava + * @since 2025-03-23 16:34:27 + */ +public interface NoticeService extends IService { + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectOtherInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectOtherInfoService.java index f85537a..6f9caa1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectOtherInfoService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectOtherInfoService.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.ProjectOtherInfo; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import java.util.List; + /** * 项目其他信息(ProjectOtherInfo)表服务接口 * @@ -18,6 +20,6 @@ public interface ProjectOtherInfoService extends IService { * @param zwIdPageReq 查询实体 * @return 所有数据 */ - ProjectOtherInfo searchId(ZwIdPageReq zwIdPageReq); + List searchId(ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java new file mode 100644 index 0000000..a213d3f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java @@ -0,0 +1,29 @@ +package com.ruoyi.gysl.service; + +import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.stats.AllProjectResponse; +import com.ruoyi.gysl.entity.stats.RibbonResponse; + +import java.util.List; + +/** + * 企业统计服务接口 + * + * @author makejava + * @since 2025-02-24 11:10:06 + */ +public interface QyStatsService { + + /** + * 项目情况 + */ + AllProjectResponse allProject(String userName); + + /** + * 关联项目 + */ + List relationalProject(String username); + + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java index ab0c183..d9f2cd3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java @@ -3,6 +3,7 @@ package com.ruoyi.gysl.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.WysmxInformation; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.entity.response.WysmxResponse; import java.util.List; @@ -20,6 +21,6 @@ public interface WysmxInformationService extends IService { * @param zwIdPageReq 查询实体 * @return 所有数据 */ - List selectOne(ZwIdPageReq zwIdPageReq); + List list(ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XfcyglService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XfcyglService.java new file mode 100644 index 0000000..49bf125 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XfcyglService.java @@ -0,0 +1,36 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.Xfcygl; +import com.ruoyi.gysl.entity.request.XfcyglPageReq; + +import java.util.List; + +/** + * 细分产业管理(Xfcygl)表服务接口 + * + * @author makejava + * @since 2025-03-22 10:39:47 + */ +public interface XfcyglService extends IService { + + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param req 查询实体 + * @return 所有数据 + */ + Page page(Page page, XfcyglPageReq req); + + /** + * 查询所有数据 + * + * @param req 查询实体 + * @return 所有数据 + */ + List page( XfcyglPageReq req); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmpjqdService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmpjqdService.java new file mode 100644 index 0000000..8af9364 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmpjqdService.java @@ -0,0 +1,24 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.Xmpjqd; +import com.ruoyi.gysl.entity.request.XmpjqdPageReq; + +/** + * 项目评价清单(Xmpjqd)表服务接口 + * + * @author makejava + * @since 2025-03-22 09:22:33 + */ +public interface XmpjqdService extends IService { + + /** + * 分页查询所有目录 + * + * @param page 分页对象 + * @return 所有数据 + */ + Page page(Page page, XmpjqdPageReq req); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java new file mode 100644 index 0000000..3d25ed1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java @@ -0,0 +1,31 @@ +package com.ruoyi.gysl.service; + +import com.ruoyi.gysl.entity.stats.AllProjectResponse; +import com.ruoyi.gysl.entity.stats.RibbonResponse; + +import java.util.List; + +/** + * 政务统计服务接口 + * + * @author makejava + * @since 2025-02-24 11:10:06 + */ +public interface ZwStatsService { + + /** + * 项目情况 + */ + AllProjectResponse allProject(); + + /** + * 功能区 + */ + List ribbon(); + + /** + * 投资主体 + */ + List investors(); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java index 34891aa..25bf88d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java @@ -3,18 +3,27 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.annotation.Excel; -import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.gysl.entity.*; +import com.ruoyi.gysl.entity.request.AuditRequest; import com.ruoyi.gysl.entity.request.BasicInformationPageReq; +import com.ruoyi.gysl.entity.request.RemarkPageReq; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.entity.response.BasicInformationResponse; import com.ruoyi.gysl.entity.response.ProjectBuildingExcel; import com.ruoyi.gysl.entity.response.ProjectExcelInfo; import com.ruoyi.gysl.mapper.BasicInformationMapper; -import com.ruoyi.gysl.service.BasicInformationService; +import com.ruoyi.gysl.service.*; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFCellStyle; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; +import java.io.Serializable; import java.lang.reflect.Field; import java.util.List; import java.util.Objects; @@ -28,16 +37,72 @@ import java.util.Objects; @Service("basicInformationService") public class BasicInformationServiceImpl extends ServiceImpl implements BasicInformationService { + + /** + * 项目规划信息 + */ + @Resource + private PlanInformationService planInformationService; + + + /** + * 建筑信息 + */ + @Resource + private BuildingInformationService buildingInformationService; + + /** + * 五要素模型信息 + */ + @Resource + private WysmxInformationService wysmxInformationService; + + /** + * 企业入驻信息 + */ + @Resource + private QyrzInformationService qyrzInformationService; + + /** + * 项目图例信息 + */ + @Resource + private ProjectLegendService projectLegendService; + + /** + * 项目备忘录 + */ + @Resource + private ProjectRemarkService projectRemarkService; + + /** + * 月度进展信息 + */ + @Resource + private ProjectMonthInfoService projectMonthInfoService; + + /** + * 项目巡礼 + */ + @Resource + private XmxlService xmxlService; + + /** + * 项目备忘录 + */ + @Resource + private ProjectOtherInfoService otherInfoService; + /** * 分页查询所有数据 * - * @param page 分页对象 - * @param req 查询实体 + * @param page 分页对象 + * @param req 查询实体 * @return 所有数据 */ @Override public Page page(Page page, BasicInformationPageReq req) { - return baseMapper.page(page,req); + return baseMapper.page(page, req); } /** @@ -106,6 +171,7 @@ public class BasicInformationServiceImpl extends ServiceImpl projectList(Page page) { + return baseMapper.projectList(page); + } + + /** + * 查看当前用户是否有权限查看或者修改新增 + */ + @Override + public BasicInformation testXmId(Serializable xmId) { + BasicInformation byId = getById(xmId); + // 获取当前登录用户是否是企业端 + try { + if (SecurityUtils.hasRole("company") && byId != null) { + if (!Objects.equals(byId.getTyshxydm(), SecurityUtils.getUsername())) { + throw new ServiceException("禁止修改!"); + } + } + } catch (Exception ignored) { + } + return byId; + } + + /** + * 企业端和政务端信息修改 + */ + @Transactional(rollbackFor = Exception.class) + @Override + public Long audit(AuditRequest req,int status) { + req.getBasicInformation().setStatus(status); + //企业端提交审核直接修改，不需要挂起等待审批 + //修改项目基本信息 + updateById(req.getBasicInformation()); + //修改项目规划信息 + planInformationService.updateById(req.getPlanInformation()); + //修改企业入驻信息 + qyrzInformationService.updateById(req.getQyrzInformation()); + //修改五要素模型信息 + wysmxInformationService.lambdaUpdate() + .eq(WysmxInformation::getXmId, req.getBasicInformation().getId()) + .remove(); + wysmxInformationService.saveBatch(req.getWysmxInformations()); + //修改其他信息 + otherInfoService.lambdaUpdate() + .eq(ProjectOtherInfo::getXmId, req.getBasicInformation().getId()) + .remove(); + otherInfoService.saveBatch(req.getProjectOtherInfos()); + return req.getBasicInformation().getId(); + } + + /** + * 通过主键查询单条项目所有数据 + * + * @param id 主键 + * @return 单条数据 + */ + @Override + public BasicInformationResponse selectOne(Long id) { + + BasicInformationResponse basicInformationResponse = new BasicInformationResponse(); + //项目基本信息 + basicInformationResponse.setBasicInformation(getById(id)); + //项目规划信息 + basicInformationResponse.setPlanInformation(planInformationService.lambdaQuery() + .eq(PlanInformation::getXmId, id) + .one()); + //项目建筑信息 + basicInformationResponse.setBuildingInformation(buildingInformationService.lambdaQuery() + .eq(BuildingInformation::getXmId, id) + .list()); + //五要素模型信息 + ZwIdPageReq zwIdPageReq = new ZwIdPageReq(); + zwIdPageReq.setXmId(id); + basicInformationResponse.setWysmxResponses(wysmxInformationService.list(zwIdPageReq)); + //企业入驻信息 + basicInformationResponse.setQyrzInformation(qyrzInformationService.selectAll(zwIdPageReq)); + //项目图例 + basicInformationResponse.setProjectLegendResponses(projectLegendService.page(zwIdPageReq)); + //项目巡礼 + basicInformationResponse.setXmxl(xmxlService.list(zwIdPageReq)); + RemarkPageReq remarkPageReq = new RemarkPageReq(); + remarkPageReq.setXmId(id); + //项目备忘录 + basicInformationResponse.setProjectRemarks(projectRemarkService.list(remarkPageReq)); + //其他信息 + basicInformationResponse.setProjectOtherInfos(otherInfoService.searchId(zwIdPageReq)); + return basicInformationResponse; + } + + + @Transactional(rollbackFor = Exception.class) + @Override + public void removeByXmIds(List idList) { + idList.forEach(x->{ + //删除项目基本信息 + lambdaUpdate() + .eq(BasicInformation::getId,x) + .remove(); + //删除项目规划信息 + planInformationService.lambdaUpdate() + .eq(PlanInformation::getXmId, x) + .remove(); + //删除项目建筑信息 + buildingInformationService.lambdaUpdate() + .eq(BuildingInformation::getXmId,x) + .remove(); + //删除五要素模型信息 + wysmxInformationService.lambdaUpdate() + .eq(WysmxInformation::getXmId,x) + .remove(); + //删除月度进展信息 + projectMonthInfoService.lambdaUpdate() + .eq(ProjectMonthInfo::getXmId,x) + .remove(); + //删除企业入驻信息 + qyrzInformationService.lambdaUpdate() + .eq(QyrzInformation::getXmId,x) + .remove(); + //删除项目图例 + projectLegendService.lambdaUpdate() + .eq(ProjectLegend::getXmId,x) + .remove(); + //删除项目巡礼 + xmxlService.lambdaUpdate() + .eq(Xmxl::getXmId, x) + .remove(); + //删除项目备忘录 + projectRemarkService.lambdaUpdate() + .eq(ProjectRemark::getXmId, x) + .remove(); + //删除其他信息 + otherInfoService.lambdaUpdate() + .eq(ProjectOtherInfo::getXmId, x) + .remove(); + }); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/DpclglServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/DpclglServiceImpl.java new file mode 100644 index 0000000..5881db0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/DpclglServiceImpl.java @@ -0,0 +1,32 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.request.DpclglPageReq; +import com.ruoyi.gysl.mapper.DpclglMapper; +import com.ruoyi.gysl.entity.Dpclgl; +import com.ruoyi.gysl.service.DpclglService; +import org.springframework.stereotype.Service; + +/** + * 单片材料管理(Dpclgl)表服务实现类 + * + * @author makejava + * @since 2025-03-22 11:11:55 + */ +@Service("dpclglService") +public class DpclglServiceImpl extends ServiceImpl implements DpclglService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param dpclgl 查询实体 + * @return 所有数据 + */ + @Override + public Page page(Page page, DpclglPageReq dpclgl) { + return baseMapper.page(page,dpclgl); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MlServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MlServiceImpl.java new file mode 100644 index 0000000..610de6e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MlServiceImpl.java @@ -0,0 +1,44 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.mapper.MlMapper; +import com.ruoyi.gysl.entity.Ml; +import com.ruoyi.gysl.entity.request.MlPageReq; +import com.ruoyi.gysl.service.MlService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 目录管理(Ml)表服务实现类 + * + * @author makejava + * @since 2025-03-22 09:21:57 + */ +@Service("mlService") +public class MlServiceImpl extends ServiceImpl implements MlService { + + /** + * 分页查询所有目录 + * + * @param page 分页对象 + * @return 所有数据 + */ + @Override + public Page page(Page page, MlPageReq req) { + return baseMapper.page(page,req); + } + + + /** + * 查询所有目录 + * + * @return 所有数据 + */ + @Override + public List page(MlPageReq req) { + return baseMapper.page(req); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java index 3bfaaf9..6ec015a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java @@ -2,12 +2,17 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.gysl.entity.Mx; +import com.ruoyi.gysl.entity.response.MxPageDetailedInfo.MxPageDetailedInfo; +import com.ruoyi.gysl.entity.response.MxPageResponse; import com.ruoyi.gysl.mapper.MxMapper; import com.ruoyi.gysl.service.MxService; -import com.ruoyi.gysl.service.WysmxInformationService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; /** * 模型管理(Mx)表服务实现类 @@ -18,13 +23,34 @@ import javax.annotation.Resource; @Service("mxService") public class MxServiceImpl extends ServiceImpl implements MxService { - @Resource - private WysmxInformationService wysmxInformationService; + /** + * 查询所有模型数据 + * + * @return 所有数据 + */ @Override - public int add(Mx mx) { - - //新增一条模型信息,就要修改一次 - return 0; + public List selectAll() { + List allList = list(); + // 按 name 分组，并转换为 GroupedData + Map groupedMap = + allList.stream().collect(Collectors.groupingBy(Mx::getName, + Collectors.collectingAndThen(Collectors.toList(), list -> { + MxPageResponse data = new MxPageResponse(); + data.setName(list.get(0).getName()); + data.setType(list.get(0).getType());// 分组 name + // 提取 a1 和 a2 到 AItem 列表 + List itemList = list.stream().map(e -> { + MxPageDetailedInfo item = new MxPageDetailedInfo(); + item.setJtzb(e.getJtzb()); + item.setXxyq(e.getXxyq()); + return item; + }).collect(Collectors.toList()); + data.setList(itemList); + return data; + }))); + return groupedMap.values().stream() + .filter(Objects::nonNull) + .collect(Collectors.toList()); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/NoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/NoticeServiceImpl.java new file mode 100644 index 0000000..80f85cc --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/NoticeServiceImpl.java @@ -0,0 +1,19 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.mapper.NoticeMapper; +import com.ruoyi.gysl.entity.Notice; +import com.ruoyi.gysl.service.NoticeService; +import org.springframework.stereotype.Service; + +/** + * 项目通知(Notice)表服务实现类 + * + * @author makejava + * @since 2025-03-23 16:34:27 + */ +@Service("noticeService") +public class NoticeServiceImpl extends ServiceImpl implements NoticeService { + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectOtherInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectOtherInfoServiceImpl.java index 3699003..b18bc0d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectOtherInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectOtherInfoServiceImpl.java @@ -7,6 +7,8 @@ import com.ruoyi.gysl.entity.ProjectOtherInfo; import com.ruoyi.gysl.service.ProjectOtherInfoService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 项目其他信息(ProjectOtherInfo)表服务实现类 * @@ -23,7 +25,7 @@ public class ProjectOtherInfoServiceImpl extends ServiceImpl searchId(ZwIdPageReq zwIdPageReq) { return baseMapper.searchId(zwIdPageReq); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java new file mode 100644 index 0000000..37db9cb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java @@ -0,0 +1,43 @@ +package com.ruoyi.gysl.service.impl; + +import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.stats.AllProjectResponse; +import com.ruoyi.gysl.entity.stats.RibbonResponse; +import com.ruoyi.gysl.mapper.QyStatsMapper; +import com.ruoyi.gysl.mapper.ZwStatsMapper; +import com.ruoyi.gysl.service.QyStatsService; +import com.ruoyi.gysl.service.ZwStatsService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 企业统计服务实现类 + * + * @author makejava + * @since 2025-02-24 09:25:55 + */ +@Service("qyStatsService") +public class QyStatsServiceImpl implements QyStatsService { + + @Resource + private QyStatsMapper qyStatsMapper; + + /** + * 项目情况 + */ + @Override + public AllProjectResponse allProject(String userName) { + return qyStatsMapper.allProject(userName); + } + + /** + * 关联项目 + */ + @Override + public List relationalProject(String username) { + return qyStatsMapper.relationalProject(username); + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java index e386556..d58d66f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java @@ -1,14 +1,18 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - import com.ruoyi.gysl.entity.WysmxInformation; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.entity.response.WysmxDetail.WysmxDetail; +import com.ruoyi.gysl.entity.response.WysmxResponse; import com.ruoyi.gysl.mapper.WysmxInformationMapper; import com.ruoyi.gysl.service.WysmxInformationService; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; /** * 五要素模型信息(WysmxInformation)表服务实现类 @@ -26,8 +30,28 @@ public class WysmxInformationServiceImpl extends ServiceImpl selectOne(ZwIdPageReq zwIdPageReq) { - return baseMapper.selectOne(zwIdPageReq); + public List list(ZwIdPageReq zwIdPageReq) { + List allList = baseMapper.list(zwIdPageReq); + // 按 name 分组，并转换为 GroupedData + Map groupedMap = + allList.stream().collect(Collectors.groupingBy(WysmxInformation::getYsmc, + Collectors.collectingAndThen(Collectors.toList(), list -> { + WysmxResponse data = new WysmxResponse(); + data.setId(list.get(0).getId()); + data.setXmId(list.get(0).getXmId()); + data.setYsmc(list.get(0).getYsmc()); + List itemList = list.stream().map(e -> { + WysmxDetail item = new WysmxDetail(); + item.setZdname(e.getZdname()); + item.setZdinfor(e.getZdinfor()); + return item; + }).collect(Collectors.toList()); + data.setList(itemList); + return data; + }))); + return groupedMap.values().stream() + .filter(Objects::nonNull) + .collect(Collectors.toList()); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XfcyglServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XfcyglServiceImpl.java new file mode 100644 index 0000000..dbeb691 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XfcyglServiceImpl.java @@ -0,0 +1,45 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.mapper.XfcyglMapper; +import com.ruoyi.gysl.entity.Xfcygl; +import com.ruoyi.gysl.entity.request.XfcyglPageReq; +import com.ruoyi.gysl.service.XfcyglService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 细分产业管理(Xfcygl)表服务实现类 + * + * @author makejava + * @since 2025-03-22 10:39:47 + */ +@Service("xfcyglService") +public class XfcyglServiceImpl extends ServiceImpl implements XfcyglService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param req 查询实体 + * @return 所有数据 + */ + @Override + public Page page(Page page, XfcyglPageReq req) { + return baseMapper.page(page,req); + } + + /** + * 查询所有数据 + * + * @param req 查询实体 + * @return 所有数据 + */ + @Override + public List page(XfcyglPageReq req) { + return baseMapper.page(req); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmpjqdServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmpjqdServiceImpl.java new file mode 100644 index 0000000..712818e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmpjqdServiceImpl.java @@ -0,0 +1,31 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.request.XmpjqdPageReq; +import com.ruoyi.gysl.mapper.XmpjqdMapper; +import com.ruoyi.gysl.entity.Xmpjqd; +import com.ruoyi.gysl.service.XmpjqdService; +import org.springframework.stereotype.Service; + +/** + * 项目评价清单(Xmpjqd)表服务实现类 + * + * @author makejava + * @since 2025-03-22 09:22:33 + */ +@Service("xmpjqdService") +public class XmpjqdServiceImpl extends ServiceImpl implements XmpjqdService { + + /** + * 分页查询所有目录 + * + * @param page 分页对象 + * @return 所有数据 + */ + @Override + public Page page(Page page, XmpjqdPageReq req) { + return baseMapper.page(page,req); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java new file mode 100644 index 0000000..44bf816 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java @@ -0,0 +1,46 @@ +package com.ruoyi.gysl.service.impl; + +import com.ruoyi.gysl.entity.stats.AllProjectResponse; +import com.ruoyi.gysl.entity.stats.RibbonResponse; +import com.ruoyi.gysl.mapper.ZwStatsMapper; +import com.ruoyi.gysl.service.ZwStatsService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 政务统计服务实现类 + * + * @author makejava + * @since 2025-02-24 09:25:55 + */ +@Service("ZwStatsService") +public class ZwStatsServiceImpl implements ZwStatsService { + + @Resource + private ZwStatsMapper zwStatsMapper; + + /** + * 项目情况 + */ + @Override + public AllProjectResponse allProject() { + return zwStatsMapper.allProject(); + } + + /** + * 功能区 + */ + @Override + public List ribbon() { + return zwStatsMapper.ribbon(); + } + /** + * 投资主体 + */ + @Override + public List investors() { + return zwStatsMapper.investors(); + } +} diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 09b29ed..94c77df 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/gysl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://39.101.188.84:3307/gysl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: root + password: Admin123@ # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml index ea45a6c..acfbb2f 100644 --- a/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml @@ -75,6 +75,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND a.begain_time <= #{req.endTime} + + AND a.tyshxydm = #{req.tyshxydm} + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/DpclglMapper.xml b/ruoyi-admin/src/main/resources/mapper/DpclglMapper.xml new file mode 100644 index 0000000..9d01abd --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/DpclglMapper.xml @@ -0,0 +1,17 @@ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/MlMapper.xml b/ruoyi-admin/src/main/resources/mapper/MlMapper.xml new file mode 100644 index 0000000..4312e8b --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/MlMapper.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/MxMapper.xml b/ruoyi-admin/src/main/resources/mapper/MxMapper.xml new file mode 100644 index 0000000..dd4b129 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/MxMapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/NoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/NoticeMapper.xml new file mode 100644 index 0000000..513478b --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/NoticeMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + insert into gysl.notice(typecontenttyshxydmcreate_idcreate_timecreate_byupdate_idupdate_byupdate_time) + values + + (#{entity.type}#{entity.content}#{entity.tyshxydm}#{entity.createId}#{entity.createTime}#{entity.createBy}#{entity.updateId}#{entity.updateBy}#{entity.updateTime}) + + + + + insert into gysl.notice(typecontenttyshxydmcreate_idcreate_timecreate_byupdate_idupdate_byupdate_time) + values + + (#{entity.type}#{entity.content}#{entity.tyshxydm}#{entity.createId}#{entity.createTime}#{entity.createBy}#{entity.updateId}#{entity.updateBy}#{entity.updateTime}) + + on duplicate key update +type = values(type) content = values(content) tyshxydm = values(tyshxydm) create_id = values(create_id) create_time = values(create_time) create_by = values(create_by) update_id = values(update_id) update_by = values(update_by) update_time = values(update_time) + + + diff --git a/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml b/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml new file mode 100644 index 0000000..e054b9c --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/WysmxInfomationMapper.xml b/ruoyi-admin/src/main/resources/mapper/WysmxInfomationMapper.xml index 5f85807..9bc6d7b 100644 --- a/ruoyi-admin/src/main/resources/mapper/WysmxInfomationMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/WysmxInfomationMapper.xml @@ -1,7 +1,7 @@ - select * from wysmx_information diff --git a/ruoyi-admin/src/main/resources/mapper/XfcyglMapper.xml b/ruoyi-admin/src/main/resources/mapper/XfcyglMapper.xml new file mode 100644 index 0000000..35bfdb6 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/XfcyglMapper.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml b/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml new file mode 100644 index 0000000..64c8fa1 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml b/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml new file mode 100644 index 0000000..4c742f0 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + From 2d7a2bfd94a6821c644755cf3bf3208f65264a36 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Mon, 24 Mar 2025 10:19:20 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gysl/controller/QyStatsController.java | 16 ++++++++-------- .../gysl/controller/ZwStatsController.java | 10 ++++++++++ .../java/com/ruoyi/gysl/entity/Notice.java | 3 +++ .../com/ruoyi/gysl/mapper/QyStatsMapper.java | 6 ++++++ .../com/ruoyi/gysl/mapper/ZwStatsMapper.java | 6 ++++++ .../com/ruoyi/gysl/regular/NoticeTiming.java | 19 ++++++++++++------- .../ruoyi/gysl/service/QyStatsService.java | 5 +++++ .../ruoyi/gysl/service/ZwStatsService.java | 7 +++++++ .../gysl/service/impl/QyStatsServiceImpl.java | 9 +++++++++ .../gysl/service/impl/ZwStatsServiceImpl.java | 9 +++++++++ .../main/resources/mapper/QyStatsMapper.xml | 4 ++++ .../main/resources/mapper/ZwStatsMapper.xml | 4 ++++ 12 files changed, 83 insertions(+), 15 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java index f5e546b..9946185 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java @@ -47,13 +47,13 @@ public class QyStatsController extends BaseController { return success(qyStatsService.relationalProject(SecurityUtils.getUsername())); } -// /** -// * 消息通知 -// */ -// @ApiOperation("消息通知") -// @GetMapping("/qyNotice") -// public AjaxResult qyNotice() { -// return success(qyStatsService.qyNotice(SecurityUtils.getUsername())); -// } + /** + * 消息通知 + */ + @ApiOperation("消息通知") + @GetMapping("/qyNotice") + public AjaxResult qyNotice() { + return success(qyStatsService.qyNotice(SecurityUtils.getUsername())); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java index 856ea61..ecd9a3c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java @@ -4,6 +4,7 @@ package com.ruoyi.gysl.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.gysl.entity.BasicInformation; import com.ruoyi.gysl.service.BasicInformationService; import com.ruoyi.gysl.service.ZwStatsService; @@ -69,5 +70,14 @@ public class ZwStatsController extends BaseController { public AjaxResult projectList(Page page) { return success(basicInformationService.projectList(page)); } + + /** + * 消息通知 + */ + @ApiOperation("消息通知") + @GetMapping("/zwNotice") + public AjaxResult zwNotice() { + return success(zwStatsService.zwNotice()); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java index ccf4237..e389b49 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java @@ -45,5 +45,8 @@ public class Notice implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; + + @ApiModelProperty(value = "项目id") + private Long zwId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java index eb81424..cb68037 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java @@ -1,6 +1,7 @@ package com.ruoyi.gysl.mapper; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.Notice; import com.ruoyi.gysl.entity.stats.AllProjectResponse; import com.ruoyi.gysl.entity.stats.RibbonResponse; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,10 @@ public interface QyStatsMapper { * 关联项目 */ List relationalProject(String username); + + /** + * 消息通知 + */ + List qyNotice(@Param("username") String username); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java index 77105a0..b975d4e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java @@ -1,5 +1,6 @@ package com.ruoyi.gysl.mapper; +import com.ruoyi.gysl.entity.Notice; import com.ruoyi.gysl.entity.stats.AllProjectResponse; import com.ruoyi.gysl.entity.stats.RibbonResponse; @@ -26,5 +27,10 @@ public interface ZwStatsMapper { * 投资主体 */ List investors(); + + /** + * 消息通知 + */ + List zwNotice(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java index 0c3a005..67f604a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java @@ -7,6 +7,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import javax.annotation.Resource; +import java.time.LocalDate; /** * 每月固定时间定时任务 @@ -23,11 +24,15 @@ public class NoticeTiming { /** * 每个月固定发一次政务通知 */ -// @Scheduled(cron = "1 0 0 * * *") -// private void configureTasks() { -// Notice notice = new Notice(); -// notice.setType(1); -// -// noticeService.save(notice); -// } + @Scheduled(cron = "0 0 0 1 * ?") + private void configureTasks() { + Notice notice = new Notice(); + notice.setType(1); + notice.setContent(LocalDate.now().getYear() + + "年"+ + LocalDate.now().getMonth().getValue()+ + "月"+ + "项目进展未填写"); + noticeService.save(notice); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java index a213d3f..cdf289c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java @@ -1,6 +1,7 @@ package com.ruoyi.gysl.service; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.Notice; import com.ruoyi.gysl.entity.stats.AllProjectResponse; import com.ruoyi.gysl.entity.stats.RibbonResponse; @@ -25,5 +26,9 @@ public interface QyStatsService { List relationalProject(String username); + /** + * 消息通知 + */ + List qyNotice(String username); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java index 3d25ed1..89413ea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java @@ -1,5 +1,6 @@ package com.ruoyi.gysl.service; +import com.ruoyi.gysl.entity.Notice; import com.ruoyi.gysl.entity.stats.AllProjectResponse; import com.ruoyi.gysl.entity.stats.RibbonResponse; @@ -27,5 +28,11 @@ public interface ZwStatsService { * 投资主体 */ List investors(); + + + /** + * 消息通知 + */ + List zwNotice(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java index 37db9cb..dc6f335 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.gysl.service.impl; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.Notice; import com.ruoyi.gysl.entity.stats.AllProjectResponse; import com.ruoyi.gysl.entity.stats.RibbonResponse; import com.ruoyi.gysl.mapper.QyStatsMapper; @@ -40,4 +41,12 @@ public class QyStatsServiceImpl implements QyStatsService { return qyStatsMapper.relationalProject(username); } + /** + * 消息通知 + */ + @Override + public List qyNotice(String username) { + return qyStatsMapper.qyNotice(username); + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java index 44bf816..e984ff9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.gysl.service.impl; +import com.ruoyi.gysl.entity.Notice; import com.ruoyi.gysl.entity.stats.AllProjectResponse; import com.ruoyi.gysl.entity.stats.RibbonResponse; import com.ruoyi.gysl.mapper.ZwStatsMapper; @@ -43,4 +44,12 @@ public class ZwStatsServiceImpl implements ZwStatsService { public List investors() { return zwStatsMapper.investors(); } + + /** + * 消息通知 + */ + @Override + public List zwNotice() { + return zwStatsMapper.zwNotice(); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml b/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml index e054b9c..70354d1 100644 --- a/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml @@ -29,5 +29,9 @@ + diff --git a/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml b/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml index 4c742f0..4058cd5 100644 --- a/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml @@ -39,5 +39,9 @@ GROUP BY nature +