chenzihao/sac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码调整，处理合并问题

Browse Source
This commit is contained in:
akun 2024-05-10 15:53:00 +08:00
parent 3a6b90197c
commit 5e5d86e9c5
28 changed files with 26 additions and 1060 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -235,7 +235,6 @@
<module>sf-order</module>
<module>sf-vertx</module>
<module>sf-vertx-api</module>
<module>sf-service</module>
</modules>
<packaging>pom</packaging>

4
sf-admin/src/main/resources/application-druid.yml
View File

@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://47.108.66.163:3306/sac_competition?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://192.168.1.23:22001/sac_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 82^hsgGHbs^2
password: abc&^321
# 从库数据源
slave:
# 从数据源开关/默认关闭

2
sf-service/src/main/java/com/sf/service/index/util/AppUtils.java → sf-common/src/main/java/com/sf/common/utils/AppUtils.java
View File

@ -1,4 +1,4 @@
package com.sf.service.index.util;
package com.sf.common.utils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

4
sf-payment/src/main/java/com/sf/payment/service/impl/HuaweiPaymentServiceImpl.java
View File

@ -20,8 +20,8 @@ import com.sf.payment.constant.GoodsConstants;
import com.sf.payment.domain.*;
import com.sf.payment.service.IHuaweiPaymentService;
import com.sf.payment.utils.HuaweiTokenGenerator;
import com.sf.service.domain.GoodsMessages;
import com.sf.service.service.IGoodsMessagesService;
import com.sf.service.goods.domain.GoodsMessages;
import com.sf.service.goods.service.IGoodsMessagesService;
import com.sf.system.domain.UserMember;
import com.sf.system.service.IUserMemberService;
import lombok.extern.slf4j.Slf4j;

105
sf-service/src/main/java/com/sf/service/deploy/controller/SysApkInfoController.java
View File

@ -1,105 +0,0 @@
package com.sf.service.deploy.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.sf.service.deploy.domain.SysApkInfo;
import com.sf.service.deploy.service.ISysApkInfoService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.sf.common.annotation.Log;
import com.sf.common.core.controller.BaseController;
import com.sf.common.core.domain.AjaxResult;
import com.sf.common.enums.BusinessType;
import com.sf.common.utils.poi.ExcelUtil;
import com.sf.common.core.page.TableDataInfo;
/**
* 安装包管理（新）Controller
*
* @author ztzh
* @date 2024-04-11
*/
@RestController
@RequestMapping("/deploy/INFO")
public class SysApkInfoController extends BaseController
{
@Autowired
private ISysApkInfoService sysApkInfoService;
/**
* 查询安装包管理（新）列表
*/
@PreAuthorize("@ss.hasPermi('deploy:INFO:list')")
@GetMapping("/list")
public TableDataInfo list(SysApkInfo sysApkInfo)
{
startPage();
List<SysApkInfo> list = sysApkInfoService.selectSysApkInfoList(sysApkInfo);
return getDataTable(list);
}
/**
* 导出安装包管理（新）列表
*/
@PreAuthorize("@ss.hasPermi('deploy:INFO:export')")
@Log(title = "安装包管理（新）", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SysApkInfo sysApkInfo)
{
List<SysApkInfo> list = sysApkInfoService.selectSysApkInfoList(sysApkInfo);
ExcelUtil<SysApkInfo> util = new ExcelUtil<SysApkInfo>(SysApkInfo.class);
util.exportExcel(response, list, "安装包管理（新）数据");
}
/**
* 获取安装包管理（新）详细信息
*/
@PreAuthorize("@ss.hasPermi('deploy:INFO:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(sysApkInfoService.selectSysApkInfoById(id));
}
/**
* 新增安装包管理（新）
*/
@PreAuthorize("@ss.hasPermi('deploy:INFO:add')")
@Log(title = "安装包管理（新）", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SysApkInfo sysApkInfo)
{
return toAjax(sysApkInfoService.insertSysApkInfo(sysApkInfo));
}
/**
* 修改安装包管理（新）
*/
@PreAuthorize("@ss.hasPermi('deploy:INFO:edit')")
@Log(title = "安装包管理（新）", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SysApkInfo sysApkInfo)
{
return toAjax(sysApkInfoService.updateSysApkInfo(sysApkInfo));
}
/**
* 删除安装包管理（新）
*/
@PreAuthorize("@ss.hasPermi('deploy:INFO:remove')")
@Log(title = "安装包管理（新）", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(sysApkInfoService.deleteSysApkInfoByIds(ids));
}
}

202
sf-service/src/main/java/com/sf/service/deploy/domain/SysApkInfo.java
View File

@ -1,202 +0,0 @@
package com.sf.service.deploy.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.sf.common.annotation.Excel;
import com.sf.common.core.domain.BaseEntity;
/**
* 安装包管理（新）对象 SYS_APK_INFO
*
* @author ztzh
* @date 2024-04-11
*/
public class SysApkInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 上传类型 */
@Excel(name = "上传类型")
private String uploadingType;
/** 安装包名称 */
@Excel(name = "安装包名称")
private String sysApkName;
/** 版本号 */
@Excel(name = "版本号")
private String version;
/** 安装包 */
@Excel(name = "安装包")
private String sysApk;
/** 安装包大小 */
@Excel(name = "安装包大小")
private String sysApkSize;
/** 安装包类型 */
@Excel(name = "安装包类型")
private String sysType;
/** 上传状态 */
private Long uploadingStatus;
/** 日志id */
private Long uploadingLogId;
/** 排序 */
private Long orderNum;
/** 逻辑删除,0:未删除,1:删除 */
private Long isDelete;
/** 创建人 */
@Excel(name = "创建人")
private String created;
/** 更新人 */
private String modified;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setUploadingType(String uploadingType)
{
this.uploadingType = uploadingType;
}
public String getUploadingType()
{
return uploadingType;
}
public void setSysApkName(String sysApkName)
{
this.sysApkName = sysApkName;
}
public String getSysApkName()
{
return sysApkName;
}
public void setVersion(String version)
{
this.version = version;
}
public String getVersion()
{
return version;
}
public void setSysApk(String sysApk)
{
this.sysApk = sysApk;
}
public String getSysApk()
{
return sysApk;
}
public void setSysApkSize(String sysApkSize)
{
this.sysApkSize = sysApkSize;
}
public String getSysApkSize()
{
return sysApkSize;
}
public void setSysType(String sysType)
{
this.sysType = sysType;
}
public String getSysType()
{
return sysType;
}
public void setUploadingStatus(Long uploadingStatus)
{
this.uploadingStatus = uploadingStatus;
}
public Long getUploadingStatus()
{
return uploadingStatus;
}
public void setUploadingLogId(Long uploadingLogId)
{
this.uploadingLogId = uploadingLogId;
}
public Long getUploadingLogId()
{
return uploadingLogId;
}
public void setOrderNum(Long orderNum)
{
this.orderNum = orderNum;
}
public Long getOrderNum()
{
return orderNum;
}
public void setIsDelete(Long isDelete)
{
this.isDelete = isDelete;
}
public Long getIsDelete()
{
return isDelete;
}
public void setCreated(String created)
{
this.created = created;
}
public String getCreated()
{
return created;
}
public void setModified(String modified)
{
this.modified = modified;
}
public String getModified()
{
return modified;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("uploadingType", getUploadingType())
.append("sysApkName", getSysApkName())
.append("version", getVersion())
.append("sysApk", getSysApk())
.append("sysApkSize", getSysApkSize())
.append("sysType", getSysType())
.append("uploadingStatus", getUploadingStatus())
.append("uploadingLogId", getUploadingLogId())
.append("orderNum", getOrderNum())
.append("isDelete", getIsDelete())
.append("created", getCreated())
.append("modified", getModified())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.toString();
}
}

62
sf-service/src/main/java/com/sf/service/deploy/mapper/SysApkInfoMapper.java
View File

@ -1,62 +0,0 @@
package com.sf.service.deploy.mapper;
import com.sf.service.deploy.domain.SysApkInfo;
import java.util.List;
/**
* 安装包管理（新）Mapper接口
*
* @author ztzh
* @date 2024-04-11
*/
public interface SysApkInfoMapper
{
/**
* 查询安装包管理（新）
*
* @param id 安装包管理（新）主键
* @return 安装包管理（新）
*/
public SysApkInfo selectSysApkInfoById(Long id);
/**
* 查询安装包管理（新）列表
*
* @param sysApkInfo 安装包管理（新）
* @return 安装包管理（新）集合
*/
public List<SysApkInfo> selectSysApkInfoList(SysApkInfo sysApkInfo);
/**
* 新增安装包管理（新）
*
* @param sysApkInfo 安装包管理（新）
* @return 结果
*/
public int insertSysApkInfo(SysApkInfo sysApkInfo);
/**
* 修改安装包管理（新）
*
* @param sysApkInfo 安装包管理（新）
* @return 结果
*/
public int updateSysApkInfo(SysApkInfo sysApkInfo);
/**
* 删除安装包管理（新）
*
* @param id 安装包管理（新）主键
* @return 结果
*/
public int deleteSysApkInfoById(Long id);
/**
* 批量删除安装包管理（新）
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteSysApkInfoByIds(Long[] ids);
}

61
sf-service/src/main/java/com/sf/service/deploy/service/ISysApkInfoService.java
View File

@ -1,61 +0,0 @@
package com.sf.service.deploy.service;
import java.util.List;
import com.sf.service.deploy.domain.SysApkInfo;
/**
* 安装包管理（新）Service接口
*
* @author ztzh
* @date 2024-04-11
*/
public interface ISysApkInfoService
{
/**
* 查询安装包管理（新）
*
* @param id 安装包管理（新）主键
* @return 安装包管理（新）
*/
public SysApkInfo selectSysApkInfoById(Long id);
/**
* 查询安装包管理（新）列表
*
* @param sysApkInfo 安装包管理（新）
* @return 安装包管理（新）集合
*/
public List<SysApkInfo> selectSysApkInfoList(SysApkInfo sysApkInfo);
/**
* 新增安装包管理（新）
*
* @param sysApkInfo 安装包管理（新）
* @return 结果
*/
public int insertSysApkInfo(SysApkInfo sysApkInfo);
/**
* 修改安装包管理（新）
*
* @param sysApkInfo 安装包管理（新）
* @return 结果
*/
public int updateSysApkInfo(SysApkInfo sysApkInfo);
/**
* 批量删除安装包管理（新）
*
* @param ids 需要删除的安装包管理（新）主键集合
* @return 结果
*/
public int deleteSysApkInfoByIds(Long[] ids);
/**
* 删除安装包管理（新）信息
*
* @param id 安装包管理（新）主键
* @return 结果
*/
public int deleteSysApkInfoById(Long id);
}

96
sf-service/src/main/java/com/sf/service/deploy/service/impl/SysApkInfoServiceImpl.java
View File

@ -1,96 +0,0 @@
package com.sf.service.deploy.service.impl;
import java.util.List;
import com.sf.common.utils.DateUtils;
import com.sf.service.deploy.domain.SysApkInfo;
import com.sf.service.deploy.mapper.SysApkInfoMapper;
import com.sf.service.deploy.service.ISysApkInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* 安装包管理（新）Service业务层处理
*
* @author ztzh
* @date 2024-04-11
*/
@Service
public class SysApkInfoServiceImpl implements ISysApkInfoService
{
@Autowired
private SysApkInfoMapper sysApkInfoMapper;
/**
* 查询安装包管理（新）
*
* @param id 安装包管理（新）主键
* @return 安装包管理（新）
*/
@Override
public SysApkInfo selectSysApkInfoById(Long id)
{
return sysApkInfoMapper.selectSysApkInfoById(id);
}
/**
* 查询安装包管理（新）列表
*
* @param sysApkInfo 安装包管理（新）
* @return 安装包管理（新）
*/
@Override
public List<SysApkInfo> selectSysApkInfoList(SysApkInfo sysApkInfo)
{
return sysApkInfoMapper.selectSysApkInfoList(sysApkInfo);
}
/**
* 新增安装包管理（新）
*
* @param sysApkInfo 安装包管理（新）
* @return 结果
*/
@Override
public int insertSysApkInfo(SysApkInfo sysApkInfo)
{
sysApkInfo.setCreateTime(DateUtils.getNowDate());
return sysApkInfoMapper.insertSysApkInfo(sysApkInfo);
}
/**
* 修改安装包管理（新）
*
* @param sysApkInfo 安装包管理（新）
* @return 结果
*/
@Override
public int updateSysApkInfo(SysApkInfo sysApkInfo)
{
sysApkInfo.setUpdateTime(DateUtils.getNowDate());
return sysApkInfoMapper.updateSysApkInfo(sysApkInfo);
}
/**
* 批量删除安装包管理（新）
*
* @param ids 需要删除的安装包管理（新）主键
* @return 结果
*/
@Override
public int deleteSysApkInfoByIds(Long[] ids)
{
return sysApkInfoMapper.deleteSysApkInfoByIds(ids);
}
/**
* 删除安装包管理（新）信息
*
* @param id 安装包管理（新）主键
* @return 结果
*/
@Override
public int deleteSysApkInfoById(Long id)
{
return sysApkInfoMapper.deleteSysApkInfoById(id);
}
}

17
sf-service/src/main/java/com/sf/service/gateway/controller/GatewayConfigController.java
View File

@ -4,30 +4,17 @@ import apijson.JSON;
import com.sf.common.annotation.Log;
import com.sf.common.core.controller.BaseController;
import com.sf.common.core.domain.AjaxResult;
import com.sf.common.core.page.TableDataInfo;
import com.sf.common.enums.BusinessType;
import com.sf.common.utils.poi.ExcelUtil;
import com.sf.common.utils.AppUtils;
import com.sf.service.gateway.domain.GatewayConfig;
import com.sf.service.gateway.domain.GatewayStrategy;
import com.sf.service.gateway.domain.dto.QueryGatewayStrategyDTO;
import com.sf.service.gateway.domain.dto.UpdateDataStatusDTO;
import com.sf.service.gateway.domain.vo.GatewayStrategyListVO;
import com.sf.service.gateway.enums.GatewayDataStatus;
import com.sf.service.gateway.service.IGatewayConfigService;
import com.sf.service.gateway.service.IGatewayStrategyService;
import com.sf.service.index.util.AppUtils;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.Assert;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 网关配置管理Controller
@ -77,7 +64,7 @@ public class GatewayConfigController extends BaseController
}
/**
* 修改网关配置
* 网关配置同步
*/
@Log(title = "网关配置同步", businessType = BusinessType.UPDATE)
@PostMapping("/sync")

