From 8a0a9475adc60df824301b3005e974e9f76a3f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com> Date: Mon, 15 Jul 2024 16:06:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A5=97=E9=A4=90=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=EF=BC=88=E6=97=A0=E7=94=A8=E6=A8=A1=E5=9D=97=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modelExist/ModelExistValidator.java | 3 - .../suitExist/SuitExistValidator.java | 2 - .../suitTempExist/SuitTempExist.java | 40 ------- .../suitTempExist/SuitTempExistValidator.java | 48 -------- .../ruoyi/ss/suitTemp/domain/SuitTemp.java | 68 ----------- .../ss/suitTemp/domain/SuitTempQuery.java | 11 -- .../ruoyi/ss/suitTemp/domain/SuitTempVO.java | 11 -- .../ss/suitTemp/mapper/SuitTempMapper.java | 68 ----------- .../ss/suitTemp/mapper/SuitTempMapper.xml | 91 --------------- .../suitTemp/service/SuitTempConverter.java | 21 ---- .../ss/suitTemp/service/SuitTempService.java | 68 ----------- .../suitTemp/service/SuitTempValidator.java | 21 ---- .../service/impl/SuitTempConverterImpl.java | 49 -------- .../service/impl/SuitTempServiceImpl.java | 102 ----------------- .../service/impl/SuitTempValidatorImpl.java | 33 ------ .../controller/app/AppSuitTempController.java | 83 -------------- .../web/controller/ss/SuitTempController.java | 107 ------------------ .../src/main/resources/application-test.yml | 2 +- 18 files changed, 1 insertion(+), 827 deletions(-) delete mode 100644 smart-switch-service/src/main/java/com/ruoyi/common/validRule/suitTempExist/SuitTempExist.java delete mode 100644 smart-switch-service/src/main/java/com/ruoyi/common/validRule/suitTempExist/SuitTempExistValidator.java delete mode 100644 smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/domain/SuitTemp.java delete mode 100644 smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/domain/SuitTempQuery.java delete mode 100644 smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/domain/SuitTempVO.java delete mode 100644 smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/mapper/SuitTempMapper.java delete mode 100644 smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/mapper/SuitTempMapper.xml delete mode 100644 smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/SuitTempConverter.java delete mode 100644 smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/SuitTempService.java delete mode 100644 smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/SuitTempValidator.java delete mode 100644 smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/impl/SuitTempConverterImpl.java delete mode 100644 smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/impl/SuitTempServiceImpl.java delete mode 100644 smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/impl/SuitTempValidatorImpl.java delete mode 100644 smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppSuitTempController.java delete mode 100644 smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SuitTempController.java diff --git a/smart-switch-service/src/main/java/com/ruoyi/common/validRule/modelExist/ModelExistValidator.java b/smart-switch-service/src/main/java/com/ruoyi/common/validRule/modelExist/ModelExistValidator.java index 627fc112..286beefa 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/common/validRule/modelExist/ModelExistValidator.java +++ b/smart-switch-service/src/main/java/com/ruoyi/common/validRule/modelExist/ModelExistValidator.java @@ -1,11 +1,8 @@ package com.ruoyi.common.validRule.modelExist; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.ss.model.domain.SmModelQuery; import com.ruoyi.ss.model.service.ModelService; -import com.ruoyi.ss.suitTemp.domain.SuitTempQuery; -import com.ruoyi.ss.suitTemp.service.SuitTempService; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/smart-switch-service/src/main/java/com/ruoyi/common/validRule/suitExist/SuitExistValidator.java b/smart-switch-service/src/main/java/com/ruoyi/common/validRule/suitExist/SuitExistValidator.java index 41422efd..fc606e69 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/common/validRule/suitExist/SuitExistValidator.java +++ b/smart-switch-service/src/main/java/com/ruoyi/common/validRule/suitExist/SuitExistValidator.java @@ -4,8 +4,6 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.ss.suit.domain.SuitQuery; import com.ruoyi.ss.suit.service.SuitService; -import com.ruoyi.ss.suitTemp.domain.SuitTempQuery; -import com.ruoyi.ss.suitTemp.service.SuitTempService; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/smart-switch-service/src/main/java/com/ruoyi/common/validRule/suitTempExist/SuitTempExist.java b/smart-switch-service/src/main/java/com/ruoyi/common/validRule/suitTempExist/SuitTempExist.java deleted file mode 100644 index f4b683d6..00000000 --- a/smart-switch-service/src/main/java/com/ruoyi/common/validRule/suitTempExist/SuitTempExist.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.ruoyi.common.validRule.suitTempExist; - -import javax.validation.Constraint; -import javax.validation.Payload; -import java.lang.annotation.*; - -/** - * 判断设备是否存在 - * @author wjh - * 2024/6/13 - */ -@Documented -@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR, ElementType.PARAMETER, ElementType.TYPE_USE }) -@Retention(RetentionPolicy.RUNTIME) -@Repeatable(SuitTempExist.List.class) -@Constraint(validatedBy = { SuitTempExistValidator.class }) -public @interface SuitTempExist { - String message() default "{*.validation.constraint.Enum.message}"; - - Class[] groups() default {}; - - Class[] payload() default {}; - - /** - * 是否允许null值，默认是允许 - */ - boolean allowNull() default true; - - /** - * 校验是否归属商户 - */ - boolean checkBelong() default false; - - @Documented - @Target({ ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR, ElementType.PARAMETER, ElementType.TYPE_USE }) - @Retention(RetentionPolicy.RUNTIME) - @interface List { - SuitTempExist[] value(); - } -} diff --git a/smart-switch-service/src/main/java/com/ruoyi/common/validRule/suitTempExist/SuitTempExistValidator.java b/smart-switch-service/src/main/java/com/ruoyi/common/validRule/suitTempExist/SuitTempExistValidator.java deleted file mode 100644 index 5830354e..00000000 --- a/smart-switch-service/src/main/java/com/ruoyi/common/validRule/suitTempExist/SuitTempExistValidator.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.ruoyi.common.validRule.suitTempExist; - -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.ss.suitTemp.domain.SuitTempQuery; -import com.ruoyi.ss.suitTemp.service.SuitTempService; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - -/** - * 2023/10/20 - * 枚举值校验 - */ -public class SuitTempExistValidator implements ConstraintValidator { - - private SuitTempExist annotation; - - @Override - public void initialize(SuitTempExist constraintAnnotation) { - this.annotation = constraintAnnotation; - } - - /** - * 判断是否校验成功 - * @param value 待校验的值 - * @return 校验结果 - */ - @Override - public boolean isValid(Long value, ConstraintValidatorContext context) { - // 如果待校验的值为null，是否校验通过 - if (value == null) { - return annotation.allowNull(); - } - try { - SuitTempService service = SpringUtils.getBean(SuitTempService.class); - SuitTempQuery query = new SuitTempQuery(); - query.setTempId(value); - if (annotation.checkBelong()) { - query.setUserId(SecurityUtils.getUserId()); - } - return service.selectOne(query) != null; - } catch (Exception e) { - throw new RuntimeException(e); - } - } -} - diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/domain/SuitTemp.java b/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/domain/SuitTemp.java deleted file mode 100644 index 603f9c4a..00000000 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/domain/SuitTemp.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.ruoyi.ss.suitTemp.domain; - -import java.math.BigDecimal; - -import com.fasterxml.jackson.annotation.JsonView; -import com.ruoyi.common.core.domain.JsonViewProfile; -import com.ruoyi.common.core.domain.ValidGroup; -import com.ruoyi.common.validRule.suitTempExist.SuitTempExist; -import com.ruoyi.ss.device.domain.DeviceView; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - -/** - * 套餐模板对象 sm_suit_temp - * - * @author ruoyi - * @date 2024-07-15 - */ -@Data -public class SuitTemp extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 模板ID */ - @SuitTempExist(message = "模板不存在", checkBelong = true, groups = { ValidGroup.FrontUpdate.class}) - @JsonView(JsonViewProfile.App.class) - private Long tempId; - - /** 用户ID */ - @Excel(name = "用户ID") - @NotNull(message = "用户不允许为空", groups = {ValidGroup.Create.class}) - @JsonView(JsonViewProfile.App.class) - private Long userId; - - /** 套餐名称 */ - @Excel(name = "套餐名称") - @NotNull(message = "套餐名称不允许为空", groups = {ValidGroup.Create.class, ValidGroup.FrontCreate.class}) - @Size(min = 1, max = 50, message = "套餐名称长度在1~50个字符之间") - @JsonView(JsonViewProfile.App.class) - private String name; - - /** 价格(元） */ - @Excel(name = "价格(元）") - @NotNull(message = "价格不允许为空", groups = {ValidGroup.Create.class, ValidGroup.FrontCreate.class}) - @Min(value = 0, message = "价格不允许小于0") - @JsonView(JsonViewProfile.App.class) - private BigDecimal price; - - /** 通电时间（分钟） */ - @Excel(name = "通电时间", readConverterExp = "分=钟") - @NotNull(message = "通电时间不允许为空", groups = {ValidGroup.Create.class, ValidGroup.FrontCreate.class}) - @Min(value = 1, message = "通电时间不允许小于1分钟") - @JsonView(JsonViewProfile.App.class) - private BigDecimal value; - - /** 详细说明 */ - @Excel(name = "详细说明") - @Size(max = 200, message = "详细说明长度不能超过200个字符") - @JsonView(JsonViewProfile.App.class) - private String description; -} diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/domain/SuitTempQuery.java b/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/domain/SuitTempQuery.java deleted file mode 100644 index 61cd7bd6..00000000 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/domain/SuitTempQuery.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.ruoyi.ss.suitTemp.domain; - -import lombok.Data; - -/** - * @author wjh - * 2024/7/15 - */ -@Data -public class SuitTempQuery extends SuitTemp{ -} diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/domain/SuitTempVO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/domain/SuitTempVO.java deleted file mode 100644 index 17599182..00000000 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/domain/SuitTempVO.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.ruoyi.ss.suitTemp.domain; - -import lombok.Data; - -/** - * @author wjh - * 2024/7/15 - */ -@Data -public class SuitTempVO extends SuitTemp{ -} diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/mapper/SuitTempMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/mapper/SuitTempMapper.java deleted file mode 100644 index 945e4b9d..00000000 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/mapper/SuitTempMapper.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.ruoyi.ss.suitTemp.mapper; - -import java.util.List; -import com.ruoyi.ss.suitTemp.domain.SuitTemp; -import com.ruoyi.ss.suitTemp.domain.SuitTempQuery; -import com.ruoyi.ss.suitTemp.domain.SuitTempVO; - -/** - * 套餐模板Mapper接口 - * - * @author ruoyi - * @date 2024-07-15 - */ -public interface SuitTempMapper -{ - /** - * 查询套餐模板 - * - * @param tempId 套餐模板主键 - * @return 套餐模板 - */ - public SuitTempVO selectSuitTempByTempId(Long tempId); - - /** - * 查询套餐模板列表 - * - * @param suitTemp 套餐模板 - * @return 套餐模板集合 - */ - public List selectSuitTempList(SuitTempQuery suitTemp); - - /** - * 新增套餐模板 - * - * @param suitTemp 套餐模板 - * @return 结果 - */ - public int insertSuitTemp(SuitTemp suitTemp); - - /** - * 修改套餐模板 - * - * @param suitTemp 套餐模板 - * @return 结果 - */ - public int updateSuitTemp(SuitTemp suitTemp); - - /** - * 删除套餐模板 - * - * @param tempId 套餐模板主键 - * @return 结果 - */ - public int deleteSuitTempByTempId(Long tempId); - - /** - * 批量删除套餐模板 - * - * @param tempIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteSuitTempByTempIds(Long[] tempIds); - - /** - * 查询一个 - */ - SuitTempVO selectOne(SuitTempQuery query); -} diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/mapper/SuitTempMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/mapper/SuitTempMapper.xml deleted file mode 100644 index 78e77ab2..00000000 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/mapper/SuitTempMapper.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - select - sst.temp_id, - sst.user_id, - sst.name, - sst.price, - sst.value, - sst.description, - sst.create_time - from sm_suit_temp sst - - - - and sst.temp_id = #{tempId} - and sst.user_id = #{userId} - and sst.name like concat('%', #{name}, '%') - and sst.description like concat('%', #{description}, '%') - - - - - - - - - - insert into sm_suit_temp - - user_id, - `name`, - price, - `value`, - `description`, - create_time, - - - #{userId}, - #{name}, - #{price}, - #{value}, - #{description}, - #{createTime}, - - - - - update sm_suit_temp - - user_id = #{userId}, - `name` = #{name}, - price = #{price}, - `value` = #{value}, - `description` = #{description}, - create_time = #{createTime}, - - where temp_id = #{tempId} - - - - delete from sm_suit_temp where temp_id = #{tempId} - - - - delete from sm_suit_temp where temp_id in - - #{tempId} - - - diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/SuitTempConverter.java b/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/SuitTempConverter.java deleted file mode 100644 index 0cb292a3..00000000 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/SuitTempConverter.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ruoyi.ss.suitTemp.service; - -import com.ruoyi.ss.suitTemp.domain.SuitTemp; -import com.ruoyi.ss.suitTemp.domain.SuitTempVO; - -/** - * @author wjh - * 2024/7/15 - */ -public interface SuitTempConverter { - - /** - * 创建时，APP VO 转为 PO - */ - SuitTemp toPoByAppCreate(SuitTempVO vo); - - /** - * 修改时，APP VO 转为 PO - */ - SuitTemp toPoByAppUpdate(SuitTempVO vo); -} diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/SuitTempService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/SuitTempService.java deleted file mode 100644 index 60cd6e90..00000000 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/SuitTempService.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.ruoyi.ss.suitTemp.service; - -import java.util.List; -import com.ruoyi.ss.suitTemp.domain.SuitTemp; -import com.ruoyi.ss.suitTemp.domain.SuitTempQuery; -import com.ruoyi.ss.suitTemp.domain.SuitTempVO; - -/** - * 套餐模板Service接口 - * - * @author ruoyi - * @date 2024-07-15 - */ -public interface SuitTempService -{ - /** - * 查询套餐模板 - * - * @param tempId 套餐模板主键 - * @return 套餐模板 - */ - public SuitTempVO selectSuitTempByTempId(Long tempId); - - /** - * 查询套餐模板列表 - * - * @param query 套餐模板 - * @return 套餐模板集合 - */ - public List selectSuitTempList(SuitTempQuery query); - - /** - * 新增套餐模板 - * - * @param suitTemp 套餐模板 - * @return 结果 - */ - public int insertSuitTemp(SuitTemp suitTemp); - - /** - * 修改套餐模板 - * - * @param suitTemp 套餐模板 - * @return 结果 - */ - public int updateSuitTemp(SuitTemp suitTemp); - - /** - * 批量删除套餐模板 - * - * @param tempIds 需要删除的套餐模板主键集合 - * @return 结果 - */ - public int deleteSuitTempByTempIds(Long[] tempIds); - - /** - * 删除套餐模板信息 - * - * @param tempId 套餐模板主键 - * @return 结果 - */ - public int deleteSuitTempByTempId(Long tempId); - - /** - * 查询一个 - */ - SuitTempVO selectOne(SuitTempQuery query); -} diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/SuitTempValidator.java b/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/SuitTempValidator.java deleted file mode 100644 index d9cbf30c..00000000 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/SuitTempValidator.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ruoyi.ss.suitTemp.service; - -import com.ruoyi.ss.suitTemp.domain.SuitTemp; -import com.ruoyi.ss.suitTemp.domain.SuitTempVO; - -/** - * @author wjh - * 2024/7/15 - */ -public interface SuitTempValidator { - - /** - * 判断套餐模板是否属于用户 - */ - boolean checkBelong(SuitTemp temp, Long userId); - - /** - * 判断套餐模板是否属于用户 - */ - boolean checkBelong(Long tempId, Long userId); -} diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/impl/SuitTempConverterImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/impl/SuitTempConverterImpl.java deleted file mode 100644 index e102d7f5..00000000 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/impl/SuitTempConverterImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.ruoyi.ss.suitTemp.service.impl; - -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.ss.suitTemp.domain.SuitTemp; -import com.ruoyi.ss.suitTemp.domain.SuitTempVO; -import com.ruoyi.ss.suitTemp.service.SuitTempConverter; -import org.springframework.stereotype.Service; - -/** - * @author wjh - * 2024/7/15 - */ -@Service -public class SuitTempConverterImpl implements SuitTempConverter { - /** - * 创建时，APP VO 转为 PO - */ - @Override - public SuitTemp toPoByAppCreate(SuitTempVO vo) { - if (vo == null) { - return null; - } - SuitTemp po = new SuitTemp(); - po.setUserId(vo.getUserId()); - po.setName(vo.getName()); - po.setPrice(vo.getPrice()); - po.setValue(vo.getValue()); - po.setDescription(vo.getDescription()); - return po; - } - - - /** - * 修改时，APP VO 转为 PO - */ - @Override - public SuitTemp toPoByAppUpdate(SuitTempVO vo) { - if (vo == null) { - return null; - } - SuitTemp po = new SuitTemp(); - po.setTempId(vo.getTempId()); - po.setName(vo.getName()); - po.setPrice(vo.getPrice()); - po.setValue(vo.getValue()); - po.setDescription(vo.getDescription()); - return po; - } -} diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/impl/SuitTempServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/impl/SuitTempServiceImpl.java deleted file mode 100644 index 962ed761..00000000 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/impl/SuitTempServiceImpl.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.ruoyi.ss.suitTemp.service.impl; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.ss.suitTemp.domain.SuitTempQuery; -import com.ruoyi.ss.suitTemp.domain.SuitTempVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.ss.suitTemp.mapper.SuitTempMapper; -import com.ruoyi.ss.suitTemp.domain.SuitTemp; -import com.ruoyi.ss.suitTemp.service.SuitTempService; - -/** - * 套餐模板Service业务层处理 - * - * @author ruoyi - * @date 2024-07-15 - */ -@Service -public class SuitTempServiceImpl implements SuitTempService -{ - @Autowired - private SuitTempMapper suitTempMapper; - - /** - * 查询套餐模板 - * - * @param tempId 套餐模板主键 - * @return 套餐模板 - */ - @Override - public SuitTempVO selectSuitTempByTempId(Long tempId) - { - return suitTempMapper.selectSuitTempByTempId(tempId); - } - - /** - * 查询套餐模板列表 - * - * @param query 套餐模板 - * @return 套餐模板 - */ - @Override - public List selectSuitTempList(SuitTempQuery query) - { - return suitTempMapper.selectSuitTempList(query); - } - - /** - * 新增套餐模板 - * - * @param suitTemp 套餐模板 - * @return 结果 - */ - @Override - public int insertSuitTemp(SuitTemp suitTemp) - { - suitTemp.setCreateTime(DateUtils.getNowDate()); - return suitTempMapper.insertSuitTemp(suitTemp); - } - - /** - * 修改套餐模板 - * - * @param suitTemp 套餐模板 - * @return 结果 - */ - @Override - public int updateSuitTemp(SuitTemp suitTemp) - { - return suitTempMapper.updateSuitTemp(suitTemp); - } - - /** - * 批量删除套餐模板 - * - * @param tempIds 需要删除的套餐模板主键 - * @return 结果 - */ - @Override - public int deleteSuitTempByTempIds(Long[] tempIds) - { - return suitTempMapper.deleteSuitTempByTempIds(tempIds); - } - - /** - * 删除套餐模板信息 - * - * @param tempId 套餐模板主键 - * @return 结果 - */ - @Override - public int deleteSuitTempByTempId(Long tempId) - { - return suitTempMapper.deleteSuitTempByTempId(tempId); - } - - @Override - public SuitTempVO selectOne(SuitTempQuery query) { - return suitTempMapper.selectOne(query); - } -} diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/impl/SuitTempValidatorImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/impl/SuitTempValidatorImpl.java deleted file mode 100644 index e19a394f..00000000 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suitTemp/service/impl/SuitTempValidatorImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.ruoyi.ss.suitTemp.service.impl; - -import com.ruoyi.ss.suitTemp.domain.SuitTemp; -import com.ruoyi.ss.suitTemp.domain.SuitTempVO; -import com.ruoyi.ss.suitTemp.service.SuitTempService; -import com.ruoyi.ss.suitTemp.service.SuitTempValidator; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Objects; - -/** - * @author wjh - * 2024/7/15 - */ -@Service -public class SuitTempValidatorImpl implements SuitTempValidator { - - @Autowired - private SuitTempService suitTempService; - - @Override - public boolean checkBelong(SuitTemp temp, Long userId) { - return userId != null && Objects.equals(temp.getUserId(), userId); - } - - @Override - public boolean checkBelong(Long tempId, Long userId) { - SuitTempVO temp = suitTempService.selectSuitTempByTempId(tempId); - return this.checkBelong(temp, userId); - } -} diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppSuitTempController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppSuitTempController.java deleted file mode 100644 index 549fc491..00000000 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppSuitTempController.java +++ /dev/null @@ -1,83 +0,0 @@ -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.domain.ValidGroup; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.ss.suitTemp.domain.SuitTempQuery; -import com.ruoyi.ss.suitTemp.domain.SuitTempVO; -import com.ruoyi.ss.suitTemp.service.SuitTempConverter; -import com.ruoyi.ss.suitTemp.service.SuitTempService; -import com.ruoyi.ss.suitTemp.service.SuitTempValidator; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author wjh - * 2024/7/15 - */ -@RestController -@RequestMapping("/app/suit/temp") -public class AppSuitTempController extends BaseController { - - @Autowired - private SuitTempService suitTempService; - - @Autowired - private SuitTempValidator suitTempValidator; - - @Autowired - private SuitTempConverter suitTempConverter; - - @ApiOperation("查询本人套餐模板列表") - @GetMapping("/list") - @JsonView(JsonViewProfile.App.class) - public TableDataInfo list(SuitTempQuery query) - { - startPage(); - query.setUserId(getUserId()); - List list = suitTempService.selectSuitTempList(query); - return getDataTable(list); - } - - @ApiOperation("获取套餐模板详细信息") - @GetMapping(value = "/{tempId}") - @JsonView(JsonViewProfile.App.class) - public AjaxResult getInfo(@PathVariable("tempId") Long tempId) - { - SuitTempVO temp = suitTempService.selectSuitTempByTempId(tempId); - if (!suitTempValidator.checkBelong(temp, getUserId())) { - return error("这不是您的套餐模板,无权查看"); - } - return success(temp); - } - - @ApiOperation("新增套餐模板") - @PostMapping - public AjaxResult add(@RequestBody @Validated(ValidGroup.FrontCreate.class) SuitTempVO vo) { - vo.setUserId(getUserId()); - return toAjax(suitTempService.insertSuitTemp(suitTempConverter.toPoByAppCreate(vo))); - } - - @ApiOperation("修改套餐模板") - @PutMapping - public AjaxResult edit(@RequestBody @Validated(ValidGroup.FrontUpdate.class) SuitTempVO vo) { - return toAjax(suitTempService.updateSuitTemp(suitTempConverter.toPoByAppUpdate(vo))); - } - - @ApiOperation("删除套餐模板") - @DeleteMapping("/{tempId}") - public AjaxResult remove(@PathVariable Long tempId) { - if (!suitTempValidator.checkBelong(tempId, getUserId())) { - return error("这不是您的套餐模板,无权删除"); - } - return toAjax(suitTempService.deleteSuitTempByTempId(tempId)); - } - -} diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SuitTempController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SuitTempController.java deleted file mode 100644 index d0c76d6f..00000000 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SuitTempController.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.ruoyi.web.controller.ss; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.ruoyi.ss.suitTemp.domain.SuitTempQuery; -import com.ruoyi.ss.suitTemp.domain.SuitTempVO; -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.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.ss.suitTemp.domain.SuitTemp; -import com.ruoyi.ss.suitTemp.service.SuitTempService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 套餐模板Controller - * - * @author ruoyi - * @date 2024-07-15 - */ -@RestController -@RequestMapping("/ss/suitTemp") -public class SuitTempController extends BaseController -{ - @Autowired - private SuitTempService suitTempService; - - /** - * 查询套餐模板列表 - */ - @PreAuthorize("@ss.hasPermi('ss:suitTemp:list')") - @GetMapping("/list") - public TableDataInfo list(SuitTempQuery suitTemp) - { - startPage(); - List list = suitTempService.selectSuitTempList(suitTemp); - return getDataTable(list); - } - - /** - * 导出套餐模板列表 - */ - @PreAuthorize("@ss.hasPermi('ss:suitTemp:export')") - @Log(title = "套餐模板", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, SuitTempQuery suitTemp) - { - List list = suitTempService.selectSuitTempList(suitTemp); - ExcelUtil util = new ExcelUtil(SuitTempVO.class); - util.exportExcel(response, list, "套餐模板数据"); - } - - /** - * 获取套餐模板详细信息 - */ - @PreAuthorize("@ss.hasPermi('ss:suitTemp:query')") - @GetMapping(value = "/{tempId}") - public AjaxResult getInfo(@PathVariable("tempId") Long tempId) - { - return success(suitTempService.selectSuitTempByTempId(tempId)); - } - - /** - * 新增套餐模板 - */ - @PreAuthorize("@ss.hasPermi('ss:suitTemp:add')") - @Log(title = "套餐模板", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SuitTemp suitTemp) - { - return toAjax(suitTempService.insertSuitTemp(suitTemp)); - } - - /** - * 修改套餐模板 - */ - @PreAuthorize("@ss.hasPermi('ss:suitTemp:edit')") - @Log(title = "套餐模板", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SuitTemp suitTemp) - { - return toAjax(suitTempService.updateSuitTemp(suitTemp)); - } - - /** - * 删除套餐模板 - */ - @PreAuthorize("@ss.hasPermi('ss:suitTemp:remove')") - @Log(title = "套餐模板", businessType = BusinessType.DELETE) - @DeleteMapping("/{tempIds}") - public AjaxResult remove(@PathVariable Long[] tempIds) - { - return toAjax(suitTempService.deleteSuitTempByTempIds(tempIds)); - } -} diff --git a/smart-switch-web/src/main/resources/application-test.yml b/smart-switch-web/src/main/resources/application-test.yml index 545db15c..8cd8e2d7 100644 --- a/smart-switch-web/src/main/resources/application-test.yml +++ b/smart-switch-web/src/main/resources/application-test.yml @@ -43,7 +43,7 @@ spring: # 数据库索引 database: 1 # 密码 - password: YgUIGNudqOQaRxHZ + password: # 连接超时时间 timeout: 10s lettuce: