diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java index 02c6084..26d1657 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 @@ -5,13 +5,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.request.BasicRequest; import com.ruoyi.gysl.service.BasicInformationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; 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; @@ -92,5 +97,47 @@ public class BasicInformationController extends BaseController { public AjaxResult delete(@RequestParam("idList") List idList) { return success(this.basicInformationService.removeByIds(idList)); } + + /** + * 导出基本信息列表 + */ + @ApiOperation("导出基本信息列表") + @PostMapping("/export") + public void export(HttpServletResponse response, BasicInformation basicInformation) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List list = basicInformationService.getBaseMapper().selectList(queryWrapper); + ExcelUtil util = new ExcelUtil(BasicInformation.class); + util.exportExcel(response, list, "基本信息"); + } + + /** + * 基本信息模板下载 + * + * @param response + */ + @ApiOperation("基本信息模板下载") + @PostMapping("/importTemplate") + public void importTemplate(HttpServletResponse response) { + ExcelUtil util = new ExcelUtil(BasicRequest.class); + util.importTemplateExcel(response, "基本信息"); + } + + + /** + * 导入 + */ + @ApiOperation("导入") + @PostMapping("/importData") + public AjaxResult importData(MultipartFile file) throws Exception { + + ExcelUtil util = new ExcelUtil(BasicRequest.class); + List basicRequestList = util.importExcel(file.getInputStream()); + + basicInformationService.importUser(basicRequestList); + + return success(); + } + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java index df75ec1..13929a2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java @@ -5,13 +5,16 @@ 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.utils.poi.ExcelUtil; import com.ruoyi.gysl.entity.BuildingInformation; +import com.ruoyi.gysl.entity.PlanInformation; import com.ruoyi.gysl.service.BuildingInformationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.io.Serializable; import java.util.List; @@ -91,5 +94,20 @@ public class BuildingInformationController extends BaseController { public AjaxResult delete(@RequestParam("idList") List idList) { return success(this.buildingInformationService.removeByIds(idList)); } + + + + + /** + * 导出建筑信息列表 + */ + @PostMapping("/export") + public void export(HttpServletResponse response, BuildingInformation buildingInformation) + { + QueryWrapper queryWrapper=new QueryWrapper<>(); + List list = buildingInformationService.getBaseMapper().selectList(queryWrapper); + ExcelUtil util = new ExcelUtil(BuildingInformation.class); + util.exportExcel(response, list, "建筑信息"); + } } 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..ad0f5e9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MlController.java @@ -0,0 +1,95 @@ +package com.ruoyi.gysl.controller; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.gysl.entity.Ml; +import com.ruoyi.gysl.service.MlService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.List; + +/** + * 目录管理(Ml)表控制层 + * + * @author makejava + * @since 2025-02-25 14:21:08 + */ +@Api(tags = "目录管理") +@RestController +@RequestMapping("/gysl/ml") +public class MlController extends BaseController { + /** + * 服务对象 + */ + @Resource + private MlService mlService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param ml 查询实体 + * @return 所有数据 + */ + @GetMapping("/page") + @ApiOperation("分页查询所有数据") + public AjaxResult selectAll(Page page, Ml ml) { + return success(this.mlService.page(page, new QueryWrapper<>(ml))); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + @ApiOperation("通过主键查询单条数据") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(this.mlService.getById(id)); + } + + /** + * 新增数据 + * + * @param ml 实体对象 + * @return 新增结果 + */ + @PostMapping("/add") + @ApiOperation("新增数据") + public AjaxResult insert(@RequestBody Ml ml) { + return success(this.mlService.save(ml)); + } + + /** + * 修改数据 + * + * @param ml 实体对象 + * @return 修改结果 + */ + @PostMapping("/edit") + @ApiOperation("修改数据") + public AjaxResult update(@RequestBody Ml ml) { + return success(this.mlService.updateById(ml)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(this.mlService.removeByIds(idList)); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java index 60bdc7e..9f6cc2a 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 @@ -31,17 +31,28 @@ public class MxController extends BaseController { @Resource private MxService mxService; +// /** +// * 分页查询所有数据 +// * +// * @param page 分页对象 +// * @param mx 查询实体 +// * @return 所有数据 +// */ +// @GetMapping("/page") +// @ApiOperation("分页查询所有数据") +// public AjaxResult selectAll(Page page, Mx mx) { +// return success(this.mxService.page(page, new QueryWrapper<>(mx))); +// } + + /** - * 分页查询所有数据 - * - * @param page 分页对象 - * @param mx 查询实体 + * 查询所有数据 * @return 所有数据 */ @GetMapping("/page") - @ApiOperation("分页查询所有数据") - public AjaxResult selectAll(Page page, Mx mx) { - return success(this.mxService.page(page, new QueryWrapper<>(mx))); + @ApiOperation("查询所有数据") + public AjaxResult selectAll() { + return success(this.mxService.selectAll()); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java index df8206e..0e27b9d 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 @@ -5,6 +5,8 @@ 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.utils.poi.ExcelUtil; +import com.ruoyi.gysl.entity.BasicInformation; import com.ruoyi.gysl.entity.PlanInformation; import com.ruoyi.gysl.service.PlanInformationService; import io.swagger.annotations.Api; @@ -12,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.io.Serializable; import java.util.List; @@ -91,5 +94,19 @@ public class PlanInformationController extends BaseController { public AjaxResult delete(@RequestParam("idList") List idList) { return success(this.planInformationService.removeByIds(idList)); } + + + + /** + * 导出规划信息列表 + */ + @PostMapping("/export") + public void export(HttpServletResponse response, PlanInformation planInformation) + { + QueryWrapper queryWrapper=new QueryWrapper<>(); + List list = planInformationService.getBaseMapper().selectList(queryWrapper); + ExcelUtil util = new ExcelUtil(PlanInformation.class); + util.exportExcel(response, list, "规划信息"); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java new file mode 100644 index 0000000..8253094 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java @@ -0,0 +1,98 @@ +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.QyrzInformation; +import com.ruoyi.gysl.service.QyrzInformationService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.List; + +/** + * (QyrzInformation)表控制层 + * + * @author makejava + * @since 2025-02-25 14:45:29 + */ + +@Api(tags ="企业入住" ) +@RestController +@RequestMapping("/gysl/qyrzInformation") +public class QyrzInformationController extends BaseController { + /** + * 服务对象 + */ + @Resource + private QyrzInformationService qyrzInformationService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param qyrzInformation 查询实体 + * @return 所有数据 + */ + @GetMapping("/page") + @ApiOperation("分页查询所有数据") + public AjaxResult selectAll(Page page, QyrzInformation qyrzInformation) { + return success(this.qyrzInformationService.page(page, new QueryWrapper<>(qyrzInformation))); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + @ApiOperation("通过主键查询单条数据") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(this.qyrzInformationService.getById(id)); + } + + /** + * 新增数据 + * + * @param qyrzInformation 实体对象 + * @return 新增结果 + */ + @PostMapping("/add") + @ApiOperation("新增数据") + public AjaxResult insert(@RequestBody QyrzInformation qyrzInformation) { + return success(this.qyrzInformationService.save(qyrzInformation)); + } + + /** + * 修改数据 + * + * @param qyrzInformation 实体对象 + * @return 修改结果 + */ + @PostMapping("/edit") + @ApiOperation("修改数据") + public AjaxResult update(@RequestBody QyrzInformation qyrzInformation) { + return success(this.qyrzInformationService.updateById(qyrzInformation)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(this.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 9450e3e..ab4bbac 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 @@ -19,9 +19,9 @@ import java.util.List; * 五要素模型信息(WysmxInformation)表控制层 * * @author makejava - * @since 2025-02-24 14:29:58 + * @since 2025-02-26 11:09:30 */ -@Api(tags ="五要素模型信息" ) +@Api(tags = "五要素模型信息") @RestController @RequestMapping("/gysl/wysmxInformation") public class WysmxInformationController extends BaseController { @@ -33,9 +33,7 @@ public class WysmxInformationController extends BaseController { /** * 分页查询所有数据 - * - * @param page 分页对象 - * @param wysmxInformation 查询实体 + * @return 所有数据 */ @GetMapping("/page") 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..a471f5b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmpjqdController.java @@ -0,0 +1,95 @@ +package com.ruoyi.gysl.controller; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.gysl.entity.Xmpjqd; +import com.ruoyi.gysl.service.XmpjqdService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.List; + +/** + * 项目评价清单(Xmpjqd)表控制层 + * + * @author makejava + * @since 2025-02-25 14:19:33 + */ +@Api(tags = "项目评价清单") +@RestController +@RequestMapping("/gysl/xmpjqd") +public class XmpjqdController extends BaseController { + /** + * 服务对象 + */ + @Resource + private XmpjqdService xmpjqdService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param xmpjqd 查询实体 + * @return 所有数据 + */ + @GetMapping("/page") + @ApiOperation("分页查询所有数据") + public AjaxResult selectAll(Page page, Xmpjqd xmpjqd) { + return success(this.xmpjqdService.page(page, new QueryWrapper<>(xmpjqd))); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + @ApiOperation("通过主键查询单条数据") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(this.xmpjqdService.getById(id)); + } + + /** + * 新增数据 + * + * @param xmpjqd 实体对象 + * @return 新增结果 + */ + @PostMapping("/add") + @ApiOperation("新增数据") + public AjaxResult insert(@RequestBody Xmpjqd xmpjqd) { + return success(this.xmpjqdService.save(xmpjqd)); + } + + /** + * 修改数据 + * + * @param xmpjqd 实体对象 + * @return 修改结果 + */ + @PostMapping("/edit") + @ApiOperation("修改数据") + public AjaxResult update(@RequestBody Xmpjqd xmpjqd) { + return success(this.xmpjqdService.updateById(xmpjqd)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(this.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 new file mode 100644 index 0000000..ab1c384 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java @@ -0,0 +1,95 @@ +package com.ruoyi.gysl.controller; + + +import com.baomidou.mybatisplus.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.Xmxl; +import com.ruoyi.gysl.service.XmxlService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.List; + +/** + * 项目巡礼(Xmxl)表控制层 + * + * @author makejava + * @since 2025-02-25 14:17:35 + */ +@Api(tags = "项目巡礼") +@RestController +@RequestMapping("/gysl/xmxl") +public class XmxlController extends BaseController { + /** + * 服务对象 + */ + @Resource + private XmxlService xmxlService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param xmxl 查询实体 + * @return 所有数据 + */ + @GetMapping("/page") + @ApiOperation("分页查询所有数据") + public AjaxResult selectAll(Page page, Xmxl xmxl) { + return success(this.xmxlService.page(page, new QueryWrapper<>(xmxl))); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + @ApiOperation("通过主键查询单条数据") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(this.xmxlService.getById(id)); + } + + /** + * 新增数据 + * + * @param xmxl 实体对象 + * @return 新增结果 + */ + @PostMapping("/add") + @ApiOperation("新增数据") + public AjaxResult insert(@RequestBody Xmxl xmxl) { + return success(this.xmxlService.save(xmxl)); + } + + /** + * 修改数据 + * + * @param xmxl 实体对象 + * @return 修改结果 + */ + @PostMapping("/edit") + @ApiOperation("修改数据") + public AjaxResult update(@RequestBody Xmxl xmxl) { + return success(this.xmxlService.updateById(xmxl)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(this.xmxlService.removeByIds(idList)); + } +} + 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..82ddd1c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java @@ -0,0 +1,95 @@ +package com.ruoyi.gysl.entity; + +import java.util.Date; +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 目录管理(Ml)实体类 + * + * @author makejava + * @since 2025-02-25 14:21:08 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ml") +@ApiModel(value = "Ml", description = "目录管理") +public class Ml implements Serializable { + private static final long serialVersionUID = -79924572462170266L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键id") + @TableField("id") + private Integer id; + + /** + * 上楼目录类别 + */ + @ApiModelProperty(value = "上楼目录类别") + @TableField("slmllb") + private Integer slmllb; + + /** + * 工业大类 + */ + @ApiModelProperty(value = "工业大类") + @TableField("gydl") + private String gydl; + + /** + * 产业 + */ + @ApiModelProperty(value = "产业") + @TableField("cy") + private String cy; + + /** + * 创建者id + */ + @ApiModelProperty(value = "创建者id") + @TableField("create_id") + private Integer createId; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + @TableField("create_by") + private String createBy; + + /** + * 更新者ID + */ + @ApiModelProperty(value = "更新者ID") + @TableField("update_id") + private Long updateId; + + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + @TableField("update_by") + private String updateBy; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + @TableField("update_time") + private Date updateTime; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java index 7cb2dac..baabdf3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java @@ -38,7 +38,7 @@ public class Mx implements Serializable { */ @ApiModelProperty(value = "1:关键要素；2：重要要素") @TableField("type") - private Integer type; + private String type; /** * 要素名称 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java new file mode 100644 index 0000000..a869864 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java @@ -0,0 +1,137 @@ +package com.ruoyi.gysl.entity; + +import java.math.BigDecimal; +import java.util.Date; +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * (QyrzInformation)实体类 + * + * @author makejava + * @since 2025-02-25 14:45:29 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("qyrz_information") +@ApiModel(value = "QyrzInformation", description = "$tableInfo.comment") +public class QyrzInformation implements Serializable { + private static final long serialVersionUID = -20690122252871743L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键id") + @TableField("id") + private Integer id; + + /** + * 项目id + */ + @ApiModelProperty(value = "项目id") + @TableField("xm_id") + private Integer xmId; + + /** + * 入住企业数 + */ + @ApiModelProperty(value = "入住企业数") + @TableField("rzqys") + private Integer rzqys; + + /** + * 入驻企业行业类型 + */ + @ApiModelProperty(value = "入驻企业行业类型") + @TableField("rzqyhylx") + private String rzqyhylx; + + /** + * 人员数量 + */ + @ApiModelProperty(value = "人员数量") + @TableField("rysl") + private Integer rysl; + + /** + * 入住率 + */ + @ApiModelProperty(value = "入住率") + @TableField("rzl") + private BigDecimal rzl; + + /** + * 已出租（售）面积 + */ + @ApiModelProperty(value = "已出租（售）面积") + @TableField("yczmj") + private BigDecimal yczmj; + + /** + * 空置出租（售）面积 + */ + @ApiModelProperty(value = "空置出租（售）面积") + @TableField("kzczmj") + private BigDecimal kzczmj; + + /** + * 工业厂房平均租金 + */ + @ApiModelProperty(value = "工业厂房平均租金") + @TableField("gycfpjzj") + private BigDecimal gycfpjzj; + + /** + * 工业厂房平均物业费 + */ + @ApiModelProperty(value = "工业厂房平均物业费") + @TableField("gycfpjwyf") + private BigDecimal gycfpjwyf; + + /** + * 创建者id + */ + @ApiModelProperty(value = "创建者id") + @TableField("create_id") + private Integer createId; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + @TableField("create_by") + private String createBy; + + /** + * 更新者ID + */ + @ApiModelProperty(value = "更新者ID") + @TableField("update_id") + private Long updateId; + + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + @TableField("update_by") + private String updateBy; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + @TableField("update_time") + private Date updateTime; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java index 7fc6886..66f973f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java @@ -1,36 +1,40 @@ package com.ruoyi.gysl.entity; -import java.math.BigDecimal; -import java.time.LocalDateTime; import java.util.Date; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -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 org.springframework.validation.annotation.Validated; /** * 五要素模型信息(WysmxInformation)实体类 * * @author makejava - * @since 2025-02-24 14:29:58 + * @since 2025-02-26 11:09:30 */ @Data @EqualsAndHashCode(callSuper = false) @TableName("wysmx_information") @ApiModel(value = "WysmxInformation", description = "五要素模型信息") public class WysmxInformation implements Serializable { - private static final long serialVersionUID = 285216252862855830L; + private static final long serialVersionUID = -64642268500596283L; @ApiModelProperty(value = "${column.comment}") @TableField("id") private Integer id; + /** + * 模型id + */ + @ApiModelProperty(value = "模型id") + @TableField("mx_id") + private Integer mxId; + /** * 项目id */ @@ -39,60 +43,12 @@ public class WysmxInformation implements Serializable { private Integer xmId; /** - * 环境保护 - */ - @ApiModelProperty(value = "环境保护") - @TableField("hjbh") - private String hjbh; - - /** - * 设备载重 - */ - @ApiModelProperty(value = "设备载重") - @TableField("sbzz") - private BigDecimal sbzz; - - /** - * 货梯要求 - */ - @ApiModelProperty(value = "货梯要求") - @TableField("htyq") - private String htyq; - - /** - * 员工密度 + * 具体要求 */ - @ApiModelProperty(value = "员工密度") - @TableField("ygmd") - private BigDecimal ygmd; + @ApiModelProperty(value = "具体要求") + @TableField("jtyq") + private String jtyq; - /** - * 加工精度 - */ - @ApiModelProperty(value = "加工精度") - @TableField("jgjd") - private BigDecimal jgjd; - - /** - * 减振措施 - */ - @ApiModelProperty(value = "减振措施") - @TableField("jzcs") - private String jzcs; - - /** - * 生产类型 - */ - @ApiModelProperty(value = "生产类型") - @TableField("sclx") - private String sclx; - - /** - * 层高要求 - */ - @ApiModelProperty(value = "层高要求") - @TableField("cgyq") - private String cgyq; /** * 创建者id @@ -106,9 +62,7 @@ public class WysmxInformation implements Serializable { */ @ApiModelProperty(value = "创建时间") @TableField("create_time") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; + private Date createTime; /** * 创建者 @@ -136,7 +90,5 @@ public class WysmxInformation implements Serializable { */ @ApiModelProperty(value = "更新时间") @TableField("update_time") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; + private Date updateTime; } 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..c8fe4bf --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java @@ -0,0 +1,113 @@ +package com.ruoyi.gysl.entity; + +import java.util.Date; +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目评价清单(Xmpjqd)实体类 + * + * @author makejava + * @since 2025-02-25 14:19:33 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("xmpjqd") +@ApiModel(value = "Xmpjqd", description = "项目评价清单") +public class Xmpjqd implements Serializable { + private static final long serialVersionUID = 223689412712645471L; + + @ApiModelProperty(value = "${column.comment}") + @TableField("id") + private Integer id; + + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + @TableField("xmmc") + private String xmmc; + + /** + * 项目建设开始时间 + */ + @ApiModelProperty(value = "项目建设开始时间") + @TableField("xmqzsj") + private Date xmqzsj; + + /** + * 现状分类 + */ + @ApiModelProperty(value = "现状分类") + @TableField("xzfl") + private Integer xzfl; + + /** + * 评价等级 + */ + @ApiModelProperty(value = "评价等级") + @TableField("pjdj") + private Integer pjdj; + + /** + * 项目法人单位 + */ + @ApiModelProperty(value = "项目法人单位") + @TableField("xmfrdw") + private String xmfrdw; + + /** + * 项目评价 + */ + @ApiModelProperty(value = "项目评价") + @TableField("xmpj") + private String xmpj; + + /** + * 创建者id + */ + @ApiModelProperty(value = "创建者id") + @TableField("create_id") + private Integer createId; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + @TableField("create_by") + private String createBy; + + /** + * 更新者ID + */ + @ApiModelProperty(value = "更新者ID") + @TableField("update_id") + private Long updateId; + + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + @TableField("update_by") + private String updateBy; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + @TableField("update_time") + private Date updateTime; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java new file mode 100644 index 0000000..9c1c7d5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java @@ -0,0 +1,102 @@ +package com.ruoyi.gysl.entity; + +import java.util.Date; +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目巡礼(Xmxl)实体类 + * + * @author makejava + * @since 2025-02-25 14:17:35 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("xmxl") +@ApiModel(value = "Xmxl", description = "项目巡礼") +public class Xmxl implements Serializable { + private static final long serialVersionUID = 300538411000092930L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键id") + @TableField("id") + private Integer id; + + /** + * 监控名称 + */ + @ApiModelProperty(value = "监控名称") + @TableField("jkmc") + private String jkmc; + + /** + * 时间 + */ + @ApiModelProperty(value = "时间") + @TableField("sj") + private Date sj; + + /** + * 当前状态 + */ + @ApiModelProperty(value = "当前状态") + @TableField("status") + private Integer status; + + /** + * 附件 + */ + @ApiModelProperty(value = "附件") + @TableField("fj") + private String fj; + + /** + * 创建者id + */ + @ApiModelProperty(value = "创建者id") + @TableField("create_id") + private Integer createId; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + @TableField("create_by") + private String createBy; + + /** + * 更新者ID + */ + @ApiModelProperty(value = "更新者ID") + @TableField("update_id") + private Long updateId; + + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + @TableField("update_by") + private String updateBy; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + @TableField("update_time") + private Date updateTime; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicRequest.java new file mode 100644 index 0000000..3e4898b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicRequest.java @@ -0,0 +1,82 @@ +package com.ruoyi.gysl.entity.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Date; + +/** + * @author dong + * @since 2025/2/26 9:20 + */ +@Data +@ApiModel("基本信息导出类") +public class BasicRequest implements Serializable { + + @Excel(name = "序号") + private Integer id; + + + //项目名称 + @Excel(name = "项目名称") + @ApiModelProperty("项目名称") + private String name; + + + //项目法人单位 + @Excel(name = "项目法人单位") + @ApiModelProperty("项目法人单位") + private String xmfrdwxz; + + + + //总投资额 + @Excel(name = "总投资额(万元）") + @ApiModelProperty("总投资额") + private BigDecimal ztze; + + + //所属功能区 + @Excel(name = "所属功能区") + @ApiModelProperty("所属功能区") + private Integer ssgnq; + + + //建设开始时间 + @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") + @ApiModelProperty("建设开始时间") + private LocalDateTime begainTime; + + + //建设结束时间 + @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") + @ApiModelProperty("建设结束时间") + private LocalDateTime endTime; + + //现状分类 + @Excel(name = "现状分类") + @ApiModelProperty("现状分类") + private Integer xzfl; + + + /** + * 总用地面积 + */ + @ApiModelProperty(value = "总用地面积（平方米）") + @Excel(name = "总用地面积") + private BigDecimal zydmj; + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MlDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MlDao.java new file mode 100644 index 0000000..f954a1c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MlDao.java @@ -0,0 +1,15 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.gysl.entity.Ml; + +/** + * 目录管理(Ml)表数据库访问层 + * + * @author makejava + * @since 2025-02-25 14:21:08 + */ +public interface MlDao extends BaseMapper { + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyrzInformationDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyrzInformationDao.java new file mode 100644 index 0000000..d2c8be9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyrzInformationDao.java @@ -0,0 +1,15 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.gysl.entity.QyrzInformation; + +/** + * (QyrzInformation)表数据库访问层 + * + * @author makejava + * @since 2025-02-25 14:45:29 + */ +public interface QyrzInformationDao extends BaseMapper { + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationDao.java index 2da1932..0d46f7d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationDao.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationDao.java @@ -1,13 +1,16 @@ 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.WysmxInformation; +import java.util.List; + /** * 五要素模型信息(WysmxInformation)表数据库访问层 * * @author makejava - * @since 2025-02-25 09:14:22 + * @since 2025-02-26 11:09:30 */ public interface WysmxInformationDao extends BaseMapper { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmpjqdDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmpjqdDao.java new file mode 100644 index 0000000..1f0d0cf --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmpjqdDao.java @@ -0,0 +1,15 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.gysl.entity.Xmpjqd; + +/** + * 项目评价清单(Xmpjqd)表数据库访问层 + * + * @author makejava + * @since 2025-02-25 14:19:33 + */ +public interface XmpjqdDao extends BaseMapper { + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlDao.java new file mode 100644 index 0000000..337fcd2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlDao.java @@ -0,0 +1,15 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.gysl.entity.Xmxl; + +/** + * 项目巡礼(Xmxl)表数据库访问层 + * + * @author makejava + * @since 2025-02-25 14:17:35 + */ +public interface XmxlDao extends BaseMapper { + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java index ea32ce3..4240b00 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java @@ -1,7 +1,11 @@ package com.ruoyi.gysl.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.request.BasicRequest; + +import java.util.List; /** * 基本信息(BasicInformation)表服务接口 @@ -11,5 +15,15 @@ import com.ruoyi.gysl.entity.BasicInformation; */ public interface BasicInformationService extends IService { + + /** + * 导入基本信息数据 + * + * @param basicRequestList 基本信息数据列表 + * @return 结果 + */ + public void importUser(List basicRequestList); + + } 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..10bb9c6 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MlService.java @@ -0,0 +1,15 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.Ml; + +/** + * 目录管理(Ml)表服务接口 + * + * @author makejava + * @since 2025-02-25 14:21:08 + */ +public interface MlService extends IService { + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java index fbc9a12..28d2554 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 @@ -3,6 +3,9 @@ package com.ruoyi.gysl.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.Mx; +import java.util.List; +import java.util.Map; + /** * 模型管理(Mx)表服务接口 @@ -12,5 +15,8 @@ import com.ruoyi.gysl.entity.Mx; */ public interface MxService extends IService { + + Map>> selectAll(); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyrzInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyrzInformationService.java new file mode 100644 index 0000000..ad70060 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyrzInformationService.java @@ -0,0 +1,15 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.QyrzInformation; + +/** + * (QyrzInformation)表服务接口 + * + * @author makejava + * @since 2025-02-25 14:45:30 + */ +public interface QyrzInformationService extends IService { + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java index e200ffe..d7d02c8 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,11 +3,13 @@ package com.ruoyi.gysl.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.WysmxInformation; +import java.util.List; + /** * 五要素模型信息(WysmxInformation)表服务接口 * * @author makejava - * @since 2025-02-24 14:29:58 + * @since 2025-02-26 11:09:31 */ public interface WysmxInformationService extends IService { 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..357498a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmpjqdService.java @@ -0,0 +1,15 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.Xmpjqd; + +/** + * 项目评价清单(Xmpjqd)表服务接口 + * + * @author makejava + * @since 2025-02-25 14:19:34 + */ +public interface XmpjqdService extends IService { + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java new file mode 100644 index 0000000..d96ac70 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java @@ -0,0 +1,15 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.Xmxl; + +/** + * 项目巡礼(Xmxl)表服务接口 + * + * @author makejava + * @since 2025-02-25 14:17:35 + */ +public interface XmxlService extends IService { + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java index 56f02a3..45e339b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java @@ -1,11 +1,16 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.gysl.mapper.BasicInformationMapper; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.request.BasicRequest; +import com.ruoyi.gysl.mapper.BasicInformationMapper; import com.ruoyi.gysl.service.BasicInformationService; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + /** * 基本信息(BasicInformation)表服务实现类 * @@ -14,6 +19,19 @@ import org.springframework.stereotype.Service; */ @Service("basicInformationService") public class BasicInformationServiceImpl extends ServiceImpl implements BasicInformationService { + @Resource + private BasicInformationMapper basicInformationMapper; + + @Override + public void importUser(List basicRequestList) { + + for (BasicRequest basicRequest : basicRequestList) { + BasicInformation basicInformation = new BasicInformation(); + BeanUtils.copyProperties(basicRequest, basicInformation); + basicInformationMapper.insert(basicInformation); + + } + } } 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..6a91006 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MlServiceImpl.java @@ -0,0 +1,19 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.mapper.MlDao; +import com.ruoyi.gysl.entity.Ml; +import com.ruoyi.gysl.service.MlService; +import org.springframework.stereotype.Service; + +/** + * 目录管理(Ml)表服务实现类 + * + * @author makejava + * @since 2025-02-25 14:21:08 + */ +@Service("mlService") +public class MlServiceImpl extends ServiceImpl implements MlService { + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java index 184187b..df0b858 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 @@ -1,11 +1,18 @@ package com.ruoyi.gysl.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.gysl.entity.Mx; import com.ruoyi.gysl.mapper.MxDao; import com.ruoyi.gysl.service.MxService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * 模型管理(Mx)表服务实现类 * @@ -15,6 +22,19 @@ import org.springframework.stereotype.Service; @Service("mxService") public class MxServiceImpl extends ServiceImpl implements MxService { + @Resource + private MxDao mxDao; + + @Override + public Map>> selectAll() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List list=mxDao.selectList(queryWrapper); + // 根据 type 和 name 分组 + Map>> groupedByTypeAndName = (Map>>) list.stream() + .collect(Collectors.groupingBy(Mx::getType, // 第一层按 type 分组 + Collectors.groupingBy(Mx::getName))); // 第二层按 name 分组 + return groupedByTypeAndName; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyrzInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyrzInformationServiceImpl.java new file mode 100644 index 0000000..87ee08c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyrzInformationServiceImpl.java @@ -0,0 +1,19 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.mapper.QyrzInformationDao; +import com.ruoyi.gysl.entity.QyrzInformation; +import com.ruoyi.gysl.service.QyrzInformationService; +import org.springframework.stereotype.Service; + +/** + * (QyrzInformation)表服务实现类 + * + * @author makejava + * @since 2025-02-25 14:45:30 + */ +@Service("qyrzInformationService") +public class QyrzInformationServiceImpl extends ServiceImpl implements QyrzInformationService { + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java index 3e0a774..4e9a0eb 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,17 +1,20 @@ 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.WysmxInformation; import com.ruoyi.gysl.mapper.WysmxInformationDao; +import com.ruoyi.gysl.entity.WysmxInformation; import com.ruoyi.gysl.service.WysmxInformationService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + /** * 五要素模型信息(WysmxInformation)表服务实现类 * * @author makejava - * @since 2025-02-24 14:29:58 + * @since 2025-02-26 11:09:31 */ @Service("wysmxInformationService") public class WysmxInformationServiceImpl extends ServiceImpl implements WysmxInformationService { 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..ef64893 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmpjqdServiceImpl.java @@ -0,0 +1,19 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.mapper.XmpjqdDao; +import com.ruoyi.gysl.entity.Xmpjqd; +import com.ruoyi.gysl.service.XmpjqdService; +import org.springframework.stereotype.Service; + +/** + * 项目评价清单(Xmpjqd)表服务实现类 + * + * @author makejava + * @since 2025-02-25 14:19:34 + */ +@Service("xmpjqdService") +public class XmpjqdServiceImpl extends ServiceImpl implements XmpjqdService { + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java new file mode 100644 index 0000000..9519c2c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java @@ -0,0 +1,19 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.mapper.XmxlDao; +import com.ruoyi.gysl.entity.Xmxl; +import com.ruoyi.gysl.service.XmxlService; +import org.springframework.stereotype.Service; + +/** + * 项目巡礼(Xmxl)表服务实现类 + * + * @author makejava + * @since 2025-02-25 14:17:35 + */ +@Service("xmxlService") +public class XmxlServiceImpl extends ServiceImpl implements XmxlService { + +} + diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 6f98ecf..ae66616 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -8,7 +8,7 @@ spring: master: url: jdbc:mysql://localhost:3306/gysl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: Hhw200301102514 + password: adminadmin # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/mapper/WysmxInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/WysmxInformationMapper.xml new file mode 100644 index 0000000..82c7ebd --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/WysmxInformationMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file