2
sf-service/src/main/java/com/sf/service/gateway/controller/GatewayInterfaceInfoController.java
View File

@ -7,6 +7,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.sf.common.utils.AppUtils;
import com.sf.service.gateway.domain.GatewayInterfaceInfo;
import com.sf.service.gateway.domain.GatewayInterfaceLinkStrategy;
import com.sf.service.gateway.domain.GatewayServer;
@ -21,7 +22,6 @@ import com.sf.service.gateway.enums.GatewayDataStatus;
import com.sf.service.gateway.service.IGatewayInterfaceInfoService;
import com.sf.service.gateway.service.IGatewayServerService;
import com.sf.service.gateway.service.IGatewayStrategyService;
import com.sf.service.index.util.AppUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;

7
sf-service/src/main/java/com/sf/service/gateway/controller/GatewayRouteController.java
View File

@ -6,17 +6,12 @@ import java.util.Map;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson2.JSON;
import com.sf.common.utils.AppUtils;
import com.sf.service.gateway.domain.GatewayRoute;
import com.sf.service.gateway.domain.GatewayStrategy;
import com.sf.service.gateway.domain.dto.InsertOrUpdateGatewayRouteDTO;
import com.sf.service.gateway.domain.dto.QueryGatewayRouteDTO;
import com.sf.service.gateway.domain.dto.QueryGatewayStrategyDTO;
import com.sf.service.gateway.domain.vo.GatewayRouteListVO;
import com.sf.service.gateway.domain.vo.GatewayStrategyListVO;
import com.sf.service.gateway.enums.GatewayDataStatus;
import com.sf.service.gateway.service.IGatewayRouteService;
import com.sf.service.index.util.AppUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;

3
sf-service/src/main/java/com/sf/service/gateway/controller/GatewayServerController.java
View File

