From 5643e855037fb202982aecd3943261a40533e3d0 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Sat, 29 Mar 2025 11:35:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=A6=E6=83=85=E7=9A=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=9B=BE=E5=83=8F=E5=92=8C=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gysl/controller/XmpjqdController.java | 50 ++++-------- .../java/com/ruoyi/gysl/entity/Xmpjqd.java | 18 ++--- .../gysl/entity/request/XmpjqdPageReq.java | 6 +- .../response/XmhxDetail/XmhxDetail.java | 18 +++++ .../gysl/entity/response/XmhxResponse.java | 22 ++++++ .../entity/response/XmpjqdOneResponse.java | 22 ++++++ .../com/ruoyi/gysl/mapper/XmpjqdMapper.java | 35 ++++++++- .../com/ruoyi/gysl/service/XmpjqdService.java | 21 +++++ .../gysl/service/impl/XmpjqdServiceImpl.java | 47 ++++++++++- .../main/resources/mapper/XmpjqdMapper.xml | 77 +++++++++++++++++-- 10 files changed, 255 insertions(+), 61 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/XmhxDetail/XmhxDetail.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/XmhxResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/XmpjqdOneResponse.java 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 index 87f74ee..632dd22 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmpjqdController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmpjqdController.java @@ -6,6 +6,8 @@ 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.entity.response.XmhxResponse; +import com.ruoyi.gysl.entity.response.XmpjqdOneResponse; import com.ruoyi.gysl.service.XmpjqdService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -34,63 +36,39 @@ public class XmpjqdController extends BaseController { private XmpjqdService xmpjqdService; /** - * 分页查询所有目录 + * 分页查询所有项目评价清单 * * @param page 分页对象 * @return 所有数据 */ - @ApiOperation("分页查询所有目录") + @ApiOperation("分页查询所有项目评价清单") @GetMapping("/page") public AjaxResult selectAll(Page page, XmpjqdPageReq req) { return success(xmpjqdService.page(page, req)); } /** - * 通过主键查询单条数据 + * 通过主键查询单条项目评价清单 * * @param id 主键 * @return 单条数据 */ - @ApiOperation("通过主键查询单条数据") + @ApiOperation(value = "通过主键查询单条项目评价清单",response = XmpjqdOneResponse.class) @GetMapping("/{id}") public AjaxResult selectOne(@PathVariable Serializable id) { - return success(xmpjqdService.getById(id)); + return success(xmpjqdService.selectOnePj(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 删除结果 + * @param id 主键 + * @return 单条数据 */ - @ApiOperation("删除数据") - @DeleteMapping("/delete") - public AjaxResult delete(@RequestParam("idList") List idList) { - return success(xmpjqdService.removeByIds(idList)); + @ApiOperation(value = "通过主键查询单条项目画像",response = XmhxResponse.class) + @GetMapping("/oneXmhx/{id}") + public AjaxResult oneXmhx(@PathVariable Serializable id) { + return success(xmpjqdService.oneXmhx(id)); } } 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 index 8c3fa41..e095093 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java @@ -21,27 +21,25 @@ import java.time.LocalDate; * @author makejava * @since 2025-03-22 09:22:33 */ -@EqualsAndHashCode(callSuper = true) @Data @TableName("xmpjqd") -public class Xmpjqd extends BaseModel implements Serializable { +public class Xmpjqd implements Serializable { @ApiModelProperty(value = "主键id") @TableField("id") - @TableId(type = IdType.AUTO) private Long id; @ApiModelProperty(value = "项目名称") - private String xmmc; + private String name; @ApiModelProperty(value = "项目建设开始时间 yyyy-MM") @DateTimeFormat(pattern = "yyyy-MM") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM", timezone = "GMT+8") - private LocalDate xmqzsj; + private LocalDate begainTime; @ApiModelProperty(value = "项目建设结束时间 yyyy-MM") @DateTimeFormat(pattern = "yyyy-MM") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM", timezone = "GMT+8") - private LocalDate xmjssj; + private LocalDate endTime; @ApiModelProperty(value = "现状分类") private Integer xzfl; @@ -49,10 +47,10 @@ public class Xmpjqd extends BaseModel implements Serializable { @ApiModelProperty(value = "评价等级") private Integer pjdj; - @ApiModelProperty(value = "项目法人单位") - private String xmfrdw; + @ApiModelProperty(value = "总数") + private Integer count; - @ApiModelProperty(value = "项目评价") - private String xmpj; + @ApiModelProperty(value = "项目法人单位") + private String xmfrdwxz; } 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 index 8507d3a..9b2a183 100644 --- 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 @@ -22,16 +22,16 @@ public class XmpjqdPageReq { private Integer pjdj; @ApiModelProperty(value = "项目名称") - private String xmmc; + private String name; @ApiModelProperty(value = "项目建设开始时间 yyyy-MM") @DateTimeFormat(pattern = "yyyy-MM") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM", timezone = "GMT+8") - private LocalDate xmqzsj; + private LocalDate begainTime; @ApiModelProperty(value = "项目建设结束时间 yyyy-MM") @DateTimeFormat(pattern = "yyyy-MM") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM", timezone = "GMT+8") - private LocalDate xmjssj; + private LocalDate endTime; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/XmhxDetail/XmhxDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/XmhxDetail/XmhxDetail.java new file mode 100644 index 0000000..1739a57 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/XmhxDetail/XmhxDetail.java @@ -0,0 +1,18 @@ +package com.ruoyi.gysl.entity.response.XmhxDetail; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目画像具体返回实体类 + * @author du + * @since 2025/3/28 16:05 + */ +@Data +public class XmhxDetail { + @ApiModelProperty("要素名称") + private String ysmc; + + @ApiModelProperty("具体数值") + private String pjpm; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/XmhxResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/XmhxResponse.java new file mode 100644 index 0000000..1e3d970 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/XmhxResponse.java @@ -0,0 +1,22 @@ +package com.ruoyi.gysl.entity.response; + +import com.ruoyi.gysl.entity.response.XmhxDetail.XmhxDetail; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 项目画像返回实体类 + * @author du + * @since 2025/3/28 15:53 + */ +@Data +public class XmhxResponse { + + @ApiModelProperty("分类 1最大值 2本项目 3中位数") + private Integer type; + + @ApiModelProperty("具体数值") + private List list; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/XmpjqdOneResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/XmpjqdOneResponse.java new file mode 100644 index 0000000..d95c436 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/XmpjqdOneResponse.java @@ -0,0 +1,22 @@ +package com.ruoyi.gysl.entity.response; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目评价清单个返回实体类 + * @author du + * @since 2025/3/28 15:09 + */ +@Data +public class XmpjqdOneResponse { + + @ApiModelProperty("要素名称") + private String ysmc; + + @ApiModelProperty("评价排名") + private Integer pjpm; + + @ApiModelProperty("总数") + private String count; +} 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 index 77d5f3c..4b10a74 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmpjqdMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmpjqdMapper.java @@ -1,12 +1,15 @@ 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.Xmpjqd; import com.ruoyi.gysl.entity.request.XmpjqdPageReq; +import com.ruoyi.gysl.entity.response.XmhxDetail.XmhxDetail; +import com.ruoyi.gysl.entity.response.XmpjqdOneResponse; import org.apache.ibatis.annotations.Param; -import com.ruoyi.gysl.entity.Xmpjqd; + +import java.io.Serializable; +import java.util.List; /** * 项目评价清单(Xmpjqd)表数据库访问层 @@ -23,5 +26,31 @@ public interface XmpjqdMapper extends BaseMapper { * @return 所有数据 */ Page page(Page page, @Param("req") XmpjqdPageReq req); + + /** + * 通过主键查询单条项目评价清单 + * + * @param id 主键 + * @return 单条数据 + */ + List selectOnePj(@Param("id") Serializable id); + + /** + * 通过主键查询单条项目画像 + * + * @param id 主键 + * @return 单条数据 + */ + List oneXmhx(@Param("id") Serializable id); + + /** + * 中位数 + */ + List zwsXmhx(); + + /** + * 最大值 + */ + List maxXmhx(); } 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 index 8af9364..03960ca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmpjqdService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmpjqdService.java @@ -4,6 +4,11 @@ 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; +import com.ruoyi.gysl.entity.response.XmhxResponse; +import com.ruoyi.gysl.entity.response.XmpjqdOneResponse; + +import java.io.Serializable; +import java.util.List; /** * 项目评价清单(Xmpjqd)表服务接口 @@ -20,5 +25,21 @@ public interface XmpjqdService extends IService { * @return 所有数据 */ Page page(Page page, XmpjqdPageReq req); + + /** + * 通过主键查询单条项目评价清单 + * + * @param id 主键 + * @return 单条数据 + */ + List selectOnePj(Serializable id); + + /** + * 通过主键查询单条项目画像 + * + * @param id 主键 + * @return 单条数据 + */ + List oneXmhx(Serializable id); } 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 index 712818e..d15317f 100644 --- 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 @@ -3,11 +3,18 @@ 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.entity.response.XmhxResponse; +import com.ruoyi.gysl.entity.response.XmpjqdOneResponse; import com.ruoyi.gysl.mapper.XmpjqdMapper; import com.ruoyi.gysl.entity.Xmpjqd; import com.ruoyi.gysl.service.XmpjqdService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + /** * 项目评价清单(Xmpjqd)表服务实现类 * @@ -17,6 +24,9 @@ import org.springframework.stereotype.Service; @Service("xmpjqdService") public class XmpjqdServiceImpl extends ServiceImpl implements XmpjqdService { + @Resource + private XmpjqdMapper xmpjqdMapper; + /** * 分页查询所有目录 * @@ -25,7 +35,42 @@ public class XmpjqdServiceImpl extends ServiceImpl impleme */ @Override public Page page(Page page, XmpjqdPageReq req) { - return baseMapper.page(page,req); + return xmpjqdMapper.page(page,req); + } + + /** + * 通过主键查询单条项目评价清单 + * + * @param id 主键 + * @return 单条数据 + */ + @Override + public List selectOnePj(Serializable id) { + return xmpjqdMapper.selectOnePj(id); + } + + /** + * 通过主键查询单条项目画像 + * + * @param id 主键 + * @return 单条数据 + */ + @Override + public List oneXmhx(Serializable id) { + List obj = new ArrayList<>(); + XmhxResponse xr = new XmhxResponse(); + xr.setType(1); + xr.setList(xmpjqdMapper.maxXmhx()); + XmhxResponse xr1 = new XmhxResponse(); + xr1.setType(2); + xr1.setList(xmpjqdMapper.oneXmhx(id)); + XmhxResponse xr2 = new XmhxResponse(); + xr2.setType(3); + xr2.setList(xmpjqdMapper.zwsXmhx()); + obj.add(xr); + obj.add(xr1); + obj.add(xr2); + return obj; } } diff --git a/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml b/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml index 64c8fa1..78e9906 100644 --- a/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml @@ -2,7 +2,17 @@ + + + + -