chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

文章协议

Browse Source
This commit is contained in:
墨大叔 2024-05-10 14:16:02 +08:00
parent a04c399c71
commit 753db322c7
14 changed files with 203 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
View File

@ -36,6 +36,7 @@ public class BaseEntity implements Serializable
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonView(JsonViewProfile.Base.class)
private Date updateTime;
/** 备注 */

10
smart-switch-service/src/main/java/com/ruoyi/ss/article/domain/SmArticle.java
View File

@ -1,10 +1,14 @@
package com.ruoyi.ss.article.domain;
import com.fasterxml.jackson.annotation.JsonView;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.JsonViewProfile;
import com.ruoyi.common.core.domain.entity.SmArticleClassify;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* 文章对象 as_article
*
@ -17,14 +21,17 @@ public class SmArticle extends BaseEntity
private static final long serialVersionUID = 1L;
/** 文章id */
@JsonView(JsonViewProfile.App.class)
private Long articleId;
/**分类id */
@Excel(name = "分类id")
@JsonView(JsonViewProfile.App.class)
private String classifyId;
/** 标题 */
@Excel(name = "标题")
@JsonView(JsonViewProfile.App.class)
private String title;
/** logo地址 */
@ -43,12 +50,15 @@ public class SmArticle extends BaseEntity
private String isHot;
/** 简介 */
@JsonView(JsonViewProfile.App.class)
private String introduction;
/** 内容详情 */
@JsonView(JsonViewProfile.App.class)
private String content;
/** 作者 */
@JsonView(JsonViewProfile.App.class)
private String author;
/** 格式化日期 */

32
smart-switch-service/src/main/java/com/ruoyi/ss/article/domain/enums/LicenceType.java Normal file
View File

@ -0,0 +1,32 @@
package com.ruoyi.ss.article.domain.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Objects;
/**
* 协议类型
* @author wjh
* 2024/5/10
*/
@Getter
@AllArgsConstructor
public enum LicenceType {
USER("user", "ss.licence.user.id"),
PRIVACY("privacy", "ss.licence.privacy.id"),
COLLECT("collection", "ss.licence.collection.id");
private final String type; // 类型
private final String key; // 配置键值
public static LicenceType parse(String type) {
for (LicenceType value : LicenceType.values()) {
if (Objects.equals(value.getType(), type)) {
return value;
}
}
return null;
}
}

2
smart-switch-service/src/main/java/com/ruoyi/ss/article/domain/article/SystemClassify.java → smart-switch-service/src/main/java/com/ruoyi/ss/article/domain/enums/SystemClassify.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.ss.article.domain.article;
package com.ruoyi.ss.article.domain.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

14
smart-switch-service/src/main/java/com/ruoyi/ss/article/service/ISmArticleService.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.ss.article.service;
import com.ruoyi.ss.article.domain.SmArticle;
import com.ruoyi.ss.article.domain.SmArticleQuery;
import com.ruoyi.ss.article.domain.enums.LicenceType;
import java.util.List;
@ -70,11 +71,10 @@ public interface ISmArticleService
*/
public String[] getTagList(Long articleId);
// /**
// * 获取动态分类列表
// *
// * @param
// * @return 结果
// */
// public List<DynamicClSmsify> selectDynamicClSmsifyList();
/**
* 根据类型获取协议
* @param type 协议类型
*/
SmArticle selectLicenceByType(LicenceType type);
}

68
smart-switch-service/src/main/java/com/ruoyi/ss/article/service/impl/SmArticleServiceImpl.java
View File

@ -1,12 +1,17 @@
package com.ruoyi.ss.article.service.impl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.ss.article.domain.SmArticle;
import com.ruoyi.ss.article.domain.SmArticleQuery;
import com.ruoyi.ss.article.domain.enums.LicenceType;
import com.ruoyi.ss.article.mapper.SmArticleMapper;
import com.ruoyi.ss.article.service.ISmArticleService;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.service.ISysConfigService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -19,13 +24,14 @@ import java.util.List;
* @date 2023-12-06
*/
@Service
@Slf4j
public class SmArticleServiceImpl implements ISmArticleService
{
@Resource
private SmArticleMapper asArticleMapper;
private SmArticleMapper articleMapper;
@Resource
private SysDictDataMapper dictDataMapper;
@Autowired
private ISysConfigService configService;
/**
* 查询文章
@ -36,7 +42,7 @@ public class SmArticleServiceImpl implements ISmArticleService
@Override
public SmArticle selectSmArticleByArticleId(Long articleId)
{
SmArticle smArticle = asArticleMapper.selectSmArticleByArticleId(articleId);
SmArticle smArticle = articleMapper.selectSmArticleByArticleId(articleId);
if(ObjectUtils.isNotEmpty(smArticle)){
smArticle.setFormatCreateTime(DateUtils.getYYYY_MM_DD(smArticle.getCreateTime()));
}
@ -52,7 +58,7 @@ public class SmArticleServiceImpl implements ISmArticleService
@Override
public List<SmArticle> selectSmArticleList(SmArticleQuery smArticle)
{
List<SmArticle> smArticles = asArticleMapper.selectSmArticleList(smArticle);
List<SmArticle> smArticles = articleMapper.selectSmArticleList(smArticle);
for (SmArticle smArticle1 : smArticles) {
smArticle.setFormatCreateTime(DateUtils.getYYYY_MM_DD(smArticle1.getCreateTime()));
}
@ -69,7 +75,7 @@ public class SmArticleServiceImpl implements ISmArticleService
public int insertSmArticle(SmArticle smArticle)
{
smArticle.setCreateTime(DateUtils.getNowDate());
return asArticleMapper.insertSmArticle(smArticle);
return articleMapper.insertSmArticle(smArticle);
}
/**
@ -82,7 +88,7 @@ public class SmArticleServiceImpl implements ISmArticleService
public int updateSmArticle(SmArticle smArticle)
{
smArticle.setUpdateTime(DateUtils.getNowDate());
return asArticleMapper.updateSmArticle(smArticle);
return articleMapper.updateSmArticle(smArticle);
}
/**
@ -94,7 +100,7 @@ public class SmArticleServiceImpl implements ISmArticleService
@Override
public int deleteSmArticleByArticleIds(Long[] articleIds)
{
return asArticleMapper.deleteSmArticleByArticleIds(articleIds);
return articleMapper.deleteSmArticleByArticleIds(articleIds);
}
/**
@ -106,7 +112,7 @@ public class SmArticleServiceImpl implements ISmArticleService
@Override
public int deleteSmArticleByArticleId(Long articleId)
{
return asArticleMapper.deleteSmArticleByArticleId(articleId);
return articleMapper.deleteSmArticleByArticleId(articleId);
}
/**
@ -117,33 +123,29 @@ public class SmArticleServiceImpl implements ISmArticleService
*/
@Override
public String[] getTagList(Long articleId) {
SmArticle smArticle = asArticleMapper.selectSmArticleByArticleId(articleId);
SmArticle smArticle = articleMapper.selectSmArticleByArticleId(articleId);
String tag = smArticle.getTag();
String[] split = tag.split(",");
return split;
}
// /**
// * 查询动态分类及数量
// *
// * @param
// * @return 结果
// */
// @Override
// public List<DynamicClassify> selectDynamicClassifyList() {
// List<DynamicClassify> classifies = new ArrayList<>();
// SysDictData dictData = new SysDictData();
// dictData.setDictType("dynamic_classify");
// List<SysDictData> sysDictData = dictDataMapper.selectDictDataList(dictData);
// for (SysDictData one :sysDictData) {
// DynamicClassify dynamicClassify = new DynamicClassify();
// String dictValue = one.getDictValue();
// dynamicClassify.setName(one.getDictLabel());
// dynamicClassify.setValue(dictValue);
// int classify = asArticleMapper.countDynamicClassify(dictValue);
// dynamicClassify.setNum(classify);
// classifies.add(dynamicClassify);
// }
// return classifies;
// }
/**
* 根据类型获取协议
*
* @param type 协议类型
*/
@Override
public SmArticle selectLicenceByType(LicenceType type) {
if (type == null) {
return null;
}
// 查询对应ID
String idStr = configService.selectConfigByKey(type.getKey());
if (!StringUtils.hasText(idStr)) {
log.warn("key {} not has text, so return null.", type.getKey());
return null;
}
// 查询ID对应的文章
return this.selectSmArticleByArticleId(Long.parseLong(idStr));
}
}

