From 3c5ae3632160493a6e6a3a3a7d8c0522aa01d31e Mon Sep 17 00:00:00 2001 From: hehaowei Date: Tue, 25 Feb 2025 09:19:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B4=9F=E9=9D=A2=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/gysl/controller/FmqdController.java | 88 +++++++++++ .../main/java/com/ruoyi/gysl/entity/Fmqd.java | 75 ++++++++++ .../ruoyi/gysl/mapper/FmqdServiceMapper.java | 49 ++++++ .../com/ruoyi/gysl/service/FmqdService.java | 52 +++++++ .../gysl/service/impl/FmqdServiceImpl.java | 75 ++++++++++ .../resources/mapper/FmqdServiceMapper.xml | 141 ++++++++++++++++++ 6 files changed, 480 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/FmqdController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Fmqd.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/FmqdServiceMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/FmqdService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/FmqdServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/FmqdServiceMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/FmqdController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/FmqdController.java new file mode 100644 index 0000000..62761ff --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/FmqdController.java @@ -0,0 +1,88 @@ +package com.ruoyi.gysl.controller; + + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.gysl.entity.Fmqd; +import com.ruoyi.gysl.service.FmqdService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +import java.util.List; + +/** + * 负面清单管理(FmqdController)表控制层 + * + */ +@Api(tags ="负面清单管理" ) +@RestController +@RequestMapping("/gysl/Fmqd") +public class FmqdController extends BaseController { + + @Resource + private FmqdService fmqdService; + + /** + * 分页查询负面清单数据 + * + * @param fmqd 查询条件实体 + * @return 分页数据 + */ + @GetMapping("/list") + @ApiOperation("分页查询负面清单数据") + public TableDataInfo list(Fmqd fmqd) { + startPage(); // 开启分页 + List list = fmqdService.selectFmqdList(fmqd); + return getDataTable(list); + // 封装分页结果 + } + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + @ApiOperation("通过主键查询负面清单数据") + public AjaxResult select(@PathVariable Integer id){ + return success(fmqdService.selectFmqdId(id)); + } + /** + * 新增数据 + *@param fmqd 实体对象 + * @return 新增结果 + */ + @PostMapping("/add") + @ApiOperation("新增数据") + public AjaxResult add(@RequestBody Fmqd fmqd) { + return success(fmqdService.save(fmqd)); + } + + /** + * 修改数据 + * + * @param fmqd 实体对象 + * @return 修改结果 + */ + @PostMapping("/edit") + @ApiOperation("修改数据") + public AjaxResult update(@RequestBody Fmqd fmqd) { + return success(fmqdService.updateById(fmqd)); + } + /** + * 删除数据 + * + * @param id 实体对象 + * @return 删除结果 + */ + @DeleteMapping("/delete/{id}") + @ApiOperation("删除数据") + public AjaxResult delete(@PathVariable Integer id) { + return success(fmqdService.deleteMapping(id)); + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Fmqd.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Fmqd.java new file mode 100644 index 0000000..7d3990f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Fmqd.java @@ -0,0 +1,75 @@ +package com.ruoyi.gysl.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/**负面清单管理 + * + */ + +@Data +@ApiModel("负面清单管理") +public class Fmqd { + + //主键id + @ApiModelProperty("主键id") + private Integer id; + + //项目名称 + @ApiModelProperty("项目名称") + private String name; + + //现状分类1：已建 + @ApiModelProperty("现状分类1：已建") + private Integer xzfl; + + //项目法人单位 + @ApiModelProperty("项目法人单位") + private String xmfrdw; + + //项目建设起止时间 + @ApiModelProperty("项目建设起止时间") + private String xmjsqzsj; + + //总投资额 + @ApiModelProperty("总投资额") + private BigDecimal ztze; + + //总用地面积 + @ApiModelProperty("总用地面积") + private BigDecimal zydmj; + + //创建者id + @ApiModelProperty("创建者id") + private Integer createId; + + //创建时间 + @ApiModelProperty("创建时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + //创建者 + @ApiModelProperty("创建者") + private String createBy; + + //更新者id + @ApiModelProperty("更新者id") + private Long updateId; + + //更新者 + @ApiModelProperty("更新者") + private String updateBy; + + //更新时间 + @ApiModelProperty("更新时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/FmqdServiceMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/FmqdServiceMapper.java new file mode 100644 index 0000000..474bc4d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/FmqdServiceMapper.java @@ -0,0 +1,49 @@ +package com.ruoyi.gysl.mapper; + +import com.ruoyi.gysl.entity.Fmqd; +import io.lettuce.core.dynamic.annotation.Param; +import org.mapstruct.Mapper; + +import java.util.List; +/** + * 负面清单管理(Fmqd)表数据库访问层 + */ +@Mapper +public interface FmqdServiceMapper { + /** + * 根据条件查询负面清单数据列表 + * + * @param fmqd 查询条件实体 + * @return 负面清单数据列表 + */ + List selectFmqdList(Fmqd fmqd); + /** + * 根据条件查询负面清单的单条数据列表 + * + * @param id 查询条件实体 + * @return 负面清单单条数据 + */ + Fmqd selectFmqdById(@Param("id") Integer id); + /** + * 添加负面清单的单条数据 + * + * @param fmqd 添加数据 + * @return 添加结果 + */ + int saveFmqd(Fmqd fmqd); + /** + * 修改负面清单的单条数据 + * + * @param fmqd 修改数据 + * @return 修改结果 + */ + int updateFmqd(Fmqd fmqd); + + /** + * 修改负面清单的单条数据 + * + * @param id 删除数据 + * @return 删除结果 + */ + int deleteFmqd(Integer id); +} \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/FmqdService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/FmqdService.java new file mode 100644 index 0000000..cce2f71 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/FmqdService.java @@ -0,0 +1,52 @@ +package com.ruoyi.gysl.service; + +import com.ruoyi.gysl.entity.Fmqd; + +import java.util.List; + +/** + * 负面清单管理(FmqdController)表数据库访问层 + * + * @author User + */ +public interface FmqdService { + + /** + * 根据条件查询负面清单数据列表 + * + * @param fmqd 查询条件实体 + * @return 负面清单数据列表 + */ + public List selectFmqdList(Fmqd fmqd); + /** + * 根据条件查询负面清单的单条数据列表 + * + * @param id 查询条件实体 + * @return 单条数据 + */ + public Fmqd selectFmqdId(Integer id); + + /** + * 增加负面清单 + * + * @param fmqd 数据 + * @return 新增结果 + */ + public int save(Fmqd fmqd); + + /** + * 修改负面清单数据 + * + * @param fmqd 数据 + * @return 修改结果 + */ + public int updateById (Fmqd fmqd); + + /** + * 删除负面清单数据 + * @param id 数据 + * @return 删除结果 + */ + int deleteMapping(Integer id); + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/FmqdServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/FmqdServiceImpl.java new file mode 100644 index 0000000..9302131 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/FmqdServiceImpl.java @@ -0,0 +1,75 @@ +package com.ruoyi.gysl.service.impl; + +import com.ruoyi.gysl.entity.Fmqd; +import com.ruoyi.gysl.mapper.FmqdServiceMapper; +import com.ruoyi.gysl.service.FmqdService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *负面清单管理 服务层实现 + */ +@Service +public class FmqdServiceImpl implements FmqdService { + + @Autowired + private FmqdServiceMapper fmqdMapper; + + + /** + * 查询负面清单信息 + * + * @param fmqd 查询条件实体 + * @return 负面清单数据列表 + */ + @Override + public List selectFmqdList(Fmqd fmqd) { + return fmqdMapper.selectFmqdList(fmqd); + } + /** + * 查询负面清单单条信息 + * + * @param id 查询条件 + * @return 负面清单单条数据 + */ + @Override + public Fmqd selectFmqdId(Integer id) { + return fmqdMapper.selectFmqdById(id); + } + + /** + * 添加负面清单信息 + * + * @param fmqd 添加信息 + * @return 新增结果 + */ + @Override + public int save(Fmqd fmqd) { + return fmqdMapper.saveFmqd(fmqd); + } + /** + * 添加负面清单信息 + * + * @param fmqd 修改信息 + * @return 修改结果 + */ + @Override + public int updateById(Fmqd fmqd) { + return fmqdMapper.updateFmqd(fmqd); + } + /** + * 添加负面清单信息 + * + * @param id 删除 + * @return 删除结果 + */ + @Override + public int deleteMapping(Integer id) { + return fmqdMapper.deleteFmqd(id); + } + + +} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/FmqdServiceMapper.xml b/ruoyi-admin/src/main/resources/mapper/FmqdServiceMapper.xml new file mode 100644 index 0000000..8f3bea6 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/FmqdServiceMapper.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + INSERT INTO fmqd ( + + name, + xzfl, + xmfrdw, + xmjsqzsj, + ztze, + zydmj, + create_id, + create_time, + create_by, + update_id, + update_by, + update_time + + ) VALUES ( + + #{name}, + #{xzfl}, + #{xmfrdw}, + #{xmjsqzsj}, + #{ztze}, + #{zydmj}, + #{createId}, + #{createTime}, + #{createBy}, + #{updateId}, + #{updateBy}, + #{updateTime} + + ) + + + + UPDATE fmqd + + + name = #{name}, + + + xzfl = #{xzfl}, + + + xmfrdw = #{xmfrdw}, + + + xmjsqzsj = #{xmjsqzsj}, + + + ztze = #{ztze}, + + + zydmj = #{zydmj}, + + + create_id = #{createId}, + + + create_time = #{createTime}, + + + create_by = #{createBy}, + + + update_id = #{updateId}, + + + update_by = #{updateBy}, + + + update_time = #{updateTime}, + + + WHERE id = #{id} + + + + DELETE FROM fmqd WHERE id = #{id} + + + \ No newline at end of file From b0dd19dc9c158dababe4c1ea0f052fa92183351a Mon Sep 17 00:00:00 2001 From: hehaowei Date: Tue, 25 Feb 2025 17:08:05 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MonthInformationController.java | 82 +++++++++ .../main/java/com/ruoyi/gysl/entity/Fmqd.java | 4 +- .../ruoyi/gysl/entity/MonthInformation.java | 87 ++++++++++ .../ruoyi/gysl/mapper/FmqdServiceMapper.java | 28 ++-- .../java/com/ruoyi/gysl/mapper/MlMapper.java | 46 +++++ .../gysl/mapper/MonthInformationMapper.java | 47 ++++++ .../com/ruoyi/gysl/service/FmqdService.java | 26 +-- .../gysl/service/MonthInformationService.java | 43 +++++ .../gysl/service/impl/FmqdServiceImpl.java | 25 ++- .../ruoyi/gysl/service/impl/MlServicImpl.java | 73 ++++++++ .../service/impl/MonthInformationImpl.java | 70 ++++++++ .../resources/mapper/FmqdServiceMapper.xml | 6 +- .../src/main/resources/mapper/MlMapper.xml | 112 +++++++++++++ .../mapper/MonthInformationMapper.xml | 158 ++++++++++++++++++ 14 files changed, 759 insertions(+), 48 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MonthInformationController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/MonthInformation.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MlMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MonthInformationMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MonthInformationService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MlServicImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MonthInformationImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/MlMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/MonthInformationMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MonthInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MonthInformationController.java new file mode 100644 index 0000000..fa79b5e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MonthInformationController.java @@ -0,0 +1,82 @@ +package com.ruoyi.gysl.controller; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.gysl.entity.MonthInformation; +import com.ruoyi.gysl.service.MonthInformationService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + + +@Api(tags = "月度进展信息") +@RestController +@RequestMapping("gysl/MonthInformation") +public class MonthInformationController extends BaseController { + /** + * 服务对象 + */ + @Resource + private MonthInformationService monthInformationService; + /** + * 分页查询月度进展信息 + * + * @param monthInformation 查询实体 + * @return 所有数据 + */ + @GetMapping("/list") + @ApiOperation("分页查询月度进展信息") + public TableDataInfo list(MonthInformation monthInformation){ + startPage(); + List list = monthInformationService.selectMonthInformation(monthInformation); + return getDataTable(list); + } + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + @ApiOperation("通过主键查询月度进展信息") + public AjaxResult select(@PathVariable Integer id){ + return success(monthInformationService.selectMonthInformationId(id)); + } + /** + * 新增数据 + * + * @param monthInformation 查询条件实体 + * @return 新增结果 + */ + @PostMapping("/add") + @ApiOperation("新增数据") + public AjaxResult add(@RequestBody MonthInformation monthInformation){ + return success(monthInformationService.saveMonthInformation(monthInformation)); + } + /** + * 修改数据 + * + * @param monthInformation 实体对象 + * @return 修改结果 + */ + @PostMapping("edit") + @ApiOperation("修改") + public AjaxResult edit(@RequestBody MonthInformation monthInformation){ + return success(monthInformationService.updateById(monthInformation)); + } + /** + * 删除数据 + * + * @param id 主键 + * @return 删除结果 + */ + @DeleteMapping("/delete/{id}") + @ApiOperation("删除数据") + public AjaxResult delete(@PathVariable Integer id){ + return success(monthInformationService.deleteMonthInformation(id)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Fmqd.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Fmqd.java index 7d3990f..50a37bb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Fmqd.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Fmqd.java @@ -9,12 +9,12 @@ import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.time.LocalDateTime; -/**负面清单管理 +/**负面清单管理(Fmqd)实体类 * */ @Data -@ApiModel("负面清单管理") +@ApiModel(value = "Fmqd", description = "负面清单管理") public class Fmqd { //主键id diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/MonthInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/MonthInformation.java new file mode 100644 index 0000000..68963a2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/MonthInformation.java @@ -0,0 +1,87 @@ +package com.ruoyi.gysl.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 月度进展信息(MonthInformation)实体类 + * + */ +@Data +@ApiModel(value = "MonthInformation", description = "月度进展信息") +public class MonthInformation { + + //主键id + @ApiModelProperty("主键id") + private Integer id; + + //项目id + @ApiModelProperty("项目id") + private Integer xmId; + + //进度月份 + @ApiModelProperty("进度月份") + private String month; + + //状态 + @ApiModelProperty("状态") + private Integer status; + + //当月完成投资 + @ApiModelProperty("当月完成投资") + private BigDecimal dywctz; + + //累计完成投资 + @ApiModelProperty("累计完成投资") + private BigDecimal ljwctz; + + //截至目前累计建成面积 + @ApiModelProperty("截至目前累计建成面积") + private BigDecimal jzmqljjcmj; + + //贷款额度 + @ApiModelProperty("贷款额度") + private BigDecimal dked; + + //从选区创建新的临时文件 + @ApiModelProperty("项目进展详情") + private BigDecimal xmjzqk; + + //创建者id + @ApiModelProperty("创建者id") + private Integer createId; + + //创建时间 + @ApiModelProperty("创建时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + //创建者 + @ApiModelProperty("创建者") + private String createBy; + + //更新者id + @ApiModelProperty("更新者id") + private Long updateId; + + //更新者 + @ApiModelProperty("更新者") + private String updateBy; + + //更新时间 + @ApiModelProperty("更新时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; +} + + + + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/FmqdServiceMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/FmqdServiceMapper.java index 474bc4d..55ed5fe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/FmqdServiceMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/FmqdServiceMapper.java @@ -11,38 +11,36 @@ import java.util.List; @Mapper public interface FmqdServiceMapper { /** - * 根据条件查询负面清单数据列表 + * 分页查询负面清单数据 * * @param fmqd 查询条件实体 - * @return 负面清单数据列表 + * @return 分页数据 */ List selectFmqdList(Fmqd fmqd); /** - * 根据条件查询负面清单的单条数据列表 + * 通过主键查询单条数据 * - * @param id 查询条件实体 - * @return 负面清单单条数据 + * @param id 主键 + * @return 单条数据 */ - Fmqd selectFmqdById(@Param("id") Integer id); + Fmqd selectFmqdById(Integer id); /** - * 添加负面清单的单条数据 - * - * @param fmqd 添加数据 - * @return 添加结果 + * 新增数据 + *@param fmqd 实体对象 + * @return 新增结果 */ int saveFmqd(Fmqd fmqd); /** - * 修改负面清单的单条数据 + * 修改数据 * - * @param fmqd 修改数据 + * @param fmqd 实体对象 * @return 修改结果 */ int updateFmqd(Fmqd fmqd); - /** - * 修改负面清单的单条数据 + * 删除数据 * - * @param id 删除数据 + * @param id 实体对象 * @return 删除结果 */ int deleteFmqd(Integer id); 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..6bf30db --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MlMapper.java @@ -0,0 +1,46 @@ +package com.ruoyi.gysl.mapper; + +import com.ruoyi.gysl.entity.Ml; +import org.mapstruct.Mapper; + +import java.util.List; +/** + * 目录(Ml)表数据库访问层 + */ +@Mapper +public interface MlMapper { + /** + * 查询分页信息 + * + * @param ml 查询条件实体 + * @return 目录数据列表 + */ + List selectMlList(Ml ml); + /** + * 查询目录单条信息 + * + * @param id 查询条件 + * @return 目录单条数据 + */ + Ml selectMlById(Integer id); + /** + * 增加目录 + * + * @param ml 数据 + * @return 新增结果 + */ + int save(Ml ml); + /** + * 修改目录 + * + * @param ml 数据 + * @return 修改结果 + */ + int updateMl(Ml ml); + /** + * 删除目录 + * @param id 数据 + * @return 删除结果 + */ + int deleteml(Integer id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MonthInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MonthInformationMapper.java new file mode 100644 index 0000000..590591f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MonthInformationMapper.java @@ -0,0 +1,47 @@ +package com.ruoyi.gysl.mapper; + +import com.ruoyi.gysl.entity.MonthInformation; +import org.mapstruct.Mapper; + +import java.util.List; + +/** + * 月度进展信息(MonthInformtion)表数据库访问层 + */ +@Mapper +public interface MonthInformationMapper { + /** + * 查询分页信息 + * + * @param monthInformation 查询条件实体 + * @return 目录数据列表 + */ + List selectMonthInformationList(MonthInformation monthInformation); + /** + * 查询月度进展信息单条信息 + * + * @param id 查询条件 + * @return 月度进展信息单条数据 + */ + MonthInformation selectMonthInformationId(Integer id); + /** + * 增加数据 + * + * @param monthInformation 数据 + * @return 新增结果 + */ + int save(MonthInformation monthInformation); + /** + * 修改数据 + * + * @param monthInformation 数据 + * @return 修改结果 + */ + int updateMonthInformation(MonthInformation monthInformation); + /** + * 删除数据 + * @param id 数据 + * @return 删除结果 + */ + int deletemonthInformation(Integer id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/FmqdService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/FmqdService.java index cce2f71..82a69cb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/FmqdService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/FmqdService.java @@ -5,48 +5,48 @@ import com.ruoyi.gysl.entity.Fmqd; import java.util.List; /** - * 负面清单管理(FmqdController)表数据库访问层 + * 负面清单管理(FmqdController)表服务接口 * * @author User */ public interface FmqdService { /** - * 根据条件查询负面清单数据列表 + * 分页查询负面清单数据 * * @param fmqd 查询条件实体 - * @return 负面清单数据列表 + * @return 分页数据 */ public List selectFmqdList(Fmqd fmqd); /** - * 根据条件查询负面清单的单条数据列表 + * 通过主键查询单条数据 * - * @param id 查询条件实体 + * @param id 主键 * @return 单条数据 */ public Fmqd selectFmqdId(Integer id); /** - * 增加负面清单 - * - * @param fmqd 数据 + * 新增数据 + *@param fmqd 实体对象 * @return 新增结果 */ public int save(Fmqd fmqd); /** - * 修改负面清单数据 + * 修改数据 * - * @param fmqd 数据 + * @param fmqd 实体对象 * @return 修改结果 */ public int updateById (Fmqd fmqd); /** - * 删除负面清单数据 - * @param id 数据 + * 删除数据 + * + * @param id 实体对象 * @return 删除结果 */ - int deleteMapping(Integer id); + public int deleteMapping(Integer id); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MonthInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MonthInformationService.java new file mode 100644 index 0000000..2034db8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MonthInformationService.java @@ -0,0 +1,43 @@ +package com.ruoyi.gysl.service; + +import com.ruoyi.gysl.entity.MonthInformation; + +import java.util.List; + +public interface MonthInformationService { + /** + * 分页查询月度进展信息 + * + * @param monthInformation 查询实体 + * @return 所有数据 + */ + List selectMonthInformation(MonthInformation monthInformation); + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + MonthInformation selectMonthInformationId(Integer id); + /** + * 新增数据 + * + * @param monthInformation 查询条件实体 + * @return 新增结果 + */ + int saveMonthInformation(MonthInformation monthInformation); + /** + * 修改数据 + * + * @param monthInformation 实体对象 + * @return 修改结果 + */ + int updateById(MonthInformation monthInformation); + /** + * 删除数据 + * + * @param id 主键 + * @return 删除结果 + */ + int deleteMonthInformation(Integer id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/FmqdServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/FmqdServiceImpl.java index 9302131..9c99dc0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/FmqdServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/FmqdServiceImpl.java @@ -10,7 +10,7 @@ import java.util.List; /** - *负面清单管理 服务层实现 + *负面清单管理 表服务实现类 */ @Service public class FmqdServiceImpl implements FmqdService { @@ -20,20 +20,20 @@ public class FmqdServiceImpl implements FmqdService { /** - * 查询负面清单信息 + * 分页查询负面清单数据 * * @param fmqd 查询条件实体 - * @return 负面清单数据列表 + * @return 分页数据 */ @Override public List selectFmqdList(Fmqd fmqd) { return fmqdMapper.selectFmqdList(fmqd); } /** - * 查询负面清单单条信息 + * 通过主键查询单条数据 * - * @param id 查询条件 - * @return 负面清单单条数据 + * @param id 主键 + * @return 单条数据 */ @Override public Fmqd selectFmqdId(Integer id) { @@ -41,9 +41,8 @@ public class FmqdServiceImpl implements FmqdService { } /** - * 添加负面清单信息 - * - * @param fmqd 添加信息 + * 新增数据 + *@param fmqd 实体对象 * @return 新增结果 */ @Override @@ -51,9 +50,9 @@ public class FmqdServiceImpl implements FmqdService { return fmqdMapper.saveFmqd(fmqd); } /** - * 添加负面清单信息 + * 修改数据 * - * @param fmqd 修改信息 + * @param fmqd 实体对象 * @return 修改结果 */ @Override @@ -61,9 +60,9 @@ public class FmqdServiceImpl implements FmqdService { return fmqdMapper.updateFmqd(fmqd); } /** - * 添加负面清单信息 + * 删除数据 * - * @param id 删除 + * @param id 实体对象 * @return 删除结果 */ @Override diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MlServicImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MlServicImpl.java new file mode 100644 index 0000000..65b8986 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MlServicImpl.java @@ -0,0 +1,73 @@ +package com.ruoyi.gysl.service.impl; + +import com.ruoyi.gysl.entity.Ml; +import com.ruoyi.gysl.mapper.MlMapper; +import com.ruoyi.gysl.service.MlService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *目录管理 表服务实现类 + */ +@Service +public class MlServicImpl implements MlService { + + @Autowired + private MlMapper mlMapper; + + /** + * 查询目录信息 + * + * @param ml 查询条件实体 + * @return 目录数据列表 + */ + @Override + public List selectMl(Ml ml) { + return mlMapper.selectMlList(ml); + } + + /** + * 查询目录单条信息 + * + * @param id 查询条件 + * @return 目录单条数据 + */ + @Override + public Ml selectMlId(Integer id) { + return mlMapper.selectMlById(id); + } + /** + * 添加目录信息 + * + * @param ml 添加信息 + * @return 新增结果 + */ + @Override + public int saveMl(Ml ml) { + return mlMapper.save(ml); + } + /** + * 修改目录信息 + * + * @param ml 修改信息 + * @return 修改结果 + */ + @Override + public int updateById(Ml ml) { + return mlMapper.updateMl(ml); + } + + /** + * 添加目录信息 + * + * @param id 删除 + * @return 删除结果 + */ + @Override + public int deleteMl(Integer id) { + return mlMapper.deleteml(id); + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MonthInformationImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MonthInformationImpl.java new file mode 100644 index 0000000..5e37c7a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MonthInformationImpl.java @@ -0,0 +1,70 @@ +package com.ruoyi.gysl.service.impl; + +import com.ruoyi.gysl.entity.MonthInformation; +import com.ruoyi.gysl.mapper.MonthInformationMapper; +import com.ruoyi.gysl.service.MonthInformationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; + +/** + * 月度进展信息 表服务实现类 + */ +@Service +public class MonthInformationImpl implements MonthInformationService { + + @Autowired + private MonthInformationMapper monthInformationMapper; + /** + * 分页查询月度进展信息 + * + * @param monthInformation 查询实体 + * @return 所有数据 + */ + @Override + public List selectMonthInformation(MonthInformation monthInformation) { + return monthInformationMapper.selectMonthInformationList(monthInformation); + } + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @Override + public MonthInformation selectMonthInformationId(Integer id) { + return monthInformationMapper.selectMonthInformationId(id); + } + /** + * 新增数据 + * + * @param monthInformation 查询条件实体 + * @return 新增结果 + */ + @Override + public int saveMonthInformation(MonthInformation monthInformation) { + return monthInformationMapper.save(monthInformation); + } + /** + * 修改数据 + * + * @param monthInformation 实体对象 + * @return 修改结果 + */ + @Override + public int updateById(MonthInformation monthInformation) { + return monthInformationMapper.updateMonthInformation(monthInformation); + } + /** + * 删除数据 + * + * @param id 主键 + * @return 删除结果 + */ + @Override + public int deleteMonthInformation(Integer id) { + return monthInformationMapper.deletemonthInformation(id); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/FmqdServiceMapper.xml b/ruoyi-admin/src/main/resources/mapper/FmqdServiceMapper.xml index 8f3bea6..5a1285b 100644 --- a/ruoyi-admin/src/main/resources/mapper/FmqdServiceMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/FmqdServiceMapper.xml @@ -49,14 +49,10 @@ - SELECT * FROM fmqd WHERE id = #{id} - INSERT INTO fmqd ( 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..49947e9 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/MlMapper.xml @@ -0,0 +1,112 @@ + + + + + + + + + + INSERT INTO ml ( + + slmllb, + gydl, + cy, + create_id, + create_time, + create_by, + update_id, + update_by, + update_time + + ) VALUES ( + + #{slmllb}, + #{gydl}, + #{cy}, + #{createId}, + #{createTime}, + #{createBy}, + #{updateId}, + #{updateBy}, + #{updateTime} + + ) + + + + UPDATE ml + + + slmllb = #{slmllb}, + + + gydl = #{gydl}, + + + cy = #{cy}, + + + create_id = #{createId}, + + + create_time = #{createTime}, + + + create_by = #{createBy}, + + + update_id = #{updateId}, + + + update_by = #{updateBy}, + + + update_time = #{updateTime}, + + + WHERE id = #{id} + + + + DELETE FROM ml WHERE id = #{id} + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/MonthInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/MonthInformationMapper.xml new file mode 100644 index 0000000..18c84b5 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/MonthInformationMapper.xml @@ -0,0 +1,158 @@ + + + + + + + + + + + + INSERT INTO month_information ( + + xm_id, + month, + status, + dywctz, + ljwctz, + jzmqljjcmj, + xmjzqk, + dked, + create_id, + create_time, + create_by, + update_id, + update_by, + update_time + + ) VALUES ( + + #{xmId}, + #{month}, + #{status}, + #{dywctz}, + #{ljwctz}, + #{jzmqljjcmj}, + #{xmjzqk}, + #{dked}, + #{createId}, + #{createTime}, + #{createBy}, + #{updateId}, + #{updateBy}, + #{updateTime} + + ) + + + + UPDATE month_information + + + id = #{id}, + + + xm_id = #{xmId}, + + + month = #{month}, + + + status = #{status}, + + + dywctz = #{dywctz}, + + + ljwctz = #{ljwctz}, + + + jzmqljjcmj = #{jzmqljjcmj}, + + + xmjzqk = #{xmjzqk}, + + + dked = #{dked}, + + + create_id = #{createId}, + + + create_time = #{createTime}, + + + create_by = #{createBy}, + + + update_id = #{updateId}, + + + update_by = #{updateBy}, + + + update_time = #{updateTime}, + + + WHERE id = #{id} + + + + DELETE FROM month_information WHERE id = #{id} + + + \ No newline at end of file From 295453f76eb94a4a5b2297dcef2ba1f95b9ce9d6 Mon Sep 17 00:00:00 2001 From: hehaowei Date: Tue, 25 Feb 2025 17:08:21 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/gysl/controller/MlController.java | 87 +++++++++++++++++++ .../main/java/com/ruoyi/gysl/entity/Ml.java | 61 +++++++++++++ .../com/ruoyi/gysl/service/MlService.java | 45 ++++++++++ 3 files changed, 193 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MlController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MlService.java 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..6701ac9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MlController.java @@ -0,0 +1,87 @@ +package com.ruoyi.gysl.controller; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +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.util.List; + +@Api(tags ="目录管理" ) +@RestController +@RequestMapping("/gysl/Ml") +public class MlController extends BaseController { + /** + * 服务对象 + */ + @Resource + private MlService mlService; + + /** + * 分页查询目录数据 + * + * @param ml 查询条件实体 + * @return 所有数据 + */ + + @GetMapping("/list") + @ApiOperation("分页查询目录数据") + public TableDataInfo list(Ml ml) { + startPage(); // 开启分页 + List list = mlService.selectMl(ml); + return getDataTable(list); + // 封装分页结果 + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + @ApiOperation("通过主键查询目录") + public AjaxResult select(@PathVariable Integer id){ + return success(mlService.selectMlId(id)); + } + + /** + * 新增数据 + *@param ml 实体对象 + * @return 新增结果 + */ + @PostMapping("/add") + @ApiOperation("新增数据") + public AjaxResult add(@RequestBody Ml ml) { + return success(mlService.saveMl(ml)); + } + + /** + * 修改数据 + * + * @param ml 实体对象 + * @return 修改结果 + */ + @PostMapping("/edit") + @ApiOperation("修改数据") + public AjaxResult update(@RequestBody Ml ml) { + return success(mlService.updateById(ml)); + } + + /** + * 删除数据 + * + * @param id 主键 + * @return 删除结果 + */ + @DeleteMapping("/delete/{id}") + @ApiOperation("删除数据") + public AjaxResult delete(@PathVariable Integer id) { + return success(mlService.deleteMl(id)); + } +} 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..a1916db --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java @@ -0,0 +1,61 @@ +package com.ruoyi.gysl.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/**目录管理(Ml)实体类 + * + */ +@Data +@ApiModel(value = "Ml", description = "目录管理") +public class Ml { + + //主键id + @ApiModelProperty("主键id") + private Integer id; + + //上楼目录类别 + @ApiModelProperty("上楼目录类别") + private Integer slmllb; + + //工业大类 + @ApiModelProperty("工业大类") + private String gydl; + + //产业 + @ApiModelProperty("产业") + private String cy; + + //创建者id + @ApiModelProperty("创建者id") + private Integer createId; + + //创建时间 + @ApiModelProperty("创建时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + //创建者 + @ApiModelProperty("创建者") + private String createBy; + + //更新者id + @ApiModelProperty("更新者id") + private Long updateId; + + //更新者 + @ApiModelProperty("更新者") + private String updateBy; + + //更新时间 + @ApiModelProperty("更新时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; +} 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..1278ed4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MlService.java @@ -0,0 +1,45 @@ +package com.ruoyi.gysl.service; + +import com.ruoyi.gysl.entity.Ml; + +import java.util.List; + +/** + * 目录管理(MlController)表服务接口 + */ +public interface MlService { + /** + * 根据条件查目录数据列表 + * + * @param ml 查询条件实体 + * @return 目录数据列表 + */ + public List selectMl(Ml ml); + /** + * 根据条件查询目录的单条数据列表 + * + * @param id 查询条件实体 + * @return 单条数据 + */ + Ml selectMlId(Integer id); + /** + * 增加目录 + * + * @param ml 数据 + * @return 新增结果 + */ + int saveMl(Ml ml); + /** + * 修改目录 + * + * @param ml 数据 + * @return 修改结果 + */ + int updateById(Ml ml); + /** + * 删除目录 + * @param id 数据 + * @return 删除结果 + */ + int deleteMl(Integer id); +} From 5f74fe26d45acd7290b10f63327c5680069d06b0 Mon Sep 17 00:00:00 2001 From: hehaowei Date: Fri, 14 Mar 2025 17:14:14 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8D=95=E7=89=87=E6=9D=90=E6=96=99?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/pom.xml | 15 ++ .../ruoyi/gysl/controller/MmmController.java | 129 ++++++++++++++++++ .../main/java/com/ruoyi/gysl/entity/Mmm.java | 84 ++++++++++++ .../ruoyi/gysl/entity/request/MmmRequest.java | 54 ++++++++ .../java/com/ruoyi/gysl/mapper/MmmMapper.java | 20 +++ .../com/ruoyi/gysl/service/MmmService.java | 23 ++++ .../gysl/service/impl/MmmServiceImpl.java | 63 +++++++++ .../src/main/resources/mapper/MmmMapper.xml | 27 ++++ 8 files changed, 415 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MmmController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mmm.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/MmmRequest.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MmmMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MmmService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MmmServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/MmmMapper.xml diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 03a023d..6466d94 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -63,11 +63,26 @@ com.ruoyi ruoyi-generator + com.github.xiaoymin knife4j-openapi2-spring-boot-starter 4.4.0 + + + + com.itextpdf + itextpdf + 5.5.13.3 + + + + + com.itextpdf + itext-asian + 5.2.0 + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MmmController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MmmController.java new file mode 100644 index 0000000..463d95b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MmmController.java @@ -0,0 +1,129 @@ +package com.ruoyi.gysl.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.itextpdf.text.DocumentException; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.gysl.entity.Mmm; +import com.ruoyi.gysl.entity.request.MmmRequest; +import com.ruoyi.gysl.service.MmmService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.IOException; +import java.time.LocalDateTime; + +/** + * 单片材料管理(MmmController)表控制层 + * + * @author User + */ +@Api(tags = "单片材料管理") +@RestController +@RequestMapping("gysl/mmm") +public class MmmController extends BaseController { + @Resource + private MmmService mmmService; + + /** + * 分页查询所有数据 + * + * @param req 分页对象 + * @return 查询结果 + */ + @ApiOperation(value = "分页查询") + @GetMapping("/page") + public AjaxResult queryByPage(MmmRequest req) { + Page page = new Page<>(); + page.setCurrent(req.getCurrent()); + page.setSize(req.getSize()); + return success(mmmService.page(page, req)); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + @ApiOperation(value = "通过主键查询单条数据", response = Mmm.class) + public AjaxResult selectOne(@PathVariable Integer id) { + return success(this.mmmService.getById(id)); + } + + + /** + * 编辑数据 + * + * @param mmm 实体对象 + * @return 修改结果 + */ + @PostMapping("/edit") + @ApiOperation("修改数据") + public AjaxResult update(@RequestBody Mmm mmm) { + //上传id 上传者 上传时间 + mmm.setUpdateTime(LocalDateTime.now()); + mmm.setUpdateBy(getUsername()); + mmm.setUpdateId(getUserId()); + return success(this.mmmService.updateById(mmm)); + } + + + /** + * 添加 + */ + @PostMapping("/add") + @ApiOperation("新增数据") + public AjaxResult insert(@RequestBody Mmm mmm) { + //创建id 创建者 创建时间 + mmm.setCreateBy(getUsername()); + mmm.setCreateId(getUserId()); + mmm.setCreateTime(LocalDateTime.now()); + return success(this.mmmService.save(mmm)); + } + + /** + * 删除数据 + * + * @param id 主键 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete/{id}") + public AjaxResult deleteById(@PathVariable Integer id) { + return success(this.mmmService.removeById(id)); + } + + + /** + * + * @param id 查找 + * @return 导出的PDF + * @throws IOException + */ + @ApiOperation("PDF导出") + @GetMapping("/PDF/{id}") + public ResponseEntity exportPdf(@PathVariable Integer id) throws IOException, DocumentException { + Mmm item = mmmService.getById(id); + //路径 + String path = "C:\\Users\\User\\Desktop\\pdf模板.pdf"; + //PDF填充 + byte[] pdfBytes = mmmService.fillPdfTemplate(path,item); + + // 设置响应头 + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_PDF); + headers.setContentDispositionFormData("attachment", item.getDocumentTitle() + ".pdf"); + headers.setContentLength(pdfBytes.length); + + return new ResponseEntity<>(pdfBytes, headers, HttpStatus.OK); + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mmm.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mmm.java new file mode 100644 index 0000000..8b49b06 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mmm.java @@ -0,0 +1,84 @@ +package com.ruoyi.gysl.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.time.LocalDateTime; + +@TableName("monolithic_material_management") +@Data +public class Mmm { + // 主键id 自增 + @ApiModelProperty("主键id") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @NotBlank(message = "文件标题不能为空") + @Size(max= 50,message="文件标题长度不能超过50") + @ApiModelProperty("文件标题") + private String documentTitle; + + @NotBlank(message = "发布单位不能为空") + @Size(max= 50,message="发布单位长度不能超过50") + @ApiModelProperty("发布单位") + private String publishUnit; + + @NotBlank(message = "发布人不能为空") + @Size(max= 50,message = "发布人长度不得超过50个字") + @ApiModelProperty("发布人") + private String publisher; + + @NotBlank(message = "发布时间不能为空") + @ApiModelProperty("发布时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime publishTime; + + @Size(max = 10000 ,message = "发布内容最大支持10000字") + @ApiModelProperty("发布内容") + private String publishingContent; + + //创建者id + @Excel(name = "create_id") + @ApiModelProperty("创建者id") + private Long createId; + + //创建时间 + @Excel(name = "create_time",dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("创建时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + //创建者 + @Excel(name = "create_by") + @ApiModelProperty("创建者") + private String createBy; + + //更新者id + @Excel(name = "update_id") + @ApiModelProperty("更新者id") + private Long updateId; + + //更新者 + @Excel(name = "update_by") + @ApiModelProperty("更新者") + private String updateBy; + + //更新时间 + @Excel(name = "update_time",dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("更新时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/MmmRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/MmmRequest.java new file mode 100644 index 0000000..ff528c5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/MmmRequest.java @@ -0,0 +1,54 @@ +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; + +@Data + +public class MmmRequest { + // 主键id 自增 + @ApiModelProperty("id") + private Integer id; + + @ApiModelProperty("文件标题") + private String documentTitle; + + @ApiModelProperty("发布单位") + private String publishUnit; + + @ApiModelProperty("发布人") + private String publisher; + + @ApiModelProperty("发布时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime publishTime; + + @ApiModelProperty("发布内容") + private String publishingContent; + + @ApiModelProperty("创建者id") + private Integer createId; + + @ApiModelProperty("发布开始时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime publishStarTime; + + @ApiModelProperty("发布结束时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime publishEndTime; + + @ApiModelProperty("页码") + private Long current=1L; + + @ApiModelProperty("页数") + private Long size=10L; + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MmmMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MmmMapper.java new file mode 100644 index 0000000..ccb0c64 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MmmMapper.java @@ -0,0 +1,20 @@ +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.Mmm; +import com.ruoyi.gysl.entity.request.MmmRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface MmmMapper extends BaseMapper { + Page page(Page page, @Param("req") MmmRequest mmm); + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param as 查询实体 + * @return 所有数据 + */ +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MmmService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MmmService.java new file mode 100644 index 0000000..263ff8a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MmmService.java @@ -0,0 +1,23 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.itextpdf.text.DocumentException; +import com.ruoyi.gysl.entity.Mmm; +import com.ruoyi.gysl.entity.request.MmmRequest; + +import java.io.IOException; + + +public interface MmmService extends IService { + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param mmm 查询实体 + * @return 所有数据 + */ + Page page(Page page, MmmRequest mmm); + + byte[] fillPdfTemplate(String path, Mmm item) throws IOException, DocumentException; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MmmServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MmmServiceImpl.java new file mode 100644 index 0000000..7ad30e0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MmmServiceImpl.java @@ -0,0 +1,63 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.itextpdf.text.DocumentException; +import com.itextpdf.text.pdf.AcroFields; +import com.itextpdf.text.pdf.PdfReader; +import com.itextpdf.text.pdf.PdfStamper; +import com.ruoyi.gysl.entity.Mmm; +import com.ruoyi.gysl.entity.request.MmmRequest; +import com.ruoyi.gysl.mapper.MmmMapper; +import com.ruoyi.gysl.service.MmmService; +import org.springframework.stereotype.Service; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.HashMap; +import java.util.Map; + +@Service +public class MmmServiceImpl extends ServiceImpl implements MmmService { + + + @Override + public Page page(Page page, MmmRequest mmm) { + return baseMapper.page(page, mmm); + } + + @Override + public byte[] fillPdfTemplate(String path, Mmm item) throws IOException, DocumentException { + + Map fillData = new HashMap<>(); + fillData.put("Title", item.getDocumentTitle()); + fillData.put("Unit", item.getPublishUnit()); + fillData.put("Publisher", item.getPublisher()); + fillData.put("Time", item.getPublishTime().toString()); + fillData.put("Content", item.getPublishingContent()); + + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + + PdfReader reader = new PdfReader(Files.newInputStream(Paths.get(path))); + PdfStamper stamper = new PdfStamper(reader, outputStream); + + // 获取表单字段 + AcroFields form = stamper.getAcroFields(); + + // 填充表单字段 + for (Map.Entry entry : fillData.entrySet()) { + String fieldName = entry.getKey(); + String fieldValue = entry.getValue(); + form.setField(fieldName, fieldValue); + + } + stamper.setFormFlattening(true); + stamper.close(); + reader.close(); + + return outputStream.toByteArray(); + } +} + diff --git a/ruoyi-admin/src/main/resources/mapper/MmmMapper.xml b/ruoyi-admin/src/main/resources/mapper/MmmMapper.xml new file mode 100644 index 0000000..2b6c203 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/MmmMapper.xml @@ -0,0 +1,27 @@ + + + + + + From 321f1cefa5ba519870a2b05d0a41ad2909207cc7 Mon Sep 17 00:00:00 2001 From: hehaowei Date: Fri, 14 Mar 2025 17:15:43 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8D=95=E7=89=87=E6=9D=90=E6=96=99?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/gysl/service/MlService.java | 3 +++ 1 file changed, 3 insertions(+) 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 index 10bb9c6..26f86bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MlService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MlService.java @@ -3,6 +3,8 @@ package com.ruoyi.gysl.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.Ml; +import java.util.List; + /** * 目录管理(Ml)表服务接口 * @@ -11,5 +13,6 @@ import com.ruoyi.gysl.entity.Ml; */ public interface MlService extends IService { + List exportMlList(Ml ml); } From 38d210d340dd4fc7ededbec47a19e435b358987f Mon Sep 17 00:00:00 2001 From: hehaowei Date: Fri, 14 Mar 2025 17:17:35 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=8D=95=E7=89=87=E6=9D=90=E6=96=99?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/gysl/controller/MlController.java | 15 +++++++++++++++ .../main/java/com/ruoyi/gysl/mapper/MlDao.java | 7 +++++++ .../ruoyi/gysl/service/impl/MlServiceImpl.java | 11 +++++++++++ .../src/main/resources/application-druid.yml | 2 +- ruoyi-admin/src/main/resources/mapper/MlDao.xml | 10 ++++++++++ 5 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 ruoyi-admin/src/main/resources/mapper/MlDao.xml 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 index ad0f5e9..0307ad4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MlController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MlController.java @@ -5,6 +5,7 @@ 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.Ml; import com.ruoyi.gysl.service.MlService; import io.swagger.annotations.Api; @@ -12,6 +13,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 +93,18 @@ public class MlController extends BaseController { public AjaxResult delete(@RequestParam("idList") List idList) { return success(this.mlService.removeByIds(idList)); } + + /** + * excel 导出 + */ + @PostMapping("/export") + @ApiOperation("导出") + public void export(HttpServletResponse response, Ml ml) { + List list = mlService.exportMlList(ml); + ExcelUtil util = new ExcelUtil<>(Ml.class); + util.exportExcel(response, list, "目录数据"); + } + + } 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 index f954a1c..c147109 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MlDao.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MlDao.java @@ -2,6 +2,9 @@ package com.ruoyi.gysl.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.gysl.entity.Ml; +import org.mapstruct.Mapper; + +import java.util.List; /** * 目录管理(Ml)表数据库访问层 @@ -9,7 +12,11 @@ import com.ruoyi.gysl.entity.Ml; * @author makejava * @since 2025-02-25 14:21:08 */ +@Mapper public interface MlDao extends BaseMapper { + + List exportMlList(Ml ml); + } 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 index 6a91006..cbde299 100644 --- 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 @@ -4,8 +4,11 @@ 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.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * 目录管理(Ml)表服务实现类 * @@ -15,5 +18,13 @@ import org.springframework.stereotype.Service; @Service("mlService") public class MlServiceImpl extends ServiceImpl implements MlService { + @Autowired + private MlDao mlDao; + + @Override + public List exportMlList(Ml ml){ + return mlDao.exportMlList(ml); + } + } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index ae66616..6f98ecf 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -8,7 +8,7 @@ spring: master: url: jdbc:mysql://localhost:3306/gysl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: adminadmin + password: Hhw200301102514 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/mapper/MlDao.xml b/ruoyi-admin/src/main/resources/mapper/MlDao.xml new file mode 100644 index 0000000..f063d6c --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/MlDao.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file