From 6edb95617d5252407be8701ade33925994cd2e37 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期三, 08 十一月 2023 17:09:37 +0800 Subject: [PATCH] Changes --- modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java | 33 ++++ modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderMeasuredDao.xml | 20 ++ modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDeliverableDao.xml | 20 ++ modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderDeliverableController.java | 96 ++++++++++++ modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java | 36 ++++ modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDeliverableDao.java | 23 ++ modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderMeasuredController.java | 96 ++++++++++++ modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderDeliverableService.java | 40 +++++ modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderMeasuredDao.java | 23 ++ modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderMeasuredService.java | 40 +++++ 10 files changed, 427 insertions(+), 0 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderDeliverableController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderDeliverableController.java new file mode 100644 index 0000000..74e33d3 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderDeliverableController.java @@ -0,0 +1,96 @@ +package com.zt.life.modules.project.controller; + + +import com.zt.common.annotation.LogOperation; +import com.zt.common.constant.Constant; +import com.zt.common.annotation.QueryParam; +import com.zt.common.db.query.QueryFilter; +import com.zt.common.servlet.Result; +import com.zt.common.servlet.PageResult; +import com.zt.common.validator.AssertUtils; +import com.zt.common.validator.ValidatorUtils; +import com.zt.common.validator.group.AddGroup; +import com.zt.common.validator.group.DefaultGroup; +import com.zt.common.validator.group.UpdateGroup; +import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable; +import com.zt.life.modules.project.service.SoftwareTestOrderDeliverableService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + + +/** + * software_test_order_deliverable + * + * @author zt generator + * @since 1.0.0 2023-11-08 + */ +@RestController +@RequestMapping("/project/SoftwareTestOrderDeliverable/") +@Api(tags="software_test_order_deliverable") +public class SoftwareTestOrderDeliverableController { + @Autowired + private SoftwareTestOrderDeliverableService softwareTestOrderDeliverableService; + + @GetMapping("page") + @ApiOperation("鍒嗛〉") + @ApiImplicitParams({ + @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT), + @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT), + @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING), + @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING), + }) + public PageResult<SoftwareTestOrderDeliverable> page(@ApiIgnore @QueryParam QueryFilter queryFilter){ + + return PageResult.ok(softwareTestOrderDeliverableService.page(queryFilter)); + } + + @GetMapping("{id}") + @ApiOperation("淇℃伅") + public Result<SoftwareTestOrderDeliverable> get(@PathVariable("id") Long id){ + SoftwareTestOrderDeliverable data = softwareTestOrderDeliverableService.get(id); + + return Result.ok(data); + } + + @PostMapping + @ApiOperation("鏂板") + @LogOperation("鏂板") + public Result insert(@RequestBody SoftwareTestOrderDeliverable softwareTestOrderDeliverable){ + //鏁堥獙鏁版嵁 + ValidatorUtils.validateEntity(softwareTestOrderDeliverable, AddGroup.class, DefaultGroup.class); + softwareTestOrderDeliverableService.insert(softwareTestOrderDeliverable); + + return Result.ok(); + } + + @PutMapping + @ApiOperation("淇敼") + @LogOperation("淇敼") + public Result update(@RequestBody SoftwareTestOrderDeliverable softwareTestOrderDeliverable){ + //鏁堥獙鏁版嵁 + ValidatorUtils.validateEntity(softwareTestOrderDeliverable, UpdateGroup.class, DefaultGroup.class); + softwareTestOrderDeliverableService.update(softwareTestOrderDeliverable); + + return Result.ok(); + } + + @DeleteMapping + @ApiOperation("鍒犻櫎") + @LogOperation("鍒犻櫎") + public Result delete(@RequestBody Long[] ids){ + //鏁堥獙鏁版嵁 + AssertUtils.isArrayEmpty(ids, "id"); + softwareTestOrderDeliverableService.delete(ids); + + return Result.ok(); + } + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderMeasuredController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderMeasuredController.java new file mode 100644 index 0000000..5518aa4 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderMeasuredController.java @@ -0,0 +1,96 @@ +package com.zt.life.modules.project.controller; + + +import com.zt.common.annotation.LogOperation; +import com.zt.common.constant.Constant; +import com.zt.common.annotation.QueryParam; +import com.zt.common.db.query.QueryFilter; +import com.zt.common.servlet.Result; +import com.zt.common.servlet.PageResult; +import com.zt.common.validator.AssertUtils; +import com.zt.common.validator.ValidatorUtils; +import com.zt.common.validator.group.AddGroup; +import com.zt.common.validator.group.DefaultGroup; +import com.zt.common.validator.group.UpdateGroup; +import com.zt.life.modules.project.model.SoftwareTestOrderMeasured; +import com.zt.life.modules.project.service.SoftwareTestOrderMeasuredService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + + +/** + * software_test_order_measured + * + * @author zt generator + * @since 1.0.0 2023-11-08 + */ +@RestController +@RequestMapping("/project/SoftwareTestOrderMeasured/") +@Api(tags="software_test_order_measured") +public class SoftwareTestOrderMeasuredController { + @Autowired + private SoftwareTestOrderMeasuredService softwareTestOrderMeasuredService; + + @GetMapping("page") + @ApiOperation("鍒嗛〉") + @ApiImplicitParams({ + @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT), + @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT), + @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING), + @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING), + }) + public PageResult<SoftwareTestOrderMeasured> page(@ApiIgnore @QueryParam QueryFilter queryFilter){ + + return PageResult.ok(softwareTestOrderMeasuredService.page(queryFilter)); + } + + @GetMapping("{id}") + @ApiOperation("淇℃伅") + public Result<SoftwareTestOrderMeasured> get(@PathVariable("id") Long id){ + SoftwareTestOrderMeasured data = softwareTestOrderMeasuredService.get(id); + + return Result.ok(data); + } + + @PostMapping + @ApiOperation("鏂板") + @LogOperation("鏂板") + public Result insert(@RequestBody SoftwareTestOrderMeasured softwareTestOrderMeasured){ + //鏁堥獙鏁版嵁 + ValidatorUtils.validateEntity(softwareTestOrderMeasured, AddGroup.class, DefaultGroup.class); + softwareTestOrderMeasuredService.insert(softwareTestOrderMeasured); + + return Result.ok(); + } + + @PutMapping + @ApiOperation("淇敼") + @LogOperation("淇敼") + public Result update(@RequestBody SoftwareTestOrderMeasured softwareTestOrderMeasured){ + //鏁堥獙鏁版嵁 + ValidatorUtils.validateEntity(softwareTestOrderMeasured, UpdateGroup.class, DefaultGroup.class); + softwareTestOrderMeasuredService.update(softwareTestOrderMeasured); + + return Result.ok(); + } + + @DeleteMapping + @ApiOperation("鍒犻櫎") + @LogOperation("鍒犻櫎") + public Result delete(@RequestBody Long[] ids){ + //鏁堥獙鏁版嵁 + AssertUtils.isArrayEmpty(ids, "id"); + softwareTestOrderMeasuredService.delete(ids); + + return Result.ok(); + } + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDeliverableDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDeliverableDao.java new file mode 100644 index 0000000..18667c8 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDeliverableDao.java @@ -0,0 +1,23 @@ +package com.zt.life.modules.project.dao; + +import com.zt.common.dao.BaseDao; +import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable; +import org.apache.ibatis.annotations.Mapper; + + +import java.util.List; +import java.util.Map; + + +/** + * software_test_order_deliverable + * + * @author zt generator + * @since 1.0.0 2023-11-08 + */ +@Mapper +public interface SoftwareTestOrderDeliverableDao extends BaseDao<SoftwareTestOrderDeliverable> { + + List<SoftwareTestOrderDeliverable> getList(Map<String, Object> params); + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderMeasuredDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderMeasuredDao.java new file mode 100644 index 0000000..ebda491 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderMeasuredDao.java @@ -0,0 +1,23 @@ +package com.zt.life.modules.project.dao; + +import com.zt.common.dao.BaseDao; +import com.zt.life.modules.project.model.SoftwareTestOrderMeasured; +import org.apache.ibatis.annotations.Mapper; + + +import java.util.List; +import java.util.Map; + + +/** + * software_test_order_measured + * + * @author zt generator + * @since 1.0.0 2023-11-08 + */ +@Mapper +public interface SoftwareTestOrderMeasuredDao extends BaseDao<SoftwareTestOrderMeasured> { + + List<SoftwareTestOrderMeasured> getList(Map<String, Object> params); + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java new file mode 100644 index 0000000..2b034a1 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java @@ -0,0 +1,33 @@ +package com.zt.life.modules.project.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.zt.common.entity.BusiEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * software_test_order_deliverable + * + * @author zt generator + * @since 1.0.0 2023-11-08 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("software_test_order_deliverable") +public class SoftwareTestOrderDeliverable extends BusiEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "搴忓彿") + private Integer code; + + @ApiModelProperty(value = "鍚嶇О") + private String name; + + @ApiModelProperty(value = "鏍囪瘑/鐗堟湰") + private String identify; + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java new file mode 100644 index 0000000..ee95240 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java @@ -0,0 +1,36 @@ +package com.zt.life.modules.project.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.zt.common.entity.BusiEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * software_test_order_measured + * + * @author zt generator + * @since 1.0.0 2023-11-08 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("software_test_order_measured") +public class SoftwareTestOrderMeasured extends BusiEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "搴忓彿") + private Integer code; + + @ApiModelProperty(value = "鍚嶇О") + private String name; + + @ApiModelProperty(value = "鏍囪瘑/鐗堟湰") + private String identify; + + @ApiModelProperty(value = "鏄惁琚祴浠�") + private String isMeasured; + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderDeliverableService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderDeliverableService.java new file mode 100644 index 0000000..82defb9 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderDeliverableService.java @@ -0,0 +1,40 @@ +package com.zt.life.modules.project.service; + +import com.zt.common.service.BaseService; +import com.zt.life.modules.project.dao.SoftwareTestOrderDeliverableDao; +import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable; +import org.springframework.stereotype.Service; +import com.zt.common.db.query.QueryFilter; +import javax.annotation.Resource; +import java.util.List; + + +/** + * software_test_order_deliverable + * + * @author zt generator + * @since 1.0.0 2023-11-08 + */ +@Service +public class SoftwareTestOrderDeliverableService extends BaseService<SoftwareTestOrderDeliverableDao, SoftwareTestOrderDeliverable> { + + /** + * 鍒嗛〉鏌ヨ + * + * @param queryFilter + * @return + */ + public List<SoftwareTestOrderDeliverable> page(QueryFilter queryFilter) { + return baseDao.getList(queryFilter.getQueryParams()); + } + + /** + * 鍒犻櫎 + * + * @param ids + */ + public void delete(Long[] ids) { + super.deleteLogic(ids); + } + +} diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderMeasuredService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderMeasuredService.java new file mode 100644 index 0000000..3855ea2 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderMeasuredService.java @@ -0,0 +1,40 @@ +package com.zt.life.modules.project.service; + +import com.zt.common.service.BaseService; +import com.zt.life.modules.project.dao.SoftwareTestOrderMeasuredDao; +import com.zt.life.modules.project.model.SoftwareTestOrderMeasured; +import org.springframework.stereotype.Service; +import com.zt.common.db.query.QueryFilter; +import javax.annotation.Resource; +import java.util.List; + + +/** + * software_test_order_measured + * + * @author zt generator + * @since 1.0.0 2023-11-08 + */ +@Service +public class SoftwareTestOrderMeasuredService extends BaseService<SoftwareTestOrderMeasuredDao, SoftwareTestOrderMeasured> { + + /** + * 鍒嗛〉鏌ヨ + * + * @param queryFilter + * @return + */ + public List<SoftwareTestOrderMeasured> page(QueryFilter queryFilter) { + return baseDao.getList(queryFilter.getQueryParams()); + } + + /** + * 鍒犻櫎 + * + * @param ids + */ + public void delete(Long[] ids) { + super.deleteLogic(ids); + } + +} diff --git a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDeliverableDao.xml b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDeliverableDao.xml new file mode 100644 index 0000000..693bcf9 --- /dev/null +++ b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDeliverableDao.xml @@ -0,0 +1,20 @@ +<?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.zt.life.modules.project.dao.SoftwareTestOrderDeliverableDao"> + + <select id="getList" resultType="com.zt.life.modules.project.model.SoftwareTestOrderDeliverable"> + select a.* + from software_test_order_deliverable a + <where> + a.is_delete = 0 + <if test="whereSql!=null"> + and ${whereSql} + </if> + </where> + <if test="orderBySql!=null"> + ORDER BY ${orderBySql} + </if> + </select> + +</mapper> diff --git a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderMeasuredDao.xml b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderMeasuredDao.xml new file mode 100644 index 0000000..28bbe72 --- /dev/null +++ b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderMeasuredDao.xml @@ -0,0 +1,20 @@ +<?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.zt.life.modules.project.dao.SoftwareTestOrderMeasuredDao"> + + <select id="getList" resultType="com.zt.life.modules.project.model.SoftwareTestOrderMeasured"> + select a.* + from software_test_order_measured a + <where> + a.is_delete = 0 + <if test="whereSql!=null"> + and ${whereSql} + </if> + </where> + <if test="orderBySql!=null"> + ORDER BY ${orderBySql} + </if> + </select> + +</mapper> -- Gitblit v1.9.1