@ -5,9 +5,9 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.sf.common.utils.AppUtils;
import com.sf.service.gateway.domain.*;
import com.sf.service.gateway.domain.dto.QueryGatewayServerDTO;
import com.sf.service.gateway.domain.dto.QueryGatewayStrategyDTO;
import com.sf.service.gateway.domain.dto.UpdateDataStatusDTO;
import com.sf.service.gateway.domain.vo.GatewayInterfaceInfoListVO;
import com.sf.service.gateway.domain.vo.GatewayServerDetailedVO;
@ -19,7 +19,6 @@ import com.sf.service.gateway.service.IGatewayInterfaceInfoService;
import com.sf.service.gateway.service.IGatewayRouteService;
import com.sf.service.gateway.service.IGatewayServerService;
import com.sf.service.gateway.service.IGatewayStrategyService;
import com.sf.service.index.util.AppUtils;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;

2
sf-service/src/main/java/com/sf/service/gateway/controller/GatewayStrategyController.java
View File

@ -6,6 +6,7 @@ import java.util.Map;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.sf.common.utils.AppUtils;
import com.sf.service.gateway.domain.GatewayStrategy;
import com.sf.service.gateway.domain.dto.QueryGatewayStrategyDTO;
import com.sf.service.gateway.domain.dto.UpdateDataStatusDTO;
@ -13,7 +14,6 @@ import com.sf.service.gateway.domain.vo.GatewayInterfaceInfoListVO;
import com.sf.service.gateway.domain.vo.GatewayStrategyListVO;
import com.sf.service.gateway.enums.GatewayDataStatus;
import com.sf.service.gateway.service.IGatewayStrategyService;
import com.sf.service.index.util.AppUtils;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;

2
sf-service/src/main/java/com/sf/service/gateway/service/impl/GatewayConfigServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.sf.common.constant.HttpStatus;
import com.sf.common.exception.ServiceException;
import com.sf.common.utils.AppUtils;
import com.sf.common.utils.DateUtils;
import com.sf.common.utils.SecurityUtils;
import com.sf.service.gateway.domain.*;
@ -15,7 +16,6 @@ import com.sf.service.gateway.enums.GatewayServiceModel;
import com.sf.service.gateway.enums.GatewayStrategyType;
import com.sf.service.gateway.mapper.GatewayConfigMapper;
import com.sf.service.gateway.service.*;
import com.sf.service.index.util.AppUtils;
import com.sf.vertx.api.pojo.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;

2
sf-service/src/main/java/com/sf/service/gateway/service/impl/GatewayInterfaceInfoServiceImpl.java
View File

@ -16,9 +16,7 @@ import com.sf.service.gateway.mapper.GatewayInterfaceInfoMapper;
import com.sf.service.gateway.mapper.GatewayInterfaceLinkStrategyMapper;
import com.sf.service.gateway.service.IGatewayInterfaceInfoService;
import com.sf.service.gateway.service.IGatewayStrategyService;
import com.sf.service.index.util.AppUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

6
sf-service/src/main/java/com/sf/service/gateway/service/impl/GatewayRouteServiceImpl.java
View File

