From 7813e595a303e8f6c1b60179b670ba7687d9bb96 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 05 三月 2024 11:58:10 +0800 Subject: [PATCH] 违约审核管理 --- ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java | 47 +++++ ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java | 47 +++++ ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultAuditingForm.java | 56 ++++++ ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java | 145 ++++++++++++++++ ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultAuditingQuery.java | 23 ++ ycl-server/src/main/java/com/ycl/platform/mapper/DefaultAuditingMapper.java | 19 ++ ycl-server/src/main/java/com/ycl/platform/service/DefaultAuditingService.java | 65 +++++++ ycl-server/src/main/java/com/ycl/platform/controller/DefaultAuditingController.java | 75 ++++++++ ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml | 16 + 9 files changed, 493 insertions(+), 0 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java new file mode 100644 index 0000000..f6add46 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java @@ -0,0 +1,47 @@ +package com.ycl.platform.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import java.time.LocalDateTime; +import com.ycl.platform.base.AbsEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 杩濊瀹℃牳 + * + * @author xp + * @since 2024-03-05 + */ +@Data +@Accessors(chain = true) +@TableName("t_default_auditing") +@ApiModel(value = "DefaultAuditing瀵硅薄", description = "杩濊瀹℃牳") +public class DefaultAuditing extends AbsEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("杩濊") + @TableField("default_id") + private Integer defaultId; + + @ApiModelProperty("瀹℃牳鐘舵��") + @TableField("auditing_status") + private String auditingStatus; + + @ApiModelProperty("瀹℃牳璇存槑") + @TableField("remark") + private String remark; + + @ApiModelProperty("瀹℃牳鏃堕棿") + @TableField("auditing_time") + private LocalDateTime auditingTime; + + @ApiModelProperty("瀹℃牳浜�") + @TableField("auditing_user") + private Integer auditingUser; + + +} diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultAuditingForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultAuditingForm.java new file mode 100644 index 0000000..9ccf2ae --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultAuditingForm.java @@ -0,0 +1,56 @@ +package com.ycl.platform.domain.form; + +import com.ycl.system.domain.group.Update; +import com.ycl.system.domain.group.Add; +import com.ycl.platform.base.AbsForm; +import com.ycl.platform.domain.entity.DefaultAuditing; +import java.time.LocalDateTime; +import org.springframework.beans.BeanUtils; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import org.springframework.lang.NonNull; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 杩濊瀹℃牳琛ㄥ崟 + * + * @author xp + * @since 2024-03-05 + */ +@Data +@Accessors(chain = true) +@ApiModel(value = "DefaultAuditing琛ㄥ崟", description = "杩濊瀹℃牳琛ㄥ崟") +public class DefaultAuditingForm extends AbsForm { + + @NotNull(message = "杩濊涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("杩濊") + private Integer defaultId; + + @NotBlank(message = "瀹℃牳鐘舵�佷笉鑳戒负绌�", groups = {Add.class, Update.class}) + @ApiModelProperty("瀹℃牳鐘舵��") + private String auditingStatus; + + @NotBlank(message = "瀹℃牳璇存槑涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("瀹℃牳璇存槑") + private String remark; + + @NotNull(message = "瀹℃牳鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("瀹℃牳鏃堕棿") + private LocalDateTime auditingTime; + + @NotNull(message = "瀹℃牳浜轰笉鑳戒负绌�", groups = {Add.class, Update.class}) + @ApiModelProperty("瀹℃牳浜�") + private Integer auditingUser; + + public static DefaultAuditing getEntityByForm(@NonNull DefaultAuditingForm form, DefaultAuditing entity) { + if(entity == null) { + entity = new DefaultAuditing(); + } + BeanUtils.copyProperties(form, entity); + return entity; + } + +} diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultAuditingQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultAuditingQuery.java new file mode 100644 index 0000000..85b4f21 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultAuditingQuery.java @@ -0,0 +1,23 @@ +package com.ycl.platform.domain.query; + +import com.ycl.platform.base.AbsQuery; +import java.util.List; +import org.springframework.lang.NonNull; +import jakarta.validation.constraints.NotBlank; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 杩濊瀹℃牳鏌ヨ + * + * @author xp + * @since 2024-03-05 + */ +@Data +@Accessors(chain = true) +@ApiModel(value = "DefaultAuditing鏌ヨ", description = "杩濊瀹℃牳鏌ヨ") +public class DefaultAuditingQuery extends AbsQuery { +} + diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java new file mode 100644 index 0000000..3a5fde8 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java @@ -0,0 +1,47 @@ +package com.ycl.platform.domain.vo; + +import com.ycl.platform.base.AbsVo; +import com.ycl.platform.domain.entity.DefaultAuditing; +import java.util.List; +import java.time.LocalDateTime; +import org.springframework.lang.NonNull; +import org.springframework.beans.BeanUtils; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 杩濊瀹℃牳灞曠ず + * + * @author xp + * @since 2024-03-05 + */ +@Data +@Accessors(chain = true) +public class DefaultAuditingVO extends AbsVo { + + /** 杩濊 */ + private Integer defaultId; + + /** 瀹℃牳鐘舵�� */ + private String auditingStatus; + + /** 瀹℃牳璇存槑 */ + private String remark; + + /** 瀹℃牳鏃堕棿 */ + private LocalDateTime auditingTime; + + /** 瀹℃牳浜� */ + private Integer auditingUser; + + public static DefaultAuditingVO getVoByEntity(@NonNull DefaultAuditing entity, DefaultAuditingVO vo) { + if(vo == null) { + vo = new DefaultAuditingVO(); + } + BeanUtils.copyProperties(entity, vo); + return vo; + } + +} diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultAuditingController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultAuditingController.java new file mode 100644 index 0000000..cb99f29 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultAuditingController.java @@ -0,0 +1,75 @@ +package com.ycl.platform.controller; + +import com.ycl.system.domain.group.Update; +import com.ycl.system.domain.group.Add; +import org.springframework.validation.annotation.Validated; +import lombok.RequiredArgsConstructor; +import java.util.List; +import org.springframework.validation.annotation.Validated; +import jakarta.validation.constraints.NotEmpty; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.ycl.platform.service.DefaultAuditingService; +import com.ycl.system.Result; +import com.ycl.platform.domain.form.DefaultAuditingForm; +import com.ycl.platform.domain.query.DefaultAuditingQuery; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +/** + * 杩濊瀹℃牳 鍓嶇鎺у埗鍣� + * + * @author xp + * @since 2024-03-05 + */ +@Validated +@RequiredArgsConstructor +@Api(value = "杩濊瀹℃牳", tags = "杩濊瀹℃牳绠$悊") +@RestController +@RequestMapping("/default-auditing") +public class DefaultAuditingController { + + private final DefaultAuditingService defaultAuditingService; + + @PostMapping + @ApiOperation(value = "娣诲姞", notes = "娣诲姞") + public Result add(@RequestBody @Validated(Add.class) DefaultAuditingForm form) { + return defaultAuditingService.add(form); + } + + @PutMapping + @ApiOperation(value = "淇敼", notes = "淇敼") + public Result update(@RequestBody @Validated(Update.class) DefaultAuditingForm form) { + return defaultAuditingService.update(form); + } + + @DeleteMapping("/{id}") + @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎") + public Result removeById(@PathVariable("id") String id) { + return defaultAuditingService.removeById(id); + } + + @DeleteMapping("/batch") + @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎") + public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) { + return defaultAuditingService.remove(ids); + } + + @GetMapping("/page") + @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉") + public Result page(DefaultAuditingQuery query) { + return defaultAuditingService.page(query); + } + + @GetMapping("/{id}") + @ApiOperation(value = "璇︽儏", notes = "璇︽儏") + public Result detail(@PathVariable("id") String id) { + return defaultAuditingService.detail(id); + } + + @GetMapping("/list") + @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃") + public Result list() { + return defaultAuditingService.all(); + } +} diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultAuditingMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultAuditingMapper.java new file mode 100644 index 0000000..3877306 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultAuditingMapper.java @@ -0,0 +1,19 @@ +package com.ycl.platform.mapper; + +import com.ycl.platform.domain.entity.DefaultAuditing; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ycl.platform.domain.vo.DefaultAuditingVO; +import com.ycl.platform.domain.form.DefaultAuditingForm; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; + +/** + * 杩濊瀹℃牳 Mapper 鎺ュ彛 + * + * @author xp + * @since 2024-03-05 + */ +@Mapper +public interface DefaultAuditingMapper extends BaseMapper<DefaultAuditing> { + +} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/DefaultAuditingService.java b/ycl-server/src/main/java/com/ycl/platform/service/DefaultAuditingService.java new file mode 100644 index 0000000..16f1a18 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/service/DefaultAuditingService.java @@ -0,0 +1,65 @@ +package com.ycl.platform.service; + +import com.ycl.platform.domain.entity.DefaultAuditing; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ycl.system.Result; +import com.ycl.platform.domain.form.DefaultAuditingForm; +import com.ycl.platform.domain.query.DefaultAuditingQuery; +import java.util.List; + +/** + * 杩濊瀹℃牳 鏈嶅姟绫� + * + * @author xp + * @since 2024-03-05 + */ +public interface DefaultAuditingService extends IService<DefaultAuditing> { + + /** + * 娣诲姞 + * @param form + * @return + */ + Result add(DefaultAuditingForm form); + + /** + * 淇敼 + * @param form + * @return + */ + Result update(DefaultAuditingForm form); + + /** + * 鎵归噺鍒犻櫎 + * @param ids + * @return + */ + Result remove(List<String> ids); + + /** + * id鍒犻櫎 + * @param id + * @return + */ + Result removeById(String id); + + /** + * 鍒嗛〉鏌ヨ + * @param query + * @return + */ + Result page(DefaultAuditingQuery query); + + /** + * 鏍规嵁id鏌ユ壘 + * @param id + * @return + */ + Result detail(String id); + + /** + * 鍒楄〃 + * @return + */ + Result all(); +} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java new file mode 100644 index 0000000..0e4dda4 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java @@ -0,0 +1,145 @@ +package com.ycl.platform.service.impl; + +import com.ycl.platform.domain.entity.DefaultAuditing; +import com.ycl.platform.mapper.DefaultAuditingMapper; +import com.ycl.platform.service.DefaultAuditingService; +import com.ycl.system.Result; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.platform.domain.form.DefaultAuditingForm; +import com.ycl.platform.domain.vo.DefaultAuditingVO; +import com.ycl.platform.domain.query.DefaultAuditingQuery; +import java.util.List; +import org.apache.commons.lang3.StringUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ycl.system.page.PageUtil; +import org.springframework.stereotype.Service; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.beans.BeanUtils; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.Assert; +import java.util.ArrayList; +import java.util.stream.Collectors; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import lombok.RequiredArgsConstructor; + +/** + * 杩濊瀹℃牳 鏈嶅姟瀹炵幇绫� + * + * @author xp + * @since 2024-03-05 + */ +@Service +@RequiredArgsConstructor +public class DefaultAuditingServiceImpl extends ServiceImpl<DefaultAuditingMapper, DefaultAuditing> implements DefaultAuditingService { + + private final DefaultAuditingMapper defaultAuditingMapper; + + /** + * 娣诲姞 + * @param form + * @return + */ + @Override + public Result add(DefaultAuditingForm form) { + DefaultAuditing entity = DefaultAuditingForm.getEntityByForm(form, null); + if(baseMapper.insert(entity) > 0) { + return Result.ok("娣诲姞鎴愬姛"); + } + return Result.error("娣诲姞澶辫触"); + } + + /** + * 淇敼 + * @param form + * @return + */ + @Override + public Result update(DefaultAuditingForm form) { + + DefaultAuditing entity = baseMapper.selectById(form.getId()); + + // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊 + Assert.notNull(entity, "璁板綍涓嶅瓨鍦�"); + BeanUtils.copyProperties(form, entity); + if (baseMapper.updateById(entity) > 0) { + return Result.ok("淇敼鎴愬姛"); + } + return Result.error("淇敼澶辫触"); + } + + /** + * 鎵归噺鍒犻櫎 + * @param ids + * @return + */ + @Override + public Result remove(List<String> ids) { + if(baseMapper.deleteBatchIds(ids) > 0) { + return Result.ok("鍒犻櫎鎴愬姛"); + } + return Result.error("鍒犻櫎澶辫触"); + } + + /** + * id鍒犻櫎 + * @param id + * @return + */ + @Override + public Result removeById(String id) { + if(baseMapper.deleteById(id) > 0) { + return Result.ok("鍒犻櫎鎴愬姛"); + } + return Result.error("鍒犻櫎澶辫触"); + } + + /** + * 鍒嗛〉鏌ヨ + * @param query + * @return + */ + @Override + public Result page(DefaultAuditingQuery query) { + + IPage<DefaultAuditing> page = new LambdaQueryChainWrapper<>(baseMapper) + .orderByDesc(DefaultAuditing::getCreateTime) + .page(PageUtil.getPage(query, DefaultAuditing.class)); + + List<DefaultAuditingVO> vos = page.getRecords().stream() + .map( + entity -> DefaultAuditingVO.getVoByEntity(entity, null) + ) + .collect(Collectors.toList()); + return Result.ok().data(vos).total(page.getTotal()); + } + + /** + * 鏍规嵁id鏌ユ壘 + * @param id + * @return + */ + @Override + public Result detail(String id) { + + DefaultAuditing entity = baseMapper.selectById(id); + Assert.notNull(entity, "璁板綍涓嶅瓨鍦�"); + DefaultAuditingVO vo = DefaultAuditingVO.getVoByEntity(entity, null); + return Result.ok().data(vo); + } + + /** + * 鍒楄〃 + * @return + */ + @Override + public Result all() { + List<DefaultAuditing> entities = baseMapper.selectList(null); + List<DefaultAuditingVO> vos = entities.stream() + .map( + entity -> DefaultAuditingVO.getVoByEntity(entity, null) + ) + .collect(Collectors.toList()); + return Result.ok().data(vos); + } +} diff --git a/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml new file mode 100644 index 0000000..bf1ba09 --- /dev/null +++ b/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml @@ -0,0 +1,16 @@ +<?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.platform.mapper.DefaultAuditingMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.DefaultAuditingVO"> + <result column="id" property="id" /> + <result column="create_time" property="createTime" /> + <result column="default_id" property="defaultId" /> + <result column="auditing_status" property="auditingStatus" /> + <result column="remark" property="remark" /> + <result column="auditing_time" property="auditingTime" /> + <result column="auditing_user" property="auditingUser" /> + </resultMap> + +</mapper> -- Gitblit v1.8.0