Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
* 'master' of http://221.0.232.152:9393/ability-center/share-platform: 删除人人开源注释,新增编目管理接口,资源管理接口
This commit is contained in:
commit
388267109a
2
pom.xml
2
pom.xml
|
@ -7,8 +7,6 @@
|
|||
<packaging>pom</packaging>
|
||||
|
||||
<name>security-enterprise</name>
|
||||
<description>人人权限专业版</description>
|
||||
<url>https://www.renren.io</url>
|
||||
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
|
@ -17,7 +9,6 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
|
|||
/**
|
||||
* renren-admin
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@SpringBootApplication(exclude = {
|
||||
org.activiti.spring.boot.SecurityAutoConfiguration.class,
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.annotation;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
@ -13,7 +5,6 @@ import java.lang.annotation.*;
|
|||
/**
|
||||
* 数据过滤注解
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Target(ElementType.METHOD)
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.annotation;
|
||||
|
||||
import java.lang.annotation.Documented;
|
||||
|
@ -17,7 +9,6 @@ import java.lang.annotation.Target;
|
|||
/**
|
||||
* 操作日志注解
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Target(ElementType.METHOD)
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.aspect;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
|
@ -31,7 +23,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 数据过滤,切面处理类
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Aspect
|
||||
@Component
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.aspect;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
|
@ -32,7 +24,6 @@ import java.lang.reflect.Method;
|
|||
/**
|
||||
* 操作日志,切面处理类
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Aspect
|
||||
@Component
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.config;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
|
||||
|
@ -17,7 +9,6 @@ import org.springframework.core.annotation.Order;
|
|||
/**
|
||||
* mybatis-plus配置
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Configuration
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.config;
|
||||
|
||||
import io.renren.common.constant.Constant;
|
||||
|
@ -28,7 +20,6 @@ import static com.google.common.collect.Lists.newArrayList;
|
|||
/**
|
||||
* Swagger配置
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Configuration
|
||||
@EnableSwagger2
|
||||
|
@ -51,10 +42,10 @@ public class SwaggerConfig{
|
|||
|
||||
private ApiInfo apiInfo() {
|
||||
return new ApiInfoBuilder()
|
||||
.title("人人开源")
|
||||
.description("renren-admin文档")
|
||||
.title("能力平台")
|
||||
.description("能力平台文档")
|
||||
.termsOfServiceUrl("https://www.renren.io")
|
||||
.version("2.0.0")
|
||||
.version("1.0.0")
|
||||
.build();
|
||||
}
|
||||
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.exception;
|
||||
|
||||
import cn.hutool.core.map.MapUtil;
|
||||
|
@ -27,11 +19,9 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
|
|||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
/**
|
||||
* 异常处理器
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@RestControllerAdvice
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.handler;
|
||||
|
||||
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
|
||||
|
@ -19,7 +11,6 @@ import java.util.Date;
|
|||
/**
|
||||
* 公共字段,自动填充值
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Component
|
||||
public class FieldMetaObjectHandler implements MetaObjectHandler {
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.interceptor;
|
||||
|
||||
import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
|
||||
|
@ -32,7 +24,6 @@ import java.util.Properties;
|
|||
/**
|
||||
* 数据过滤
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Intercepts({@Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})})
|
||||
|
|
|
@ -1,17 +1,8 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.interceptor;
|
||||
|
||||
/**
|
||||
* 数据范围
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public class DataScope {
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.utils;
|
||||
|
||||
import com.alibaba.excel.context.AnalysisContext;
|
||||
|
@ -21,7 +13,6 @@ import java.util.List;
|
|||
/**
|
||||
* Excel模板读取类
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public class ExcelDataListener<E, T> extends AnalysisEventListener<T> {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(ExcelDataListener.class);
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.utils;
|
||||
|
||||
import com.alibaba.excel.EasyExcel;
|
||||
|
@ -22,7 +14,6 @@ import java.util.List;
|
|||
/**
|
||||
* excel工具类
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public class ExcelUtils {
|
||||
|
||||
|
|
|
@ -1,17 +1,8 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.validator.group;
|
||||
|
||||
/**
|
||||
* 阿里云
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public interface AliyunGroup {
|
||||
}
|
||||
|
|
|
@ -1,17 +1,8 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.validator.group;
|
||||
|
||||
/**
|
||||
* FastDFS
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public interface FastDFSGroup {
|
||||
}
|
||||
|
|
|
@ -1,17 +1,8 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.validator.group;
|
||||
|
||||
/**
|
||||
* 本地上传
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public interface LocalGroup {
|
||||
}
|
||||
|
|
|
@ -1,17 +1,8 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.validator.group;
|
||||
|
||||
/**
|
||||
* MinIO
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public interface MinioGroup {
|
||||
}
|
||||
|
|
|
@ -1,17 +1,8 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.validator.group;
|
||||
|
||||
/**
|
||||
* 腾讯云
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public interface QcloudGroup {
|
||||
}
|
||||
|
|
|
@ -1,17 +1,8 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.common.validator.group;
|
||||
|
||||
/**
|
||||
* 七牛
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public interface QiniuGroup {
|
||||
}
|
||||
|
|
|
@ -9,7 +9,6 @@ import java.util.Date;
|
|||
/**
|
||||
* 能力-服务
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-01-11
|
||||
*/
|
||||
@Data
|
||||
|
|
|
@ -9,7 +9,6 @@ import java.util.Date;
|
|||
/**
|
||||
* 能力-视频监控
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-01-11
|
||||
*/
|
||||
@Data
|
||||
|
|
|
@ -11,7 +11,6 @@ import java.util.Date;
|
|||
/**
|
||||
* 能力-服务
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-01-11
|
||||
*/
|
||||
@Data
|
||||
|
|
|
@ -11,7 +11,6 @@ import java.util.Date;
|
|||
/**
|
||||
* 能力-视频监控
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-01-11
|
||||
*/
|
||||
@Data
|
||||
|
|
|
@ -7,7 +7,6 @@ import io.renren.modules.ability.entity.service.BsAbilityServiceEntity;
|
|||
/**
|
||||
* 能力-服务
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-01-11
|
||||
*/
|
||||
public interface BsAbilityServiceService extends CrudService<BsAbilityServiceEntity, BsAbilityServiceDTO> {
|
||||
|
|
|
@ -14,7 +14,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 能力-服务
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-01-11
|
||||
*/
|
||||
@Service
|
||||
|
|
|
@ -7,7 +7,6 @@ import io.renren.modules.ability.entity.video.BsAbilityVideoEntity;
|
|||
/**
|
||||
* 能力-视频监控
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-01-11
|
||||
*/
|
||||
public interface BsAbilityVideoService extends CrudService<BsAbilityVideoEntity, BsAbilityVideoDTO> {
|
||||
|
|
|
@ -16,7 +16,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 能力-视频监控
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-01-11
|
||||
*/
|
||||
@Service
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.config;
|
||||
|
||||
import org.activiti.spring.SpringProcessEngineConfiguration;
|
||||
|
@ -15,7 +7,6 @@ import org.springframework.context.annotation.Configuration;
|
|||
/**
|
||||
* 流程配置信息
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Configuration
|
||||
public class ProcessEngineConfig implements ProcessEngineConfigurationConfigurer {
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.controller;
|
||||
|
||||
import io.renren.common.annotation.LogOperation;
|
||||
|
@ -31,7 +23,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 模型管理
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/act/model")
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.controller;
|
||||
|
||||
import io.renren.common.annotation.LogOperation;
|
||||
|
@ -40,7 +32,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 流程管理
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/act/process")
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.controller;
|
||||
|
||||
import io.renren.common.annotation.LogOperation;
|
||||
|
@ -29,7 +21,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 运行中的流程
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/act/running")
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.dao;
|
||||
|
||||
import io.renren.common.dao.BaseDao;
|
||||
|
|
|
@ -27,7 +27,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 转正申请
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("act/demo/correction")
|
||||
|
|
|
@ -7,7 +7,6 @@ import org.apache.ibatis.annotations.Mapper;
|
|||
/**
|
||||
* 转正申请
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Mapper
|
||||
public interface CorrectionDao extends BaseDao<CorrectionEntity> {
|
||||
|
|
|
@ -12,7 +12,6 @@ import java.util.Date;
|
|||
/**
|
||||
* 转正申请
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "转正申请")
|
||||
|
|
|
@ -10,7 +10,6 @@ import java.util.Date;
|
|||
/**
|
||||
* 转正申请
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper=false)
|
||||
|
|
|
@ -8,7 +8,6 @@ import io.renren.modules.activiti.demo.entity.CorrectionEntity;
|
|||
/**
|
||||
* 转正申请
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public interface CorrectionService extends CrudService<CorrectionEntity, CorrectionDTO> {
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 转正申请
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Service
|
||||
public class CorrectionServiceImpl extends CrudServiceImpl<CorrectionDao, CorrectionEntity, CorrectionDTO> implements CorrectionService {
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2019 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.dto;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.dto;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
|
@ -18,7 +10,6 @@ import java.io.Serializable;
|
|||
/**
|
||||
* 模型
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Data
|
||||
@Api(tags="模型")
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.dto;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.dto;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.dto;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2019 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
|
|
@ -1,12 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2019 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
|
||||
package io.renren.modules.activiti.entity;
|
||||
|
||||
import io.renren.common.entity.BaseEntity;
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.org.activiti.rest.editor.main;
|
||||
|
||||
import org.activiti.engine.ActivitiException;
|
||||
|
@ -20,7 +12,6 @@ import java.io.InputStream;
|
|||
/**
|
||||
* Stencilset
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("service")
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.org.activiti.rest.editor.model;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
|
@ -26,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController;
|
|||
/**
|
||||
* Model Editor
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("service")
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.org.activiti.rest.editor.model;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
|
@ -32,7 +24,6 @@ import java.io.InputStream;
|
|||
/**
|
||||
* Model Rest
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("service")
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.service;
|
||||
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
|
@ -43,7 +35,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 模型管理
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Service
|
||||
public class ActModelService {
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.service;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
|
@ -47,7 +39,6 @@ import java.util.zip.ZipInputStream;
|
|||
/**
|
||||
* 流程管理
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Service
|
||||
public class ActProcessService {
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.service;
|
||||
|
||||
import io.renren.common.constant.Constant;
|
||||
|
@ -35,7 +27,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 运行中的流程
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Service
|
||||
public class ActRunningService {
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2019 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2019 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.service;
|
||||
|
||||
import io.renren.common.page.PageData;
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2019 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.activiti.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
|
|
|
@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.*;
|
|||
/**
|
||||
* 能力-地理图层
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-03-23
|
||||
*/
|
||||
@Data
|
||||
|
|
|
@ -9,7 +9,6 @@ import lombok.Data;
|
|||
/**
|
||||
* 能力-地理图层
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-03-23
|
||||
*/
|
||||
@Data
|
||||
|
|
|
@ -7,7 +7,6 @@ import io.renren.modules.bsBase.entity.BsAbilityBasebuildEntity;
|
|||
/**
|
||||
* 能力-地理图层
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-03-23
|
||||
*/
|
||||
public interface BsAbilityBasebuildService extends CrudService<BsAbilityBasebuildEntity, BsAbilityBasebuildDTO> {
|
||||
|
|
|
@ -16,7 +16,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 能力-地理图层
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-03-23
|
||||
*/
|
||||
@Service
|
||||
|
|
|
@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.*;
|
|||
/**
|
||||
* 能力-地理图层
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-03-23
|
||||
*/
|
||||
@Data
|
||||
|
|
|
@ -9,7 +9,6 @@ import lombok.Data;
|
|||
/**
|
||||
* 能力-地理图层
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-03-23
|
||||
*/
|
||||
@Data
|
||||
|
|
|
@ -7,7 +7,6 @@ import io.renren.modules.bsSystem.entity.BsAbilitySystemEntity;
|
|||
/**
|
||||
* 能力-地理图层
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-03-23
|
||||
*/
|
||||
public interface BsAbilitySystemService extends CrudService<BsAbilitySystemEntity, BsAbilitySystemDTO> {
|
||||
|
|
|
@ -16,7 +16,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 能力-地理图层
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-03-23
|
||||
*/
|
||||
@Service
|
||||
|
|
|
@ -8,7 +8,6 @@ import java.util.Date;
|
|||
/**
|
||||
* 目录表
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-01-11
|
||||
*/
|
||||
@Data
|
||||
|
|
|
@ -10,7 +10,6 @@ import java.util.Date;
|
|||
/**
|
||||
* 目录表
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-01-11
|
||||
*/
|
||||
@Data
|
||||
|
|
|
@ -11,7 +11,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 目录表
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-01-11
|
||||
*/
|
||||
public interface BsCatalogueService extends CrudService<BsCatalogueEntity, BsCatalogueDTO> {
|
||||
|
|
|
@ -21,7 +21,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 目录表
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
* @since 3.0 2022-01-11
|
||||
*/
|
||||
@Service
|
||||
|
|
|
@ -0,0 +1,90 @@
|
|||
package io.renren.modules.category.controller;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import io.renren.common.exception.ErrorCode;
|
||||
import io.renren.common.utils.MessageUtils;
|
||||
import io.renren.common.utils.Result;
|
||||
import io.renren.common.validator.ValidatorUtils;
|
||||
import io.renren.common.validator.group.AddGroup;
|
||||
import io.renren.common.validator.group.DefaultGroup;
|
||||
import io.renren.common.validator.group.UpdateGroup;
|
||||
import io.renren.modules.category.dto.CategoryDTO;
|
||||
import io.renren.modules.category.entity.Category;
|
||||
import io.renren.modules.category.service.CategoryService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/category")
|
||||
@Api(tags="编目管理")
|
||||
public class CategoryController {
|
||||
|
||||
@Autowired
|
||||
private CategoryService categoryService;
|
||||
/**
|
||||
* 查询顶级分类
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/getTopCategory")
|
||||
@ApiOperation("获取一级分类")
|
||||
public Result getTopCategory() {
|
||||
return new Result().ok(categoryService.getTopCategory());
|
||||
}
|
||||
|
||||
@GetMapping("/getCategoryTree")
|
||||
@ApiOperation("获取完整分类数据")
|
||||
public Object getCategoryTree() {
|
||||
return new Result<List<CategoryDTO>>().ok(categoryService.getCategoryTree());
|
||||
}
|
||||
|
||||
@GetMapping("/getAllFiledByTopCategory")
|
||||
@ApiOperation("根据一级分类获取属性字段")
|
||||
public Object getAllFiledByTopCategory(String topCategoryName) {
|
||||
return new Result<List<Category>>().ok(categoryService.getAllFiledByTopCategory(topCategoryName));
|
||||
}
|
||||
|
||||
@GetMapping("/getAllFilterCriteriaByTopCategory")
|
||||
@ApiOperation("根据一级分类获取筛选条件字段")
|
||||
public Object getAllFilterCriteriaByTopCategory(String topCategoryName) {
|
||||
return new Result<>().ok(categoryService.getAllFilterCriteriaByTopCategory(topCategoryName));
|
||||
}
|
||||
|
||||
@PostMapping("/insert")
|
||||
@ApiOperation("保存")
|
||||
public Object insert(@RequestBody CategoryDTO categoryDTO) {
|
||||
//效验数据
|
||||
ValidatorUtils.validateEntity(categoryDTO, AddGroup.class, DefaultGroup.class);
|
||||
categoryDTO.setDelFlag(0);
|
||||
categoryService.save(categoryDTO);
|
||||
|
||||
return new Result();
|
||||
}
|
||||
|
||||
@PostMapping("/update")
|
||||
@ApiOperation("修改")
|
||||
public Object update(@RequestBody CategoryDTO categoryDTO) {
|
||||
//效验数据
|
||||
ValidatorUtils.validateEntity(categoryDTO, UpdateGroup.class, DefaultGroup.class);
|
||||
|
||||
categoryService.update(categoryDTO);
|
||||
|
||||
return new Result();
|
||||
|
||||
}
|
||||
|
||||
@PostMapping("/deleteById")
|
||||
@ApiOperation("删除")
|
||||
public Object deleteById(@RequestBody JSONObject jsonObject) {
|
||||
try {
|
||||
categoryService.deleteByIds(jsonObject);
|
||||
return new Result();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return new Result<>().error(ErrorCode.INTERNAL_SERVER_ERROR, MessageUtils.getMessage(ErrorCode.INTERNAL_SERVER_ERROR));
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,20 @@
|
|||
package io.renren.modules.category.dao;
|
||||
|
||||
import io.renren.common.dao.BaseDao;
|
||||
import io.renren.modules.category.dto.CategoryDTO;
|
||||
import io.renren.modules.category.entity.Category;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Mapper
|
||||
public interface CategoryDao extends BaseDao<Category> {
|
||||
|
||||
List<Category> selectByParentId(@Param("parentId") Long parentId);
|
||||
|
||||
Integer deleteByIds(@Param("ids") List<Long> idList);
|
||||
|
||||
List<Map> selectFilterCriterByTopCategory(String topCategoryName);
|
||||
}
|
|
@ -0,0 +1,65 @@
|
|||
package io.renren.modules.category.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 资源分类表
|
||||
*
|
||||
* @author dg
|
||||
* @since 1.0 2022-04-12
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "资源分类表")
|
||||
public class CategoryDTO implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Long id;
|
||||
@ApiModelProperty(value = "名称")
|
||||
private String name;
|
||||
@ApiModelProperty(value = "根级分类名称")
|
||||
private String rootCategory;
|
||||
@ApiModelProperty(value = "父级ID")
|
||||
private Long pid;
|
||||
@ApiModelProperty(value = "是否为属性字段,true/false")
|
||||
private String isAttr;
|
||||
@ApiModelProperty(value = "是否作为筛选条件,true/false")
|
||||
private String isFilterCriteria;
|
||||
@ApiModelProperty(value = "是否和字典表关联,true/false")
|
||||
private String isLinkToDic;
|
||||
@ApiModelProperty(value = "关联字典类型")
|
||||
private String linkValue;
|
||||
@ApiModelProperty(value = "序号")
|
||||
private Integer xh;
|
||||
@ApiModelProperty(value = "删除标记:0:正常使用;1:已删除;9:其他")
|
||||
private Integer delFlag;
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private Long creator;
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private Date createDate;
|
||||
@ApiModelProperty(value = "修改人")
|
||||
private Long updater;
|
||||
@ApiModelProperty(value = "更新时间")
|
||||
private Date updateDate;
|
||||
@ApiModelProperty(value = "备用字段1")
|
||||
private String note1;
|
||||
@ApiModelProperty(value = "备用字段2")
|
||||
private String note2;
|
||||
@ApiModelProperty(value = "备用字段3")
|
||||
private String note3;
|
||||
@ApiModelProperty(value = "备用字段4")
|
||||
private String note4;
|
||||
@ApiModelProperty(value = "备用字段5")
|
||||
private String note5;
|
||||
|
||||
@ApiModelProperty(value = "是否为叶子结点:Y:是;N:否")
|
||||
private String isLeaf;
|
||||
@ApiModelProperty(value = "子集")
|
||||
private List<CategoryDTO> children;
|
||||
|
||||
}
|
|
@ -0,0 +1,94 @@
|
|||
package io.renren.modules.category.entity;
|
||||
|
||||
import lombok.Data;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 资源分类表
|
||||
*
|
||||
* @author dg
|
||||
* @since 1.0 2022-04-12
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper=false)
|
||||
@ToString
|
||||
@TableName("tb_data_category")
|
||||
public class Category implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
@TableId
|
||||
private Long id;
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
private String name;
|
||||
/**
|
||||
* 根级分类名称
|
||||
*/
|
||||
private String rootCategory;
|
||||
/**
|
||||
* 父级ID
|
||||
*/
|
||||
private Long pid;
|
||||
/**
|
||||
* 是否为属性字段,true/false
|
||||
*/
|
||||
private String isAttr;
|
||||
/**
|
||||
* 是否作为筛选条件,true/false
|
||||
*/
|
||||
private String isFilterCriteria;
|
||||
/**
|
||||
* 是否和字典表关联,true/false
|
||||
*/
|
||||
private String isLinkToDic;
|
||||
/**
|
||||
* 关联字典类型
|
||||
*/
|
||||
private String linkValue;
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
private Integer xh;
|
||||
/**
|
||||
* 删除标记:0:正常使用;1:已删除;9:其他
|
||||
*/
|
||||
private Integer delFlag;
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long creator;
|
||||
/**
|
||||
* 修改人
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
private Long updater;
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Date createDate;
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
private Date updateDate;
|
||||
/**
|
||||
* 备用字段1-5
|
||||
*/
|
||||
private String note1;
|
||||
private String note2;
|
||||
private String note3;
|
||||
private String note4;
|
||||
private String note5;
|
||||
|
||||
}
|
|
@ -0,0 +1,22 @@
|
|||
package io.renren.modules.category.service;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import io.renren.common.service.CrudService;
|
||||
import io.renren.modules.category.dto.CategoryDTO;
|
||||
import io.renren.modules.category.entity.Category;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface CategoryService extends CrudService<Category, CategoryDTO> {
|
||||
|
||||
Object getTopCategory();
|
||||
|
||||
List<CategoryDTO> getCategoryTree();
|
||||
|
||||
void deleteByIds(JSONObject jsonObject);
|
||||
|
||||
List<Category> getAllFiledByTopCategory(String topCategoryName);
|
||||
|
||||
List<Map> getAllFilterCriteriaByTopCategory(String topCategoryName);
|
||||
}
|
|
@ -0,0 +1,89 @@
|
|||
package io.renren.modules.category.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import io.renren.common.service.impl.CrudServiceImpl;
|
||||
import io.renren.modules.category.dao.CategoryDao;
|
||||
import io.renren.modules.category.dto.CategoryDTO;
|
||||
import io.renren.modules.category.entity.Category;
|
||||
import io.renren.modules.category.service.CategoryService;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
@Service
|
||||
public class CategoryServiceImpl extends CrudServiceImpl<CategoryDao, Category, CategoryDTO> implements CategoryService {
|
||||
|
||||
@Autowired
|
||||
private CategoryDao categoryDao;
|
||||
|
||||
@Override
|
||||
public Object getTopCategory() {
|
||||
return categoryDao.selectByParentId(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<CategoryDTO> getCategoryTree() {
|
||||
List<Category> topCategory = categoryDao.selectByParentId(null);
|
||||
ArrayList<CategoryDTO> list = new ArrayList<>();
|
||||
topCategory.forEach(item -> {
|
||||
CategoryDTO dto = new CategoryDTO();
|
||||
BeanUtils.copyProperties(item, dto);
|
||||
list.add(dto);
|
||||
});
|
||||
return getAllCategory(list);
|
||||
}
|
||||
|
||||
private List<CategoryDTO> getAllCategory(List<CategoryDTO> topCategory) {
|
||||
for (CategoryDTO categoryDto : topCategory) {
|
||||
if (categoryDao.selectByParentId(categoryDto.getId()).isEmpty()) {
|
||||
categoryDto.setIsLeaf("Y");
|
||||
categoryDto.setChildren(null);
|
||||
} else {
|
||||
ArrayList<CategoryDTO> list = new ArrayList<>();
|
||||
categoryDao.selectByParentId(categoryDto.getId())
|
||||
.stream().forEach(item -> {
|
||||
CategoryDTO dto = new CategoryDTO();
|
||||
BeanUtils.copyProperties(item, dto);
|
||||
list.add(dto);
|
||||
});
|
||||
categoryDto.setIsLeaf("N");
|
||||
categoryDto.setChildren(getAllCategory(list));
|
||||
}
|
||||
}
|
||||
return topCategory;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void deleteByIds(JSONObject jsonObject) {
|
||||
JSONArray jsonArray = jsonObject.getJSONArray("ids");
|
||||
List<Long> idList = jsonArray.toJavaList(Long.class);
|
||||
categoryDao.deleteByIds(idList);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Category> getAllFiledByTopCategory(String topCategoryName) {
|
||||
QueryWrapper<Category> wrapper = new QueryWrapper<>();
|
||||
wrapper.eq("root_category", topCategoryName)
|
||||
.eq("del_flag",0)
|
||||
.eq("is_attr", "true")
|
||||
.orderByAsc("xh");
|
||||
return categoryDao.selectList(wrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Map> getAllFilterCriteriaByTopCategory(String topCategoryName) {
|
||||
//return categoryDao.selectFilterCriterByTopCategory(topCategoryName);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public QueryWrapper<Category> getWrapper(Map<String, Object> params) {
|
||||
return null;
|
||||
}
|
||||
}
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.demo.controller;
|
||||
|
||||
import io.renren.common.annotation.LogOperation;
|
||||
|
@ -34,7 +26,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 新闻
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("demo/news")
|
||||
|
|
|
@ -26,7 +26,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 产品管理
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("demo/product")
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.demo.dao;
|
||||
|
||||
import io.renren.common.dao.BaseDao;
|
||||
|
@ -18,7 +10,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 新闻
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Mapper
|
||||
public interface NewsDao extends BaseDao<NewsEntity> {
|
||||
|
|
|
@ -7,7 +7,6 @@ import org.apache.ibatis.annotations.Mapper;
|
|||
/**
|
||||
* 产品管理
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Mapper
|
||||
public interface ProductDao extends BaseDao<ProductEntity> {
|
||||
|
|
|
@ -7,7 +7,6 @@ import org.apache.ibatis.annotations.Mapper;
|
|||
/**
|
||||
* 产品参数管理
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Mapper
|
||||
public interface ProductParamsDao extends BaseDao<ProductParamsEntity> {
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.demo.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
|
@ -25,7 +17,6 @@ import java.util.Date;
|
|||
/**
|
||||
* 新闻管理
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "新闻管理")
|
||||
|
|
|
@ -12,7 +12,6 @@ import java.util.List;
|
|||
/**
|
||||
* 产品管理
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "产品管理")
|
||||
|
|
|
@ -10,7 +10,6 @@ import java.io.Serializable;
|
|||
/**
|
||||
* 产品参数管理
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Data
|
||||
@ApiModel(value = "产品参数管理")
|
||||
|
|
|
@ -12,7 +12,6 @@ import java.util.Date;
|
|||
/**
|
||||
* Excel导入演示
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper=false)
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.demo.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
|
@ -20,7 +12,6 @@ import java.util.Date;
|
|||
/**
|
||||
* 新闻
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper=false)
|
||||
|
|
|
@ -12,7 +12,6 @@ import java.util.Date;
|
|||
/**
|
||||
* 产品管理
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper=false)
|
||||
|
|
|
@ -12,7 +12,6 @@ import java.util.Date;
|
|||
/**
|
||||
* 产品参数管理
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper=false)
|
||||
|
|
|
@ -12,7 +12,6 @@ import java.util.Date;
|
|||
/**
|
||||
* Excel导入演示
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Data
|
||||
@ContentRowHeight(20)
|
||||
|
|
|
@ -7,7 +7,6 @@ import io.renren.modules.demo.entity.ExcelDataEntity;
|
|||
/**
|
||||
* Excel导入演示
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public interface ExcelDataService extends CrudService<ExcelDataEntity, ExcelDataDTO> {
|
||||
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.demo.service;
|
||||
|
||||
import io.renren.common.page.PageData;
|
||||
|
@ -18,7 +10,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 新闻
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public interface NewsService extends BaseService<NewsEntity> {
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@ import java.util.List;
|
|||
/**
|
||||
* 产品参数管理
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public interface ProductParamsService extends BaseService<ProductParamsEntity> {
|
||||
|
||||
|
|
|
@ -7,7 +7,6 @@ import io.renren.modules.demo.entity.ProductEntity;
|
|||
/**
|
||||
* 产品管理
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public interface ProductService extends CrudService<ProductEntity, ProductDTO> {
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@ import java.util.Map;
|
|||
/**
|
||||
* Excel导入演示
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Service
|
||||
public class ExcelDataServiceImpl extends CrudServiceImpl<ExcelDataDao, ExcelDataEntity, ExcelDataDTO> implements ExcelDataService {
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2018 人人开源 All rights reserved.
|
||||
*
|
||||
* https://www.renren.io
|
||||
*
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.demo.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
|
|
|
@ -15,7 +15,6 @@ import java.util.List;
|
|||
/**
|
||||
* 产品参数管理
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Service
|
||||
public class ProductParamsServiceImpl extends BaseServiceImpl<ProductParamsDao, ProductParamsEntity> implements ProductParamsService {
|
||||
|
|
|
@ -19,7 +19,6 @@ import java.util.Map;
|
|||
/**
|
||||
* 产品管理
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Service
|
||||
public class ProductServiceImpl extends CrudServiceImpl<ProductDao, ProductEntity, ProductDTO> implements ProductService {
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2020 人人开源 All rights reserved.
|
||||
* <p>
|
||||
* https://www.renren.io
|
||||
* <p>
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.devtools.config;
|
||||
|
||||
import io.renren.modules.devtools.config.query.*;
|
||||
|
@ -20,7 +12,6 @@ import java.sql.SQLException;
|
|||
/**
|
||||
* 数据源信息
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
@Data
|
||||
public class DataSourceInfo {
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2020 人人开源 All rights reserved.
|
||||
* <p>
|
||||
* https://www.renren.io
|
||||
* <p>
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.devtools.config.query;
|
||||
|
||||
|
||||
|
@ -14,7 +6,6 @@ import io.renren.modules.devtools.utils.DbType;
|
|||
/**
|
||||
* Query
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public interface AbstractQuery {
|
||||
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2020 人人开源 All rights reserved.
|
||||
* <p>
|
||||
* https://www.renren.io
|
||||
* <p>
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.devtools.config.query;
|
||||
|
||||
import io.renren.modules.devtools.utils.DbType;
|
||||
|
@ -14,7 +6,6 @@ import org.apache.commons.lang.StringUtils;
|
|||
/**
|
||||
* MySQL查询
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public class MySqlQuery implements AbstractQuery {
|
||||
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2020 人人开源 All rights reserved.
|
||||
* <p>
|
||||
* https://www.renren.io
|
||||
* <p>
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.devtools.config.query;
|
||||
|
||||
|
||||
|
@ -15,7 +7,6 @@ import org.apache.commons.lang.StringUtils;
|
|||
/**
|
||||
* Oracle查询
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public class OracleQuery implements AbstractQuery {
|
||||
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2020 人人开源 All rights reserved.
|
||||
* <p>
|
||||
* https://www.renren.io
|
||||
* <p>
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.devtools.config.query;
|
||||
|
||||
import io.renren.modules.devtools.utils.DbType;
|
||||
|
@ -14,7 +6,6 @@ import org.apache.commons.lang.StringUtils;
|
|||
/**
|
||||
* PostgreSql查询
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public class PostgreSqlQuery implements AbstractQuery {
|
||||
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
/**
|
||||
* Copyright (c) 2020 人人开源 All rights reserved.
|
||||
* <p>
|
||||
* https://www.renren.io
|
||||
* <p>
|
||||
* 版权所有,侵权必究!
|
||||
*/
|
||||
|
||||
package io.renren.modules.devtools.config.query;
|
||||
|
||||
import io.renren.modules.devtools.utils.DbType;
|
||||
|
@ -14,7 +6,6 @@ import org.apache.commons.lang.StringUtils;
|
|||
/**
|
||||
* SqlServer查询
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public class SqlServerQuery implements AbstractQuery {
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue