From b37eac632faf7f26b6f947d8b6792db8828fba6f Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 26 二月 2025 21:57:47 +0800 Subject: [PATCH] 工程管理 --- business/src/main/java/com/ycl/service/ProjectEngineeringService.java | 65 ++++++ business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java | 54 +++++ business/src/main/java/com/ycl/domain/query/ProjectEngineeringQuery.java | 34 +++ business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java | 54 +++++ business/src/main/resources/mapper/ProjectEngineeringMapper.xml | 64 ++++++ business/src/main/java/com/ycl/domain/entity/ProjectEngineering.java | 43 ++++ business/src/main/java/com/ycl/controller/ProjectEngineeringController.java | 83 ++++++++ business/src/main/java/com/ycl/mapper/ProjectEngineeringMapper.java | 34 +++ business/src/main/java/com/ycl/service/impl/ProjectEngineeringServiceImpl.java | 119 +++++++++++ 9 files changed, 550 insertions(+), 0 deletions(-) diff --git a/business/src/main/java/com/ycl/controller/ProjectEngineeringController.java b/business/src/main/java/com/ycl/controller/ProjectEngineeringController.java new file mode 100644 index 0000000..71de6fe --- /dev/null +++ b/business/src/main/java/com/ycl/controller/ProjectEngineeringController.java @@ -0,0 +1,83 @@ +package com.ycl.controller; + +import com.ycl.common.group.Update; +import com.ycl.common.group.Add; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import lombok.RequiredArgsConstructor; +import java.util.List; +import org.springframework.validation.annotation.Validated; +import javax.validation.constraints.NotEmpty; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.ycl.service.ProjectEngineeringService; +import com.ycl.common.base.Result; +import com.ycl.domain.form.ProjectEngineeringForm; +import com.ycl.domain.query.ProjectEngineeringQuery; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +/** + * 椤圭洰宸ョ▼ 鍓嶇鎺у埗鍣� + * + * @author xp + * @since 2025-02-26 + */ +@Validated +@RequiredArgsConstructor +@Api(value = "椤圭洰宸ョ▼", tags = "椤圭洰宸ョ▼绠$悊") +@RestController +@RequestMapping("/project-engineering") +public class ProjectEngineeringController { + + private final ProjectEngineeringService projectEngineeringService; + + @PostMapping + @ApiOperation(value = "娣诲姞", notes = "娣诲姞") +// @PreAuthorize("@ss.hasPermi('projectEngineering:add')") + public Result add(@RequestBody @Validated(Add.class) ProjectEngineeringForm form) { + return projectEngineeringService.add(form); + } + + @PutMapping + @ApiOperation(value = "淇敼", notes = "淇敼") +// @PreAuthorize("@ss.hasPermi('projectEngineering:edit')") + public Result update(@RequestBody @Validated(Update.class) ProjectEngineeringForm form) { + return projectEngineeringService.update(form); + } + + @DeleteMapping("/{id}") + @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎") +// @PreAuthorize("@ss.hasPermi('projectEngineering:del')") + public Result removeById(@PathVariable("id") String id) { + return projectEngineeringService.removeById(id); + } + + @DeleteMapping("/batch") + @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎") +// @PreAuthorize("@ss.hasPermi('projectEngineering:del:batch')") + public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) { + return projectEngineeringService.remove(ids); + } + + @GetMapping("/page") + @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉") +// @PreAuthorize("@ss.hasPermi('projectEngineering:page')") + public Result page(ProjectEngineeringQuery query) { + return projectEngineeringService.page(query); + } + + @GetMapping("/{id}") + @ApiOperation(value = "璇︽儏", notes = "璇︽儏") +// @PreAuthorize("@ss.hasPermi('projectEngineering:detail')") + public Result detail(@PathVariable("id") Integer id) { + return projectEngineeringService.detail(id); + } + + @GetMapping("/list") +// @PreAuthorize("@ss.hasPermi('projectEngineering:list')") + @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃") + public Result list() { + return projectEngineeringService.all(); + } +} diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectEngineering.java b/business/src/main/java/com/ycl/domain/entity/ProjectEngineering.java new file mode 100644 index 0000000..65b9eb9 --- /dev/null +++ b/business/src/main/java/com/ycl/domain/entity/ProjectEngineering.java @@ -0,0 +1,43 @@ +package com.ycl.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; + +import com.ycl.system.domain.base.AbsEntity; +import lombok.Data; + +/** + * 椤圭洰宸ョ▼ + * + * @author xp + * @since 2025-02-26 + */ +@Data +@TableName("t_project_engineering") +public class ProjectEngineering extends AbsEntity { + + private static final long serialVersionUID = 1L; + + @TableField("project_info_id") + /** 椤圭洰id */ + private Long projectInfoId; + + @TableField("project_name") + /** 宸ョ▼鍚嶇О */ + private String projectName; + + @TableField("project_type") + /** 椤圭洰鎺ㄨ繘绫诲瀷 */ + private String projectType; + + @TableField("investment_amount") + /** 鎶曡祫棰� */ + private String investmentAmount; + + @TableField("status") + /** 鐘舵�� */ + private String status; + + +} diff --git a/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java b/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java new file mode 100644 index 0000000..dba0808 --- /dev/null +++ b/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java @@ -0,0 +1,54 @@ +package com.ycl.domain.form; + +import com.ycl.common.group.Update; +import com.ycl.common.group.Add; +import com.ycl.system.domain.base.AbsForm; +import com.ycl.domain.entity.ProjectEngineering; +import org.springframework.beans.BeanUtils; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import org.springframework.lang.NonNull; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.util.Date; + +/** + * 椤圭洰宸ョ▼琛ㄥ崟 + * + * @author xp + * @since 2025-02-26 + */ +@Data +@ApiModel(value = "ProjectEngineering琛ㄥ崟", description = "椤圭洰宸ョ▼琛ㄥ崟") +public class ProjectEngineeringForm extends AbsForm { + + @NotNull(message = "椤圭洰id涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("椤圭洰id") + private Long projectInfoId; + + @NotBlank(message = "宸ョ▼鍚嶇О涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("宸ョ▼鍚嶇О") + private String projectName; + + @NotBlank(message = "椤圭洰鎺ㄨ繘绫诲瀷涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("椤圭洰鎺ㄨ繘绫诲瀷") + private String projectType; + + @NotBlank(message = "鎶曡祫棰濅笉鑳戒负绌�", groups = {Add.class, Update.class}) + @ApiModelProperty("鎶曡祫棰�") + private String investmentAmount; + + @NotBlank(message = "鐘舵�佷笉鑳戒负绌�", groups = {Add.class, Update.class}) + @ApiModelProperty("鐘舵��") + private String status; + + public static ProjectEngineering getEntityByForm(@NonNull ProjectEngineeringForm form, ProjectEngineering entity) { + if(entity == null) { + entity = new ProjectEngineering(); + } + BeanUtils.copyProperties(form, entity); + return entity; + } + +} diff --git a/business/src/main/java/com/ycl/domain/query/ProjectEngineeringQuery.java b/business/src/main/java/com/ycl/domain/query/ProjectEngineeringQuery.java new file mode 100644 index 0000000..1500e54 --- /dev/null +++ b/business/src/main/java/com/ycl/domain/query/ProjectEngineeringQuery.java @@ -0,0 +1,34 @@ +package com.ycl.domain.query; + +import com.ycl.system.domain.base.AbsQuery; +import java.util.List; +import org.springframework.lang.NonNull; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 椤圭洰宸ョ▼鏌ヨ + * + * @author xp + * @since 2025-02-26 + */ +@Data +@ApiModel(value = "ProjectEngineering鏌ヨ鍙傛暟", description = "椤圭洰宸ョ▼鏌ヨ鍙傛暟") +public class ProjectEngineeringQuery extends AbsQuery { + + @ApiModelProperty("涓婚」鐩�") + private Long projectInfoId; + + @ApiModelProperty("宸ョ▼鍚�") + private String projectName; + + @ApiModelProperty("寮�宸ョ姸鎬�") + private String status; + + @ApiModelProperty("娴佺▼鎺ㄨ繘绫诲瀷") + private String projectType; +} + diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java new file mode 100644 index 0000000..58d66c2 --- /dev/null +++ b/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java @@ -0,0 +1,54 @@ +package com.ycl.domain.vo; + +import com.ycl.system.domain.base.AbsVo; +import com.ycl.domain.entity.ProjectEngineering; +import java.util.List; +import org.springframework.lang.NonNull; +import org.springframework.beans.BeanUtils; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.util.Date; + +/** + * 椤圭洰宸ョ▼灞曠ず + * + * @author xp + * @since 2025-02-26 + */ +@Data +@ApiModel(value = "椤圭洰宸ョ▼鍝嶅簲鏁版嵁", description = "椤圭洰宸ョ▼鍝嶅簲鏁版嵁") +public class ProjectEngineeringVO extends AbsVo { + + /** 椤圭洰id */ + @ApiModelProperty("椤圭洰id") + private Long projectInfoId; + + @ApiModelProperty("涓婚」鐩悕绉�") + private String projectInfoName; + + /** 宸ョ▼鍚嶇О */ + @ApiModelProperty("宸ョ▼鍚嶇О") + private String projectName; + + /** 椤圭洰鎺ㄨ繘绫诲瀷 */ + @ApiModelProperty("椤圭洰鎺ㄨ繘绫诲瀷") + private String projectType; + + /** 鎶曡祫棰� */ + @ApiModelProperty("鎶曡祫棰�") + private String investmentAmount; + + /** 鐘舵�� */ + @ApiModelProperty("鐘舵��") + private String status; + + public static ProjectEngineeringVO getVoByEntity(@NonNull ProjectEngineering entity, ProjectEngineeringVO vo) { + if(vo == null) { + vo = new ProjectEngineeringVO(); + } + BeanUtils.copyProperties(entity, vo); + return vo; + } + +} diff --git a/business/src/main/java/com/ycl/mapper/ProjectEngineeringMapper.java b/business/src/main/java/com/ycl/mapper/ProjectEngineeringMapper.java new file mode 100644 index 0000000..2975235 --- /dev/null +++ b/business/src/main/java/com/ycl/mapper/ProjectEngineeringMapper.java @@ -0,0 +1,34 @@ +package com.ycl.mapper; + +import com.ycl.domain.entity.ProjectEngineering; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ycl.domain.vo.ProjectEngineeringVO; +import com.ycl.domain.form.ProjectEngineeringForm; +import com.ycl.domain.query.ProjectEngineeringQuery; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 椤圭洰宸ョ▼ Mapper 鎺ュ彛 + * + * @author xp + * @since 2025-02-26 + */ +@Mapper +public interface ProjectEngineeringMapper extends BaseMapper<ProjectEngineering> { + + /** + * id鏌ユ壘椤圭洰宸ョ▼ + * @param id + * @return + */ + ProjectEngineeringVO getById(Integer id); + + /** + * 鍒嗛〉 + */ + IPage getPage(IPage page, @Param("query") ProjectEngineeringQuery query); + +} diff --git a/business/src/main/java/com/ycl/service/ProjectEngineeringService.java b/business/src/main/java/com/ycl/service/ProjectEngineeringService.java new file mode 100644 index 0000000..274276d --- /dev/null +++ b/business/src/main/java/com/ycl/service/ProjectEngineeringService.java @@ -0,0 +1,65 @@ +package com.ycl.service; + +import com.ycl.domain.entity.ProjectEngineering; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ycl.common.base.Result; +import com.ycl.domain.form.ProjectEngineeringForm; +import com.ycl.domain.query.ProjectEngineeringQuery; +import java.util.List; + +/** + * 椤圭洰宸ョ▼ 鏈嶅姟绫� + * + * @author xp + * @since 2025-02-26 + */ +public interface ProjectEngineeringService extends IService<ProjectEngineering> { + + /** + * 娣诲姞 + * @param form + * @return + */ + Result add(ProjectEngineeringForm form); + + /** + * 淇敼 + * @param form + * @return + */ + Result update(ProjectEngineeringForm form); + + /** + * 鎵归噺鍒犻櫎 + * @param ids + * @return + */ + Result remove(List<String> ids); + + /** + * id鍒犻櫎 + * @param id + * @return + */ + Result removeById(String id); + + /** + * 鍒嗛〉鏌ヨ + * @param query + * @return + */ + Result page(ProjectEngineeringQuery query); + + /** + * 鏍规嵁id鏌ユ壘 + * @param id + * @return + */ + Result detail(Integer id); + + /** + * 鍒楄〃 + * @return + */ + Result all(); +} diff --git a/business/src/main/java/com/ycl/service/impl/ProjectEngineeringServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectEngineeringServiceImpl.java new file mode 100644 index 0000000..c736026 --- /dev/null +++ b/business/src/main/java/com/ycl/service/impl/ProjectEngineeringServiceImpl.java @@ -0,0 +1,119 @@ +package com.ycl.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ycl.domain.entity.ProjectEngineering; +import com.ycl.mapper.ProjectEngineeringMapper; +import com.ycl.service.ProjectEngineeringService; +import com.ycl.common.base.Result; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.domain.form.ProjectEngineeringForm; +import com.ycl.domain.vo.ProjectEngineeringVO; +import com.ycl.domain.query.ProjectEngineeringQuery; +import org.springframework.stereotype.Service; +import lombok.RequiredArgsConstructor; +import com.ycl.framework.utils.PageUtil; +import org.springframework.beans.BeanUtils; +import org.springframework.util.Assert; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * 椤圭洰宸ョ▼ 鏈嶅姟瀹炵幇绫� + * + * @author xp + * @since 2025-02-26 + */ +@Service +@RequiredArgsConstructor +public class ProjectEngineeringServiceImpl extends ServiceImpl<ProjectEngineeringMapper, ProjectEngineering> implements ProjectEngineeringService { + + private final ProjectEngineeringMapper projectEngineeringMapper; + + /** + * 娣诲姞 + * @param form + * @return + */ + @Override + public Result add(ProjectEngineeringForm form) { + ProjectEngineering entity = ProjectEngineeringForm.getEntityByForm(form, null); + baseMapper.insert(entity); + return Result.ok("娣诲姞鎴愬姛"); + } + + /** + * 淇敼 + * @param form + * @return + */ + @Override + public Result update(ProjectEngineeringForm form) { + ProjectEngineering entity = baseMapper.selectById(form.getId()); + + // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊 + Assert.notNull(entity, "璁板綍涓嶅瓨鍦�"); + BeanUtils.copyProperties(form, entity); + baseMapper.updateById(entity); + return Result.ok("淇敼鎴愬姛"); + } + + /** + * 鎵归噺鍒犻櫎 + * @param ids + * @return + */ + @Override + public Result remove(List<String> ids) { + baseMapper.deleteBatchIds(ids); + return Result.ok("鍒犻櫎鎴愬姛"); + } + + /** + * id鍒犻櫎 + * @param id + * @return + */ + @Override + public Result removeById(String id) { + baseMapper.deleteById(id); + return Result.ok("鍒犻櫎鎴愬姛"); + } + + /** + * 鍒嗛〉鏌ヨ + * @param query + * @return + */ + @Override + public Result page(ProjectEngineeringQuery query) { + IPage<ProjectEngineeringVO> page = PageUtil.getPage(query, ProjectEngineeringVO.class); + baseMapper.getPage(page, query); + return Result.ok().data(page.getRecords()).total(page.getTotal()); + } + + /** + * 鏍规嵁id鏌ユ壘 + * @param id + * @return + */ + @Override + public Result detail(Integer id) { + ProjectEngineeringVO vo = baseMapper.getById(id); + Assert.notNull(vo, "璁板綍涓嶅瓨鍦�"); + return Result.ok().data(vo); + } + + /** + * 鍒楄〃 + * @return + */ + @Override + public Result all() { + List<ProjectEngineering> entities = baseMapper.selectList(null); + List<ProjectEngineeringVO> vos = entities.stream() + .map(entity -> ProjectEngineeringVO.getVoByEntity(entity, null)) + .collect(Collectors.toList()); + return Result.ok().data(vos); + } +} diff --git a/business/src/main/resources/mapper/ProjectEngineeringMapper.xml b/business/src/main/resources/mapper/ProjectEngineeringMapper.xml new file mode 100644 index 0000000..5b9b9b5 --- /dev/null +++ b/business/src/main/resources/mapper/ProjectEngineeringMapper.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.ycl.mapper.ProjectEngineeringMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.ycl.domain.vo.ProjectEngineeringVO"> + <result column="project_info_id" property="projectInfoId" /> + <result column="projectInfoName" property="projectInfoName" /> + <result column="project_name" property="projectName" /> + <result column="project_type" property="projectType" /> + <result column="investment_amount" property="investmentAmount" /> + <result column="status" property="status" /> + </resultMap> + + + + + + + + <select id="getById" resultMap="BaseResultMap"> + SELECT + TPE.project_info_id, + TPE.project_name, + TPE.project_type, + TPE.investment_amount, + TPE.status, + TPE.id + FROM + t_project_engineering TPE + WHERE + TPE.id = #{id} AND TPE.deleted = 0 + </select> + + + <select id="getPage" resultMap="BaseResultMap"> + SELECT + TPE.project_info_id, + TPE.project_name, + TPE.project_type, + TPE.investment_amount, + TPE.status, + TPE.id, + TPI.project_name as projectInfoName + FROM + t_project_engineering TPE + INNER JOIN t_project_info TPI ON TPI.id = TPE.project_info_id AND TPI.deleted = 0 + WHERE + TPE.deleted = 0 + <if test="query.projectName != null and query.projectName != ''"> + AND TPE.project_name LIKE concat('%', #{query.projectName}, '%') + </if> + <if test="query.projectInfoId != null"> + AND TPE.project_info_id = #{query.projectInfoId} + </if> + <if test="query.status != null and query.status != ''"> + AND TPE.status = #{query.status} + </if> + <if test="query.projectType != null and query.projectType != ''"> + AND TPE.project_type = #{query.projectType} + </if> + </select> + +</mapper> -- Gitblit v1.8.0