@ -5,7 +5,7 @@ import java.util.*;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONException;
import com.sf.common.utils.AppUtils;
import com.sf.common.utils.DateUtils;
import com.sf.common.utils.SecurityUtils;
import com.sf.common.utils.URLUtils;
@ -16,15 +16,11 @@ import com.sf.service.gateway.enums.*;
import com.sf.service.gateway.mapper.GatewayRouteMapper;
import com.sf.service.gateway.service.IGatewayRouteService;
import com.sf.service.gateway.service.IGatewayServerService;
import com.sf.service.index.util.AppUtils;
import org.hibernate.validator.constraints.URL;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import javax.validation.constraints.NotBlank;
/**
* 路由管理Service业务层处理

8
sf-service/src/main/java/com/sf/service/controller/GoodsMessagesController.java → sf-service/src/main/java/com/sf/service/goods/controller/GoodsMessagesController.java
View File

@ -1,14 +1,12 @@
package com.sf.service.controller;
package com.sf.service.goods.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import apijson.orm.model.Request;
import com.sf.common.enums.RequestHeaderEnums;
import com.sf.common.utils.StringUtils;
import com.sf.common.utils.http.RequestUtils;
import com.sf.service.domain.GoodsMessages;
import com.sf.service.service.IGoodsMessagesService;
import com.sf.service.goods.domain.GoodsMessages;
import com.sf.service.goods.service.IGoodsMessagesService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;

2
sf-service/src/main/java/com/sf/service/domain/GoodsMessages.java → sf-service/src/main/java/com/sf/service/goods/domain/GoodsMessages.java
View File

@ -1,4 +1,4 @@
package com.sf.service.domain;
package com.sf.service.goods.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

4
sf-service/src/main/java/com/sf/service/mapper/GoodsMessagesMapper.java → sf-service/src/main/java/com/sf/service/goods/mapper/GoodsMessagesMapper.java
View File

@ -1,7 +1,7 @@
package com.sf.service.mapper;
package com.sf.service.goods.mapper;
import java.util.List;
import com.sf.service.domain.GoodsMessages;
import com.sf.service.goods.domain.GoodsMessages;
/**
* 商品信息Mapper接口

4
sf-service/src/main/java/com/sf/service/service/IGoodsMessagesService.java → sf-service/src/main/java/com/sf/service/goods/service/IGoodsMessagesService.java
View File

@ -1,7 +1,7 @@
package com.sf.service.service;
package com.sf.service.goods.service;
import java.util.List;
import com.sf.service.domain.GoodsMessages;
import com.sf.service.goods.domain.GoodsMessages;
/**
* 商品信息Service接口

8
sf-service/src/main/java/com/sf/service/service/impl/GoodsMessagesServiceImpl.java → sf-service/src/main/java/com/sf/service/goods/service/impl/GoodsMessagesServiceImpl.java
View File

@ -1,12 +1,12 @@
package com.sf.service.service.impl;
package com.sf.service.goods.service.impl;
import java.util.List;
import com.sf.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.sf.service.mapper.GoodsMessagesMapper;
import com.sf.service.domain.GoodsMessages;
import com.sf.service.service.IGoodsMessagesService;
import com.sf.service.goods.mapper.GoodsMessagesMapper;
import com.sf.service.goods.domain.GoodsMessages;
import com.sf.service.goods.service.IGoodsMessagesService;
import org.springframework.util.StringUtils;
/**

105
sf-service/src/main/java/com/sf/service/index/controller/ApplyListInfoController.java
View File

@ -1,105 +0,0 @@
package com.sf.service.index.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.sf.service.index.domain.ApplyListInfo;
import com.sf.service.index.service.IApplyListInfoService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.sf.common.annotation.Log;
import com.sf.common.core.controller.BaseController;
import com.sf.common.core.domain.AjaxResult;
import com.sf.common.enums.BusinessType;
import com.sf.common.utils.poi.ExcelUtil;
import com.sf.common.core.page.TableDataInfo;
/**
* 应用列Controller
*
* @author ztzh
* @date 2024-04-11
*/
@RestController
@RequestMapping("/index/list")
public class ApplyListInfoController extends BaseController
{
@Autowired
private IApplyListInfoService applyListInfoService;
/**
* 查询应用列列表
*/
@PreAuthorize("@ss.hasPermi('index:list:list')")
@GetMapping("/list")
public TableDataInfo list(ApplyListInfo applyListInfo)
{
startPage();
List<ApplyListInfo> list = applyListInfoService.selectApplyListInfoList(applyListInfo);
return getDataTable(list);
}
/**
* 导出应用列列表
*/
@PreAuthorize("@ss.hasPermi('index:list:export')")
@Log(title = "应用列", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApplyListInfo applyListInfo)
{
List<ApplyListInfo> list = applyListInfoService.selectApplyListInfoList(applyListInfo);
ExcelUtil<ApplyListInfo> util = new ExcelUtil<ApplyListInfo>(ApplyListInfo.class);
util.exportExcel(response, list, "应用列数据");
}
/**
* 获取应用列详细信息
*/
@PreAuthorize("@ss.hasPermi('index:list:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(applyListInfoService.selectApplyListInfoById(id));
}
/**
* 新增应用列
*/
@PreAuthorize("@ss.hasPermi('index:list:add')")
@Log(title = "应用列", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApplyListInfo applyListInfo)
{
return toAjax(applyListInfoService.insertApplyListInfo(applyListInfo));
}
/**
* 修改应用列
*/
@PreAuthorize("@ss.hasPermi('index:list:edit')")
@Log(title = "应用列", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApplyListInfo applyListInfo)
{
return toAjax(applyListInfoService.updateApplyListInfo(applyListInfo));
}
/**
* 删除应用列
*/
@PreAuthorize("@ss.hasPermi('index:list:remove')")
@Log(title = "应用列", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(applyListInfoService.deleteApplyListInfoByIds(ids));
}
}

