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 @@ + + + + + + + + +