From ff054079a3512c6629fcbc183912b2c999eb025b Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 05 三月 2024 14:43:08 +0800
Subject: [PATCH] 景区运行数据基础功能
---
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsSceneryOperationDataController.java | 22 ++--
dujy-modules/dujy-demo/src/main/resources/mapper/demo/RsSceneryOperationDataMapper.xml | 7 +
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsSceneryOperationData.java | 34 +++++---
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/RsSceneryOperationDataMapper.java | 4
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsSceneryOperationDataBo.java | 38 +++++----
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsSceneryOperationDataService.java | 8 +-
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsSceneryOperationDataVo.java | 36 ++++++---
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsSceneryOperationDataServiceImpl.java | 54 +++++++------
8 files changed, 120 insertions(+), 83 deletions(-)
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsSceneryOperationDataController.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsSceneryOperationDataController.java
index e60e8f5..9bbbf98 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsSceneryOperationDataController.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsSceneryOperationDataController.java
@@ -25,13 +25,13 @@
/**
* 鏅尯杩愯鏁版嵁
*
- * @author Lion Li
- * @date 2024-02-27
+ * @author gonghl
+ * @date 2024-03-05
*/
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/sc/sceneryOperationData")
+@RequestMapping("/demo/sceneryOperationData")
public class RsSceneryOperationDataController extends BaseController {
private final IRsSceneryOperationDataService rsSceneryOperationDataService;
@@ -39,7 +39,7 @@
/**
* 鏌ヨ鏅尯杩愯鏁版嵁鍒楄〃
*/
- @SaCheckPermission("rs:sceneryOperationData:list")
+ @SaCheckPermission("demo:sceneryOperationData:list")
@GetMapping("/list")
public TableDataInfo<RsSceneryOperationDataVo> list(RsSceneryOperationDataBo bo, PageQuery pageQuery) {
return rsSceneryOperationDataService.queryPageList(bo, pageQuery);
@@ -48,7 +48,7 @@
/**
* 瀵煎嚭鏅尯杩愯鏁版嵁鍒楄〃
*/
- @SaCheckPermission("rs:sceneryOperationData:export")
+ @SaCheckPermission("demo:sceneryOperationData:export")
@Log(title = "鏅尯杩愯鏁版嵁", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(RsSceneryOperationDataBo bo, HttpServletResponse response) {
@@ -61,17 +61,17 @@
*
* @param id 涓婚敭
*/
- @SaCheckPermission("rs:sceneryOperationData:query")
+ @SaCheckPermission("demo:sceneryOperationData:query")
@GetMapping("/{id}")
public R<RsSceneryOperationDataVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable Long id) {
+ @PathVariable String id) {
return R.ok(rsSceneryOperationDataService.queryById(id));
}
/**
* 鏂板鏅尯杩愯鏁版嵁
*/
- @SaCheckPermission("system:sceneryOperationData:add")
+ @SaCheckPermission("demo:sceneryOperationData:add")
@Log(title = "鏅尯杩愯鏁版嵁", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -82,7 +82,7 @@
/**
* 淇敼鏅尯杩愯鏁版嵁
*/
- @SaCheckPermission("system:sceneryOperationData:edit")
+ @SaCheckPermission("demo:sceneryOperationData:edit")
@Log(title = "鏅尯杩愯鏁版嵁", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -95,11 +95,11 @@
*
* @param ids 涓婚敭涓�
*/
- @SaCheckPermission("system:sceneryOperationData:remove")
+ @SaCheckPermission("demo:sceneryOperationData:remove")
@Log(title = "鏅尯杩愯鏁版嵁", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable Long[] ids) {
+ @PathVariable String[] ids) {
return toAjax(rsSceneryOperationDataService.deleteWithValidByIds(List.of(ids), true));
}
}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsSceneryOperationData.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsSceneryOperationData.java
index 8300719..b42c565 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsSceneryOperationData.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsSceneryOperationData.java
@@ -6,17 +6,17 @@
import lombok.EqualsAndHashCode;
import java.io.Serial;
+import java.util.Date;
/**
* 鏅尯杩愯鏁版嵁瀵硅薄 rs_scenery_operation_data
*
- * @author Lion Li
- * @date 2024-02-27
+ * @author gonghl
+ * @date 2024-03-05
*/
@Data
-//@EqualsAndHashCode(callSuper = true)
@TableName("rs_scenery_operation_data")
-public class RsSceneryOperationData {
+public class RsSceneryOperationData {
@Serial
private static final long serialVersionUID = 1L;
@@ -25,17 +25,27 @@
* id
*/
@TableId(value = "id")
- private Long id;
+ private String id;
/**
- * 鍛ㄦ湡骞�
+ * 鏅尯id
*/
- private Long periodYear;
+ private String sceneryInfoId;
/**
- * 鍛ㄦ湡鏈�
+ * 鏅尯鍚嶇О
*/
- private Long periodMonth;
+ private String sceneryInfoName;
+
+ /**
+ * 骞村害/鏈堝害 1骞村害 2鏈堝害
+ */
+ private Long period;
+
+ /**
+ * 鍛ㄦ湡
+ */
+ private String periodDate;
/**
* 杞︽祦閲�
@@ -77,10 +87,6 @@
*/
private Long status;
- /**
- * 鏅尯id
- */
- private Long scId;
-
+ private Date createTime;
}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsSceneryOperationDataBo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsSceneryOperationDataBo.java
index fea5acc..f52a289 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsSceneryOperationDataBo.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsSceneryOperationDataBo.java
@@ -12,8 +12,8 @@
/**
* 鏅尯杩愯鏁版嵁涓氬姟瀵硅薄 rs_scenery_operation_data
*
- * @author Lion Li
- * @date 2024-02-27
+ * @author gonghl
+ * @date 2024-03-05
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -23,20 +23,32 @@
/**
* id
*/
- @NotNull(message = "id涓嶈兘涓虹┖", groups = { EditGroup.class })
- private Long id;
+ @NotBlank(message = "id涓嶈兘涓虹┖", groups = { EditGroup.class })
+ private String id;
/**
- * 鍛ㄦ湡骞�
+ * 鏅尯id
*/
- @NotNull(message = "鍛ㄦ湡骞翠笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
- private Long periodYear;
+ @NotBlank(message = "鏅尯id涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+ private String sceneryInfoId;
/**
- * 鍛ㄦ湡鏈�
+ * 鏅尯鍚嶇О
*/
- @NotNull(message = "鍛ㄦ湡鏈堜笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
- private Long periodMonth;
+ @NotBlank(message = "鏅尯鍚嶇О涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+ private String sceneryInfoName;
+
+ /**
+ * 骞村害/鏈堝害 1骞村害 2鏈堝害
+ */
+ @NotNull(message = "骞村害/鏈堝害 1骞村害 2鏈堝害涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+ private Long period;
+
+ /**
+ * 鍛ㄦ湡
+ */
+ @NotBlank(message = "鍛ㄦ湡涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+ private String periodDate;
/**
* 杞︽祦閲�
@@ -85,12 +97,6 @@
*/
@NotNull(message = "鐘舵�� 1鍚敤 0鏈惎鐢ㄤ笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
private Long status;
-
- /**
- * 鏅尯id
- */
- @NotNull(message = "鏅尯id涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
- private Long scId;
}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsSceneryOperationDataVo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsSceneryOperationDataVo.java
index 2071f17..cdd82d0 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsSceneryOperationDataVo.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsSceneryOperationDataVo.java
@@ -17,8 +17,8 @@
/**
* 鏅尯杩愯鏁版嵁瑙嗗浘瀵硅薄 rs_scenery_operation_data
*
- * @author Lion Li
- * @date 2024-02-27
+ * @author gonghl
+ * @date 2024-03-05
*/
@Data
@ExcelIgnoreUnannotated
@@ -32,19 +32,31 @@
* id
*/
@ExcelProperty(value = "id")
- private Long id;
+ private String id;
/**
- * 鍛ㄦ湡骞�
+ * 鏅尯id
*/
- @ExcelProperty(value = "鍛ㄦ湡骞�")
- private Long periodYear;
+ @ExcelProperty(value = "鏅尯id")
+ private String sceneryInfoId;
/**
- * 鍛ㄦ湡鏈�
+ * 鏅尯鍚嶇О
*/
- @ExcelProperty(value = "鍛ㄦ湡鏈�")
- private Long periodMonth;
+ @ExcelProperty(value = "鏅尯鍚嶇О")
+ private String sceneryInfoName;
+
+ /**
+ * 骞村害/鏈堝害 1骞村害 2鏈堝害
+ */
+ @ExcelProperty(value = "骞村害/鏈堝害 1骞村害 2鏈堝害")
+ private Long period;
+
+ /**
+ * 鍛ㄦ湡
+ */
+ @ExcelProperty(value = "鍛ㄦ湡")
+ private String periodDate;
/**
* 杞︽祦閲�
@@ -95,10 +107,10 @@
private Long status;
/**
- * 鏅尯id
+ * 鍒涘缓鏃堕棿
*/
- @ExcelProperty(value = "鏅尯id")
- private Long scId;
+ @ExcelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/RsSceneryOperationDataMapper.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/RsSceneryOperationDataMapper.java
index d1a9dc9..5a029cb 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/RsSceneryOperationDataMapper.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/RsSceneryOperationDataMapper.java
@@ -7,8 +7,8 @@
/**
* 鏅尯杩愯鏁版嵁Mapper鎺ュ彛
*
- * @author Lion Li
- * @date 2024-02-27
+ * @author gonghl
+ * @date 2024-03-05
*/
public interface RsSceneryOperationDataMapper extends BaseMapperPlus<RsSceneryOperationData, RsSceneryOperationDataVo> {
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsSceneryOperationDataService.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsSceneryOperationDataService.java
index 0345db9..7d030ea 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsSceneryOperationDataService.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsSceneryOperationDataService.java
@@ -12,15 +12,15 @@
/**
* 鏅尯杩愯鏁版嵁Service鎺ュ彛
*
- * @author Lion Li
- * @date 2024-02-27
+ * @author gonghl
+ * @date 2024-03-05
*/
public interface IRsSceneryOperationDataService {
/**
* 鏌ヨ鏅尯杩愯鏁版嵁
*/
- RsSceneryOperationDataVo queryById(Long id);
+ RsSceneryOperationDataVo queryById(String id);
/**
* 鏌ヨ鏅尯杩愯鏁版嵁鍒楄〃
@@ -45,5 +45,5 @@
/**
* 鏍￠獙骞舵壒閲忓垹闄ゆ櫙鍖鸿繍琛屾暟鎹俊鎭�
*/
- Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+ Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsSceneryOperationDataServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsSceneryOperationDataServiceImpl.java
index 81e9c66..3371dde 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsSceneryOperationDataServiceImpl.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsSceneryOperationDataServiceImpl.java
@@ -1,29 +1,31 @@
package org.dromara.demo.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.demo.domain.RsSceneryOperationData;
import org.dromara.demo.domain.bo.RsSceneryOperationDataBo;
import org.dromara.demo.domain.vo.RsSceneryOperationDataVo;
-import org.dromara.demo.domain.RsSceneryOperationData;
import org.dromara.demo.mapper.RsSceneryOperationDataMapper;
import org.dromara.demo.service.IRsSceneryOperationDataService;
+import org.springframework.stereotype.Service;
+import java.util.Collection;
+import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.Collection;
/**
* 鏅尯杩愯鏁版嵁Service涓氬姟灞傚鐞�
*
- * @author Lion Li
- * @date 2024-02-27
+ * @author gonghl
+ * @date 2024-03-05
*/
@RequiredArgsConstructor
@Service
@@ -35,7 +37,7 @@
* 鏌ヨ鏅尯杩愯鏁版嵁
*/
@Override
- public RsSceneryOperationDataVo queryById(Long id){
+ public RsSceneryOperationDataVo queryById(String id){
return baseMapper.selectVoById(id);
}
@@ -61,17 +63,10 @@
private LambdaQueryWrapper<RsSceneryOperationData> buildQueryWrapper(RsSceneryOperationDataBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<RsSceneryOperationData> lqw = Wrappers.lambdaQuery();
- lqw.eq(bo.getPeriodYear() != null, RsSceneryOperationData::getPeriodYear, bo.getPeriodYear());
- lqw.eq(bo.getPeriodMonth() != null, RsSceneryOperationData::getPeriodMonth, bo.getPeriodMonth());
- lqw.eq(bo.getCarFlowNum() != null, RsSceneryOperationData::getCarFlowNum, bo.getCarFlowNum());
- lqw.eq(bo.getPersonFlowNum() != null, RsSceneryOperationData::getPersonFlowNum, bo.getPersonFlowNum());
- lqw.eq(bo.getVisitorSubNum() != null, RsSceneryOperationData::getVisitorSubNum, bo.getVisitorSubNum());
- lqw.eq(bo.getEnterGardenNum() != null, RsSceneryOperationData::getEnterGardenNum, bo.getEnterGardenNum());
- lqw.eq(bo.getOnPolice() != null, RsSceneryOperationData::getOnPolice, bo.getOnPolice());
- lqw.eq(bo.getOnPaddyWagon() != null, RsSceneryOperationData::getOnPaddyWagon, bo.getOnPaddyWagon());
- lqw.eq(bo.getStandbyPolice() != null, RsSceneryOperationData::getStandbyPolice, bo.getStandbyPolice());
+ lqw.like(StringUtils.isNotBlank(bo.getSceneryInfoName()), RsSceneryOperationData::getSceneryInfoName, bo.getSceneryInfoName());
+ lqw.eq(StringUtils.isNotBlank(bo.getPeriodDate()), RsSceneryOperationData::getPeriodDate, bo.getPeriodDate());
lqw.eq(bo.getStatus() != null, RsSceneryOperationData::getStatus, bo.getStatus());
- lqw.eq(bo.getScId() != null, RsSceneryOperationData::getScId, bo.getScId());
+ lqw.orderByDesc(RsSceneryOperationData::getCreateTime);
return lqw;
}
@@ -86,6 +81,12 @@
if (flag) {
bo.setId(add.getId());
}
+ // 鍚敤鏂版暟鎹皢鍏朵綑鍚岀被鍨嬫暟鎹敼涓虹鐢�
+ if (bo.getStatus().equals(1L)) {
+ LambdaUpdateWrapper<RsSceneryOperationData> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.ne(RsSceneryOperationData::getId, bo.getId()).eq(RsSceneryOperationData::getSceneryInfoId, bo.getSceneryInfoId()).set(RsSceneryOperationData::getStatus, 2);
+ baseMapper.update(updateWrapper);
+ }
return flag;
}
@@ -95,7 +96,12 @@
@Override
public Boolean updateByBo(RsSceneryOperationDataBo bo) {
RsSceneryOperationData update = MapstructUtils.convert(bo, RsSceneryOperationData.class);
- validEntityBeforeSave(update);
+ // 鍚敤鏂版暟鎹皢鍏朵綑鍚岀被鍨嬫暟鎹敼涓虹鐢�
+ if (bo.getStatus().equals(1L)) {
+ LambdaUpdateWrapper<RsSceneryOperationData> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.ne(RsSceneryOperationData::getId, bo.getId()).eq(RsSceneryOperationData::getSceneryInfoId, bo.getSceneryInfoId()).set(RsSceneryOperationData::getStatus, 2);
+ baseMapper.update(updateWrapper);
+ }
return baseMapper.updateById(update) > 0;
}
@@ -103,14 +109,14 @@
* 淇濆瓨鍓嶇殑鏁版嵁鏍￠獙
*/
private void validEntityBeforeSave(RsSceneryOperationData entity){
- //TODO 鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
+ entity.setCreateTime(new Date());
}
/**
* 鎵归噺鍒犻櫎鏅尯杩愯鏁版嵁
*/
@Override
- public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+ public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
if(isValid){
//TODO 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
}
diff --git a/dujy-modules/dujy-demo/src/main/resources/mapper/demo/RsSceneryOperationDataMapper.xml b/dujy-modules/dujy-demo/src/main/resources/mapper/demo/RsSceneryOperationDataMapper.xml
new file mode 100644
index 0000000..8502b2b
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/resources/mapper/demo/RsSceneryOperationDataMapper.xml
@@ -0,0 +1,7 @@
+<?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="org.dromara.demo.mapper.RsSceneryOperationDataMapper">
+
+</mapper>
--
Gitblit v1.8.0