153
sf-service/src/main/java/com/sf/service/index/domain/ApplyListInfo.java
View File

@ -1,153 +0,0 @@
package com.sf.service.index.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.sf.common.annotation.Excel;
import com.sf.common.core.domain.BaseEntity;
/**
* 应用列对象 APPLY_LIST_INFO
*
* @author ztzh
* @date 2024-04-11
*/
public class ApplyListInfo extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private Long id;
/**
* 应用code
*/
@Excel(name = "应用编号")
private String appCode;
/**
* 应用名称
*/
@Excel(name = "应用名称")
private String appName;
/**
* 应用描述
*/
@Excel(name = "应用描述")
private String appDesc;
/**
* 图片
*/
@Excel(name = "图片")
private String picture;
/**
* 排序
*/
private Long orderNum;
/**
* 逻辑删除,0:未删除,1:删除
*/
private Long isDelete;
/**
* 创建人
*/
private String created;
/**
* 更新人
*/
private String modified;
public void setId(Long id) {
this.id = id;
}
public Long getId() {
return id;
}
public void setAppName(String appName) {
this.appName = appName;
}
public String getAppName() {
return appName;
}
public void setAppDesc(String appDesc) {
this.appDesc = appDesc;
}
public String getAppDesc() {
return appDesc;
}
public void setPicture(String picture) {
this.picture = picture;
}
public String getPicture() {
return picture;
}
public void setOrderNum(Long orderNum) {
this.orderNum = orderNum;
}
public Long getOrderNum() {
return orderNum;
}
public void setIsDelete(Long isDelete) {
this.isDelete = isDelete;
}
public Long getIsDelete() {
return isDelete;
}
public void setCreated(String created) {
this.created = created;
}
public String getCreated() {
return created;
}
public void setModified(String modified) {
this.modified = modified;
}
public String getModified() {
return modified;
}
public void setAppCode(String appCode) {
this.appCode = appCode;
}
public String getAppCode() {
return appCode;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("appCode",getAppCode())
.append("appName", getAppName())
.append("appDesc", getAppDesc())
.append("picture", getPicture())
.append("orderNum", getOrderNum())
.append("isDelete", getIsDelete())
.append("created", getCreated())
.append("modified", getModified())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.toString();
}
}

62
sf-service/src/main/java/com/sf/service/index/mapper/ApplyListInfoMapper.java
View File

@ -1,62 +0,0 @@
package com.sf.service.index.mapper;
import com.sf.service.index.domain.ApplyListInfo;
import java.util.List;
/**
* 应用列Mapper接口
*
* @author ztzh
* @date 2024-04-11
*/
public interface ApplyListInfoMapper
{
/**
* 查询应用列
*
* @param id 应用列主键
* @return 应用列
*/
public ApplyListInfo selectApplyListInfoById(Long id);
/**
* 查询应用列列表
*
* @param applyListInfo 应用列
* @return 应用列集合
*/
public List<ApplyListInfo> selectApplyListInfoList(ApplyListInfo applyListInfo);
/**
* 新增应用列
*
* @param applyListInfo 应用列
* @return 结果
*/
public int insertApplyListInfo(ApplyListInfo applyListInfo);
/**
* 修改应用列
*
* @param applyListInfo 应用列
* @return 结果
*/
public int updateApplyListInfo(ApplyListInfo applyListInfo);
/**
* 删除应用列
*
* @param id 应用列主键
* @return 结果
*/
public int deleteApplyListInfoById(Long id);
/**
* 批量删除应用列
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteApplyListInfoByIds(Long[] ids);
}

62
sf-service/src/main/java/com/sf/service/index/service/IApplyListInfoService.java
View File

@ -1,62 +0,0 @@
package com.sf.service.index.service;
import com.sf.service.index.domain.ApplyListInfo;
import java.util.List;
/**
* 应用列Service接口
*
* @author ztzh
* @date 2024-04-11
*/
public interface IApplyListInfoService
{
/**
* 查询应用列
*
* @param id 应用列主键
* @return 应用列
*/
public ApplyListInfo selectApplyListInfoById(Long id);
/**
* 查询应用列列表
*
* @param applyListInfo 应用列
* @return 应用列集合
*/
public List<ApplyListInfo> selectApplyListInfoList(ApplyListInfo applyListInfo);
/**
* 新增应用列
*
* @param applyListInfo 应用列
* @return 结果
*/
public int insertApplyListInfo(ApplyListInfo applyListInfo);
/**
* 修改应用列
*
* @param applyListInfo 应用列
* @return 结果
*/
public int updateApplyListInfo(ApplyListInfo applyListInfo);
/**
* 批量删除应用列
*
* @param ids 需要删除的应用列主键集合
* @return 结果
*/
public int deleteApplyListInfoByIds(Long[] ids);
/**
* 删除应用列信息
*
* @param id 应用列主键
* @return 结果
*/
public int deleteApplyListInfoById(Long id);
}

98
sf-service/src/main/java/com/sf/service/index/service/impl/ApplyListInfoServiceImpl.java
View File

@ -1,98 +0,0 @@
package com.sf.service.index.service.impl;
import java.util.List;
import com.sf.common.utils.DateUtils;
import com.sf.common.utils.uuid.IdUtils;
import com.sf.service.index.domain.ApplyListInfo;
import com.sf.service.index.mapper.ApplyListInfoMapper;
import com.sf.service.index.service.IApplyListInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* 应用列Service业务层处理
*
* @author ztzh
* @date 2024-04-11
*/
@Service
public class ApplyListInfoServiceImpl implements IApplyListInfoService
{
@Autowired
private ApplyListInfoMapper applyListInfoMapper;
/**
* 查询应用列
*
* @param id 应用列主键
* @return 应用列
*/
@Override
public ApplyListInfo selectApplyListInfoById(Long id)
{
return applyListInfoMapper.selectApplyListInfoById(id);
}
/**
* 查询应用列列表
*
* @param applyListInfo 应用列
* @return 应用列
*/
@Override
public List<ApplyListInfo> selectApplyListInfoList(ApplyListInfo applyListInfo)
{
return applyListInfoMapper.selectApplyListInfoList(applyListInfo);
}
/**
* 新增应用列
*
* @param applyListInfo 应用列
* @return 结果
*/
@Override
public int insertApplyListInfo(ApplyListInfo applyListInfo)
{
applyListInfo.setCreateTime(DateUtils.getNowDate());
applyListInfo.setAppCode(IdUtils.randomTime("ZT"));
return applyListInfoMapper.insertApplyListInfo(applyListInfo);
}
/**
* 修改应用列
*
* @param applyListInfo 应用列
* @return 结果
*/
@Override
public int updateApplyListInfo(ApplyListInfo applyListInfo)
{
applyListInfo.setUpdateTime(DateUtils.getNowDate());
return applyListInfoMapper.updateApplyListInfo(applyListInfo);
}
/**
* 批量删除应用列
*
* @param ids 需要删除的应用列主键
* @return 结果
*/
@Override
public int deleteApplyListInfoByIds(Long[] ids)
{
return applyListInfoMapper.deleteApplyListInfoByIds(ids);
}
/**
* 删除应用列信息
*
* @param id 应用列主键
* @return 结果
*/
@Override
public int deleteApplyListInfoById(Long id)
{
return applyListInfoMapper.deleteApplyListInfoById(id);
}
}

2
sf-service/src/main/resources/mapper/service/GoodsMessagesMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sf.service.mapper.GoodsMessagesMapper">
<mapper namespace="com.sf.service.goods.mapper.GoodsMessagesMapper">
<resultMap type="GoodsMessages" id="GoodsMessagesResult">
<result property="id" column="id" />