From 06acb8b142d643a7ea7d0520bd5ef7e780068fe9 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 05 三月 2024 11:07:23 +0800
Subject: [PATCH] 点位
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java | 52 +++++
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 16 +
ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java | 61 ++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPointQuery.java | 24 ++
ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java | 19 ++
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java | 51 +++++
ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java | 2
ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java | 77 ++++++++
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 145 ++++++++++++++++
ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java | 65 +++++++
10 files changed, 512 insertions(+), 0 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
new file mode 100644
index 0000000..1e33e8d
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
@@ -0,0 +1,52 @@
+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_yw_point")
+@ApiModel(value = "YwPoint瀵硅薄", description = "杩愮淮鐐逛綅")
+public class YwPoint extends AbsEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("鐐逛綅鍚嶇О")
+ @TableField("point_name")
+ private String pointName;
+
+ @ApiModelProperty("鐐逛綅寮�濮嬫椂闂�")
+ @TableField("start_time")
+ private LocalDateTime startTime;
+
+ @ApiModelProperty("鐐逛綅缁撴潫鏃堕棿")
+ @TableField("end_time")
+ private LocalDateTime endTime;
+
+ @ApiModelProperty("杩愮淮鍗曚綅")
+ @TableField("unit_id")
+ private Integer unitId;
+
+ @ApiModelProperty("杩愮淮鐘舵��")
+ @TableField("status")
+ private String status;
+
+ @ApiModelProperty("澶囨敞")
+ @TableField("remark")
+ private String remark;
+
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
new file mode 100644
index 0000000..a053a68
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
@@ -0,0 +1,61 @@
+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.YwPoint;
+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;
+
+import java.time.LocalDateTime;
+
+/**
+ * 杩愮淮鐐逛綅琛ㄥ崟
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "YwPoint琛ㄥ崟", description = "杩愮淮鐐逛綅琛ㄥ崟")
+public class YwPointForm extends AbsForm {
+
+ @NotBlank(message = "鐐逛綅鍚嶇О涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("鐐逛綅鍚嶇О")
+ private String pointName;
+
+ @NotNull(message = "鐐逛綅寮�濮嬫椂闂翠笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("鐐逛綅寮�濮嬫椂闂�")
+ private LocalDateTime startTime;
+
+ @NotNull(message = "鐐逛綅缁撴潫鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("鐐逛綅缁撴潫鏃堕棿")
+ private LocalDateTime endTime;
+
+ @NotNull(message = "杩愮淮鍗曚綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩愮淮鍗曚綅")
+ private Integer unitId;
+
+ @NotBlank(message = "杩愮淮鐘舵�佷笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩愮淮鐘舵��")
+ private String status;
+
+ @NotBlank(message = "澶囨敞涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+ public static YwPoint getEntityByForm(@NonNull YwPointForm form, YwPoint entity) {
+ if(entity == null) {
+ entity = new YwPoint();
+ }
+ BeanUtils.copyProperties(form, entity);
+ return entity;
+ }
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPointQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPointQuery.java
new file mode 100644
index 0000000..ca880b0
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPointQuery.java
@@ -0,0 +1,24 @@
+package com.ycl.platform.domain.query;
+
+import java.util.List;
+
+import com.ycl.platform.base.AbsQuery;
+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 = "YwPoint鏌ヨ", description = "杩愮淮鐐逛綅鏌ヨ")
+public class YwPointQuery extends AbsQuery {
+}
+
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
new file mode 100644
index 0000000..9b41fcf
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
@@ -0,0 +1,51 @@
+package com.ycl.platform.domain.vo;
+
+import com.ycl.platform.base.AbsVo;
+import com.ycl.platform.domain.entity.YwPoint;
+
+import java.time.LocalDateTime;
+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 lombok.experimental.Accessors;
+
+/**
+ * 杩愮淮鐐逛綅灞曠ず
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+public class YwPointVO extends AbsVo {
+
+ /** 鐐逛綅鍚嶇О */
+ private String pointName;
+
+ /** 鐐逛綅寮�濮嬫椂闂� */
+ private LocalDateTime startTime;
+
+ /** 鐐逛綅缁撴潫鏃堕棿 */
+ private LocalDateTime endTime;
+
+ /** 杩愮淮鍗曚綅 */
+ private Integer unitId;
+
+ /** 杩愮淮鐘舵�� */
+ private String status;
+
+ /** 澶囨敞 */
+ private String remark;
+
+ public static YwPointVO getVoByEntity(@NonNull YwPoint entity, YwPointVO vo) {
+ if(vo == null) {
+ vo = new YwPointVO();
+ }
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ }
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java
index 0c07df2..afd09f3 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java
@@ -2,6 +2,7 @@
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.util.List;
@@ -53,6 +54,7 @@
return ywPeopleService.remove(ids);
}
+ @PreAuthorize("@ss.hasPermi('unit:people:page')")
@GetMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
public Result page(YwPeopleQuery query) {
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
new file mode 100644
index 0000000..d89522a
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
@@ -0,0 +1,77 @@
+package com.ycl.platform.controller;
+
+import com.ycl.system.domain.group.Update;
+import com.ycl.system.domain.group.Add;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.YwPointService;
+import com.ycl.system.Result;
+import com.ycl.platform.domain.form.YwPointForm;
+import com.ycl.platform.domain.query.YwPointQuery;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 杩愮淮鐐逛綅 鍓嶇鎺у埗鍣�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Validated
+@RequiredArgsConstructor
+@Api(value = "杩愮淮鐐逛綅", tags = "杩愮淮鐐逛綅绠＄悊")
+@RestController
+@RequestMapping("/yw-point")
+public class YwPointController {
+
+ private final YwPointService ywPointService;
+
+ @PostMapping
+ @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+ public Result add(@RequestBody @Validated(Add.class) YwPointForm form) {
+ return ywPointService.add(form);
+ }
+
+ @PutMapping
+ @ApiOperation(value = "淇敼", notes = "淇敼")
+ public Result update(@RequestBody @Validated(Update.class) YwPointForm form) {
+ return ywPointService.update(form);
+ }
+
+ @DeleteMapping("/{id}")
+ @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
+ public Result removeById(@PathVariable("id") String id) {
+ return ywPointService.removeById(id);
+ }
+
+ @DeleteMapping("/batch")
+ @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
+ public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
+ return ywPointService.remove(ids);
+ }
+
+ @PreAuthorize("@ss.hasPermi('point:page')")
+ @GetMapping("/page")
+ @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+ public Result page(YwPointQuery query) {
+ return ywPointService.page(query);
+ }
+
+ @GetMapping("/{id}")
+ @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ public Result detail(@PathVariable("id") String id) {
+ return ywPointService.detail(id);
+ }
+
+ @GetMapping("/list")
+ @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+ public Result list() {
+ return ywPointService.all();
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
new file mode 100644
index 0000000..2260119
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
@@ -0,0 +1,19 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.YwPoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.platform.domain.vo.YwPointVO;
+import com.ycl.platform.domain.form.YwPointForm;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 杩愮淮鐐逛綅 Mapper 鎺ュ彛
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Mapper
+public interface YwPointMapper extends BaseMapper<YwPoint> {
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
new file mode 100644
index 0000000..ca727e1
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
@@ -0,0 +1,65 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.YwPoint;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.system.Result;
+import com.ycl.platform.domain.form.YwPointForm;
+import com.ycl.platform.domain.query.YwPointQuery;
+import java.util.List;
+
+/**
+ * 杩愮淮鐐逛綅 鏈嶅姟绫�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+public interface YwPointService extends IService<YwPoint> {
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ Result add(YwPointForm form);
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ Result update(YwPointForm form);
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ Result remove(List<String> ids);
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ Result removeById(String id);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ Result page(YwPointQuery 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/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
new file mode 100644
index 0000000..8e31ddb
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -0,0 +1,145 @@
+package com.ycl.platform.service.impl;
+
+import com.ycl.platform.domain.entity.YwPoint;
+import com.ycl.platform.mapper.YwPointMapper;
+import com.ycl.platform.service.YwPointService;
+import com.ycl.system.Result;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.form.YwPointForm;
+import com.ycl.platform.domain.vo.YwPointVO;
+import com.ycl.platform.domain.query.YwPointQuery;
+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 YwPointServiceImpl extends ServiceImpl<YwPointMapper, YwPoint> implements YwPointService {
+
+ private final YwPointMapper ywPointMapper;
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ @Override
+ public Result add(YwPointForm form) {
+ YwPoint entity = YwPointForm.getEntityByForm(form, null);
+ if(baseMapper.insert(entity) > 0) {
+ return Result.ok("娣诲姞鎴愬姛");
+ }
+ return Result.error("娣诲姞澶辫触");
+ }
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ @Override
+ public Result update(YwPointForm form) {
+
+ YwPoint 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(YwPointQuery query) {
+
+ IPage<YwPoint> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .orderByDesc(YwPoint::getCreateTime)
+ .page(PageUtil.getPage(query, YwPoint.class));
+
+ List<YwPointVO> vos = page.getRecords().stream()
+ .map(
+ entity -> YwPointVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos).total(page.getTotal());
+ }
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ @Override
+ public Result detail(String id) {
+
+ YwPoint entity = baseMapper.selectById(id);
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ YwPointVO vo = YwPointVO.getVoByEntity(entity, null);
+ return Result.ok().data(vo);
+ }
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ @Override
+ public Result all() {
+ List<YwPoint> entities = baseMapper.selectList(null);
+ List<YwPointVO> vos = entities.stream()
+ .map(
+ entity -> YwPointVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos);
+ }
+}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
new file mode 100644
index 0000000..c77e645
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.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.YwPointMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.YwPointVO">
+ <result column="id" property="id" />
+ <result column="point_name" property="pointName" />
+ <result column="start_time" property="startTime" />
+ <result column="end_time" property="endTime" />
+ <result column="unit_id" property="unitId" />
+ <result column="status" property="status" />
+ <result column="remark" property="remark" />
+ </resultMap>
+
+</mapper>
--
Gitblit v1.8.0