From 0c1a03ea09693ecddad0f733b39dc72647c1d021 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 06 三月 2024 18:08:42 +0800 Subject: [PATCH] 考核模板 --- ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java | 46 ++++ ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java | 43 ++++ ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateMapper.java | 19 + ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java | 75 +++++++ ycl-server/src/main/java/com/ycl/platform/service/CheckTemplateService.java | 65 ++++++ ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckTemplateForm.java | 90 +++++++++ ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java | 44 ++++ ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java | 10 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java | 154 +++++++++++++++ ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml | 17 + ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml | 15 + 11 files changed, 576 insertions(+), 2 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java new file mode 100644 index 0000000..7255761 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.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_template") +@ApiModel(value = "CheckTemplate瀵硅薄", description = "鑰冩牳妯℃澘") +public class CheckTemplate extends AbsEntity { + + private static final long serialVersionUID = 1L; + + /** + * 妯℃澘鍚嶇О + */ + @TableField("template_name") + private String templateName; + + @ApiModelProperty("璋冩暣绯绘暟") + @TableField("adjust_coefficient") + private Integer adjustCoefficient; + + /** + * 璋冩暣绯绘暟鐨勬柟寮忥細涔橀櫎 + */ + @TableField("adjust_way") + private String adjustWay; + + @ApiModelProperty("鐘舵��") + @TableField("status") + private String status; + + +} diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckTemplateForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckTemplateForm.java new file mode 100644 index 0000000..14772b5 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckTemplateForm.java @@ -0,0 +1,90 @@ +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.CheckTemplate; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +import jakarta.validation.constraints.NotEmpty; +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 = "CheckTemplate琛ㄥ崟", description = "鑰冩牳妯℃澘琛ㄥ崟") +public class CheckTemplateForm extends AbsForm { + + @NotNull(message = "妯℃澘鍚嶇О涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("妯℃澘鍚嶇О") + private String templateName; + + @NotNull(message = "璋冩暣绯绘暟涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("璋冩暣绯绘暟") + private BigDecimal adjustCoefficient; + + @NotNull(message = "璋冩暣绯绘暟璁$畻鏂瑰紡涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("璋冩暣绯绘暟璁$畻鏂瑰紡") + private String adjustWay; + + @NotBlank(message = "鐘舵�佷笉鑳戒负绌�", groups = {Add.class, Update.class}) + @ApiModelProperty("鐘舵��") + private String status; + + @NotEmpty(message = "鑰冩牳瑙勫垯涓嶈兘涓虹┖") + @ApiModelProperty("鑰冩牳瑙勫垯") + private List<RuleItem> ruleList; + + public static CheckTemplate getEntityByForm(@NonNull CheckTemplateForm form, CheckTemplate entity) { + if(entity == null) { + entity = new CheckTemplate(); + } + BeanUtils.copyProperties(form, entity); + return entity; + } + + public class RuleItem { + + /** + * 瑙勫垯 + */ + private Integer ruleId; + + /** + * 鏉冮噸 + */ + private BigDecimal weight; + + public Integer getRuleId() { + return ruleId; + } + + public void setRuleId(Integer ruleId) { + this.ruleId = ruleId; + } + + public BigDecimal getWeight() { + return weight; + } + + public void setWeight(BigDecimal weight) { + this.weight = weight; + } + } + +} diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java new file mode 100644 index 0000000..5e37380 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java @@ -0,0 +1,43 @@ +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 = "CheckTemplate鏌ヨ", description = "鑰冩牳妯℃澘鏌ヨ") +public class CheckTemplateQuery extends AbsQuery { + + /** + * 妯℃澘鍚嶇О + */ + private String templateName; + + /** + * 鐘舵�� + */ + private String status; + + @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/CheckTemplateVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java new file mode 100644 index 0000000..2dfebd2 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java @@ -0,0 +1,44 @@ +package com.ycl.platform.domain.vo; + +import com.ycl.platform.base.AbsVo; +import com.ycl.platform.domain.entity.CheckTemplate; +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 CheckTemplateVO extends AbsVo { + + /** 妯℃澘鍚嶇О */ + private String templateName; + + /** 璋冩暣绯绘暟 */ + private Integer adjustCoefficient; + + /** 璋冩暣绯绘暟鐨勬柟寮忥細涔橀櫎 */ + private String adjustWay; + + /** 鐘舵�� */ + private String status; + + public static CheckTemplateVO getVoByEntity(@NonNull CheckTemplate entity, CheckTemplateVO vo) { + if(vo == null) { + vo = new CheckTemplateVO(); + } + BeanUtils.copyProperties(entity, vo); + return vo; + } + +} diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java new file mode 100644 index 0000000..749448a --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.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.CheckTemplateService; +import com.ycl.system.Result; +import com.ycl.platform.domain.form.CheckTemplateForm; +import com.ycl.platform.domain.query.CheckTemplateQuery; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +/** + * 鑰冩牳妯℃澘 鍓嶇鎺у埗鍣� + * + * @author xp + * @since 2024-03-06 + */ +@Validated +@RequiredArgsConstructor +@Api(value = "鑰冩牳妯℃澘", tags = "鑰冩牳妯℃澘绠$悊") +@RestController +@RequestMapping("/check-template") +public class CheckTemplateController { + + private final CheckTemplateService checkTemplateService; + + @PostMapping + @ApiOperation(value = "娣诲姞", notes = "娣诲姞") + public Result add(@RequestBody @Validated(Add.class) CheckTemplateForm form) { + return checkTemplateService.add(form); + } + + @PutMapping + @ApiOperation(value = "淇敼", notes = "淇敼") + public Result update(@RequestBody @Validated(Update.class) CheckTemplateForm form) { + return checkTemplateService.update(form); + } + + @DeleteMapping("/{id}") + @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎") + public Result removeById(@PathVariable("id") String id) { + return checkTemplateService.removeById(id); + } + + @DeleteMapping("/batch") + @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎") + public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) { + return checkTemplateService.remove(ids); + } + + @PostMapping("/page") + @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉") + public Result page(@RequestBody CheckTemplateQuery query) { + return checkTemplateService.page(query); + } + + @GetMapping("/{id}") + @ApiOperation(value = "璇︽儏", notes = "璇︽儏") + public Result detail(@PathVariable("id") String id) { + return checkTemplateService.detail(id); + } + + @GetMapping("/list") + @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃") + public Result list() { + return checkTemplateService.all(); + } +} diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateMapper.java new file mode 100644 index 0000000..ca49830 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateMapper.java @@ -0,0 +1,19 @@ +package com.ycl.platform.mapper; + +import com.ycl.platform.domain.entity.CheckTemplate; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ycl.platform.domain.vo.CheckTemplateVO; +import com.ycl.platform.domain.form.CheckTemplateForm; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; + +/** + * 鑰冩牳妯℃澘 Mapper 鎺ュ彛 + * + * @author xp + * @since 2024-03-06 + */ +@Mapper +public interface CheckTemplateMapper extends BaseMapper<CheckTemplate> { + +} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/CheckTemplateService.java b/ycl-server/src/main/java/com/ycl/platform/service/CheckTemplateService.java new file mode 100644 index 0000000..d6b845c --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/service/CheckTemplateService.java @@ -0,0 +1,65 @@ +package com.ycl.platform.service; + +import com.ycl.platform.domain.entity.CheckTemplate; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ycl.system.Result; +import com.ycl.platform.domain.form.CheckTemplateForm; +import com.ycl.platform.domain.query.CheckTemplateQuery; +import java.util.List; + +/** + * 鑰冩牳妯℃澘 鏈嶅姟绫� + * + * @author xp + * @since 2024-03-06 + */ +public interface CheckTemplateService extends IService<CheckTemplate> { + + /** + * 娣诲姞 + * @param form + * @return + */ + Result add(CheckTemplateForm form); + + /** + * 淇敼 + * @param form + * @return + */ + Result update(CheckTemplateForm form); + + /** + * 鎵归噺鍒犻櫎 + * @param ids + * @return + */ + Result remove(List<String> ids); + + /** + * id鍒犻櫎 + * @param id + * @return + */ + Result removeById(String id); + + /** + * 鍒嗛〉鏌ヨ + * @param query + * @return + */ + Result page(CheckTemplateQuery 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 index 43a9293..c357e57 100644 --- 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 @@ -1,5 +1,6 @@ package com.ycl.platform.service.impl; +import com.ycl.platform.base.BaseSelect; import com.ycl.platform.domain.entity.CheckRule; import com.ycl.platform.domain.entity.YwUnit; import com.ycl.platform.mapper.CheckRuleMapper; @@ -144,9 +145,14 @@ @Override public Result all() { List<CheckRule> entities = baseMapper.selectList(null); - List<CheckRuleVO> vos = entities.stream() + List<BaseSelect> vos = entities.stream() .map( - entity -> CheckRuleVO.getVoByEntity(entity, null) + entity -> { + BaseSelect vo = new BaseSelect(); + vo.setId(entity.getId()); + vo.setValue(entity.getRuleName()); + return vo; + } ) .collect(Collectors.toList()); return Result.ok().data(vos); diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java new file mode 100644 index 0000000..c08db94 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java @@ -0,0 +1,154 @@ +package com.ycl.platform.service.impl; + +import com.ycl.platform.domain.entity.CheckTemplate; +import com.ycl.platform.domain.entity.YwUnit; +import com.ycl.platform.mapper.CheckTemplateMapper; +import com.ycl.platform.service.CheckTemplateService; +import com.ycl.system.Result; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.platform.domain.form.CheckTemplateForm; +import com.ycl.platform.domain.vo.CheckTemplateVO; +import com.ycl.platform.domain.query.CheckTemplateQuery; +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 CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateMapper, CheckTemplate> implements CheckTemplateService { + + private final CheckTemplateMapper checkTemplateMapper; + + /** + * 娣诲姞 + * @param form + * @return + */ + @Override + public Result add(CheckTemplateForm form) { + CheckTemplate entity = CheckTemplateForm.getEntityByForm(form, null); + if(baseMapper.insert(entity) > 0) { + return Result.ok("娣诲姞鎴愬姛"); + } + return Result.error("娣诲姞澶辫触"); + } + + /** + * 淇敼 + * @param form + * @return + */ + @Override + public Result update(CheckTemplateForm form) { + + CheckTemplate 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(CheckTemplateQuery query) { + IPage<CheckTemplate> page = new LambdaQueryChainWrapper<>(baseMapper) + .like(StringUtils.hasText(query.getTemplateName()), CheckTemplate::getTemplateName, query.getTemplateName()) + .eq(StringUtils.hasText(query.getStatus()), CheckTemplate::getStatus, query.getStatus()) + .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()), + CheckTemplate::getCreateTime, + DateUtils.getDayStart(query.getStart()), + DateUtils.getDayEnd(query.getEnd())) + .orderByDesc(CheckTemplate::getCreateTime) + .page(PageUtil.getPage(query, CheckTemplate.class)); + + List<CheckTemplateVO> vos = page.getRecords().stream() + .map( + entity -> CheckTemplateVO.getVoByEntity(entity, null) + ) + .collect(Collectors.toList()); + return Result.ok().data(vos).total(page.getTotal()); + } + + /** + * 鏍规嵁id鏌ユ壘 + * @param id + * @return + */ + @Override + public Result detail(String id) { + + CheckTemplate entity = baseMapper.selectById(id); + Assert.notNull(entity, "璁板綍涓嶅瓨鍦�"); + CheckTemplateVO vo = CheckTemplateVO.getVoByEntity(entity, null); + return Result.ok().data(vo); + } + + /** + * 鍒楄〃 + * @return + */ + @Override + public Result all() { + List<CheckTemplate> entities = baseMapper.selectList(null); + List<CheckTemplateVO> vos = entities.stream() + .map( + entity -> CheckTemplateVO.getVoByEntity(entity, null) + ) + .collect(Collectors.toList()); + return Result.ok().data(vos); + } +} diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml new file mode 100644 index 0000000..fd4157c --- /dev/null +++ b/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml @@ -0,0 +1,17 @@ +<?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.CheckRuleMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.CheckRuleVO"> + <result column="id" property="id" /> + <result column="create_time" property="createTime" /> + <result column="update_time" property="updateTime" /> + <result column="rule_name" property="ruleName" /> + <result column="rule_detail" property="ruleDetail" /> + <result column="video_point_num" property="videoPointNum" /> + <result column="vehicle_checkpoint_num" property="vehicleCheckpointNum" /> + <result column="face_chceckpoint_num" property="faceChceckpointNum" /> + </resultMap> + +</mapper> diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml new file mode 100644 index 0000000..545dd3e --- /dev/null +++ b/ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml @@ -0,0 +1,15 @@ +<?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.CheckTemplateMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.CheckTemplateVO"> + <result column="id" property="id" /> + <result column="create_time" property="createTime" /> + <result column="update_time" property="updateTime" /> + <result column="adjust_coefficient" property="adjustCoefficient" /> + <result column="adjust_way" property="adjustWay" /> + <result column="status" property="status" /> + </resultMap> + +</mapper> -- Gitblit v1.8.0