4
smart-switch-service/src/main/java/com/ruoyi/ss/businessRecord/service/SmBusinessRecordServiceImpl.java
View File

@ -164,12 +164,12 @@ public class SmBusinessRecordServiceImpl implements ISmBusinessRecordService
// 商户总数
SmUserQuery userDto = new SmUserQuery();
userDto.setDelFlag(UserStatus.OK.getCode());
userDto.setIsMch(true);
brief.setUserCount(userService.selectCount(userDto));
// 租户总数
SmUserQuery tenantDto = new SmUserQuery();
tenantDto.setDelFlag(UserStatus.OK.getCode());
tenantDto.setIsMch(false);
brief.setTenantCount(userService.selectCount(tenantDto));
// 充值金额总数

28
smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml
View File

@ -80,19 +80,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deleteDate != null"> and date(su.delete_time) = #{deleteDate}</if>
<if test="createDate != null"> and date(su.create_time) = #{createDate}</if>
<if test="userId != null"> and su.user_id = #{userId}</if>
<if test="tenantDeviceId != null">
and su.user_id in (
select sdt.tenant_id
from sm_device_tenant sdt
where sdt.device_id = #{tenantDeviceId}
)
</if>
<if test="userIds != null and userIds.size() > 0">
and su.user_id in
<foreach collection="userIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="delFlag == null"> and su.del_flag = '0'</if>
<if test="delFlag != null"> and su.del_flag = #{delFlag}</if>
<if test="tenantDeviceId != null">
and su.user_id in (
select sdt.tenant_id
from sm_device_tenant sdt
where sdt.device_id = #{tenantDeviceId}
)
</if>
<if test="userIds != null and userIds.size() > 0">
and su.user_id in
<foreach collection="userIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</sql>
<select id="selectSmUserList" parameterType="SmUserQuery" resultMap="SmUserResult">

17
smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppArticleController.java
View File

