From 6fdafdef5c457cd5fabebcaedd4e9418979468d6 Mon Sep 17 00:00:00 2001
From: liulin <lin.liu@88.com>
Date: 星期四, 19 六月 2025 17:19:02 +0800
Subject: [PATCH] 添加公共参数
---
src/main/java/com/fengdu/gas/host/controller/CommonParametersController.java | 113 ++++++++
src/main/java/com/fengdu/gas/repository/po/CommonParametersPO.java | 79 +++++
src/test/java/com/fengdu/gas/GenCodeGauss.java | 2
src/main/java/com/fengdu/gas/entity/request/commonparameters/ReqCreateCommonParameters.java | 49 +++
src/main/java/com/fengdu/gas/repository/impl/CommonParametersMapperImpl.java | 137 +++++++++
src/main/java/com/fengdu/gas/repository/vo/CommonParametersVO.java | 54 +++
src/main/java/com/fengdu/gas/entity/search/SearchCommonParameters.java | 14 +
src/main/java/com/fengdu/gas/service/CommonParametersService.java | 244 +++++++++++++++++
src/main/java/com/fengdu/gas/service/convert/CommonParametersConvert.java | 48 +++
src/main/java/com/fengdu/gas/entity/request/commonparameters/ReqModifyCommonParameters.java | 53 +++
src/main/java/com/fengdu/gas/common/util/MailUtils.java | 2
src/main/java/com/fengdu/gas/repository/mapper/CommonParametersMapper.java | 10
12 files changed, 804 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/fengdu/gas/common/util/MailUtils.java b/src/main/java/com/fengdu/gas/common/util/MailUtils.java
index db01e11..c79a074 100644
--- a/src/main/java/com/fengdu/gas/common/util/MailUtils.java
+++ b/src/main/java/com/fengdu/gas/common/util/MailUtils.java
@@ -34,6 +34,8 @@
final Properties props = new Properties();
props.put("mail.smtp.auth", "true");
props.put("mail.smtp.host", "smtp.qq.com");
+ props.put("mail.smtp.socketFactory.port", "465"); // SSL端口号通常为465
+ props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory"); // 使用SSL套接字工厂
// 发件人的账号
props.put("spring:mail:username", USER);
diff --git a/src/main/java/com/fengdu/gas/entity/request/commonparameters/ReqCreateCommonParameters.java b/src/main/java/com/fengdu/gas/entity/request/commonparameters/ReqCreateCommonParameters.java
new file mode 100644
index 0000000..86ede33
--- /dev/null
+++ b/src/main/java/com/fengdu/gas/entity/request/commonparameters/ReqCreateCommonParameters.java
@@ -0,0 +1,49 @@
+/**
+# __----~~~~~~~~~~~------___
+# . . ~~//====...... __--~ ~~
+# -. \_|// |||\\ ~~~~~~::::... /~
+# ___-==_ _-~o~ \/ ||| \\ _/~~-
+# __---~~~.==~||\=_ -_--~/_-~|- |\\ \\ _/~
+# _-~~ .=~ | \\-_ '-~7 /- / || \ /
+# .~ .~ | \\ -_ / /- / || \ /
+# / ____ / | \\ ~-_/ /|- _/ .|| \ /
+# |~~ ~~|--~~~~--_ \ ~==-/ | \~--===~~ .\
+# ' ~-| /| |-~\~~ __--~~
+# |-~~-_/ | | ~\_ _-~ /\
+# / \ \__ \/~ \__
+# _--~ _/ | .-~~____--~-/ ~~==.
+# ((->/~ '.|||' -_| ~~-/ , . _||
+# -_ ~\ ~~---l__i__i__i--~~_/
+# _-~-__ ~) \--______________--~~
+# //.-~~~-~_--~- |-------~~~~~~~~
+# //.-~~~--\
+# 神兽保佑
+# 永无BUG！
+*/
+package com.fengdu.gas.entity.request.commonparameters;
+
+import lombok.Data;
+
+/**
+ * 公共参数
+ * @author zr
+ */
+@Data
+public class ReqCreateCommonParameters {
+ /**
+ * 参数名称，与前端对接的名称
+ */
+ private String name;
+ /**
+ * 参数标识，与硬件对接的名称
+ */
+ private String mark;
+ /**
+ * 单位
+ */
+ private String unit;
+ /**
+ * 排序值
+ */
+ private Integer sort;
+}
diff --git a/src/main/java/com/fengdu/gas/entity/request/commonparameters/ReqModifyCommonParameters.java b/src/main/java/com/fengdu/gas/entity/request/commonparameters/ReqModifyCommonParameters.java
new file mode 100644
index 0000000..efa7626
--- /dev/null
+++ b/src/main/java/com/fengdu/gas/entity/request/commonparameters/ReqModifyCommonParameters.java
@@ -0,0 +1,53 @@
+/**
+# __----~~~~~~~~~~~------___
+# . . ~~//====...... __--~ ~~
+# -. \_|// |||\\ ~~~~~~::::... /~
+# ___-==_ _-~o~ \/ ||| \\ _/~~-
+# __---~~~.==~||\=_ -_--~/_-~|- |\\ \\ _/~
+# _-~~ .=~ | \\-_ '-~7 /- / || \ /
+# .~ .~ | \\ -_ / /- / || \ /
+# / ____ / | \\ ~-_/ /|- _/ .|| \ /
+# |~~ ~~|--~~~~--_ \ ~==-/ | \~--===~~ .\
+# ' ~-| /| |-~\~~ __--~~
+# |-~~-_/ | | ~\_ _-~ /\
+# / \ \__ \/~ \__
+# _--~ _/ | .-~~____--~-/ ~~==.
+# ((->/~ '.|||' -_| ~~-/ , . _||
+# -_ ~\ ~~---l__i__i__i--~~_/
+# _-~-__ ~) \--______________--~~
+# //.-~~~-~_--~- |-------~~~~~~~~
+# //.-~~~--\
+# 神兽保佑
+# 永无BUG！
+*/
+package com.fengdu.gas.entity.request.commonparameters;
+
+import lombok.Data;
+
+/**
+ * 公共参数
+ * @author zr
+ */
+@Data
+public class ReqModifyCommonParameters {
+ /**
+ * 主键
+ */
+ private Long id;
+ /**
+ * 参数名称，与前端对接的名称
+ */
+ private String name;
+ /**
+ * 参数标识，与硬件对接的名称
+ */
+ private String mark;
+ /**
+ * 单位
+ */
+ private String unit;
+ /**
+ * 排序值
+ */
+ private Integer sort;
+}
diff --git a/src/main/java/com/fengdu/gas/entity/search/SearchCommonParameters.java b/src/main/java/com/fengdu/gas/entity/search/SearchCommonParameters.java
new file mode 100644
index 0000000..7b5af49
--- /dev/null
+++ b/src/main/java/com/fengdu/gas/entity/search/SearchCommonParameters.java
@@ -0,0 +1,14 @@
+package com.fengdu.gas.entity.search;
+
+import lombok.Data;
+
+import com.fengdu.gas.entity.dto.SearchBasicDTO;
+
+/**
+ * 公共参数
+ * @author zr
+ */
+@Data
+public class SearchCommonParameters extends SearchBasicDTO {
+
+}
diff --git a/src/main/java/com/fengdu/gas/host/controller/CommonParametersController.java b/src/main/java/com/fengdu/gas/host/controller/CommonParametersController.java
new file mode 100644
index 0000000..db8116e
--- /dev/null
+++ b/src/main/java/com/fengdu/gas/host/controller/CommonParametersController.java
@@ -0,0 +1,113 @@
+/**
+# __----~~~~~~~~~~~------___
+# . . ~~//====...... __--~ ~~
+# -. \_|// |||\\ ~~~~~~::::... /~
+# ___-==_ _-~o~ \/ ||| \\ _/~~-
+# __---~~~.==~||\=_ -_--~/_-~|- |\\ \\ _/~
+# _-~~ .=~ | \\-_ '-~7 /- / || \ /
+# .~ .~ | \\ -_ / /- / || \ /
+# / ____ / | \\ ~-_/ /|- _/ .|| \ /
+# |~~ ~~|--~~~~--_ \ ~==-/ | \~--===~~ .\
+# ' ~-| /| |-~\~~ __--~~
+# |-~~-_/ | | ~\_ _-~ /\
+# / \ \__ \/~ \__
+# _--~ _/ | .-~~____--~-/ ~~==.
+# ((->/~ '.|||' -_| ~~-/ , . _||
+# -_ ~\ ~~---l__i__i__i--~~_/
+# _-~-__ ~) \--______________--~~
+# //.-~~~-~_--~- |-------~~~~~~~~
+# //.-~~~--\
+# 神兽保佑
+# 永无BUG！
+*/
+package com.fengdu.gas.host.controller;
+
+import com.fengdu.gas.common.ExecutedResult;
+import com.fengdu.gas.common.PagerResult;
+import com.fengdu.gas.common.util.ParameterUtil;
+import com.fengdu.gas.common.validator.ParameterValidateResult;
+import com.fengdu.gas.common.validator.ParameterValidator;
+import com.fengdu.gas.entity.request.ReqListId;
+import com.fengdu.gas.host.BasicController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+import com.fengdu.gas.service.CommonParametersService;
+import com.fengdu.gas.entity.request.commonparameters.ReqCreateCommonParameters;
+import com.fengdu.gas.entity.request.commonparameters.ReqModifyCommonParameters;
+import com.fengdu.gas.entity.search.SearchCommonParameters;
+import com.fengdu.gas.repository.vo.CommonParametersVO;
+
+/**
+ * 9000.公共参数
+ * @author zr
+ * @order 9000
+ */
+@RestController
+@RequestMapping(value = "commonParameters")
+public class CommonParametersController extends BasicController {
+ @Autowired
+ private CommonParametersService service;
+
+ /**
+ * 创建[公共参数]
+ * @author zr
+ */
+ @PostMapping(value = "create")
+ public ExecutedResult<Long> create(@RequestBody ReqCreateCommonParameters request) {
+ //#region 参数验证
+ ParameterValidator validator = new ParameterValidator()
+ // 非空
+ //.addNotNullOrEmpty(ParameterUtil.named("名称"), request.getName())
+ // 限制最大长度
+ //.addLengthMax(ParameterUtil.named("名称"), request.getName(), ConstantFactory.LENGTH_MAX50)
+ ;
+ ParameterValidateResult result = validator.validate();
+ if (result.getIsFiled()) {
+ return failed(result.getErrorMsg());
+ }
+ //#endregion
+ return service.create(request);
+ }
+
+ /**
+ * 编辑[公共参数]
+ * @author zr
+ */
+ @PostMapping(value = "modify")
+ public ExecutedResult<String> modify(@RequestBody ReqModifyCommonParameters request) {
+ //#region 参数验证
+ ParameterValidator validator = new ParameterValidator()
+ // 必须大于0
+ .addGreater(ParameterUtil.named("[公共参数]id"), request.getId(), 0L)
+ // 非空
+ //.addNotNullOrEmpty(ParameterUtil.named("名称"), request.getName())
+ // 限制最大长度
+ //.addLengthMax(ParameterUtil.named("名称"), request.getName(), ConstantFactory.LENGTH_MAX50)
+ ;
+ ParameterValidateResult result = validator.validate();
+ if (result.getIsFiled()) {
+ return failed(result.getErrorMsg());
+ }
+ //#endregion
+ return service.modify(request);
+ }
+
+ /**
+ * 获取[公共参数]
+ * @author zr
+ */
+ @GetMapping(value = "get/{id}")
+ public ExecutedResult<CommonParametersVO> get(@PathVariable Long id) {
+ return service.get(id);
+ }
+
+ /**
+ * 查询[公共参数]
+ * @author zr
+ */
+ @PostMapping(value = "search")
+ public ExecutedResult<PagerResult<CommonParametersVO>> search(@RequestBody SearchCommonParameters request) {
+ return service.search(request);
+ }
+}
diff --git a/src/main/java/com/fengdu/gas/repository/impl/CommonParametersMapperImpl.java b/src/main/java/com/fengdu/gas/repository/impl/CommonParametersMapperImpl.java
new file mode 100644
index 0000000..214b165
--- /dev/null
+++ b/src/main/java/com/fengdu/gas/repository/impl/CommonParametersMapperImpl.java
@@ -0,0 +1,137 @@
+/**
+# __----~~~~~~~~~~~------___
+# . . ~~//====...... __--~ ~~
+# -. \_|// |||\\ ~~~~~~::::... /~
+# ___-==_ _-~o~ \/ ||| \\ _/~~-
+# __---~~~.==~||\=_ -_--~/_-~|- |\\ \\ _/~
+# _-~~ .=~ | \\-_ '-~7 /- / || \ /
+# .~ .~ | \\ -_ / /- / || \ /
+# / ____ / | \\ ~-_/ /|- _/ .|| \ /
+# |~~ ~~|--~~~~--_ \ ~==-/ | \~--===~~ .\
+# ' ~-| /| |-~\~~ __--~~
+# |-~~-_/ | | ~\_ _-~ /\
+# / \ \__ \/~ \__
+# _--~ _/ | .-~~____--~-/ ~~==.
+# ((->/~ '.|||' -_| ~~-/ , . _||
+# -_ ~\ ~~---l__i__i__i--~~_/
+# _-~-__ ~) \--______________--~~
+# //.-~~~-~_--~- |-------~~~~~~~~
+# //.-~~~--\
+# 神兽保佑
+# 永无BUG！
+*/
+package com.fengdu.gas.repository.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fengdu.gas.common.PagerResult;
+import com.fengdu.gas.common.enums.EYesOrNo;
+import com.fengdu.gas.common.util.*;
+import com.fengdu.gas.entity.dto.*;
+import com.fengdu.gas.entity.enums.*;
+import com.fengdu.gas.repository.BasicMapperImpl;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import com.fengdu.gas.entity.search.SearchCommonParameters;
+import com.fengdu.gas.repository.mapper.CommonParametersMapper;
+import com.fengdu.gas.repository.po.CommonParametersPO;
+
+/**
+ * 公共参数
+ * @author zr
+ */
+@Repository
+public class CommonParametersMapperImpl extends BasicMapperImpl<CommonParametersPO, CommonParametersMapper> {
+ CommonParametersMapperImpl(CommonParametersMapper mapper) {
+ super(mapper);
+ }
+
+ @Override
+ public PagerResult<CommonParametersPO> search(SearchBasicDTO request) {
+ // 还原查询条件真实类型
+ SearchCommonParameters search = (SearchCommonParameters)request;
+ // 查询条件
+ LambdaQueryWrapper<CommonParametersPO> queryWrapper = this.query();
+ // 非逻辑删除
+ queryWrapper.eq(CommonParametersPO::getIsDelete, EYesOrNo.NO.getValue());
+ // 状态
+ //queryWrapper.eq(NumericUtil.tryParseInt(search.getStatus()).compareTo(0) > 0, CommonParametersPO::getStatus, search.getStatus());
+ // 状态列表
+ //queryWrapper.in(ListUtil.isNotNullOrEmpty(search.getListStatus()), CommonParametersPO::getStatus, search.getListStatus());
+
+ // 数据创建时间-起始
+ queryWrapper.ge(NumericUtil.tryParseLong(search.getCreateTimeStart()).compareTo(0L) > 0, CommonParametersPO::getCreateTime, search.getCreateTimeStart());
+ // 数据创建时间-截止
+ queryWrapper.le(NumericUtil.tryParseLong(search.getCreateTimeEnd()).compareTo(0L) > 0, CommonParametersPO::getCreateTime, search.getCreateTimeEnd());
+ // 关键字
+ //if (StringUtil.isNotNullOrEmpty(search.getKeywords())) {
+ // queryWrapper.and(q ->
+ // q.like(CommonParametersPO::getName, search.getKeywords())
+ // .or().like(CommonParametersPO::getPhone, search.getKeywords())
+ // );
+ //}
+
+ // 排序处理
+ if (ListUtil.isNotNullOrEmpty(search.getOrderBy())) {
+ for (OrderByDTO item : search.getOrderBy()) {
+ EOrderBy orderBy = EOrderBy.getByValue(item.getOrderBy());
+ // 顺序排序
+ if (item.getIsAsc()) {
+ switch (orderBy) {
+ // 主键
+ case ID:
+ queryWrapper.orderByAsc(CommonParametersPO::getId);
+ break;
+ // 数据创建时间
+ case CREATE_TIME:
+ queryWrapper.orderByAsc(CommonParametersPO::getCreateTime);
+ break;
+ // 最后更新时间
+ case UPDATE_TIME:
+ queryWrapper.orderByAsc(CommonParametersPO::getUpdateTime);
+ break;
+ }
+ } else {
+ // 倒叙排序
+ switch (orderBy) {
+ // 主键
+ case ID:
+ queryWrapper.orderByDesc(CommonParametersPO::getId);
+ break;
+ // 数据创建时间
+ case CREATE_TIME:
+ queryWrapper.orderByDesc(CommonParametersPO::getCreateTime);
+ break;
+ // 最后更新时间
+ case UPDATE_TIME:
+ queryWrapper.orderByDesc(CommonParametersPO::getUpdateTime);
+ break;
+ }
+ }
+ }
+ } else {
+ queryWrapper.orderByDesc(CommonParametersPO::getId);
+ }
+ Page<CommonParametersPO> pageResult = super.selectPage(new Page<>(search.getPage(), search.getLimit()), queryWrapper);
+ return new PagerResult<>(pageResult.getSize(), pageResult.getCurrent(), pageResult.getTotal(), pageResult.getRecords());
+ }
+
+ public Boolean add(CommonParametersPO item) {
+ int rowCount = super.insert(item);
+ return rowCount == 1;
+ }
+
+ public Boolean addNotIncrement(CommonParametersPO item) {
+ int rowCount = super.insert(item);
+ return rowCount == 1;
+ }
+
+ public CommonParametersPO getById(Long id) {
+ return super.get(id);
+ }
+
+ public List<CommonParametersPO> getListById(List<Long> listId) {
+ return super.getList(listId);
+ }
+}
diff --git a/src/main/java/com/fengdu/gas/repository/mapper/CommonParametersMapper.java b/src/main/java/com/fengdu/gas/repository/mapper/CommonParametersMapper.java
new file mode 100644
index 0000000..e8b724f
--- /dev/null
+++ b/src/main/java/com/fengdu/gas/repository/mapper/CommonParametersMapper.java
@@ -0,0 +1,10 @@
+package com.fengdu.gas.repository.mapper;
+
+import com.fengdu.gas.repository.BasicMapper;import com.fengdu.gas.repository.po.CommonParametersPO;
+
+/**
+ * 公共参数 mapper
+ * @author zr
+ */
+public interface CommonParametersMapper extends BasicMapper<CommonParametersPO> {
+}
diff --git a/src/main/java/com/fengdu/gas/repository/po/CommonParametersPO.java b/src/main/java/com/fengdu/gas/repository/po/CommonParametersPO.java
new file mode 100644
index 0000000..36818bf
--- /dev/null
+++ b/src/main/java/com/fengdu/gas/repository/po/CommonParametersPO.java
@@ -0,0 +1,79 @@
+/**
+# __----~~~~~~~~~~~------___
+# . . ~~//====...... __--~ ~~
+# -. \_|// |||\\ ~~~~~~::::... /~
+# ___-==_ _-~o~ \/ ||| \\ _/~~-
+# __---~~~.==~||\=_ -_--~/_-~|- |\\ \\ _/~
+# _-~~ .=~ | \\-_ '-~7 /- / || \ /
+# .~ .~ | \\ -_ / /- / || \ /
+# / ____ / | \\ ~-_/ /|- _/ .|| \ /
+# |~~ ~~|--~~~~--_ \ ~==-/ | \~--===~~ .\
+# ' ~-| /| |-~\~~ __--~~
+# |-~~-_/ | | ~\_ _-~ /\
+# / \ \__ \/~ \__
+# _--~ _/ | .-~~____--~-/ ~~==.
+# ((->/~ '.|||' -_| ~~-/ , . _||
+# -_ ~\ ~~---l__i__i__i--~~_/
+# _-~-__ ~) \--______________--~~
+# //.-~~~-~_--~- |-------~~~~~~~~
+# //.-~~~--\
+# 神兽保佑
+# 永无BUG！
+*/
+package com.fengdu.gas.repository.po;
+
+import lombok.Data;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * 公共参数
+ * @author zr
+ */
+@Data
+@TableName("common_parameters")
+public class CommonParametersPO implements Serializable {
+ /**
+ * 主键
+ */
+ private Long id;
+ /**
+ * 参数名称，与前端对接的名称
+ */
+ @TableField(value = "name")
+ private String name;
+ /**
+ * 参数标识，与硬件对接的名称
+ */
+ @TableField(value = "mark")
+ private String mark;
+ /**
+ * 单位
+ */
+ @TableField(value = "unit")
+ private String unit;
+ /**
+ * 排序值
+ */
+ @TableField(value = "sort")
+ private Integer sort;
+ /**
+ * 是否删除(逻辑删除)
+ */
+ @TableLogic
+ @TableField(value = "is_delete")
+ private Integer isDelete;
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_time")
+ private Long createTime;
+ /**
+ * 最后更新时间
+ */
+ @TableField(value = "update_time")
+ private Timestamp updateTime;
+}
diff --git a/src/main/java/com/fengdu/gas/repository/vo/CommonParametersVO.java b/src/main/java/com/fengdu/gas/repository/vo/CommonParametersVO.java
new file mode 100644
index 0000000..04657db
--- /dev/null
+++ b/src/main/java/com/fengdu/gas/repository/vo/CommonParametersVO.java
@@ -0,0 +1,54 @@
+/**
+# __----~~~~~~~~~~~------___
+# . . ~~//====...... __--~ ~~
+# -. \_|// |||\\ ~~~~~~::::... /~
+# ___-==_ _-~o~ \/ ||| \\ _/~~-
+# __---~~~.==~||\=_ -_--~/_-~|- |\\ \\ _/~
+# _-~~ .=~ | \\-_ '-~7 /- / || \ /
+# .~ .~ | \\ -_ / /- / || \ /
+# / ____ / | \\ ~-_/ /|- _/ .|| \ /
+# |~~ ~~|--~~~~--_ \ ~==-/ | \~--===~~ .\
+# ' ~-| /| |-~\~~ __--~~
+# |-~~-_/ | | ~\_ _-~ /\
+# / \ \__ \/~ \__
+# _--~ _/ | .-~~____--~-/ ~~==.
+# ((->/~ '.|||' -_| ~~-/ , . _||
+# -_ ~\ ~~---l__i__i__i--~~_/
+# _-~-__ ~) \--______________--~~
+# //.-~~~-~_--~- |-------~~~~~~~~
+# //.-~~~--\
+# 神兽保佑
+# 永无BUG！
+*/
+package com.fengdu.gas.repository.vo;
+
+import lombok.Data;
+
+import com.fengdu.gas.common.util.LocalDateTimeUtil;
+import com.fengdu.gas.common.util.NumericUtil;
+import java.util.Objects;
+import com.fengdu.gas.repository.po.CommonParametersPO;
+
+/**
+ * 公共参数
+ * @author zr
+ */
+@Data
+public class CommonParametersVO extends CommonParametersPO implements BasicVO {
+
+ @Override
+ public String getCreateTimeView() {
+ if (NumericUtil.tryParseLong(this.getCreateTime()).compareTo(0L) > 0) {
+ return LocalDateTimeUtil.toFormatString(this.getCreateTime());
+ }
+ return "";
+ }
+
+ @Override
+ public String getUpdateTimeView() {
+ if (Objects.isNull(this.getUpdateTime())) {
+ return "";
+ }
+ return LocalDateTimeUtil.toFormatFullString(this.getUpdateTime());
+ }
+}
diff --git a/src/main/java/com/fengdu/gas/service/CommonParametersService.java b/src/main/java/com/fengdu/gas/service/CommonParametersService.java
new file mode 100644
index 0000000..aaf6d8b
--- /dev/null
+++ b/src/main/java/com/fengdu/gas/service/CommonParametersService.java
@@ -0,0 +1,244 @@
+/**
+# __----~~~~~~~~~~~------___
+# . . ~~//====...... __--~ ~~
+# -. \_|// |||\\ ~~~~~~::::... /~
+# ___-==_ _-~o~ \/ ||| \\ _/~~-
+# __---~~~.==~||\=_ -_--~/_-~|- |\\ \\ _/~
+# _-~~ .=~ | \\-_ '-~7 /- / || \ /
+# .~ .~ | \\ -_ / /- / || \ /
+# / ____ / | \\ ~-_/ /|- _/ .|| \ /
+# |~~ ~~|--~~~~--_ \ ~==-/ | \~--===~~ .\
+# ' ~-| /| |-~\~~ __--~~
+# |-~~-_/ | | ~\_ _-~ /\
+# / \ \__ \/~ \__
+# _--~ _/ | .-~~____--~-/ ~~==.
+# ((->/~ '.|||' -_| ~~-/ , . _||
+# -_ ~\ ~~---l__i__i__i--~~_/
+# _-~-__ ~) \--______________--~~
+# //.-~~~-~_--~- |-------~~~~~~~~
+# //.-~~~--\
+# 神兽保佑
+# 永无BUG！
+*/
+package com.fengdu.gas.service;
+
+import com.fengdu.gas.common.*;
+import com.fengdu.gas.common.enums.*;
+import com.fengdu.gas.common.model.Tuple;
+import com.fengdu.gas.common.util.*;
+import org.apache.commons.lang3.BooleanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.*;
+import java.util.stream.Collectors;
+import com.fengdu.gas.repository.impl.CommonParametersMapperImpl;
+import com.fengdu.gas.repository.po.CommonParametersPO;
+import com.fengdu.gas.entity.request.commonparameters.ReqCreateCommonParameters;
+import com.fengdu.gas.entity.request.commonparameters.ReqModifyCommonParameters;
+import com.fengdu.gas.entity.search.SearchCommonParameters;
+import com.fengdu.gas.repository.vo.CommonParametersVO;
+import com.fengdu.gas.service.convert.CommonParametersConvert;
+
+/**
+ * 公共参数
+ * @author zr
+ */
+@Service
+public class CommonParametersService extends BaseService {
+ @Autowired
+ private CommonParametersMapperImpl mapper;
+
+ public ExecutedResult<Long> create(ReqCreateCommonParameters request) {
+ // 转换po
+ CommonParametersPO item = CommonParametersConvert.INSTANCE.toCreate(request);
+ // 设置状态
+ //item.setStatus(EState.NORMAL.getValue());
+ // 设置记录创建时间
+ item.setCreateTime(LocalDateTimeUtil.nowTimeStamp());
+ // 是否删除(逻辑删除)初始值
+ item.setIsDelete(EYesOrNo.NO.getValue());
+
+ int rowCount = mapper.insert(item);
+ if (rowCount != 1) {
+ return ExecutedResult.failed("创建[公共参数]失败。");
+ }
+ return ExecutedResult.success(item.getId());
+ }
+
+ public ExecutedResult<String> modify(ReqModifyCommonParameters request) {
+ // 验证记录是否存在
+ ExecutedResult<CommonParametersPO> checkExists = this.check4Id(request.getId());
+ if (checkExists.isFailed()) {
+ return ExecutedResult.failed(checkExists.getMsg());
+ }
+ // 转换po
+ CommonParametersPO item = CommonParametersConvert.INSTANCE.toModify(request);
+
+ int rowCount = mapper.updateById(item);
+ if (rowCount != 1) {
+ return ExecutedResult.failed("编辑[公共参数]失败。");
+ }
+ return ExecutedResult.success();
+ }
+
+ public ExecutedResult<CommonParametersVO> get(Long id) {
+ CommonParametersVO result = new CommonParametersVO();
+
+ CommonParametersPO find = mapper.get(id);
+ if (null != find) {
+ // 转换vo
+ result = CommonParametersConvert.INSTANCE.toVo(find);
+ }
+ return ExecutedResult.success(result);
+ }
+
+// public ExecutedResult<String> stop(Long id) {
+// // 验证记录是否存在
+// ExecutedResult<CommonParametersPO> checkExists = this.check4Id(id);
+// if (checkExists.isFailed()) {
+// return ExecutedResult.failed(checkExists.getMsg());
+// }
+// CommonParametersPO item = new CommonParametersPO();
+// item.setId(id);
+// item.setStatus(EState.DISABLED.getValue());
+//
+// int rowCount = mapper.updateById(item);
+// if (rowCount != 1) {
+// return ExecutedResult.failed("停用[公共参数]失败。");
+// }
+// return ExecutedResult.success();
+// }
+//
+// public ExecutedResult<String> enable(Long id) {
+// // 验证记录是否存在
+// ExecutedResult<CommonParametersPO> checkExists = this.check4Id(id);
+// if (checkExists.isFailed()) {
+// return ExecutedResult.failed(checkExists.getMsg());
+// }
+// CommonParametersPO item = new CommonParametersPO();
+// item.setId(id);
+// item.setStatus(EState.NORMAL.getValue());
+//
+// int rowCount = mapper.updateById(item);
+// if (rowCount != 1) {
+// return ExecutedResult.failed("启用[公共参数]失败。");
+// }
+// return ExecutedResult.success();
+// }
+//
+// public ExecutedResult<String> setSort(ReqSetSort request) {
+// // 验证记录是否存在
+// ExecutedResult<CommonParametersPO> checkExists = this.check4Id(request.getId());
+// if (checkExists.isFailed()) {
+// return ExecutedResult.failed(checkExists.getMsg());
+// }
+// CommonParametersPO item = new CommonParametersPO();
+// item.setId(request.getId());
+// item.setSort(request.getSort());
+//
+// int rowCount = mapper.updateById(item);
+// if (rowCount != 1) {
+// return ExecutedResult.failed("设置[公共参数]排序值失败。");
+// }
+// return ExecutedResult.success();
+// }
+//
+// public ExecutedResult<String> listSetSort(ReqListSetSort request) {
+// // id列表
+// List<Long> listId = request.getList().stream().map(ReqSetSort::getId).collect(Collectors.toList());
+// // 验证记录是否存在
+// ExecutedResult<List<CommonParametersPO>> checkExists = this.check4Id(listId);
+// if (checkExists.isFailed()) {
+// return ExecutedResult.failed(checkExists.getMsg());
+// }
+//
+// List<CommonParametersPO> listUpdate = request.getList().stream()
+// .map(c -> {
+// CommonParametersPO item = new CommonParametersPO();
+// item.setId(c.getId());
+// item.setSort(c.getSort());
+// return item;
+// })
+// .collect(Collectors.toList());
+// Boolean result = mapper.modifyList(listUpdate);
+// if (result) {
+// return ExecutedResult.success();
+// }
+// return ExecutedResult.failed("[公共参数]设置排序值失败");
+// }
+//
+// public ExecutedResult<String> remove(Long id) {
+// Boolean result = mapper.deleteLogic(id);
+// if (BooleanUtils.isFalse(result)) {
+// return ExecutedResult.failed("删除[公共参数]失败。");
+// }
+// return ExecutedResult.success();
+// }
+//
+// public ExecutedResult<String> removeList(List<Long> ids) {
+// Boolean result = mapper.deleteLogic(ids);
+// if (BooleanUtils.isFalse(result)) {
+// return ExecutedResult.failed("删除[公共参数]失败。");
+// }
+// return ExecutedResult.success();
+// }
+
+ public ExecutedResult<List<CommonParametersVO>> getList(List<Long> listId) {
+ List<CommonParametersVO> result = new ArrayList<>();
+
+ List<CommonParametersPO> list = mapper.getList(listId);
+ if (ListUtil.isNotNullOrEmpty(list)) {
+ // 转换vo
+ result = CommonParametersConvert.INSTANCE.toVo(list);
+ }
+ return ExecutedResult.success(result);
+ }
+
+ public ExecutedResult<PagerResult<CommonParametersVO>> search(SearchCommonParameters search) {
+ // 处理创建时间范围-查询参数
+ Tuple<String, String> createTimeRange = ParameterUtil.getTimeRange(search.getCreateTimeRange());
+ if (StringUtil.isNotNullOrEmpty(createTimeRange.getItem1())) {
+ search.setCreateTimeStart(LocalDateTimeUtil.getTimeStamp(createTimeRange.getItem1()).getTime());
+ }
+ if (StringUtil.isNotNullOrEmpty(createTimeRange.getItem2())) {
+ search.setCreateTimeEnd(LocalDateTimeUtil.getTimeStamp(createTimeRange.getItem2()).getTime());
+ }
+
+ PagerResult<CommonParametersPO> pageList = mapper.search(search);
+ List<CommonParametersVO> listVo = new ArrayList<>();
+ List<CommonParametersPO> list = pageList.getList();
+ if (ListUtil.isNotNullOrEmpty(list)) {
+ pageList.setLastId(list.get(list.size() - 1).getId());
+ // 转换vo
+ listVo = CommonParametersConvert.INSTANCE.toVo(list);
+ }
+ PagerResult<CommonParametersVO> result = new PagerResult<>(pageList.getLimit(), pageList.getPage(), pageList.getTotal(), listVo);
+ result.setLastId(pageList.getLastId());
+ return ExecutedResult.success(result);
+ }
+
+ protected ExecutedResult<CommonParametersPO> check4Id(Long id) {
+ CommonParametersPO exists = mapper.get(id);
+ if (Objects.isNull(exists)) {
+ return ExecutedResult.failed("[公共参数]不存在：" + id);
+ }
+ return ExecutedResult.success(exists);
+ }
+ protected ExecutedResult<List<CommonParametersPO>> check4Id(List<Long> listId) {
+ // 从数据库查找公共参数
+ List<CommonParametersPO> list = mapper.getList(listId);
+ if (ListUtil.isNullOrEmpty(list)) {
+ return ExecutedResult.failed("[公共参数]不存在." + listId);
+ }
+ // 数据库找到的id列表
+ List<Long> listIdFind = list.stream().map(CommonParametersPO::getId).collect(Collectors.toList());
+ // 数量不一致
+ if (listId.size() != listIdFind.size()) {
+ // 筛选数据库不存在的公共参数
+ List<Long> listIdNotFound = listId.stream().filter(c -> !listIdFind.contains(c)).collect(Collectors.toList());
+ if (ListUtil.isNullOrEmpty(list)) {
+ return ExecutedResult.failed("[公共参数]不存在." + listIdNotFound);
+ }
+ }
+ return ExecutedResult.success(list);
+ }}
diff --git a/src/main/java/com/fengdu/gas/service/convert/CommonParametersConvert.java b/src/main/java/com/fengdu/gas/service/convert/CommonParametersConvert.java
new file mode 100644
index 0000000..ca33f9e
--- /dev/null
+++ b/src/main/java/com/fengdu/gas/service/convert/CommonParametersConvert.java
@@ -0,0 +1,48 @@
+/**
+# __----~~~~~~~~~~~------___
+# . . ~~//====...... __--~ ~~
+# -. \_|// |||\\ ~~~~~~::::... /~
+# ___-==_ _-~o~ \/ ||| \\ _/~~-
+# __---~~~.==~||\=_ -_--~/_-~|- |\\ \\ _/~
+# _-~~ .=~ | \\-_ '-~7 /- / || \ /
+# .~ .~ | \\ -_ / /- / || \ /
+# / ____ / | \\ ~-_/ /|- _/ .|| \ /
+# |~~ ~~|--~~~~--_ \ ~==-/ | \~--===~~ .\
+# ' ~-| /| |-~\~~ __--~~
+# |-~~-_/ | | ~\_ _-~ /\
+# / \ \__ \/~ \__
+# _--~ _/ | .-~~____--~-/ ~~==.
+# ((->/~ '.|||' -_| ~~-/ , . _||
+# -_ ~\ ~~---l__i__i__i--~~_/
+# _-~-__ ~) \--______________--~~
+# //.-~~~-~_--~- |-------~~~~~~~~
+# //.-~~~--\
+# 神兽保佑
+# 永无BUG！
+*/
+package com.fengdu.gas.service.convert;
+
+import com.fengdu.gas.entity.request.commonparameters.ReqCreateCommonParameters;
+import com.fengdu.gas.entity.request.commonparameters.ReqModifyCommonParameters;
+import com.fengdu.gas.repository.po.CommonParametersPO;
+import com.fengdu.gas.repository.vo.CommonParametersVO;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * 公共参数
+ * @author {#=author}
+ */
+@Mapper
+public interface CommonParametersConvert {
+ CommonParametersConvert INSTANCE = Mappers.getMapper(CommonParametersConvert.class);
+
+ CommonParametersPO toCreate(ReqCreateCommonParameters request);
+ CommonParametersPO toModify(ReqModifyCommonParameters request);
+
+ CommonParametersVO toVo(CommonParametersPO item);
+ List<CommonParametersVO> toVo(List<CommonParametersPO> list);
+}
diff --git a/src/test/java/com/fengdu/gas/GenCodeGauss.java b/src/test/java/com/fengdu/gas/GenCodeGauss.java
index 0e91ac8..23b77ce 100644
--- a/src/test/java/com/fengdu/gas/GenCodeGauss.java
+++ b/src/test/java/com/fengdu/gas/GenCodeGauss.java
@@ -243,7 +243,7 @@
* 只生成以下配置的表
*/
private static final List<String> ONLY_TABLES = Arrays.asList(
- "send_message_record","water_monitory_point","water_facility_type","water_facility_parameter","facility_alarm_record"
+ "common_parameters"
);
public static void main(String[] args) {
--
Gitblit v1.9.3