From 3a31a59f374b26da23d95ca1c10b583889f11611 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 06 三月 2024 16:17:26 +0800 Subject: [PATCH] 考核规则 --- ycl-server/src/main/java/com/ycl/platform/mapper/CheckRuleMapper.java | 19 ++ ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckRuleQuery.java | 44 ++++ ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java | 46 +++++ ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java | 73 ++++++++ ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckRuleForm.java | 56 ++++++ ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java | 47 +++++ ycl-server/src/main/java/com/ycl/platform/service/CheckRuleService.java | 65 +++++++ ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java | 154 +++++++++++++++++ 8 files changed, 504 insertions(+), 0 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java new file mode 100644 index 0000000..bd2d147 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java @@ -0,0 +1,46 @@ +package com.ycl.platform.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +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-06 + */ +@Data +@Accessors(chain = true) +@TableName("t_check_rule") +@ApiModel(value = "CheckRule瀵硅薄", description = "鑰冩牳瑙勫垯") +public class CheckRule extends AbsEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("瑙勫垯鍚嶇О") + @TableField("rule_name") + private String ruleName; + + @ApiModelProperty("瑙勫垯鎻忚堪") + @TableField("rule_detail") + private String ruleDetail; + + @ApiModelProperty("澶╃綉瑙嗛鐐逛綅鏁�") + @TableField("video_point_num") + private Integer videoPointNum; + + @ApiModelProperty("杞﹁締鍗″彛鐐逛綅鏁�") + @TableField("vehicle_checkpoint_num") + private Integer vehicleCheckpointNum; + + @ApiModelProperty("浜鸿劯鍗″彛鐐逛綅鏁�") + @TableField("face_chceckpoint_num") + private Integer faceChceckpointNum; + + +} diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckRuleForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckRuleForm.java new file mode 100644 index 0000000..384d989 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckRuleForm.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.CheckRule; +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-06 + */ +@Data +@Accessors(chain = true) +@ApiModel(value = "CheckRule琛ㄥ崟", description = "鑰冩牳瑙勫垯琛ㄥ崟") +public class CheckRuleForm extends AbsForm { + + @NotBlank(message = "瑙勫垯鍚嶇О涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("瑙勫垯鍚嶇О") + private String ruleName; + + @NotBlank(message = "瑙勫垯鎻忚堪涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("瑙勫垯鎻忚堪") + private String ruleDetail; + + @NotNull(message = "澶╃綉瑙嗛鐐逛綅鏁颁笉鑳戒负绌�", groups = {Add.class, Update.class}) + @ApiModelProperty("澶╃綉瑙嗛鐐逛綅鏁�") + private Integer videoPointNum; + + @NotNull(message = "杞﹁締鍗″彛鐐逛綅鏁颁笉鑳戒负绌�", groups = {Add.class, Update.class}) + @ApiModelProperty("杞﹁締鍗″彛鐐逛綅鏁�") + private Integer vehicleCheckpointNum; + + @NotNull(message = "浜鸿劯鍗″彛鐐逛綅鏁颁笉鑳戒负绌�", groups = {Add.class, Update.class}) + @ApiModelProperty("浜鸿劯鍗″彛鐐逛綅鏁�") + private Integer faceChceckpointNum; + + public static CheckRule getEntityByForm(@NonNull CheckRuleForm form, CheckRule entity) { + if(entity == null) { + entity = new CheckRule(); + } + BeanUtils.copyProperties(form, entity); + return entity; + } + +} diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckRuleQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckRuleQuery.java new file mode 100644 index 0000000..a266cd1 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckRuleQuery.java @@ -0,0 +1,44 @@ +package com.ycl.platform.domain.query; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ycl.platform.base.AbsQuery; + +import java.util.Date; +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-06 + */ +@Data +@Accessors(chain = true) +@ApiModel(value = "CheckRule鏌ヨ", description = "鑰冩牳瑙勫垯鏌ヨ") +public class CheckRuleQuery extends AbsQuery { + + /** + * 瑙勫垯鍚嶇О + */ + private String ruleName; + + /** + * 寮�濮嬫椂闂� + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date start; + + /** + * 缁撴潫鏃堕棿 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date end; + +} + diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java new file mode 100644 index 0000000..a075183 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java @@ -0,0 +1,47 @@ +package com.ycl.platform.domain.vo; + +import com.ycl.platform.base.AbsVo; +import com.ycl.platform.domain.entity.CheckRule; +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-06 + */ +@Data +@Accessors(chain = true) +public class CheckRuleVO extends AbsVo { + + /** 瑙勫垯鍚嶇О */ + private String ruleName; + + /** 瑙勫垯鎻忚堪 */ + private String ruleDetail; + + /** 澶╃綉瑙嗛鐐逛綅鏁� */ + private Integer videoPointNum; + + /** 杞﹁締鍗″彛鐐逛綅鏁� */ + private Integer vehicleCheckpointNum; + + /** 浜鸿劯鍗″彛鐐逛綅鏁� */ + private Integer faceChceckpointNum; + + public static CheckRuleVO getVoByEntity(@NonNull CheckRule entity, CheckRuleVO vo) { + if(vo == null) { + vo = new CheckRuleVO(); + } + BeanUtils.copyProperties(entity, vo); + return vo; + } + +} diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java new file mode 100644 index 0000000..8fd63eb --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java @@ -0,0 +1,73 @@ +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 jakarta.validation.constraints.NotEmpty; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.ycl.platform.service.CheckRuleService; +import com.ycl.system.Result; +import com.ycl.platform.domain.form.CheckRuleForm; +import com.ycl.platform.domain.query.CheckRuleQuery; +import org.springframework.web.bind.annotation.*; + +/** + * 鑰冩牳瑙勫垯 鍓嶇鎺у埗鍣� + * + * @author xp + * @since 2024-03-06 + */ +@Validated +@RequiredArgsConstructor +@Api(value = "鑰冩牳瑙勫垯", tags = "鑰冩牳瑙勫垯绠$悊") +@RestController +@RequestMapping("/check-rule") +public class CheckRuleController { + + private final CheckRuleService checkRuleService; + + @PostMapping + @ApiOperation(value = "娣诲姞", notes = "娣诲姞") + public Result add(@RequestBody @Validated(Add.class) CheckRuleForm form) { + return checkRuleService.add(form); + } + + @PutMapping + @ApiOperation(value = "淇敼", notes = "淇敼") + public Result update(@RequestBody @Validated(Update.class) CheckRuleForm form) { + return checkRuleService.update(form); + } + + @DeleteMapping("/{id}") + @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎") + public Result removeById(@PathVariable("id") String id) { + return checkRuleService.removeById(id); + } + + @DeleteMapping("/batch") + @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎") + public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) { + return checkRuleService.remove(ids); + } + + @PostMapping("/page") + @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉") + public Result page(@RequestBody CheckRuleQuery query) { + return checkRuleService.page(query); + } + + @GetMapping("/{id}") + @ApiOperation(value = "璇︽儏", notes = "璇︽儏") + public Result detail(@PathVariable("id") String id) { + return checkRuleService.detail(id); + } + + @GetMapping("/list") + @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃") + public Result list() { + return checkRuleService.all(); + } +} diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckRuleMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckRuleMapper.java new file mode 100644 index 0000000..44c50ee --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckRuleMapper.java @@ -0,0 +1,19 @@ +package com.ycl.platform.mapper; + +import com.ycl.platform.domain.entity.CheckRule; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ycl.platform.domain.vo.CheckRuleVO; +import com.ycl.platform.domain.form.CheckRuleForm; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; + +/** + * 鑰冩牳瑙勫垯 Mapper 鎺ュ彛 + * + * @author xp + * @since 2024-03-06 + */ +@Mapper +public interface CheckRuleMapper extends BaseMapper<CheckRule> { + +} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/CheckRuleService.java b/ycl-server/src/main/java/com/ycl/platform/service/CheckRuleService.java new file mode 100644 index 0000000..8c0de70 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/service/CheckRuleService.java @@ -0,0 +1,65 @@ +package com.ycl.platform.service; + +import com.ycl.platform.domain.entity.CheckRule; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ycl.system.Result; +import com.ycl.platform.domain.form.CheckRuleForm; +import com.ycl.platform.domain.query.CheckRuleQuery; +import java.util.List; + +/** + * 鑰冩牳瑙勫垯 鏈嶅姟绫� + * + * @author xp + * @since 2024-03-06 + */ +public interface CheckRuleService extends IService<CheckRule> { + + /** + * 娣诲姞 + * @param form + * @return + */ + Result add(CheckRuleForm form); + + /** + * 淇敼 + * @param form + * @return + */ + Result update(CheckRuleForm form); + + /** + * 鎵归噺鍒犻櫎 + * @param ids + * @return + */ + Result remove(List<String> ids); + + /** + * id鍒犻櫎 + * @param id + * @return + */ + Result removeById(String id); + + /** + * 鍒嗛〉鏌ヨ + * @param query + * @return + */ + Result page(CheckRuleQuery 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/CheckRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java new file mode 100644 index 0000000..43a9293 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java @@ -0,0 +1,154 @@ +package com.ycl.platform.service.impl; + +import com.ycl.platform.domain.entity.CheckRule; +import com.ycl.platform.domain.entity.YwUnit; +import com.ycl.platform.mapper.CheckRuleMapper; +import com.ycl.platform.service.CheckRuleService; +import com.ycl.system.Result; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.platform.domain.form.CheckRuleForm; +import com.ycl.platform.domain.vo.CheckRuleVO; +import com.ycl.platform.domain.query.CheckRuleQuery; +import java.util.List; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ycl.system.page.PageUtil; +import com.ycl.utils.DateUtils; +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.Objects; +import java.util.stream.Collectors; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import lombok.RequiredArgsConstructor; +import org.springframework.util.StringUtils; + +/** + * 鑰冩牳瑙勫垯 鏈嶅姟瀹炵幇绫� + * + * @author xp + * @since 2024-03-06 + */ +@Service +@RequiredArgsConstructor +public class CheckRuleServiceImpl extends ServiceImpl<CheckRuleMapper, CheckRule> implements CheckRuleService { + + private final CheckRuleMapper checkRuleMapper; + + /** + * 娣诲姞 + * @param form + * @return + */ + @Override + public Result add(CheckRuleForm form) { + CheckRule entity = CheckRuleForm.getEntityByForm(form, null); + if(baseMapper.insert(entity) > 0) { + return Result.ok("娣诲姞鎴愬姛"); + } + return Result.error("娣诲姞澶辫触"); + } + + /** + * 淇敼 + * @param form + * @return + */ + @Override + public Result update(CheckRuleForm form) { + + CheckRule 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(CheckRuleQuery query) { + + IPage<CheckRule> page = new LambdaQueryChainWrapper<>(baseMapper) + .like(StringUtils.hasText(query.getRuleName()), CheckRule::getRuleName, query.getRuleName()) + .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()), + CheckRule::getCreateTime, + DateUtils.getDayStart(query.getStart()), + DateUtils.getDayEnd(query.getEnd())) + .orderByDesc(CheckRule::getCreateTime) + .page(PageUtil.getPage(query, CheckRule.class)); + + List<CheckRuleVO> vos = page.getRecords().stream() + .map( + entity -> CheckRuleVO.getVoByEntity(entity, null) + ) + .collect(Collectors.toList()); + return Result.ok().data(vos).total(page.getTotal()); + } + + /** + * 鏍规嵁id鏌ユ壘 + * @param id + * @return + */ + @Override + public Result detail(String id) { + + CheckRule entity = baseMapper.selectById(id); + Assert.notNull(entity, "璁板綍涓嶅瓨鍦�"); + CheckRuleVO vo = CheckRuleVO.getVoByEntity(entity, null); + return Result.ok().data(vo); + } + + /** + * 鍒楄〃 + * @return + */ + @Override + public Result all() { + List<CheckRule> entities = baseMapper.selectList(null); + List<CheckRuleVO> vos = entities.stream() + .map( + entity -> CheckRuleVO.getVoByEntity(entity, null) + ) + .collect(Collectors.toList()); + return Result.ok().data(vos); + } +} -- Gitblit v1.8.0