@ -1,14 +1,18 @@
package com.ruoyi.web.controller.app;
import com.fasterxml.jackson.annotation.JsonView;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.JsonViewProfile;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.ss.article.domain.enums.LicenceType;
import com.ruoyi.ss.articleClassify.domain.SmArticleClassifyQuery;
import com.ruoyi.ss.article.domain.SmArticleQuery;
import com.ruoyi.ss.article.domain.article.SystemClassify;
import com.ruoyi.ss.article.domain.enums.SystemClassify;
import com.ruoyi.ss.articleClassify.service.ISmArticleClassifyService;
import com.ruoyi.ss.article.service.ISmArticleService;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@ -31,6 +35,7 @@ public class AppArticleController extends BaseController {
@ApiOperation("常见问题分类列表")
@GetMapping("/problem/list")
@JsonView(JsonViewProfile.App.class)
public TableDataInfo getProblemList(SmArticleClassifyQuery dto) {
startPage();
dto.setParentId(SystemClassify.PROBLEM.getClassifyId());
@ -39,6 +44,7 @@ public class AppArticleController extends BaseController {
@ApiOperation("获取文章列表")
@GetMapping("/list")
@JsonView(JsonViewProfile.App.class)
public TableDataInfo getArticleList(SmArticleQuery dto) {
startPage();
return getDataTable(articleService.selectSmArticleList(dto));
@ -46,9 +52,18 @@ public class AppArticleController extends BaseController {
@ApiOperation("获取文章详细内容")
@GetMapping("/{articleId}")
@JsonView(JsonViewProfile.App.class)
public AjaxResult getDetail(@PathVariable Long articleId) {
return success(articleService.selectSmArticleByArticleId(articleId));
}
@ApiOperation("获取协议文章")
@GetMapping("/licence/{type}")
@JsonView(JsonViewProfile.App.class)
public AjaxResult getLicence(@PathVariable @ApiParam("协议类型") String type) {
LicenceType licenceType = LicenceType.parse(type);
return success(articleService.selectLicenceByType(licenceType));
}
}

43
smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java
View File

@ -126,37 +126,30 @@ public class AppTransactionBillController extends BaseController
dto.setEndDate(now);
}
// 如果按日查询，查询的月份是当前月份，并且当前日期小于7日，则查询最近7天的数据，否则查询当月第一天开始的数据
if (Objects.equals(dto.getGroupBy(), TransactionBillGroupBy.create_date.name())
&& Objects.equals(dto.getYear(), DateUtils.getYear(now))
&& Objects.equals(dto.getMonth(), DateUtils.getMonth(now))
&& DateUtils.getDay(now) < 7) {
// 七天前
dto.setStartDate(DateUtils.addDays(dto.getEndDate(), -6));
} else {
// 每月第一天
Date firstDay = new Date(dto.getEndDate().getTime());
firstDay.setDate(1);
dto.setStartDate(firstDay);
if (Objects.equals(dto.getGroupBy(), TransactionBillGroupBy.create_date.name())) {
if (Objects.equals(dto.getYear(), DateUtils.getYear(now))
&& Objects.equals(dto.getMonth(), DateUtils.getMonth(now))
&& DateUtils.getDay(now) < 7) {
// 七天前
dto.setStartDate(DateUtils.addDays(dto.getEndDate(), -6));
dto.setYear(null);
dto.setMonth(null);
} else {
Date firstDay = new Date(dto.getEndDate().getTime());
firstDay.setYear(dto.getYear() - 1900);
firstDay.setMonth(dto.getMonth() - 1);
firstDay.setDate(1);
dto.setStartDate(firstDay);
}
}
dto.setYear(null);
dto.setMonth(null);
dto.setMchId(getUserId());
dto.setStatus(TransactionBillStatus.SUCCESS.getStatus());
AjaxResult ajax = AjaxResult.success(smTransactionBillService.selectLandlordCount(dto));
// 总收入
if (Objects.equals(dto.getGroupBy(), TransactionBillGroupBy.create_date.name())) {
dto.setGroupBy(TransactionBillGroupBy.create_month.name());
} else if (Objects.equals(dto.getGroupBy(), TransactionBillGroupBy.create_month.name())) {
dto.setGroupBy(TransactionBillGroupBy.create_year.name());
} else {
dto.setGroupBy(null);
}
dto.setStartDate(null);
dto.setMonth(DateUtils.getMonth(dto.getEndDate()));
dto.setYear(DateUtils.getYear(dto.getEndDate()));
dto.setEndDate(null);
List<BillCountVo> totalList = smTransactionBillService.selectCount(dto);
TransactionBillQuery allQuery = new TransactionBillQuery();
allQuery.setMchId(getUserId());
List<BillCountVo> totalList = smTransactionBillService.selectCount(allQuery);
if (CollectionUtils.isEmpty(totalList)) {
ajax.put("totalRecharge", 0);
} else {

21
smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmArticleController.java
View File

@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.ss.article.domain.SmArticle;
import com.ruoyi.ss.articleClassify.domain.SmArticleClassifyQuery;
@ -14,6 +15,7 @@ import com.ruoyi.ss.article.service.ISmArticleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.yaml.snakeyaml.util.UriEncoder;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -37,7 +39,7 @@ public class SmArticleController extends BaseController
/**
* 查询文章列表
*/
// @PreAuthorize("@ss.hasPermi('system:article:list')")
@PreAuthorize("@ss.hasPermi('system:article:list')")
@GetMapping("/list")
public TableDataInfo list(SmArticleQuery smArticle)
{
@ -49,7 +51,7 @@ public class SmArticleController extends BaseController
/**
* 导出文章列表
*/
// @PreAuthorize("@ss.hasPermi('system:article:export')")
@PreAuthorize("@ss.hasPermi('system:article:export')")
@Log(title = "文章", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SmArticleQuery smArticle)
@ -62,7 +64,7 @@ public class SmArticleController extends BaseController
/**
* 获取文章详细信息
*/
// @PreAuthorize("@ss.hasPermi('system:article:query')")
@PreAuthorize("@ss.hasPermi('system:article:query')")
@GetMapping(value = "/{articleId}")
public AjaxResult getInfo(@PathVariable("articleId") Long articleId)
{
@ -72,29 +74,36 @@ public class SmArticleController extends BaseController
/**
* 新增文章
*/
// @PreAuthorize("@ss.hasPermi('system:article:add')")
@PreAuthorize("@ss.hasPermi('system:article:add')")
@Log(title = "文章", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SmArticle smArticle)
{
if (StringUtils.hasText(smArticle.getContent())) {
smArticle.setContent(UriEncoder.decode(smArticle.getContent()));
}
return toAjax(asArticleService.insertSmArticle(smArticle));
}
/**
* 修改文章
*/
// @PreAuthorize("@ss.hasPermi('system:article:edit')")
@PreAuthorize("@ss.hasPermi('system:article:edit')")
@Log(title = "文章", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SmArticle smArticle)
{
if (StringUtils.hasText(smArticle.getContent())) {
smArticle.setContent(UriEncoder.decode(smArticle.getContent()));
}
return toAjax(asArticleService.updateSmArticle(smArticle));
}
/**
* 删除文章
*/
// @PreAuthorize("@ss.hasPermi('system:article:remove')")
@PreAuthorize("@ss.hasPermi('system:article:remove')")
@Log(title = "文章", businessType = BusinessType.DELETE)
@DeleteMapping("/{articleIds}")
public AjaxResult remove(@PathVariable Long[] articleIds)

24
smart-switch-web/src/main/resources/application-dev.yml
View File

@ -30,3 +30,27 @@ wx:
device:
# 项目启动时抄表
startRecord: false
spring:
# redis 配置
redis:
# 地址
host: localhost
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
# 密码
password:
# 连接超时时间
timeout: 10s
lettuce:
pool:
# 连接池中的最小空闲连接
min-idle: 0
# 连接池中的最大空闲连接
max-idle: 8
# 连接池的最大数据库连接数
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms

30
smart-switch-web/src/main/resources/application-test.yml
View File

@ -4,7 +4,7 @@ debug: false
# 项目相关配置
ruoyi:
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: /www/wwwroot/smartmeter/upload
profile: /www/wwwroot/smart-swith/upload
wx:
# 微信小程序appId
@ -20,9 +20,9 @@ wx:
# apiV3密钥
apiV3Key: 49819e0f0abdb2df3246f7b27f264d75
# 通知回调地址
notifyUrl: http://117.50.163.179/dev-api/app/pay/notify/wx # 测试环境
notifyUrl: https://kaiguan.chuantewulian.cn/prod-api/app/pay/notify/wx # 测试环境
# 密钥所在位置
privateKeyPath: /www/wwwroot/smartmeter/wxpay/apiclient_key.pem
privateKeyPath: /www/wwwroot/smart-switch/wxpay/apiclient_key.pem
# 证书序列号
merchantSerialNumber: 66910F800A60768020F07D39A56AE701574A16AE
@ -30,3 +30,27 @@ wx:
device:
# 项目启动时抄表
startRecord: true
spring:
# redis 配置
redis:
# 地址
host: localhost
# 端口，默认为6379
port: 6379
# 数据库索引
database: 1
# 密码
password: YgUIGNudqOQaRxHZ
# 连接超时时间
timeout: 10s
lettuce:
pool:
# 连接池中的最小空闲连接
min-idle: 0
# 连接池中的最大空闲连接
max-idle: 8
# 连接池的最大数据库连接数
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms

22
smart-switch-web/src/main/resources/application.yml
View File

@ -20,28 +20,6 @@ spring:
restart:
# 热部署开关
enabled: true
# redis 配置
redis:
# 地址
host: localhost
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
# 密码
password:
# 连接超时时间
timeout: 10s
lettuce:
pool:
# 连接池中的最小空闲连接
min-idle: 0
# 连接池中的最大空闲连接
max-idle: 8
# 连接池的最大数据库连接数
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
# 七牛云配置
qiniu: