Conflicts:
	dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java
This commit is contained in:
xiao-fajia 2024-08-13 10:42:07 +08:00
commit 94db55c584
312 changed files with 18249 additions and 409 deletions

View File

@ -25,11 +25,18 @@
<artifactId>yudao-module-infra-api</artifactId>
<version>${revision}</version>
</dependency>
<!-- 多租户相关 -->
<dependency>
<groupId>cn.iocoder.boot</groupId>
<artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
<version>2.1.0-jdk8-snapshot</version>
</dependency>
<!-- 数据权限 -->
<dependency>
<groupId>cn.iocoder.boot</groupId>
<artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
<version>2.1.0-jdk8-snapshot</version>
</dependency>
<!-- Web 相关 -->
<dependency>
<groupId>cn.iocoder.boot</groupId>

View File

@ -25,6 +25,12 @@ public class BaseConstants {
public static final String PASSWORD_DEFAULT = "123456";
/**租户下部门名称*/
public static final String DEPT_NAME_CORP_NAME = "政企客户";
/**计算下次保险时间*/
public static final String COMPUTE_TYPE_BX = "bx";
/**计算下次保养时间*/
public static final String COMPUTE_TYPE_BY = "by";
/**计算下次检测时间*/
public static final String COMPUTE_TYPE_JC = "jc";
/**企业管理-员工管理表名称*/
public static final String COMPANY_STAFF = "company_staff";
/**员工标识*/

View File

@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.custom.entity;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
@ -16,6 +18,9 @@ import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import org.springframework.format.annotation.DateTimeFormat;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
/**
* 车辆信息 DO
@ -51,42 +56,50 @@ public class CarMain extends TenantBaseDO {
/**
* 保养日期
*/
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime maintenanceDate;
/**
* 保养里程
*/
private String maintenanceMileage;
private BigDecimal maintenanceMileage;
/**
* 年检日期
*/
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime inspectionDate;
/**
* 保险日期
*/
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime insuranceDate;
/**
* 二级维护时间
*/
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime checkDate;
/**
* 下次保养日期
*/
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime nextMaintenanceDate;
/**
* 下次保养里程
*/
private Integer nextMaintenanceMileage;
private BigDecimal nextMaintenanceMileage;
/**
* 下次年检日期
*/
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime nextInspectionDate;
/**
* 保险到期日期
*/
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime insuranceExpiryDate;
/**
* 下次二级维护时间
*/
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime nextCheckDate;
/**
* 车辆品牌
@ -103,6 +116,7 @@ public class CarMain extends TenantBaseDO {
/**
* 车辆注册日期
*/
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime carRegisterDate;
/**
* 行驶证图片
@ -115,6 +129,7 @@ public class CarMain extends TenantBaseDO {
/**
* 最近办理业务的时间
*/
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime recentlyHandleBusinessTime;

View File

@ -5,12 +5,14 @@ import javax.validation.*;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.custom.entity.CarMain;
import cn.iocoder.yudao.module.custom.vo.CarBrandRespVO;
import cn.iocoder.yudao.module.custom.vo.CarMainReqVO;
import cn.iocoder.yudao.module.custom.vo.CarMainRespVO;
import cn.iocoder.yudao.module.custom.vo.CustomerMainSaveReqVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import java.time.LocalDateTime;
import java.util.List;
/**
@ -66,4 +68,15 @@ public interface CarMainService extends IService<CarMain> {
* @return void
**/
void bindCustomAndCar(CarMainReqVO saveReqVO);
/**
* 测算车辆下一次保养/检测/保险时间
* @author PQZ
* @date 7:45 2024/8/9
* @param reqVO TODO
* @return java.time.LocalDateTime
**/
LocalDateTime compute(CarMainReqVO reqVO);
}

View File

@ -20,9 +20,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import static cn.iocoder.yudao.common.BaseConstants.COMPUTE_TYPE_BX;
import static cn.iocoder.yudao.common.BaseConstants.CUS_SIGN_CAR;
/**
@ -195,6 +198,20 @@ public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> impl
customerCarService.bindCustomerCar(saveReqVO.getId(),CUS_SIGN_CAR,customerCars);
}
/**
* 测算车辆下一次保养/检测/保险时间
* @author PQZ
* @date 7:45 2024/8/9
* @param reqVO CarMainReqVO
* @return java.time.LocalDateTime
**/
@Override
public LocalDateTime compute(CarMainReqVO reqVO) {
LocalDateTime resultTime;
return null;
}
/**
* 车牌号车架号发动机号码 查重
* @param reqVO

View File

@ -1,10 +1,16 @@
package cn.iocoder.yudao.module.custom.vo;
import cn.iocoder.yudao.module.custom.entity.CarMain;
import cn.iocoder.yudao.module.label.entity.BusiLabel;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
@ -15,75 +21,23 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class CarMainReqVO extends PageParam {
@Schema(description = "主键ID")
private String id;
public class CarMainReqVO extends CarMain {
@Schema(description = "发动机号码")
private String engineNumber;
@Schema(description = "页码,从 1 开始", requiredMode = Schema.RequiredMode.REQUIRED,example = "1")
@NotNull(message = "页码不能为空")
@Min(value = 1, message = "页码最小值为 1")
private Integer pageNo = 1;
@Schema(description = "车架号")
private String vin;
@Schema(description = "每页条数,最大值为 100", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
@NotNull(message = "每页条数不能为空")
@Min(value = 1, message = "每页条数最小值为 1")
@Max(value = 100, message = "每页条数最大值为 100")
private Integer pageSize = 10;
@Schema(description = "车牌号")
private String licenseNumber;
@Schema(description = "车辆型号")
private String carModel;
@Schema(description = "保养日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime maintenanceDate;
@Schema(description = "保养里程")
private String maintenanceMileage;
@Schema(description = "年检日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime inspectionDate;
@Schema(description = "保险日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime insuranceDate;
@Schema(description = "二级维护时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime checkDate;
@Schema(description = "车辆品牌")
private String carBrand;
@Schema(description = "车辆性质:营运 非营运等")
private String carNature;
@Schema(description = "车辆类别:私家车 货车 教练车 公务车 出租车")
private String carCategory;
@Schema(description = "车辆注册日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime carRegisterDate;
@Schema(description = "行驶证图片")
private String carLicenseImg;
@Schema(description = "最近办理业务")
private String recentlyHandledBusiness;
@Schema(description = "最近办理业务的时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime recentlyHandleBusinessTime;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime createTime;
@Schema(description = "租户ID")
private String tenantId;
@Schema(description = "车辆绑定客户信息")
/**车辆绑定客户信息*/
private List<CustomerMainRespVO> cusList;
@Schema(description = "车辆绑定标签信息")
/**车辆绑定标签信息*/
List<BusiLabel> labelList;
/**车辆品牌型号数组*/
List<String> brandAndModel;

View File

@ -18,9 +18,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
public class CarMainRespVO extends CarMain {
@Schema(description = "创建时间")
@ExcelProperty("创建时间")
private LocalDateTime createTime;
/**是否车主0否1是*/
@Schema(description = "是否车主0否1是")

View File

@ -1,74 +0,0 @@
package cn.iocoder.yudao.module.custom.vo;
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 企业管理-资产处置子 Response VO")
@Data
@ExcelIgnoreUnannotated
public class PropertyDealItemRespVO {
@Schema(description = "主键标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "18095")
@ExcelProperty("主键标识")
private String id;
@Schema(description = "处置单/变动单id", example = "12936")
@ExcelProperty("处置单/变动单id")
private String dealId;
@Schema(description = "资产id", example = "14421")
@ExcelProperty("资产id")
private String propertyId;
@Schema(description = "处置方式")
@ExcelProperty(value = "处置方式", converter = DictConvert.class)
@DictFormat("company_deal_way") // TODO 代码优化建议设置到对应的 DictTypeConstants 枚举类中
private String dealWay;
@Schema(description = "原企业id", example = "17291")
@ExcelProperty("原企业id")
private String oldCorpId;
@Schema(description = "调入企业id", example = "21009")
@ExcelProperty("调入企业id")
private String corpId;
@Schema(description = "原部门id", example = "23846")
@ExcelProperty("原部门id")
private Long oldDeptId;
@Schema(description = "调入部门id", example = "3881")
@ExcelProperty("调入部门id")
private Long deptId;
@Schema(description = "原存放地id", example = "8837")
@ExcelProperty("原存放地id")
private String oldPosId;
@Schema(description = "调入存放地id", example = "28147")
@ExcelProperty("调入存放地id")
private String posId;
@Schema(description = "原使用人id", example = "23983")
@ExcelProperty("原使用人id")
private Long oldUserId;
@Schema(description = "调入使用人id", example = "918")
@ExcelProperty("调入使用人id")
private Long userId;
@Schema(description = "备注", example = "你说的对")
@ExcelProperty("备注")
private String remark;
@Schema(description = "创建时间")
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

View File

@ -1,47 +0,0 @@
package cn.iocoder.yudao.module.custom.vo;
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 企业管理-资产处置单/变动单 Response VO")
@Data
@ExcelIgnoreUnannotated
public class PropertyDealRespVO {
@Schema(description = "主键标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "29577")
@ExcelProperty("主键标识")
private String id;
@Schema(description = "企业idbase_company表中的id", example = "21595")
@ExcelProperty("企业idbase_company表中的id")
private String corpId;
@Schema(description = "部门idsystem_dept表中的id用来做数据权限控制", example = "19510")
@ExcelProperty("部门idsystem_dept表中的id用来做数据权限控制")
private Long deptId;
@Schema(description = "数据类型", example = "1")
@ExcelProperty(value = "数据类型", converter = DictConvert.class)
@DictFormat("property_data_type") // TODO 代码优化建议设置到对应的 DictTypeConstants 枚举类中
private String dataType;
@Schema(description = "处置/变动单号")
@ExcelProperty("处置/变动单号")
private String dealNo;
@Schema(description = "处置/变动日期")
@ExcelProperty("处置/变动日期")
private LocalDate dealDate;
@Schema(description = "创建时间")
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

View File

@ -1,51 +0,0 @@
package cn.iocoder.yudao.module.custom.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
@Schema(description = "管理后台 - 企业管理-资产存放位置 Response VO")
@Data
@ExcelIgnoreUnannotated
public class PropertyPosRespVO {
@Schema(description = "主键标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "19336")
@ExcelProperty("主键标识")
private String id;
@Schema(description = "企业idbase_company表中的id", example = "5018")
@ExcelProperty("企业idbase_company表中的id")
private String corpId;
@Schema(description = "部门idsystem_dept表中的id用来做数据权限控制", example = "25943")
@ExcelProperty("部门idsystem_dept表中的id用来做数据权限控制")
private Long deptId;
@Schema(description = "存放地名称", example = "王五")
@ExcelProperty("存放地名称")
private String posName;
@Schema(description = "存放地地址")
@ExcelProperty("存放地地址")
private String address;
@Schema(description = "面积")
@ExcelProperty("面积")
private BigDecimal area;
@Schema(description = "存放类型", example = "2")
@ExcelProperty(value = "存放类型", converter = DictConvert.class)
@DictFormat("company_deposit_type") // TODO 代码优化建议设置到对应的 DictTypeConstants 枚举类中
private String depositType;
@Schema(description = "创建时间")
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

View File

@ -0,0 +1,26 @@
package cn.iocoder.yudao.config;
import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* 数据权限 Configuration
*
* @author vinjor-m
*/
@Configuration(proxyBeanMethods = false)
public class CompanyDataPermissionConfiguration {
@Bean
public DeptDataPermissionRuleCustomizer companyDataPermissionRuleCustomizer() {
return rule -> {
// 应用部门的数据权限都有哪些表默认dept_id
rule.addDeptColumn(CompanyStaff.class);
// 应用用户的数据权限都有哪些表和对应字段默认creator
// rule.addUserColumn(CompanyStaff.class, "id");
};
}
}

View File

@ -1,14 +1,14 @@
package cn.iocoder.yudao.module.custom.controller.admin;
package cn.iocoder.yudao.module.property.controller.admin;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.custom.entity.Property;
import cn.iocoder.yudao.module.custom.service.PropertyService;
import cn.iocoder.yudao.module.custom.vo.PropertyReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyRespVO;
import cn.iocoder.yudao.module.property.entity.Property;
import cn.iocoder.yudao.module.property.service.PropertyService;
import cn.iocoder.yudao.module.property.vo.PropertyReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;

View File

@ -1,14 +1,14 @@
package cn.iocoder.yudao.module.custom.controller.admin;
package cn.iocoder.yudao.module.property.controller.admin;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.custom.entity.PropertyDealDO;
import cn.iocoder.yudao.module.custom.service.PropertyDealService;
import cn.iocoder.yudao.module.custom.vo.PropertyDealReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyDealRespVO;
import cn.iocoder.yudao.module.property.entity.PropertyDealDO;
import cn.iocoder.yudao.module.property.service.PropertyDealService;
import cn.iocoder.yudao.module.property.vo.PropertyDealReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyDealRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;

View File

@ -1,14 +1,14 @@
package cn.iocoder.yudao.module.custom.controller.admin;
package cn.iocoder.yudao.module.property.controller.admin;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.custom.entity.PropertyDealItemDO;
import cn.iocoder.yudao.module.custom.service.PropertyDealItemService;
import cn.iocoder.yudao.module.custom.vo.PropertyDealItemReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyDealItemRespVO;
import cn.iocoder.yudao.module.property.entity.PropertyDealItemDO;
import cn.iocoder.yudao.module.property.service.PropertyDealItemService;
import cn.iocoder.yudao.module.property.vo.PropertyDealItemReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyDealItemRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;

View File

@ -1,14 +1,14 @@
package cn.iocoder.yudao.module.custom.controller.admin;
package cn.iocoder.yudao.module.property.controller.admin;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.custom.entity.PropertyKeep;
import cn.iocoder.yudao.module.custom.service.PropertyKeepService;
import cn.iocoder.yudao.module.custom.vo.PropertyKeepReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyKeepRespVO;
import cn.iocoder.yudao.module.property.entity.PropertyKeep;
import cn.iocoder.yudao.module.property.service.PropertyKeepService;
import cn.iocoder.yudao.module.property.vo.PropertyKeepReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyKeepRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;

View File

@ -1,14 +1,14 @@
package cn.iocoder.yudao.module.custom.controller.admin;
package cn.iocoder.yudao.module.property.controller.admin;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.custom.entity.PropertyPosDO;
import cn.iocoder.yudao.module.custom.service.PropertyPosService;
import cn.iocoder.yudao.module.custom.vo.PropertyPosReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyPosRespVO;
import cn.iocoder.yudao.module.property.entity.PropertyPosDO;
import cn.iocoder.yudao.module.property.service.PropertyPosService;
import cn.iocoder.yudao.module.property.vo.PropertyPosReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyPosRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;

View File

@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.custom.entity;
package cn.iocoder.yudao.module.property.entity;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.IdType;
@ -9,6 +9,7 @@ import lombok.*;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 企业管理-资产 DO
@ -28,7 +29,7 @@ public class Property extends TenantBaseDO {
/**
* 主键标识
*/
@TableId(type = IdType.INPUT)
@TableId(type = IdType.ASSIGN_UUID)
private String id;
/**
* 企业id
@ -105,7 +106,7 @@ public class Property extends TenantBaseDO {
/**
* 取得日期
*/
private LocalDate getDate;
private LocalDateTime getDate;
/**
* 出厂日期
*/

View File

@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.custom.entity;
package cn.iocoder.yudao.module.property.entity;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.IdType;
@ -27,7 +27,7 @@ public class PropertyDealDO extends BaseDO {
/**
* 主键标识
*/
@TableId(type = IdType.INPUT)
@TableId(type = IdType.ASSIGN_UUID)
private String id;
/**
* 企业idbase_company表中的id

View File

@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.custom.entity;
package cn.iocoder.yudao.module.property.entity;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.IdType;
@ -25,7 +25,7 @@ public class PropertyDealItemDO extends BaseDO {
/**
* 主键标识
*/
@TableId(type = IdType.INPUT)
@TableId(type = IdType.ASSIGN_UUID)
private String id;
/**
* 处置单/变动单id

View File

@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.custom.entity;
package cn.iocoder.yudao.module.property.entity;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.IdType;
@ -27,7 +27,7 @@ public class PropertyKeep extends TenantBaseDO {
/**
* 主键标识
*/
@TableId(type = IdType.INPUT)
@TableId(type = IdType.ASSIGN_UUID)
private String id;
/**
* 资产id

View File

@ -1,6 +1,6 @@
package cn.iocoder.yudao.module.custom.entity;
package cn.iocoder.yudao.module.property.entity;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
@ -22,12 +22,12 @@ import java.math.BigDecimal;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PropertyPosDO extends BaseDO {
public class PropertyPosDO extends TenantBaseDO {
/**
* 主键标识
*/
@TableId(type = IdType.INPUT)
@TableId(type = IdType.ASSIGN_UUID)
private String id;
/**
* 企业idbase_company表中的id

View File

@ -1,8 +1,8 @@
package cn.iocoder.yudao.module.custom.mapper;
package cn.iocoder.yudao.module.property.mapper;
import cn.iocoder.yudao.module.custom.entity.PropertyDealItemDO;
import cn.iocoder.yudao.module.custom.vo.PropertyDealItemReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyDealItemRespVO;
import cn.iocoder.yudao.module.property.entity.PropertyDealItemDO;
import cn.iocoder.yudao.module.property.vo.PropertyDealItemReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyDealItemRespVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Mapper;

View File

@ -1,9 +1,9 @@
package cn.iocoder.yudao.module.custom.mapper;
package cn.iocoder.yudao.module.property.mapper;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.custom.entity.PropertyDealDO;
import cn.iocoder.yudao.module.custom.vo.PropertyDealReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyDealRespVO;
import cn.iocoder.yudao.module.property.entity.PropertyDealDO;
import cn.iocoder.yudao.module.property.vo.PropertyDealReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyDealRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Mapper;

View File

@ -1,8 +1,8 @@
package cn.iocoder.yudao.module.custom.mapper;
package cn.iocoder.yudao.module.property.mapper;
import cn.iocoder.yudao.module.custom.entity.PropertyKeep;
import cn.iocoder.yudao.module.custom.vo.PropertyKeepReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyKeepRespVO;
import cn.iocoder.yudao.module.property.entity.PropertyKeep;
import cn.iocoder.yudao.module.property.vo.PropertyKeepReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyKeepRespVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Mapper;

View File

@ -1,8 +1,8 @@
package cn.iocoder.yudao.module.custom.mapper;
package cn.iocoder.yudao.module.property.mapper;
import cn.iocoder.yudao.module.custom.entity.Property;
import cn.iocoder.yudao.module.custom.vo.PropertyReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyRespVO;
import cn.iocoder.yudao.module.property.entity.Property;
import cn.iocoder.yudao.module.property.vo.PropertyReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyRespVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Mapper;

View File

@ -1,8 +1,8 @@
package cn.iocoder.yudao.module.custom.mapper;
package cn.iocoder.yudao.module.property.mapper;
import cn.iocoder.yudao.module.custom.entity.PropertyPosDO;
import cn.iocoder.yudao.module.custom.vo.PropertyPosReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyPosRespVO;
import cn.iocoder.yudao.module.property.entity.PropertyPosDO;
import cn.iocoder.yudao.module.property.vo.PropertyPosReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyPosRespVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Mapper;

View File

@ -1,8 +1,8 @@
package cn.iocoder.yudao.module.custom.service;
package cn.iocoder.yudao.module.property.service;
import cn.iocoder.yudao.module.custom.entity.PropertyDealItemDO;
import cn.iocoder.yudao.module.custom.vo.PropertyDealItemReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyDealItemRespVO;
import cn.iocoder.yudao.module.property.entity.PropertyDealItemDO;
import cn.iocoder.yudao.module.property.vo.PropertyDealItemReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyDealItemRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

View File

@ -1,8 +1,8 @@
package cn.iocoder.yudao.module.custom.service;
package cn.iocoder.yudao.module.property.service;
import cn.iocoder.yudao.module.custom.entity.PropertyDealDO;
import cn.iocoder.yudao.module.custom.vo.PropertyDealReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyDealRespVO;
import cn.iocoder.yudao.module.property.entity.PropertyDealDO;
import cn.iocoder.yudao.module.property.vo.PropertyDealReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyDealRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

View File

@ -1,8 +1,8 @@
package cn.iocoder.yudao.module.custom.service;
package cn.iocoder.yudao.module.property.service;
import cn.iocoder.yudao.module.custom.entity.PropertyKeep;
import cn.iocoder.yudao.module.custom.vo.PropertyKeepReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyKeepRespVO;
import cn.iocoder.yudao.module.property.entity.PropertyKeep;
import cn.iocoder.yudao.module.property.vo.PropertyKeepReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyKeepRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

View File

@ -1,8 +1,8 @@
package cn.iocoder.yudao.module.custom.service;
package cn.iocoder.yudao.module.property.service;
import cn.iocoder.yudao.module.custom.entity.PropertyPosDO;
import cn.iocoder.yudao.module.custom.vo.PropertyPosReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyPosRespVO;
import cn.iocoder.yudao.module.property.entity.PropertyPosDO;
import cn.iocoder.yudao.module.property.vo.PropertyPosReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyPosRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

View File

@ -1,8 +1,8 @@
package cn.iocoder.yudao.module.custom.service;
package cn.iocoder.yudao.module.property.service;
import cn.iocoder.yudao.module.custom.entity.Property;
import cn.iocoder.yudao.module.custom.vo.PropertyReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyRespVO;
import cn.iocoder.yudao.module.property.entity.Property;
import cn.iocoder.yudao.module.property.vo.PropertyReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

View File

@ -1,11 +1,11 @@
package cn.iocoder.yudao.module.custom.service.impl;
package cn.iocoder.yudao.module.property.service.impl;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.custom.entity.PropertyDealItemDO;
import cn.iocoder.yudao.module.custom.mapper.PropertyDealItemMapper;
import cn.iocoder.yudao.module.custom.service.PropertyDealItemService;
import cn.iocoder.yudao.module.custom.vo.PropertyDealItemReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyDealItemRespVO;
import cn.iocoder.yudao.module.property.entity.PropertyDealItemDO;
import cn.iocoder.yudao.module.property.mapper.PropertyDealItemMapper;
import cn.iocoder.yudao.module.property.service.PropertyDealItemService;
import cn.iocoder.yudao.module.property.vo.PropertyDealItemReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyDealItemRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

View File

@ -1,11 +1,11 @@
package cn.iocoder.yudao.module.custom.service.impl;
package cn.iocoder.yudao.module.property.service.impl;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.custom.entity.PropertyDealDO;
import cn.iocoder.yudao.module.custom.mapper.PropertyDealMapper;
import cn.iocoder.yudao.module.custom.service.PropertyDealService;
import cn.iocoder.yudao.module.custom.vo.PropertyDealReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyDealRespVO;
import cn.iocoder.yudao.module.property.entity.PropertyDealDO;
import cn.iocoder.yudao.module.property.mapper.PropertyDealMapper;
import cn.iocoder.yudao.module.property.service.PropertyDealService;
import cn.iocoder.yudao.module.property.vo.PropertyDealReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyDealRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

View File

@ -1,11 +1,11 @@
package cn.iocoder.yudao.module.custom.service.impl;
package cn.iocoder.yudao.module.property.service.impl;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.custom.entity.PropertyKeep;
import cn.iocoder.yudao.module.custom.mapper.PropertyKeepMapper;
import cn.iocoder.yudao.module.custom.service.PropertyKeepService;
import cn.iocoder.yudao.module.custom.vo.PropertyKeepReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyKeepRespVO;
import cn.iocoder.yudao.module.property.entity.PropertyKeep;
import cn.iocoder.yudao.module.property.mapper.PropertyKeepMapper;
import cn.iocoder.yudao.module.property.service.PropertyKeepService;
import cn.iocoder.yudao.module.property.vo.PropertyKeepReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyKeepRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

View File

@ -1,11 +1,11 @@
package cn.iocoder.yudao.module.custom.service.impl;
package cn.iocoder.yudao.module.property.service.impl;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.custom.entity.PropertyPosDO;
import cn.iocoder.yudao.module.custom.mapper.PropertyPosMapper;
import cn.iocoder.yudao.module.custom.service.PropertyPosService;
import cn.iocoder.yudao.module.custom.vo.PropertyPosReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyPosRespVO;
import cn.iocoder.yudao.module.property.entity.PropertyPosDO;
import cn.iocoder.yudao.module.property.mapper.PropertyPosMapper;
import cn.iocoder.yudao.module.property.service.PropertyPosService;
import cn.iocoder.yudao.module.property.vo.PropertyPosReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyPosRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

View File

@ -1,12 +1,13 @@
package cn.iocoder.yudao.module.custom.service.impl;
package cn.iocoder.yudao.module.property.service.impl;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.custom.entity.Property;
import cn.iocoder.yudao.module.custom.mapper.PropertyMapper;
import cn.iocoder.yudao.module.custom.service.PropertyService;
import cn.iocoder.yudao.module.custom.vo.PropertyReqVO;
import cn.iocoder.yudao.module.custom.vo.PropertyRespVO;
import cn.iocoder.yudao.module.property.entity.Property;
import cn.iocoder.yudao.module.property.mapper.PropertyMapper;
import cn.iocoder.yudao.module.property.service.PropertyService;
import cn.iocoder.yudao.module.property.vo.PropertyReqVO;
import cn.iocoder.yudao.module.property.vo.PropertyRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@ -49,7 +50,9 @@ public class PropertyServiceImpl extends ServiceImpl<PropertyMapper, Property> i
@Override
public IPage<PropertyRespVO> getPropertyPage(PropertyReqVO pageReqVO) {
return baseMapper.selectPage(pageReqVO);
Page<Property> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
return null;
}
}

View File

@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.custom.vo;
package cn.iocoder.yudao.module.property.vo;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
@Schema(description = "管理后台 - 企业管理-资产处置子分页 Request VO")
@Data
@ -57,7 +57,7 @@ public class PropertyDealItemReqVO extends PageParam {
private String remark;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime createTime;
}

View File

@ -0,0 +1,20 @@
package cn.iocoder.yudao.module.property.vo;
import cn.iocoder.yudao.module.property.entity.PropertyDealItemDO;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 企业管理-资产处置子 Response VO")
@Data
@ExcelIgnoreUnannotated
public class PropertyDealItemRespVO extends PropertyDealItemDO {
@Schema(description = "创建时间")
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

View File

@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.custom.vo;
package cn.iocoder.yudao.module.property.vo;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
@Schema(description = "管理后台 - 企业管理-资产处置单/变动单分页 Request VO")
@Data
@ -34,11 +34,11 @@ public class PropertyDealReqVO extends PageParam {
private String dealNo;
@Schema(description = "处置/变动日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDate[] dealDate;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDate dealDate;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime createTime;
}

View File

@ -0,0 +1,20 @@
package cn.iocoder.yudao.module.property.vo;
import cn.iocoder.yudao.module.property.entity.PropertyDealDO;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 企业管理-资产处置单/变动单 Response VO")
@Data
@ExcelIgnoreUnannotated
public class PropertyDealRespVO extends PropertyDealDO {
@Schema(description = "创建时间")
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

View File

@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.custom.vo;
package cn.iocoder.yudao.module.property.vo;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;

View File

@ -1,6 +1,6 @@
package cn.iocoder.yudao.module.custom.vo;
package cn.iocoder.yudao.module.property.vo;
import cn.iocoder.yudao.module.custom.entity.Property;
import cn.iocoder.yudao.module.property.entity.Property;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;

View File

@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.custom.vo;
package cn.iocoder.yudao.module.property.vo;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
@Schema(description = "管理后台 - 企业管理-资产存放位置分页 Request VO")
@Data
@ -40,7 +40,7 @@ public class PropertyPosReqVO extends PageParam {
private String depositType;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDateTime createTime;
}

View File

@ -0,0 +1,20 @@
package cn.iocoder.yudao.module.property.vo;
import cn.iocoder.yudao.module.property.entity.PropertyPosDO;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 企业管理-资产存放位置 Response VO")
@Data
@ExcelIgnoreUnannotated
public class PropertyPosRespVO extends PropertyPosDO {
@Schema(description = "创建时间")
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

View File

@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.custom.vo;
package cn.iocoder.yudao.module.property.vo;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
@ -8,7 +8,6 @@ import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
@ -75,18 +74,18 @@ public class PropertyReqVO extends PageParam {
@Schema(description = "取得日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDate[] getDate;
private LocalDateTime getDate;
@Schema(description = "出厂日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDate[] prodDate;
private LocalDateTime prodDate;
@Schema(description = "供应商")
private String supplier;
@Schema(description = "启用日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDate[] openDate;
private LocalDateTime openDate;
@Schema(description = "净值(元)")
private BigDecimal netValue;
@ -102,11 +101,11 @@ public class PropertyReqVO extends PageParam {
@Schema(description = "上次维修/保养日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDate[] lastKeepDate;
private LocalDateTime lastKeepDate;
@Schema(description = "下次维修/保养日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDate[] nextKeepDate;
private LocalDateTime nextKeepDate;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)

View File

@ -1,6 +1,6 @@
package cn.iocoder.yudao.module.custom.vo;
package cn.iocoder.yudao.module.property.vo;
import cn.iocoder.yudao.module.custom.entity.Property;
import cn.iocoder.yudao.module.property.entity.Property;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;

View File

@ -4,6 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.common.BaseConstants;
import cn.iocoder.yudao.common.CommonErrorCodeConstants;
import cn.iocoder.yudao.framework.common.util.io.FileUtils;
import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRule;
import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRule;
import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.company.entity.Company;
import cn.iocoder.yudao.module.company.service.CompanyService;
@ -64,6 +68,8 @@ public class CompanyStaffServiceImpl extends ServiceImpl<CompanyStaffMapper, Com
@Resource
private UniqueCodeService uniqueCodeService;
@Resource
private DataPermissionRule dataPermissionRule;
@Resource
private DeptApi deptApi;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.company.dal.mysql.property.PropertyPosMapper">
<mapper namespace="cn.iocoder.yudao.module.property.dal.mysql.property.PropertyPosMapper">
<!--
一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。

View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>cn.iocoder.boot</groupId>
<artifactId>yudao</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>dl-module-knowledge</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>
点亮企业知识管理模块
</description>
<dependencies>
<dependency>
<groupId>cn.iocoder.boot</groupId>
<artifactId>dl-module-base</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
</project>

View File

@ -0,0 +1,22 @@
package cn.iocoder.yudao.module.knowledge.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD,ElementType.TYPE})
public @interface ExcelOut {
//列名
String name() default "";
//排序实体类中从1开始排序0被序号列占用
int sort();
//列宽
int width() default 15;
String dateFormat() default "";
boolean isFileUrl() default false;
}

View File

@ -0,0 +1,85 @@
package cn.iocoder.yudao.module.knowledge.common;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
/**
* 字符集工具类
*
* @author ruoyi
*/
public class CharsetKit
{
/** ISO-8859-1 */
public static final String ISO_8859_1 = "ISO-8859-1";
/** UTF-8 */
public static final String UTF_8 = "UTF-8";
/** GBK */
public static final String GBK = "GBK";
/** ISO-8859-1 */
public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
/** UTF-8 */
public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
/** GBK */
public static final Charset CHARSET_GBK = Charset.forName(GBK);
/**
* 转换为Charset对象
*
* @param charset 字符集为空则返回默认字符集
* @return Charset
*/
public static Charset charset(String charset)
{
return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
}
/**
* 转换字符串的字符集编码
*
* @param source 字符串
* @param srcCharset 源字符集默认ISO-8859-1
* @param destCharset 目标字符集默认UTF-8
* @return 转换后的字符集
*/
public static String convert(String source, String srcCharset, String destCharset)
{
return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
}
/**
* 转换字符串的字符集编码
*
* @param source 字符串
* @param srcCharset 源字符集默认ISO-8859-1
* @param destCharset 目标字符集默认UTF-8
* @return 转换后的字符集
*/
public static String convert(String source, Charset srcCharset, Charset destCharset)
{
if (null == srcCharset)
{
srcCharset = StandardCharsets.ISO_8859_1;
}
if (null == destCharset)
{
destCharset = StandardCharsets.UTF_8;
}
if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
{
return source;
}
return new String(source.getBytes(srcCharset), destCharset);
}
/**
* @return 系统字符集编码
*/
public static String systemCharset()
{
return Charset.defaultCharset().name();
}
}

View File

@ -0,0 +1,91 @@
package cn.iocoder.yudao.module.knowledge.common;
/**
* 字符串格式化
*
* @author ruoyi
*/
public class StrFormatter
{
public static final String EMPTY_JSON = "{}";
public static final char C_BACKSLASH = '\\';
public static final char C_DELIM_START = '{';
public static final char C_DELIM_END = '}';
/**
* 格式化字符串<br>
* 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
* 如果想输出 {} 使用 \\转义 { 即可如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
* <br>
* 通常使用format("this is {} for {}", "a", "b") -> this is a for b<br>
* 转义{} format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
* 转义\ format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
*
* @param strPattern 字符串模板
* @param argArray 参数列表
* @return 结果
*/
public static String format(final String strPattern, final Object... argArray)
{
if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray))
{
return strPattern;
}
final int strPatternLength = strPattern.length();
// 初始化定义好的长度以获得更好的性能
StringBuilder sbuf = new StringBuilder(strPatternLength + 50);
int handledPosition = 0;
int delimIndex;// 占位符所在位置
for (int argIndex = 0; argIndex < argArray.length; argIndex++)
{
delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition);
if (delimIndex == -1)
{
if (handledPosition == 0)
{
return strPattern;
}
else
{ // 字符串模板剩余部分不再包含占位符加入剩余部分后返回结果
sbuf.append(strPattern, handledPosition, strPatternLength);
return sbuf.toString();
}
}
else
{
if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH)
{
if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH)
{
// 转义符之前还有一个转义符占位符依旧有效
sbuf.append(strPattern, handledPosition, delimIndex - 1);
sbuf.append(Convert.utf8Str(argArray[argIndex]));
handledPosition = delimIndex + 2;
}
else
{
// 占位符被转义
argIndex--;
sbuf.append(strPattern, handledPosition, delimIndex - 1);
sbuf.append(C_DELIM_START);
handledPosition = delimIndex + 1;
}
}
else
{
// 正常占位符
sbuf.append(strPattern, handledPosition, delimIndex);
sbuf.append(Convert.utf8Str(argArray[argIndex]));
handledPosition = delimIndex + 2;
}
}
}
// 加入最后一个占位符后所有的字符
sbuf.append(strPattern, handledPosition, strPattern.length());
return sbuf.toString();
}
}

View File

@ -0,0 +1,622 @@
package cn.iocoder.yudao.module.knowledge.common;
import org.springframework.util.AntPathMatcher;
import java.util.*;
/**
* 字符串工具类
*
* @author ruoyi
*/
public class StringUtils extends org.apache.commons.lang3.StringUtils
{
/** 空字符串 */
private static final String NULLSTR = "";
/** 下划线 */
private static final char SEPARATOR = '_';
/**
* 获取参数不为空值
*
* @param value defaultValue 要判断的value
* @return value 返回值
*/
public static <T> T nvl(T value, T defaultValue)
{
return value != null ? value : defaultValue;
}
/**
* * 判断一个Collection是否为空 包含ListSetQueue
*
* @param coll 要判断的Collection
* @return true为空 false非空
*/
public static boolean isEmpty(Collection<?> coll)
{
return isNull(coll) || coll.isEmpty();
}
/**
* * 判断一个Collection是否非空包含ListSetQueue
*
* @param coll 要判断的Collection
* @return true非空 false
*/
public static boolean isNotEmpty(Collection<?> coll)
{
return !isEmpty(coll);
}
/**
* * 判断一个对象数组是否为空
*
* @param objects 要判断的对象数组
** @return true为空 false非空
*/
public static boolean isEmpty(Object[] objects)
{
return isNull(objects) || (objects.length == 0);
}
/**
* * 判断一个对象数组是否非空
*
* @param objects 要判断的对象数组
* @return true非空 false
*/
public static boolean isNotEmpty(Object[] objects)
{
return !isEmpty(objects);
}
/**
* * 判断一个Map是否为空
*
* @param map 要判断的Map
* @return true为空 false非空
*/
public static boolean isEmpty(Map<?, ?> map)
{
return isNull(map) || map.isEmpty();
}
/**
* * 判断一个Map是否为空
*
* @param map 要判断的Map
* @return true非空 false
*/
public static boolean isNotEmpty(Map<?, ?> map)
{
return !isEmpty(map);
}
/**
* * 判断一个字符串是否为空串
*
* @param str String
* @return true为空 false非空
*/
public static boolean isEmpty(String str)
{
return isNull(str) || NULLSTR.equals(str.trim());
}
/**
* * 判断一个字符串是否为非空串
*
* @param str String
* @return true非空串 false空串
*/
public static boolean isNotEmpty(String str)
{
return !isEmpty(str);
}
/**
* * 判断一个对象是否为空
*
* @param object Object
* @return true为空 false非空
*/
public static boolean isNull(Object object)
{
return object == null;
}
/**
* * 判断一个对象是否非空
*
* @param object Object
* @return true非空 false
*/
public static boolean isNotNull(Object object)
{
return !isNull(object);
}
/**
* * 判断一个对象是否是数组类型Java基本型别的数组
*
* @param object 对象
* @return true是数组 false不是数组
*/
public static boolean isArray(Object object)
{
return isNotNull(object) && object.getClass().isArray();
}
/**
* 去空格
*/
public static String trim(String str)
{
return (str == null ? "" : str.trim());
}
/**
* 截取字符串
*
* @param str 字符串
* @param start 开始
* @return 结果
*/
public static String substring(final String str, int start)
{
if (str == null)
{
return NULLSTR;
}
if (start < 0)
{
start = str.length() + start;
}
if (start < 0)
{
start = 0;
}
if (start > str.length())
{
return NULLSTR;
}
return str.substring(start);
}
/**
* 截取字符串
*
* @param str 字符串
* @param start 开始
* @param end 结束
* @return 结果
*/
public static String substring(final String str, int start, int end)
{
if (str == null)
{
return NULLSTR;
}
if (end < 0)
{
end = str.length() + end;
}
if (start < 0)
{
start = str.length() + start;
}
if (end > str.length())
{
end = str.length();
}
if (start > end)
{
return NULLSTR;
}
if (start < 0)
{
start = 0;
}
if (end < 0)
{
end = 0;
}
return str.substring(start, end);
}
/**
* 判断是否为空并且不是空白字符
*
* @param str 要判断的value
* @return 结果
*/
public static boolean hasText(String str)
{
return (str != null && !str.isEmpty() && containsText(str));
}
private static boolean containsText(CharSequence str)
{
int strLen = str.length();
for (int i = 0; i < strLen; i++)
{
if (!Character.isWhitespace(str.charAt(i)))
{
return true;
}
}
return false;
}
/**
* 格式化文本, {} 表示占位符<br>
* 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
* 如果想输出 {} 使用 \\转义 { 即可如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
* <br>
* 通常使用format("this is {} for {}", "a", "b") -> this is a for b<br>
* 转义{} format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
* 转义\ format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
*
* @param template 文本模板被替换的部分用 {} 表示
* @param params 参数值
* @return 格式化后的文本
*/
public static String format(String template, Object... params)
{
if (isEmpty(params) || isEmpty(template))
{
return template;
}
return StrFormatter.format(template, params);
}
/**
* 字符串转set
*
* @param str 字符串
* @param sep 分隔符
* @return set集合
*/
public static final Set<String> str2Set(String str, String sep)
{
return new HashSet<String>(str2List(str, sep, true, false));
}
/**
* 字符串转list
*
* @param str 字符串
* @param sep 分隔符
* @param filterBlank 过滤纯空白
* @param trim 去掉首尾空白
* @return list集合
*/
public static final List<String> str2List(String str, String sep, boolean filterBlank, boolean trim)
{
List<String> list = new ArrayList<String>();
if (StringUtils.isEmpty(str))
{
return list;
}
// 过滤空白字符串
if (filterBlank && StringUtils.isBlank(str))
{
return list;
}
String[] split = str.split(sep);
for (String string : split)
{
if (filterBlank && StringUtils.isBlank(string))
{
continue;
}
if (trim)
{
string = string.trim();
}
list.add(string);
}
return list;
}
/**
* 判断给定的collection列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value
*
* @param collection 给定的集合
* @param array 给定的数组
* @return boolean 结果
*/
public static boolean containsAny(Collection<String> collection, String... array)
{
if (isEmpty(collection) || isEmpty(array))
{
return false;
}
else
{
for (String str : array)
{
if (collection.contains(str))
{
return true;
}
}
return false;
}
}
/**
* 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写
*
* @param cs 指定字符串
* @param searchCharSequences 需要检查的字符串数组
* @return 是否包含任意一个字符串
*/
public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences)
{
if (isEmpty(cs) || isEmpty(searchCharSequences))
{
return false;
}
for (CharSequence testStr : searchCharSequences)
{
if (containsIgnoreCase(cs, testStr))
{
return true;
}
}
return false;
}
/**
* 驼峰转下划线命名
*/
public static String toUnderScoreCase(String str)
{
if (str == null)
{
return null;
}
StringBuilder sb = new StringBuilder();
// 前置字符是否大写
boolean preCharIsUpperCase = true;
// 当前字符是否大写
boolean curreCharIsUpperCase = true;
// 下一字符是否大写
boolean nexteCharIsUpperCase = true;
for (int i = 0; i < str.length(); i++)
{
char c = str.charAt(i);
if (i > 0)
{
preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
}
else
{
preCharIsUpperCase = false;
}
curreCharIsUpperCase = Character.isUpperCase(c);
if (i < (str.length() - 1))
{
nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
}
if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase)
{
sb.append(SEPARATOR);
}
else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase)
{
sb.append(SEPARATOR);
}
sb.append(Character.toLowerCase(c));
}
return sb.toString();
}
/**
* 是否包含字符串
*
* @param str 验证字符串
* @param strs 字符串组
* @return 包含返回true
*/
public static boolean inStringIgnoreCase(String str, String... strs)
{
if (str != null && strs != null)
{
for (String s : strs)
{
if (str.equalsIgnoreCase(trim(s)))
{
return true;
}
}
}
return false;
}
/**
* 将下划线大写方式命名的字符串转换为驼峰式如果转换前的下划线大写方式命名的字符串为空则返回空字符串 例如HELLO_WORLD->HelloWorld
*
* @param name 转换前的下划线大写方式命名的字符串
* @return 转换后的驼峰式命名的字符串
*/
public static String convertToCamelCase(String name)
{
StringBuilder result = new StringBuilder();
// 快速检查
if (name == null || name.isEmpty())
{
// 没必要转换
return "";
}
else if (!name.contains("_"))
{
// 不含下划线仅将首字母大写
return name.substring(0, 1).toUpperCase() + name.substring(1);
}
// 用下划线将原始字符串分割
String[] camels = name.split("_");
for (String camel : camels)
{
// 跳过原始字符串中开头结尾的下换线或双重下划线
if (camel.isEmpty())
{
continue;
}
// 首字母大写
result.append(camel.substring(0, 1).toUpperCase());
result.append(camel.substring(1).toLowerCase());
}
return result.toString();
}
/**
* 驼峰式命名法
* 例如user_name->userName
*/
public static String toCamelCase(String s)
{
if (s == null)
{
return null;
}
if (s.indexOf(SEPARATOR) == -1)
{
return s;
}
s = s.toLowerCase();
StringBuilder sb = new StringBuilder(s.length());
boolean upperCase = false;
for (int i = 0; i < s.length(); i++)
{
char c = s.charAt(i);
if (c == SEPARATOR)
{
upperCase = true;
}
else if (upperCase)
{
sb.append(Character.toUpperCase(c));
upperCase = false;
}
else
{
sb.append(c);
}
}
return sb.toString();
}
/**
* 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
*
* @param str 指定字符串
* @param strs 需要检查的字符串数组
* @return 是否匹配
*/
public static boolean matches(String str, List<String> strs)
{
if (isEmpty(str) || isEmpty(strs))
{
return false;
}
for (String pattern : strs)
{
if (isMatch(pattern, str))
{
return true;
}
}
return false;
}
/**
* 判断url是否与规则配置:
* ? 表示单个字符;
* * 表示一层路径内的任意字符串不可跨层级;
* ** 表示任意层路径;
*
* @param pattern 匹配规则
* @param url 需要匹配的url
* @return
*/
public static boolean isMatch(String pattern, String url)
{
AntPathMatcher matcher = new AntPathMatcher();
return matcher.match(pattern, url);
}
@SuppressWarnings("unchecked")
public static <T> T cast(Object obj)
{
return (T) obj;
}
/**
* 数字左边补齐0使之达到指定长度注意如果数字转换为字符串后长度大于size则只保留 最后size个字符
*
* @param num 数字对象
* @param size 字符串指定长度
* @return 返回数字的字符串格式该字符串为指定长度
*/
public static final String padl(final Number num, final int size)
{
return padl(num.toString(), size, '0');
}
/**
* 字符串左补齐如果原始字符串s长度大于size则只保留最后size个字符
*
* @param s 原始字符串
* @param size 字符串指定长度
* @param c 用于补齐的字符
* @return 返回指定长度的字符串由原字符串左补齐或截取得到
*/
public static final String padl(final String s, final int size, final char c)
{
final StringBuilder sb = new StringBuilder(size);
if (s != null)
{
final int len = s.length();
if (s.length() <= size)
{
for (int i = size - len; i > 0; i--)
{
sb.append(c);
}
sb.append(s);
}
else
{
return s.substring(len - size, len);
}
}
else
{
for (int i = size; i > 0; i--)
{
sb.append(c);
}
}
return sb.toString();
}
}

View File

@ -0,0 +1,44 @@
package cn.iocoder.yudao.module.knowledge.constants;
/**
* 缓存的key 常量
*
* @author ruoyi
*/
public class CacheConstants
{
/**
* 登录用户 redis key
*/
public static final String LOGIN_TOKEN_KEY = "login_tokens:";
/**
* 验证码 redis key
*/
public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
/**
* 参数管理 cache key
*/
public static final String SYS_CONFIG_KEY = "sys_config:";
/**
* 字典管理 cache key
*/
public static final String SYS_DICT_KEY = "sys_dict:";
/**
* 防重提交 redis key
*/
public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";
/**
* 限流 redis key
*/
public static final String RATE_LIMIT_KEY = "rate_limit:";
/**
* 登录账户密码错误次数 redis key
*/
public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
}

View File

@ -0,0 +1,41 @@
package cn.iocoder.yudao.module.knowledge.constants;
import lombok.Getter;
/**
* @author 叶圣暖
*/
@Getter
public enum CodeEnum {
// 成功
SUCCESS(200, "成功", "操作成功"),
AUTH_FAIL(401, "无权限", "无权限"),
//2500XX项目内通用错误码
TEST(250001, "测试,请稍后再试", "测试"),
//2500XX项目内通用错误码
PARAMETER_VERIFICATION_FAILED(250000, "系统开小差了,请稍后再试", "参数校验失败"),
SYSTEM_SEATA_GLOCK_ERROR(90001, "当前操作失败,可能有其他操作正在更新数据,请重新再试,如果一直失败请联系管理员", "系统异常"),
SYSTEM_ERROR(250099, "系统开小差了,请稍后再试", "系统异常"),
//档案管理
TARCHIVES_SELECT_FAILED(121001, "查找失败", "查找失败"),
TARCHIVES_SAVE_FAILED(121002, "新建文件夹||文件保存失败", "新建文件夹||文件保存失败"),
TARCHIVES_RENAME_FAILED(121003, "文件夹||文件名称更改失败", "文件夹||文件名称更改失败"),
TARCHIVES_DELETE_FAILED(121004, "文件||文件夹删除失败", "文件||文件夹删除失败"),
TARCHIVES_RESTORE_ERROR(121005, "还原失败", "还原失败"),
TARCHIVES_BINDELETE_FAILED(121006, "回收站删除失败", "回收站删除失败"),
TARCHIVES_SORT_FAILED(121007, "排序失败", "排序失败"),
TARCHIVES_FILEMOVE_FAILED(121008, "文件移动失败", "文件移动失败"),
TARCHIVES_FILEEXPORT_FAILED(121009, "文件导出失败", "文件导出失败"),
DB_FAILD(500, "数据重复", "数据异常");
private final int code;
private final String msg;
private final String desc;
CodeEnum(Integer code, String msg, String desc) {
this.code = code;
this.msg = msg;
this.desc = desc;
}
}

View File

@ -0,0 +1,173 @@
package cn.iocoder.yudao.module.knowledge.constants;
import java.util.Locale;
/**
* 通用常量信息
*
* @author ruoyi
*/
public class Constants
{
/**
* UTF-8 字符集
*/
public static final String UTF8 = "UTF-8";
/**
* GBK 字符集
*/
public static final String GBK = "GBK";
/**
* 系统语言
*/
public static final Locale DEFAULT_LOCALE = Locale.SIMPLIFIED_CHINESE;
/**
* www主域
*/
public static final String WWW = "www.";
/**
* http请求
*/
public static final String HTTP = "http://";
/**
* https请求
*/
public static final String HTTPS = "https://";
/**
* 通用成功标识
*/
public static final String SUCCESS = "0";
/**
* 通用失败标识
*/
public static final String FAIL = "1";
/**
* 登录成功
*/
public static final String LOGIN_SUCCESS = "Success";
/**
* 注销
*/
public static final String LOGOUT = "Logout";
/**
* 注册
*/
public static final String REGISTER = "Register";
/**
* 登录失败
*/
public static final String LOGIN_FAIL = "Error";
/**
* 所有权限标识
*/
public static final String ALL_PERMISSION = "*:*:*";
/**
* 管理员角色权限标识
*/
public static final String SUPER_ADMIN = "admin";
/**
* 角色权限分隔符
*/
public static final String ROLE_DELIMETER = ",";
/**
* 权限标识分隔符
*/
public static final String PERMISSION_DELIMETER = ",";
/**
* 验证码有效期分钟
*/
public static final Integer CAPTCHA_EXPIRATION = 2;
/**
* 令牌
*/
public static final String TOKEN = "token";
/**
* 令牌前缀
*/
public static final String TOKEN_PREFIX = "Bearer ";
/**
* 令牌前缀
*/
public static final String LOGIN_USER_KEY = "login_user_key";
/**
* 用户ID
*/
public static final String JWT_USERID = "userid";
/**
* 用户名称
*/
//public static final String JWT_USERNAME = Claims.SUBJECT;
/**
* 用户头像
*/
public static final String JWT_AVATAR = "avatar";
/**
* 创建时间
*/
public static final String JWT_CREATED = "created";
/**
* 用户权限
*/
public static final String JWT_AUTHORITIES = "authorities";
/**
* 资源映射路径 前缀
*/
public static final String RESOURCE_PREFIX = "/profile";
/**
* RMI 远程方法调用
*/
public static final String LOOKUP_RMI = "rmi:";
/**
* LDAP 远程方法调用
*/
public static final String LOOKUP_LDAP = "ldap:";
/**
* LDAPS 远程方法调用
*/
public static final String LOOKUP_LDAPS = "ldaps:";
/**
* 自动识别json对象白名单配置仅允许解析的包名范围越小越安全
*/
public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.ruoyi" };
/**
* 定时任务白名单配置仅允许访问的包名如其他需要可以自行添加
*/
public static final String[] JOB_WHITELIST_STR = { "com.ruoyi.framework.task" };
/**
* 定时任务违规的字符
*/
public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
"org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.framework.config", "com.ruoyi.project.tool" };
}

View File

@ -0,0 +1,38 @@
package cn.iocoder.yudao.module.knowledge.constants;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@Schema(
description = "分页结果"
)
@Data
public final class PageResult<T> implements Serializable {
@Schema(
description = "数据",
requiredMode = RequiredMode.REQUIRED
)
private List<T> list;
@Schema(
description = "总量",
requiredMode = RequiredMode.REQUIRED
)
private Long total;
@Schema(
description = "当前页数据量",
requiredMode = RequiredMode.REQUIRED
)
private Integer currentSize;
@Schema(
description = "当前页数",
requiredMode = RequiredMode.REQUIRED
)
private Integer currentPage;
}

View File

@ -0,0 +1,7 @@
package cn.iocoder.yudao.module.knowledge.constants;
public class RedisKeyConstants {
public static final String EXAMINATION_NUMBER_KEY_PREFIX = "exNum:";
public static final String PAPER_NUMBER_KEY_SUFFIX = "paperNum:";
}

View File

@ -0,0 +1,63 @@
package cn.iocoder.yudao.module.knowledge.constants;
import lombok.Data;
import java.io.Serializable;
@Data
public class Result<T> implements Serializable {
private Integer code;
private String msg;
private T data;
private static final Integer SUCCESS_CODE = 200;
private static final String SUCCESS_MSG = "success";
public Result() {
}
public Integer getCode() {
return this.code;
}
public void setCode(Integer code) {
this.code = code;
}
public String getMsg() {
return this.msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
public T getData() {
return this.data;
}
public void setData(T data) {
this.data = data;
}
public String toString() {
return "Result{code=" + this.code + ", msg='" + this.msg + "', data=" + this.data + "}";
}
public static <T> Result<T> success(T data) {
Result var1 = new Result();
var1.setCode(SUCCESS_CODE);
var1.setMsg("success");
var1.setData(data);
return var1;
}
public static <T> Result<T> success() {
return success((T)null);
}
public static <T> Result<T> error(Integer code, String msg) {
Result var2 = new Result();
var2.setCode(code);
var2.setMsg(msg);
return var2;
}
}

View File

@ -0,0 +1,32 @@
package cn.iocoder.yudao.module.knowledge.constants;
public class TestPaperConstants {
/**
* 保存
*/
public static final Integer SAVE = 1;
/**
* 交卷
*/
public static final Integer SUBMIT = 2;
/**
* 单选
*/
public static final String RADIO = "0";
/**
* 多选
*/
public static final String CHECKBOX = "1";
/**
* 判断
*/
public static final String JUDGE = "2";
/**
* 填空
*/
public static final String GAP_FILLING = "3";
/**
* 问答
*/
public static final String SUBJECTIVE = "4";
}

View File

@ -0,0 +1,251 @@
package cn.iocoder.yudao.module.knowledge.controller.admin;
import cn.iocoder.yudao.module.knowledge.constants.Result;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.knowledge.controller.requestdto.TArchivesRequest;
import cn.iocoder.yudao.module.knowledge.controller.requestdto.UserInfoRequest;
import cn.iocoder.yudao.module.knowledge.entity.TArchives;
import cn.iocoder.yudao.module.knowledge.service.TArchivesService;
import cn.iocoder.yudao.module.knowledge.utils.ExcelUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.iocoder.yudao.module.knowledge.constants.Result;
import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 档案表(TArchives)表控制层
*
* @author makejava
* @since 2024-04-11 10:25:58
*/
@RestController
@RequestMapping("/system/tArchives")
public class TArchivesController {
/**
* 错误日志
*/
private static Logger errorLog = LoggerFactory.getLogger("errorLog");
/**
* 埋点info日志
*/
private static Logger buriedLog = LoggerFactory.getLogger("buriedLog");
/**
* 服务对象
*/
@Autowired
private TArchivesService tArchivesService;
/**
* 日常使用测试接口
*
* @param tArchives
* @return
*/
@Operation(summary = "getTArchives", description = "查询文件信息")
@Parameters({
@Parameter(name = "id", description = "文件id"),
})
@ApiResponses({
@ApiResponse(responseCode = "200", description = "successful operation",
content = {@Content(mediaType = "application/json",
schema = @Schema(implementation = Result.class)
)}),
@ApiResponse(responseCode = "250000", description = "paramter error operation",
content = {@Content(mediaType = "application/json",
schema = @Schema(implementation = Result.class)
)})
})
@GetMapping(value = "/findAll", produces = "application/json;charset=UTF-8")
public Result selectAll(TArchivesRequest tArchives) {
Page<TArchives> page = new Page<>(tArchives.getPageNo(), tArchives.getPageSize());
return Result.success(this.tArchivesService.findAll(page, tArchives));
}
@Operation(summary = "selectOne", description = "查询文件信息")
@Parameters({
@Parameter(
content = {@Content(mediaType = "application/json",
schema = @Schema(implementation = UserInfoRequest.class)
)})
})
@ApiResponses({
@ApiResponse(responseCode = "200", description = "successful operation",
content = {@Content(mediaType = "application/json",
schema = @Schema(implementation = Result.class)
)}),
@ApiResponse(responseCode = "250000", description = "paramter error operation",
content = {@Content(mediaType = "application/json",
schema = @Schema(implementation = Result.class)
)})
})
@GetMapping(value = "/findAllDocList", produces = "application/json;charset=UTF-8")
public Result findAllDocList(TArchivesRequest tArchives) {
Page<TArchives> page = new Page<>(tArchives.getPageNo(), tArchives.getPageSize());
return Result.success(this.tArchivesService.findAllDocList(page, tArchives));
}
/**
* 通过主键查询单条数据
*
* @param id 主键
* @return 单条数据
*/
@GetMapping(value = "/findOne", produces = "application/json;charset=UTF-8")
public Result selectOne(HttpServletRequest request, @RequestParam("id") Integer id) {
return Result.success(this.tArchivesService.getById(id));
}
/**
* 通过id查询父id
* @param id 主键
* @return 单条数据
*/
@GetMapping(value = "/getParentId", produces = "application/json;charset=UTF-8")
public Result getParentId(HttpServletRequest request, @RequestParam(value = "id",required = false) Long id) {
return Result.success(this.tArchivesService.getParentId(id));
}
/**
* 文件保存
* 新建文件夹
*
* @param tArchivesRequest 实体对象
* @return 新增结果
*/
@PostMapping(value = "/save", produces = "application/json;charset=UTF-8")
public Result insert(@RequestBody TArchivesRequest tArchivesRequest) throws Exception{
return this.tArchivesService.add(tArchivesRequest);
}
/**
* 更改文件名以及文件夹名
*
* @param request
* @param id
* @param name
* @return
*/
@GetMapping(value = "/update", produces = "application/json;charset=UTF-8")
public Result update(HttpServletRequest request, @RequestParam("id") Long id, @RequestParam("name") String name) {
TArchives tArchives = new TArchives();
tArchives.setId(id);
tArchives.setCurFilename(name);
return Result.success(this.tArchivesService.updateByTaId(tArchives));
}
/**
* 删除文件或文件夹
*
* @param ids
* @return
*/
@PostMapping(value = "/delete", produces = "application/json;charset=UTF-8")
public Result delete(@RequestParam(value = "ids",required = false) List<Long> ids) throws Exception {
return this.tArchivesService.delete(ids);
}
/**
* 还原
*
* @param ids
* @return
*/
@PostMapping(value = "/restore", produces = "application/json;charset=UTF-8")
public Result restore(@RequestParam("ids") List<Long> ids) {
return Result.success(this.tArchivesService.restore(ids));
}
/**
* 文件移动
*
* @param tArchivesRequest 实体对象
* @return 修改结果
*/
@PostMapping(value = "/move", produces = "application/json;charset=UTF-8")
public Result move(@RequestBody TArchivesRequest tArchivesRequest) {
return Result.success(this.tArchivesService.move(tArchivesRequest));
}
/**
* 更改文件地址
*
* @param request
* @param code
* @param url
* @return
*/
@GetMapping(value = "/updateUrl", produces = "application/json;charset=UTF-8")
public Result updateUrl(HttpServletRequest request, @RequestParam("code ") String code, @RequestParam("url ") String url) {
TArchives tArchives = this.tArchivesService.selectByCode(code);
tArchives.setFileUrl(url);
return Result.success(this.tArchivesService.updateByTaId(tArchives));
}
/**
* 导出
*/
@PostMapping(value = "/export", produces = "application/json;charset=UTF-8")
public void export(HttpServletResponse response, TArchivesRequest tArchives) {
List<TArchives> tArchivesList = tArchivesService.findAllDoc(tArchives);
//导出
ExcelUtils.exportExcel(tArchivesList, TArchives.class, "档案文件表", response);
}
/**
* 彻底删除
*
* @param ids 主键结合
* @return 删除结果
*/
@PostMapping(value = "ackDelete", produces = "application/json;charset=UTF-8")
public Result ackDelete(@RequestParam(value = "ids",required = false) List<Long> ids) {
return Result.success(this.tArchivesService.ackDelete(ids));
}
@PostMapping(value = "/app/findAll", produces = "application/json;charset=UTF-8")
public Result appFindAll(@RequestBody TArchivesRequest tArchives) {
Page<TArchives> page = new Page<>(tArchives.getPageNo(), tArchives.getPageSize());
return Result.success(this.tArchivesService.findAll(page, tArchives));
}
@GetMapping(value = "/app/findByParentId", produces = "application/json;charset=UTF-8")
public Result appFindByParentId(TArchivesRequest tArchives) {
Page<TArchives> page = new Page<>(tArchives.getPageNo(), tArchives.getPageSize());
return Result.success(this.tArchivesService.appFindByParentId(page, tArchives));
}
@GetMapping(value = "/app/getParentId", produces = "application/json;charset=UTF-8")
public Result appGetParentId(HttpServletRequest request, @RequestParam(value = "id",required = false) String id) {
if (!id.equals("null")){
return Result.success(this.tArchivesService.getParentId(Long.parseLong(id)));
}else {
return Result.success();
}
}
}

View File

@ -0,0 +1,275 @@
package cn.iocoder.yudao.module.knowledge.controller.admin;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.knowledge.controller.requestdto.DeleteRequest;
import cn.iocoder.yudao.module.knowledge.controller.requestdto.TLawsRequest;
import cn.iocoder.yudao.module.knowledge.entity.TLaws;
import cn.iocoder.yudao.module.knowledge.service.TLawsService;
import cn.iocoder.yudao.module.knowledge.utils.ExcelUtils;
import cn.iocoder.yudao.module.knowledge.constants.Result;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.util.List;
/**
* 法律法规表(TLaws)表控制层
*
* @author makejava
* @since 2024-04-12 10:31:34
*/
@RestController
@RequestMapping("tLaws")
public class TLawsController {
/**
* 错误日志
*/
private static Logger errorLog= LoggerFactory.getLogger("errorLog");
/**
* 埋点info日志
*/
private static Logger buriedLog=LoggerFactory.getLogger("buriedLog");
/**
* 服务对象
*/
@Autowired
private TLawsService tLawsService;
/**
* 分页查询所有数据
*
* @param tLaws 查询实体
* @return 所有数据
*/
@PostMapping(value = "/findAll",produces = "application/json;charset=UTF-8")
public Result findAll(@RequestBody TLawsRequest tLaws) {
Page<TLaws> page = new Page<>(tLaws.getPageNo(),tLaws.getPageSize());
return Result.success(tLawsService.select(page, tLaws));
}
/**
* 通过主键查询单条数据
*
* @param id 主键
* @return 单条数据
*/
@GetMapping(value = "/findOne",produces = "application/json;charset=UTF-8")
public Result findOne(@RequestParam(value = "id") String id ) {
return Result.success(tLawsService.getById(id));
}
/**
* 新增数据
*
* @param tLaws 实体对象
* @return 新增结果
*/
@PostMapping(value = "/insert",produces = "application/json;charset=UTF-8")
public Result insert(@RequestBody TLawsRequest tLaws) throws Exception {
return Result.success(tLawsService.add(tLaws));
}
/**
* 修改数据
*
* @param tLaws 实体对象
* @return 修改结果
*/
@PostMapping (value = "/update",produces = "application/json;charset=UTF-8")
public Result update(@RequestBody TLawsRequest tLaws) throws Exception {
return Result.success(tLawsService.updateByTLId(tLaws));
}
/**
* 历史记录
*
* @return
*/
@GetMapping(value = "/history",produces = "application/json;charset=UTF-8")
public Result history(TLawsRequest tLaws) {
return Result.success(tLawsService.history(tLaws));
}
/**
* 归档
* @param id
* @return
*/
@GetMapping(value = "/filing",produces = "application/json;charset=UTF-8")
public Result filing(@RequestParam("id") long id ) throws Exception {
tLawsService.filing(id);
return Result.success();
}
/**
* 导出表格
* @param response
* @param tLaws
*/
@PostMapping(value = "/export",produces = "application/json;charset=UTF-8")
public void export(HttpServletResponse response, TLawsRequest tLaws) {
//此处调用service查询需要导出的数据
List<TLaws> tlawsList = tLawsService.selectForExport(tLaws);
//导出
ExcelUtils.exportExcel(tlawsList, TLaws.class, "法律法规文件表", response);
}
/**
* 归档文件夹
* @return
*/
@GetMapping(value = "/archiveFolder",produces = "application/json;charset=UTF-8")
public Result archiveFolder() {
tLawsService.archiveFolder();
return Result.success();
}
/**
* 记录查询
* @param tLawsRequest
* @return
*/
@GetMapping(value = "/recordsQuery",produces = "application/json;charset=UTF-8")
public Result recordsQuery(TLawsRequest tLawsRequest) {
return Result.success(tLawsService.recordsQuery(tLawsRequest));
}
/**
* 删除数据
* @param ids
* @return
*/
@PostMapping(value = "/delete", produces = "application/json;charset=UTF-8")
public Result delete(@RequestParam("ids") List<Long> ids) {
return Result.success(this.tLawsService.delete(ids));
}
//========app
/**
* 分页查询所有数据
*
* @param tLaws 查询实体
* @return 所有数据
*/
@PostMapping(value = "/app/findAll",produces = "application/json;charset=UTF-8")
public Result findAllForApp(@RequestBody TLawsRequest tLaws) throws ParseException {
Page<TLaws> page = new Page<>(tLaws.getPageNo(),tLaws.getPageSize());
return Result.success(tLawsService.selectForApp(page, tLaws));
}
/**
* app首页文档
* @param tLaws
* @return
*/
@PostMapping(value = "/app/findAllDocuments",produces = "application/json;charset=UTF-8")
public Result findAllDocuments(@RequestBody TLawsRequest tLaws) {
Page<TLaws> page = new Page<>(tLaws.getPageNo(),tLaws.getPageSize());
return Result.success(tLawsService.findAllDocuments(page, tLaws));
}
/**
* 通过主键查询单条数据
*
* @param id 主键
* @return 单条数据
*/
@GetMapping(value = "/app/findOne",produces = "application/json;charset=UTF-8")
public Result findOneForApp(@RequestParam(value = "id") String id ) {
return Result.success(tLawsService.getById(id));
}
/**
* 新增数据
*
* @param tLaws 实体对象
* @return 新增结果
*/
@PostMapping(value = "/app/insert",produces = "application/json;charset=UTF-8")
public Result insertForApp(@RequestBody TLawsRequest tLaws) throws Exception {
return Result.success(tLawsService.addForApp(tLaws));
}
/**
* 修改数据
*
* @param tLaws 实体对象
* @return 修改结果
*/
@PostMapping (value = "/app/update",produces = "application/json;charset=UTF-8")
public Result updateForApp(@RequestBody TLawsRequest tLaws) throws Exception {
return Result.success(tLawsService.updateByTLIdForApp(tLaws));
}
/**
* 历史记录
*
* @return
*/
@GetMapping(value = "/app/history",produces = "application/json;charset=UTF-8")
public Result historyForApp(TLawsRequest tLaws) {
return Result.success(tLawsService.historyForApp(tLaws));
}
/**
* 归档
* @param id
* @return
*/
@GetMapping(value = "/app/filing",produces = "application/json;charset=UTF-8")
public Result filingForApp(@RequestParam("id") long id ) throws Exception {
tLawsService.filingForApp(id);
return Result.success();
}
/**
* 归档文件夹
* @return
*/
@GetMapping(value = "/app/archiveFolder",produces = "application/json;charset=UTF-8")
public Result archiveFolderForApp() {
tLawsService.archiveFolderForApp();
return Result.success();
}
/**
* 记录查询
* @param tLawsRequest
* @return
*/
@GetMapping(value = "/app/recordsQuery",produces = "application/json;charset=UTF-8")
public Result recordsQueryForApp(TLawsRequest tLawsRequest) {
return Result.success(tLawsService.recordsQueryForApp(tLawsRequest));
}
/**
* 删除数据
* @param ids
* @return
*/
@PostMapping(value = "/app/delete", produces = "application/json;charset=UTF-8")
public Result deleteForApp(@RequestParam("ids") List<Long> ids) {
return Result.success(tLawsService.deleteForApp(ids));
}
}

View File

@ -0,0 +1,263 @@
package cn.iocoder.yudao.module.knowledge.controller.admin;
import cn.iocoder.yudao.module.knowledge.service.TRegulatoryFrameworkService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.iocoder.yudao.module.knowledge.controller.requestdto.TRegulatoryFrameworkRequest;
import cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFramework;
import cn.iocoder.yudao.module.knowledge.utils.ExcelUtils;
import cn.iocoder.yudao.module.knowledge.constants.Result;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.util.List;
/**
* 规章制度表(TRegulatoryFramework)表控制层
*
* @author makejava
* @since 2024-04-12 17:36:32
*/
@RestController
@RequestMapping("tRegulatoryFramework")
public class TRegulatoryFrameworkController {
/**
* 错误日志
*/
private static Logger errorLog= LoggerFactory.getLogger("errorLog");
/**
* 埋点info日志
*/
private static Logger buriedLog=LoggerFactory.getLogger("buriedLog");
/**
* 服务对象
*/
@Autowired
private TRegulatoryFrameworkService regulatoryService;
/**
* 分页查询所有数据
*
* @param regulatoryFrameworkRequest 查询实体
* @return 所有数据
*/
@PostMapping(value = "/findAll",produces = "application/json;charset=UTF-8")
public Result findAll(@RequestBody TRegulatoryFrameworkRequest regulatoryFrameworkRequest) {
Page<TRegulatoryFramework> page = new Page<>(regulatoryFrameworkRequest.getPageNo(),regulatoryFrameworkRequest.getPageSize());
return Result.success(regulatoryService.select(page, regulatoryFrameworkRequest));
}
/**
* 通过主键查询单条数据
*
* @param id 主键
* @return 单条数据
*/
@GetMapping(value = "/findOne",produces = "application/json;charset=UTF-8")
public Result findOne(@RequestParam(value = "id") String id ) {
return Result.success(regulatoryService.getById(id));
}
/**
* 新增数据
*
* @param regulatoryFrameworkRequest 实体对象
* @return 新增结果
*/
@PostMapping(value = "/insert",produces = "application/json;charset=UTF-8")
public Result insert(@RequestBody TRegulatoryFrameworkRequest regulatoryFrameworkRequest)throws Exception {
return Result.success(regulatoryService.add(regulatoryFrameworkRequest));
}
/**
* 修改数据
*
* @param regulatoryFrameworkRequest 实体对象
* @return 修改结果
*/
@PostMapping (value = "/update",produces = "application/json;charset=UTF-8")
public Result update(@RequestBody TRegulatoryFrameworkRequest regulatoryFrameworkRequest) throws Exception {
return Result.success(regulatoryService.updateByTLId(regulatoryFrameworkRequest));
}
/**
* 历史记录
*
* @return
*/
@GetMapping(value = "/history",produces = "application/json;charset=UTF-8")
public Result history(TRegulatoryFrameworkRequest regulatoryFrameworkRequest) {
return Result.success(regulatoryService.history(regulatoryFrameworkRequest));
}
/**
* 归档
* @param id
* @return
*/
@GetMapping(value = "/filing",produces = "application/json;charset=UTF-8")
public Result filing(@RequestParam("id") long id ) throws Exception {
regulatoryService.filing(id);
return Result.success();
}
/**
* 导出表格
* @param response
*/
@PostMapping(value = "/export",produces = "application/json;charset=UTF-8")
public void export(HttpServletResponse response, TRegulatoryFrameworkRequest regulatoryFrameworkRequest) {
//此处调用service查询需要导出的数据
List<TRegulatoryFramework> tlawsList = regulatoryService.selectForExport(regulatoryFrameworkRequest);
//导出
ExcelUtils.exportExcel(tlawsList, TRegulatoryFramework.class, "规章制度文件表", response);
}
/**
* 归档文件夹
* @return
*/
@GetMapping(value = "/archiveFolder",produces = "application/json;charset=UTF-8")
public Result archiveFolder() {
regulatoryService.archiveFolder();
return Result.success();
}
/**
* 记录查询
* @param tLawsRequest
* @return
*/
@GetMapping(value = "/recordsQuery",produces = "application/json;charset=UTF-8")
public Result recordsQuery(TRegulatoryFrameworkRequest tLawsRequest) {
return Result.success(regulatoryService.recordsQuery(tLawsRequest));
}
/**
* 删除数据
* @param ids
* @return
*/
@PostMapping(value = "/delete", produces = "application/json;charset=UTF-8")
public Result delete(@RequestParam("ids") List<Long> ids) {
return Result.success(regulatoryService.delete(ids));
}
//======app
/**
* 分页查询所有数据
*
* @param regulatoryFrameworkRequest 查询实体
* @return 所有数据
*/
@PostMapping(value = "/app/findAll",produces = "application/json;charset=UTF-8")
public Result findAllForApp(@RequestBody TRegulatoryFrameworkRequest regulatoryFrameworkRequest) throws ParseException {
Page<TRegulatoryFramework> page = new Page<>(regulatoryFrameworkRequest.getPageNo(),regulatoryFrameworkRequest.getPageSize());
return Result.success(regulatoryService.selectForApp(page, regulatoryFrameworkRequest));
}
/**
* 通过主键查询单条数据
*
* @param id 主键
* @return 单条数据
*/
@GetMapping(value = "/app/findOne",produces = "application/json;charset=UTF-8")
public Result findOneForApp(@RequestParam(value = "id") String id ) {
return Result.success(regulatoryService.getById(id));
}
/**
* 新增数据
*
* @param regulatoryFrameworkRequest 实体对象
* @return 新增结果
*/
@PostMapping(value = "/app/insert",produces = "application/json;charset=UTF-8")
public Result insertForApp(@RequestBody TRegulatoryFrameworkRequest regulatoryFrameworkRequest)throws Exception {
return Result.success(regulatoryService.addForApp(regulatoryFrameworkRequest));
}
/**
* 修改数据
*
* @param regulatoryFrameworkRequest 实体对象
* @return 修改结果
*/
@PostMapping (value = "/app/update",produces = "application/json;charset=UTF-8")
public Result updateForApp(@RequestBody TRegulatoryFrameworkRequest regulatoryFrameworkRequest) throws Exception {
return Result.success(regulatoryService.updateByTLIdForApp(regulatoryFrameworkRequest));
}
/**
* 历史记录
*
* @return
*/
@GetMapping(value = "/app/history",produces = "application/json;charset=UTF-8")
public Result historyForApp(TRegulatoryFrameworkRequest regulatoryFrameworkRequest) {
return Result.success(regulatoryService.historyForApp(regulatoryFrameworkRequest));
}
/**
* 归档
* @param id
* @return
*/
@GetMapping(value = "/app/filing",produces = "application/json;charset=UTF-8")
public Result filingForApp(@RequestParam("id") long id ) throws Exception {
regulatoryService.filingForApp(id);
return Result.success();
}
/**
* 归档文件夹
* @return
*/
@GetMapping(value = "/app/archiveFolder",produces = "application/json;charset=UTF-8")
public Result archiveFolderForApp() {
regulatoryService.archiveFolderForApp();
return Result.success();
}
/**
* 记录查询
* @param tLawsRequest
* @return
*/
@GetMapping(value = "/app/recordsQuery",produces = "application/json;charset=UTF-8")
public Result recordsQueryForApp(TRegulatoryFrameworkRequest tLawsRequest) {
return Result.success(regulatoryService.recordsQueryForApp(tLawsRequest));
}
/**
* 删除数据
* @param ids
* @return
*/
@PostMapping(value = "/app/delete", produces = "application/json;charset=UTF-8")
public Result deleteForApp(@RequestParam("ids") List<Long> ids) {
return Result.success(regulatoryService.deleteForApp(ids));
}
}

View File

@ -0,0 +1,178 @@
package cn.iocoder.yudao.module.knowledge.controller.admin;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.iocoder.yudao.module.knowledge.controller.requestdto.BidManagementRequest;
import cn.iocoder.yudao.module.knowledge.controller.requestdto.TViolationRequest;
import cn.iocoder.yudao.module.knowledge.entity.TViolation;
import cn.iocoder.yudao.module.knowledge.service.TViolationService;
import cn.iocoder.yudao.module.knowledge.utils.ExcelUtils;
import cn.iocoder.yudao.module.knowledge.constants.Result;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 违章表(TViolation)表控制层
*
* @author makejava
* @since 2024-04-13 14:58:19
*/
@RestController
@RequestMapping("tViolation")
public class TViolationController {
/**
* 错误日志
*/
private static Logger errorLog= LoggerFactory.getLogger("errorLog");
/**
* 埋点info日志
*/
private static Logger buriedLog=LoggerFactory.getLogger("buriedLog");
/**
* 服务对象
*/
@Autowired
private TViolationService violationService;
/**
* 分页查询所有数据
*
* @param tViolation 查询实体
* @return 所有数据
*/
@PostMapping(value = "/findAll",produces = "application/json;charset=UTF-8")
public Result findAll(@RequestBody TViolationRequest tViolation) {
Page<TViolation> page = new Page<>(tViolation.getPageNo(),tViolation.getPageSize());
return Result.success(violationService.select(page, tViolation));
}
/**
* 导出表格
* @param response
* @param tViolation
*/
@PostMapping(value = "/export",produces = "application/json;charset=UTF-8")
public void export(HttpServletResponse response, TViolationRequest tViolation) {
//此处调用service查询需要导出的数据
List<TViolation> exportList = violationService.selectForExport(tViolation);
//导出
ExcelUtils.exportExcel(exportList, TViolation.class, "违章管理文件表", response);
}
/**
* 通过主键查询单条数据
*
* @param id 主键
* @return 单条数据
*/
@GetMapping(value = "/findOne",produces = "application/json;charset=UTF-8")
public Result findOne(@RequestParam(value = "id") Long id ) {
return Result.success(violationService.getTVById(id));
}
/**
* 新增数据
* @param request
* @return
*/
@PostMapping(value = "/insert",produces = "application/json;charset=UTF-8")
public Result insert(@RequestBody TViolationRequest request) {
return Result.success(violationService.add(request));
}
/**
* 修改数据
* @return 修改结果
*/
@PostMapping (value = "/update",produces = "application/json;charset=UTF-8")
public Result update(@RequestBody TViolationRequest request) {
violationService.updateByIdVo(request);
return Result.success();
}
/**
* 删除数据
* @param ids
* @return
*/
@PostMapping(value = "/delete", produces = "application/json;charset=UTF-8")
public Result delete(@RequestParam("ids") List<Long> ids) {
return Result.success(violationService.delete(ids));
}
//======app
/**
* 通过主键查询单条数据
*
* @param id 主键
* @return 单条数据
*/
@GetMapping(value = "/app/findOne",produces = "application/json;charset=UTF-8")
public Result findOneForApp(@RequestParam(value = "id") Long id ) {
return Result.success(violationService.findOneForApp(id));
}
/**
* 新增数据
* @param request
* @return
*/
@PostMapping(value = "/app/insert",produces = "application/json;charset=UTF-8")
public Result insertForApp(@RequestBody TViolationRequest request) {
return Result.success(violationService.addForApp(request));
}
/**
* 修改数据
* @return 修改结果
*/
@PostMapping (value = "/app/update",produces = "application/json;charset=UTF-8")
public Result updateForApp(@RequestBody TViolationRequest request) {
violationService.updateByIdVoForApp(request);
return Result.success();
}
/**
* 删除数据
* @param ids
* @return
*/
@PostMapping(value = "/app/delete", produces = "application/json;charset=UTF-8")
public Result deleteForApp(@RequestParam("ids") List<Long> ids) {
return Result.success(violationService.deleteForApp(ids));
}
/**
* 推送
* @param id
* @return
*/
@GetMapping(value = "/app/push",produces = "application/json;charset=UTF-8")
public Result pushForApp(@RequestParam(value = "id") Long id) {
violationService.pushForApp(id);
return Result.success();
}
@PostMapping(value = "/app/findAll",produces = "application/json;charset=UTF-8")
public Result appFindAll(@RequestBody TViolationRequest tViolation) {
Page<TViolation> page = new Page<>(tViolation.getPageNo(),tViolation.getPageSize());
return Result.success(violationService.appFindAll(page, tViolation));
}
}

View File

@ -0,0 +1,101 @@
//package cn.iocoder.yudao.module.knowledge.controller.api;
//
//import cn.iocoder.yudao.framework.common.pojo.CommonResult;
//import cn.iocoder.yudao.module.knowledge.constants.Result;
//import cn.iocoder.yudao.module.system.api.dept.DeptApi;
//import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
//import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
//import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
//import cn.iocoder.yudao.module.knowledge.common.StringUtils;
//import cn.iocoder.yudao.module.knowledge.entity.DeptTree;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.*;
//
//import java.util.*;
//
//@RestController
//@RequestMapping("/commonApi")
//public class CommonApi {
// @Autowired
// private DeptApi deptApi;
// @Autowired
// private AdminUserApi userApi;
// @GetMapping("/getDeptData")
// public Result getDeptData(){
// List<DeptRespDTO> deptList = deptApi.getDeptList(null);
// List<DeptTree> tempList =new ArrayList<>();
// for (DeptRespDTO deptRespDTO : deptList) {
// DeptTree deptTree =new DeptTree();
// deptTree.setId(deptRespDTO.getId());
// deptTree.setParentId(deptRespDTO.getParentId());
// deptTree.setLabel(deptRespDTO.getName());
// tempList.add(deptTree);
// }
// //循环递归处理返回树结构
// List<DeptTree> deptTrees = buildTree(tempList);
// return Result.success(deptTrees);
// }
//// @GetMapping("/getUserData")
//// public Result getUserData(@RequestParam(value = "deptIds") Collection<Long> deptIds,
//// @RequestParam(value = "nickName",required = false) String nickName){
//// CommonResult<List<AdminUserRespDTO>> userListByDeptIds = userApi.getUserByUsername(deptIds,false,nickName);
//// return Result.success(userListByDeptIds.getData());
//// }
//
//// public List<DeptTree> buildTree(List<DeptTree> depts)
//// {
//// List<DeptTree> returnList = new ArrayList<DeptTree>();
//// List<Long> tempList = depts.stream().map(DeptTree::getId).toList();
//// for (DeptTree dept : depts)
//// {
//// // 如果是顶级节点, 遍历该父节点的所有子节点
//// if (!tempList.contains(dept.getParentId()))
//// {
//// recursionFn(depts, dept);
//// returnList.add(dept);
//// }
//// }
//// if (returnList.isEmpty())
//// {
//// returnList = depts;
//// }
//// return returnList;
//// }
//
// private void recursionFn(List<DeptTree> list, DeptTree t)
// {
// // 得到子节点列表
// List<DeptTree> childList = getChildList(list, t);
// t.setChildren(childList);
// for (DeptTree tChild : childList)
// {
// if (hasChild(list, tChild))
// {
// recursionFn(list, tChild);
// }
// }
// }
// private List<DeptTree> getChildList(List<DeptTree> list, DeptTree t)
// {
// List<DeptTree> tlist = new ArrayList<DeptTree>();
// Iterator<DeptTree> it = list.iterator();
// while (it.hasNext())
// {
// DeptTree n = (DeptTree) it.next();
// if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getId().longValue())
// {
// tlist.add(n);
// }
// }
// return tlist;
// }
//
// /**
// * 判断是否有子节点
// */
// private boolean hasChild(List<DeptTree> list, DeptTree t)
// {
// return !getChildList(list, t).isEmpty();
// }
//
//}

View File

@ -0,0 +1,29 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@Data
public class BidManagementRequest extends PageParam {
private String id;
private String tag;
private String title;
private String fileName;
@DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private String createTime;
private String fileSize;
private String fileUrl;
private String des;
}

View File

@ -0,0 +1,10 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import lombok.Data;
import java.util.List;
@Data
public class DeleteRequest {
List<String> idList;
}

View File

@ -0,0 +1,19 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import lombok.Data;
/**
* @packageName:cn.iocoder.yudao.module.knowledge.controller.requestdto
* @className:TOperaDocPage
* @Description:
* @author:韩维杰
* @date 2024/4/24 20:10
**/
@Data
public class ExpertRequestPage extends PageParam {
private String searchKey;
}

View File

@ -0,0 +1,49 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
public class KnowledgeStatisticsRequest extends PageParam {
private Long id;
//文件的唯一编码
private String code;
//名称
private String name;
//版本
private String version;
//文件真实存在的地方
private String fileUrl;
//文件大小
private Long fileSize;
//文件原名称
private String fileName;
//归档时间
private Date filingTime;
//是否归档
private Integer isFiling;
//是否删除
//预留字段
private String lawsA;
//预留字段
private String lawsB;
//创建者
private String creator;
//创建者id
private String creatorId;
//创建时间
@DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
//更改时间
private Date updateTime;
//说明
private String describeInfo;
}

View File

@ -0,0 +1,40 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import cn.iocoder.yudao.module.knowledge.entity.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
/**
* @packageName:cn.iocoder.yudao.module.knowledge.controller.requestdto
* @className:MonitorRquest
* @Description:
* @author:韩维杰
* @date 2024/4/27 11:38
**/
@Data
public class MonitorRequest extends TRegulatoryFrameworkExecution {
@Schema(description = "",example = "")
private TFileInfo fileContent;
@Schema(description = "",example = "")
private List<TRfeContent> rfeContents;
@Schema(description = "",example = "")
private List<TRfeUser> users;
// ==========================================
@Schema(description = "",example = "")
private Long rfecId;
@Schema(description = "",example = "")
private String countent;
@Schema(description = "",example = "")
private String descr;
}

View File

@ -0,0 +1,23 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import lombok.Data;
/**
* @packageName:cn.iocoder.yudao.module.knowledge.controller.requestdto
* @className:TOperaDocPage
* @Description:
* @author:韩维杰
* @date 2024/4/24 20:10
**/
@Data
public class MonitorRequestPage extends PageParam {
private String bgnTime;
private String endTime;
private String searchKey;
private String state;
private Long userId;
}

View File

@ -0,0 +1,78 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* 监督内容文件表查询
*
* @author admin
* @since 1.0.0 2024-06-23
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description = "监督内容文件表查询")
public class RRfeuTaskFileRequest extends PageParam {
/**
* 主键id
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 监督任务内容id
*/
private Long rRfeuTaskContentId;
/**
* 文件名称
*/
private String fileName;
/**
* 文件路径
*/
private String fileUrl;
/**
* 租户id
*/
private Long tenantId;
/**
* 创建者
*/
private String creator;
/**
* 创建者id
*/
private String creatorId;
/**
* 创建时间
*/
private Date createTime;
/**
* 更改时间
*/
private Date updateTime;
private String deptId;
private String identityId;
/**
* 文件大小
*/
private Long fileSize;
}

View File

@ -0,0 +1,18 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Schema(description = "生成试卷题目类型dto" )
@Data
public class Stemdto {
@Schema(description = "题目类型")
private String type;
@Schema(description = "题数")
private Integer questionSum;
@Schema(description = "单个分数")
private double score;
}

View File

@ -0,0 +1,68 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.module.knowledge.controller.responsevo.FileInfo;
import com.baomidou.mybatisplus.annotation.TableField;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* 档案表(TArchives)表实体类
*
* @author makejava
* @since 2024-04-11 10:25:58
*/
@Data
public class TArchivesRequest extends PageParam {
//父id
private Long parentId;
//主键id
private Long id;
//归档文件id
private Long pigeonholeId;
//类型 1 图片 2视频 3文档 4 音频
private String type;
//文件现名称
private String curFilename;
private String originalFilename;
//是否是文件夹 0文件夹 1:文件
private Integer isDir;
//是否删除 0已删除1未删除
//是否移到回收站 0 1
private Integer isRecycled;
//ids
private List<Long> ids;
private List<Long> idlsit;
//文件的唯一编码
private String code;
//文件真实存在的地方
private String fileUrl;
//文件大小
private Long fileSize;
//创建者
private String creator;
//创建者id
private String creatorId;
@TableField(exist = false)
private FileInfo fileInfo;
//创建时间
private Date createTime;
//更改时间
private Date updateTime;
// 0未归档 1 归档
private String archiveType;
private String year;
}

View File

@ -0,0 +1,19 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 招标确认函候选人表查询
*
* @author admin
* @since 1.0.0 2024-04-15
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description = "招标确认函候选人表查询")
public class TBidConfirmationCandidateRequest extends PageParam {
}

View File

@ -0,0 +1,117 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import com.baomidou.mybatisplus.annotation.TableId;
import cn.iocoder.yudao.module.knowledge.entity.TBidConfirmationCandidate;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
/**
* 招标确认函查询
*
* @author admin
* @since 1.0.0 2024-04-18
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description = "招标确认函查询")
public class TBidConfirmationRequest extends PageParam {
@Schema(description = "主键")
@TableId
private Long id;
@Schema(
description = "标签",
example = "1"
)
private String tag;
@Schema(
description = "公司名",
example = "科技公司"
)
private String companyName;
@Schema(
description = "中标标题",
example = "标题"
)
private String title;
@Schema(
description = "招标编号",
example = "a01"
)
private String bigCode;
@Schema(
description = "项目名称",
example = "zhaobiao"
)
private String projectName;
@Schema(
description = "招标人",
example = "xaomin"
)
private String tenderee;
@Schema(
description = "发函时间",
example = "2024"
)
private Integer letterDateYear;
@Schema(
description = "发函时间",
example = "1"
)
private Integer letterDateMonth;
@Schema(
description = "中标时间",
example = "1"
)
@DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date winBidTime;
@Schema(
description = "发函时间",
example = "2024:04:15 08:23:56"
)
private Integer letterDateDay;
@Schema(
description = "中标说明",
example = "中标了"
)
private String winBidDes;
@Schema(description = "文件真实存在的地方", example = "/path/to/file/example.jpg")
private String fileUrl;
@Schema(description = "文件大小", example = "1024KB")
private Long fileSize;
@Schema(description = "文件原名称", example = "example.jpg")
private String fileName;
@Schema(description = "归档时间", example = "2024-04-15T12:00:00")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date filingTime;
@Schema(description = "是否归档", allowableValues = {"0", "1"}, example = "0")
private Integer isFiling;
@Schema(
description = "候选人列表")
private List<TBidConfirmationCandidate> bidConfirmationCandidateList;
}

View File

@ -0,0 +1,181 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import cn.iocoder.yudao.module.knowledge.entity.TFileInfo;
import cn.iocoder.yudao.module.knowledge.entity.TNotProcurementBid;
import cn.iocoder.yudao.module.knowledge.entity.TProcurementBid;
import cn.iocoder.yudao.module.knowledge.entity.TViolationImage;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
/**
* 招标计划表查询
*
* @author admin
* @since 1.0.0 2024-04-15
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description = "招标计划表查询")
public class TBidPlanRequest extends PageParam {
@Schema(description = "主键")
@TableId
private Long id;
@Schema(
description = "标签",
example = "123"
)
private String tag;
@Schema(
description = "项目名称",
example = "项目"
)
private String projectName;
@Schema(
description = "委员会",
example = "sdas"
)
private String committee;
@Schema(
description = "编制",
example = "wes"
)
private String authorizedStrength;
@Schema(
description = "审核",
example = "dfd"
)
private String audit;
@Schema(
description = "审批",
example = "ddf"
)
private String approval;
@Schema(
description = "项目日期",
example = "2024-04-14 15:13:42"
)
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date projectDate;
@Schema(
description = "审议日期",
example = "2024-04-14 15:13:42"
)
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date auditDate;
@Schema(
description = "盖章日期",
example = "2024-04-14 15:13:42"
)
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date stampDate;
@Schema(
description = "招标团队",
example = "erdf"
)
private String bidTeam;
@Schema(
description = "分工与职责",
example = "ere"
)
private String responsibility;
@Schema(
description = "项目概述",
example = "dfewfew"
)
private String overview;
@Schema(
description = "调研与对标情况",
example = "ddsdff"
)
private String researchSituation;
@Schema(
description = "工程类(起草人)",
example = "小明"
)
private String engineering;
@Schema(
description = "设备类(批准人)",
example = "小青"
)
private String equipment;
@Schema(
description = "材料类(首次发布时间)",
example = "2024-04-14 15:13:42"
)
private String materials;
@Schema(
description = "服务类(目的)",
example = "招标"
)
private String service;
@Schema(
description = "其他(适用范围)",
example = "0"
)
private String rests;
@Schema(description = "文件真实存在的地方", example = "/path/to/file/example.jpg")
private String fileUrl;
@Schema(description = "文件大小", example = "1024KB")
private Long fileSize;
@Schema(description = "文件原名称", example = "example.jpg")
private String fileName;
@Schema(description = "归档时间", example = "2024-04-15T12:00:00")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date filingTime;
@Schema(description = "是否归档", allowableValues = {"0", "1"}, example = "0")
private Integer isFiling;
@Schema(
description = "非招标采购方式",
example = "list"
)
private List<TNotProcurementBid> notProcurementBids;
@Schema(
description = "招标采购方式",
example = "list"
)
private List<TProcurementBid> procurementBids;
@Schema(
description = "上传的文件",
example = "file"
)
private TFileInfo uploadFileInfo;
}

View File

@ -0,0 +1,38 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 课程目录表查询
*
* @author admin
* @since 1.0.0 2024-04-16
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description = "课程目录表查询")
public class TCourseDirectoryRequest extends PageParam {
@Schema(description = "主键")
@NotNull(groups = EditGroup.class, message = "id不能为空")
private Long id;
@NotNull(message = "父id不能为空")
@Schema(description = "父id", example = "1")
private Long parentId;
@NotBlank(message = "目录名称不能为空")
@Schema(description = "目录名称", example = "数学")
private String name;
@Schema(description = "序号", example = "1")
private Integer sequence;
}

View File

@ -0,0 +1,47 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* 课程推送查询
*
* @author admin
* @since 1.0.0 2024-05-12
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description = "课程推送查询")
public class TCoursePushRequest extends PageParam {
@Schema(description = "主键")
@NotNull(message = "id不能为空", groups = EditGroup.class)
private Long id;
@Schema(description = "视频名称")
@NotBlank(message = "视频名称不能为空")
private String name;
@Schema(description = "视频路径")
@NotBlank(message = "视频路径不能为空")
private String fileUrl;
private Boolean status;
private Date dateTime;
@Schema(description = "推送时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
private Date pushTime;
private Date pushTimeStart;
}

View File

@ -0,0 +1,76 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import com.baomidou.mybatisplus.annotation.TableId;
import javax.validation.constraints.NotNull;
import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
* 学习记录表查询
*
* @author admin
* @since 1.0.0 2024-06-17
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description = "学习记录表查询")
public class TCourseRecordsRequest extends PageParam {
/**
* 主键
*/
@TableId
private Long id;
/**
* 用户主键
*/
private Long userId;
/**
* 课程id
*/
private Long courseId;
/**
* 持续时长
*/
private Double continueTime;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建者
*/
private String creator;
/**
* 更改时间
*/
private Date updateTime;
private String deptId;
private String identityId;
/**
* 是否删除 1已删除0未删除
*/
/**
* 租户id
*/
private Long tenantId;
}

View File

@ -0,0 +1,49 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/**
* 课程表查询
*
* @author admin
* @since 1.0.0 2024-04-16
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description = "课程表查询")
public class TCourseRequest extends PageParam {
@Schema(description = "主键")
@NotNull(message = "id不能为空", groups = EditGroup.class)
private Long id;
@NotNull(message = "courseDirectoryId不能为空")
@Schema(description = "课程目录表主键", example = "1")
private Long courseDirectoryId;
@Schema(description = "课程目录名称", example = "数学")
private String courseDirectoryName;
@NotBlank(message = "课程名称不能为空")
@NotBlank(message = "课程名称不能为空")
@Schema(description = "课程名称", example = "数学")
private String name;
@Schema(description = "课程说明", example = "erwef")
private String desrc;
@Valid
@Schema(description = "课件, 新增修改时需要", example = "1")
private List<TCoursewareRequest> coursewares;
private List<Long> courseDirectoryIdList;
}

View File

@ -0,0 +1,47 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
/**
* 课件表查询
*
* @author admin
* @since 1.0.0 2024-04-16
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description = "课件表查询")
public class TCoursewareRequest extends PageParam {
@Schema(description = "主键")
@TableId
private Long id;
@Schema(description = "课程表主键", example = "1")
private Long courseId;
@Schema(description = "课件名称", example = "数学课件")
private String name;
@Schema(description = "课程说明", example = "dsds")
private String desrc;
@Schema(description = "编码 (用于在文件表中获取附件信息)", example = "a01")
private String code;
@Schema(description = "排序", example = "1")
private Integer order;
@Schema(description = "文件地址", example = "http://www.baidu.com")
private String fileUrl;
@Schema(description = "文件名称")
private String fileName;
@Schema(description = "文件大小 单位M")
private Integer fileSize;
}

View File

@ -0,0 +1,52 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import javax.validation.constraints.NotNull;
import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
* 专家维护信息表查询
*
* @author admin
* @since 1.0.0 2024-05-02
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description = "专家维护信息表查询")
public class TExpertMaintenanceRequest extends PageParam {
/**
* 标签编号
*/
private String tagNum;
/**
* 标签名称
*/
private String tagName;
/**
* 专家人数
*/
private Integer expertNum;
/**
* 专家汇总专家id ,隔开
*/
private String expertIds;
private Date createTime;
private Date updateTime;
}

View File

@ -0,0 +1,89 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import com.baomidou.mybatisplus.annotation.TableId;
import javax.validation.constraints.NotNull;
import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
* 专家表查询
*
* @author admin
* @since 1.0.0 2024-05-02
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description = "专家表查询")
public class TExpertRequest extends PageParam {
/**
* 人员姓名
*/
private String username;
/**
* 人员编码
*/
private String usercode;
/**
* 手机号
*/
private String phone;
/**
* 性别
*/
private String sex;
/**
* 头像
*/
private String headPortrait;
/**
* 学历
*/
private String educationBackground;
/**
* 介绍
*/
private String introduce;
/**
* 领域专家
*/
private String domainExpert;
/**
* 职位
*/
private String post;
/**
* 创建时间
*/
private Date createTime;
/**
* 更改时间
*/
private Date updateTime;
private String deptId;
private String identityId;
/**
* 是否删除 1已删除0未删除
*/
}

View File

@ -0,0 +1,22 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import javax.validation.constraints.NotNull;
import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
/**
* 专家专区收藏信息表查询
*
* @author admin
* @since 1.0.0 2024-05-05
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description = "专家专区收藏信息表查询")
public class TExpertZoneCollectionRequest extends PageParam {
}

View File

@ -0,0 +1,53 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import javax.validation.constraints.NotNull;
import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
* 专家专区评论信息表查询
*
* @author admin
* @since 1.0.0 2024-05-05
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description = "专家专区评论信息表查询")
public class TExpertZoneCommentRequest extends PageParam {
/**
* 专家专区id
*/
private Long expertZoneId;
/**
* 评论级别1一级评论2二级评论
*/
private String commentLevel;
/**
* 一级评论id
*/
private Long pid;
/**
* 评论内容
*/
private String commentContent;
/**
* 创建用户id
*/
private Long userId;
/**
* 创建时间
*/
private Date createTime;
}

View File

@ -0,0 +1,43 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import javax.validation.constraints.NotNull;
import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
* 专家专区查询
*
* @author admin
* @since 1.0.0 2024-05-04
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description = "专家专区查询")
public class TExpertZoneRequest extends PageParam {
/**
* 标题
*/
private String title;
/**
* 内容
*/
private String content;
/**
* 专家id
*/
private Long specialistId;
/**
* 创建时间
*/
private Date createTime;
}

View File

@ -0,0 +1,53 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import com.baomidou.mybatisplus.annotation.TableField;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
public class TLawsRequest extends PageParam {
private Long id;
//文件的唯一编码
private String code;
//名称
private String name;
//版本
private String version;
//文件真实存在的地方
private String fileUrl;
//文件大小
private Long fileSize;
//文件原名称
private String fileName;
//归档时间
private Date filingTime;
//是否归档
private Integer isFiling;
//是否删除
//预留字段
private String lawsA;
//1:法律2:行政法规3:部门规章4:地方法规5:地方规章
private String type;
//预留字段
private String lawsB;
//创建者
private String creator;
//创建者id
private String creatorId;
//创建时间
@DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
//更改时间
private Date updateTime;
//说明
private String describeInfo;
@TableField(exist = false)
private String createTimeStr;
}

View File

@ -0,0 +1,60 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
import cn.iocoder.yudao.module.knowledge.entity.TMapImage;
import cn.iocoder.yudao.module.knowledge.entity.TMapNode;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
@Data
public class TMapRequest extends PageParam {
@Schema(description = "主键", example = "1")
private Long id;
@Schema(description = "文件的唯一编码", example = "ABC123")
private String name;
@Schema(description = "名称", example = "文件名称")
private String modelTag;
@Schema(description = "创建者", example = "John Doe")
private String creator;
@Schema(description = "创建者id", example = "1001")
private String creatorId;
@TableField(
fill = FieldFill.INSERT
)
@ExcelOut(name = "创建时间", sort = 6 ,width = 25,dateFormat = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date createTime;
@Schema(description = "地图节点集合", example = "list")
private List<TMapNode> node;
@Schema(description = "父级地图节点id", example = "list")
private Long parentId;
@Schema(description = "地图id", example = "list")
private Long mapId;
@Schema(
description = "图片",
example = "jpg"
)
private List<TMapImage> imgList;
}

View File

@ -0,0 +1,73 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* (TMonthlyProjectPurchase)表实体类
*
*/
@Data
public class TMonthlyProjectPurchaseRequest extends PageParam {
private Long id;
//所在项目名称
private String projectName;
//采购事项名称
private String procurementMatters;
//采购内容
private String procurementContent;
//事项类型
private String matterType;
//采购方式
private String purchasingMethod;
//招标代理机构
private String tenderingAgency;
//预估合同价
private String contractPriceEstimated;
//合同价
private String contractPrice;
//中标价
private String bidPrice;
//采购时间
@DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date purchaseTime;
//合同签订时间
@DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date contractSigningTime;
//合同相对方
private String contractCounterparty;
//备注
private String remark;
//创建人
private String creator;
private String deptId;
private String identityId;
//是否删除
//创建时间
@DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
//更改时间
@DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
//租户id
private Long tenantId;
private String bgnTime;
private String endTime;
}

View File

@ -0,0 +1,22 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import lombok.Data;
/**
* @packageName:cn.iocoder.yudao.module.knowledge.controller.requestdto
* @className:TOperaDocPage
* @Description:
* @author:韩维杰
* @date 2024/4/24 20:10
**/
@Data
public class TOperaDocPage extends PageParam {
private String createTime;
private String cnName;
private String name;
private String selTagValue;
}

View File

@ -0,0 +1,158 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import cn.iocoder.yudao.module.knowledge.entity.TOperationProcedure;
import cn.iocoder.yudao.module.knowledge.entity.TOperationProcedureCore;
import cn.iocoder.yudao.module.knowledge.entity.TProductRawMaterials;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* @packageName:cn.iocoder.yudao.module.knowledge.entity
* @className:TOperationDocument
* @Description:
* @author:韩维杰
* @date 2024/4/19 15:30
**/
@Data
public class TOperationDocRequest extends TProductRawMaterials {
@Schema(description = "操作文件中文名称",example = "2024某某公司")
private String cnName;
@Schema(description = "文件类型标识",example = "0,1,2")
private String tag;
@Schema(description = "操作步骤",example = "[{xx:'',xx:''},{xx:'',xx:''}]")
private ArrayList<TOperationProcedureCore> czTableDatas;
@Schema(description = "操作文件编码",example = "")
private String operationDocumentCode;
@Schema(description = "单位名称",example = "")
private String unitName;
@Schema(description = "作业名称/人数",example = "")
private String jobName;
@Schema(description = "编号",example = "")
private String code;
@Schema(description = "劳保用品",example = "")
private String labour;
@Schema(description = "使用工具/材料",example = "")
private String tool;
@Schema(description = "作业环境",example = "")
private String environment;
@Schema(description = "编制人/日期",example = "")
private String organizer;
@Schema(description = "审核人/日期",example = "")
private String auditor;
@Schema(description = "批准人/日期",example = "")
private String approver;
private String version;
@Schema(description = "内容",example = "")
private List<String> content;
@Schema(description = "英文名称",example = "")
private String setx;
@Schema(description = "原编码")
private String originalCode;
@Schema(description = "受控状态")
private String controlledState;
@Schema(description = "发布时间", example = "2024-04-23T12:00:00")
private Date releaseTime;
@Schema(description = "实施时间", example = "2024-04-23T12:00:00")
private Date implementationTime;
@Schema(description = "顺序号")
private String sn;
@Schema(description = "系列")
private String series;
@Schema(description = "具体操作")
private String concreteOperations;
@Schema(description = "变化内容")
private String changeContent;
@Schema(description = "标准归口")
private String attribute;
@Schema(description = "起草单位")
private String draftingUnit;
@Schema(description = "起草人")
private String rapporteur;
@Schema(description = "第一次发布时间", example = "2024-04-23T12:00:00")
private Date firstReleaseTime;
@Schema(description = "目的")
private String purpose;
@Schema(description = "适用范围")
private String scopeOfApplication;
@Schema(description = "术语")
private String term;
@Schema(description = "引用文件")
private String referenceFile;
@Schema(description = "要求")
private String requires;
@Schema(description = "相关文件")
private String relevantFile;
@Schema(description = "相关记录")
private String relevantRecord;
@Schema(description = "发放范围")
private String distributionScope;
@Schema(description = "符号",example = "")
private String symbol;
@Schema(description = "实验方法",example = "")
private String experimentalMethod;
@Schema(description = "组批",example = "")
private String lotGrouping;
@Schema(description = "取样",example = "")
private String sampling;
@Schema(description = "质量结果判定",example = "")
private String resultDetermination;
@Schema(description = "不合格处置方式",example = "")
private String disposalMethod;
@Schema(description = "称重",example = "")
private String weigh;
//具体内容
private String specificContent;
private String type;
}

View File

@ -0,0 +1,70 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import com.baomidou.mybatisplus.annotation.TableField;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.module.knowledge.annotation.ExcelOut;
import cn.iocoder.yudao.module.knowledge.controller.responsevo.FileInfo;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
*
* @author makejava
* @since 2024-04-11 10:25:58
*/
@Data
public class TOtherArchivesRequest extends PageParam {
//父id
private Long parentId;
//主键id
private Long id;
//归档文件id
private Long pigeonholeId;
//类型 1 图片 2视频 3文档 4 音频
private String type;
//文件现名称
@ExcelOut(name = "文件名称", sort = 1, width = 20)
private String curFilename;
private String originalFilename;
//是否是文件夹 0文件夹 1:文件
private Integer isDir;
//是否删除 0已删除1未删除
//是否移到回收站 0 1
private Integer isRecycled;
//ids
private List<Long> ids;
private List<Long> idlsit;
//文件的唯一编码
private String code;
//文件真实存在的地方
private String fileUrl;
//文件大小
@ExcelOut(name = "文件大小", sort = 1, width = 20)
private Long fileSize;
//创建者
private String creator;
//创建者id
private String creatorId;
@TableField(exist = false)
private FileInfo fileInfo;
//创建时间
@ExcelOut(name = "文件创建时间", sort = 1, width = 20)
private Date createTime;
//更改时间
private Date updateTime;
// 0未归档 1 归档
private String archiveType;
private String year;
}

View File

@ -0,0 +1,29 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import cn.iocoder.yudao.module.knowledge.entity.TOperationProcedure;
import cn.iocoder.yudao.module.knowledge.entity.TOperationProcedureCore;
import cn.iocoder.yudao.module.knowledge.entity.TProductRawMaterials;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
* @packageName:cn.iocoder.yudao.module.knowledge.entity
* @className:TOperationDocument
* @Description:
* @author:韩维杰
* @date 2024/4/19 15:30
**/
@Data
public class TProductRequest extends TProductRawMaterials {
@Schema(description = "标准名称",example = "2024某某公司")
private String cpName;
@Schema(description = "文件类型标识",example = "0,1,2")
private String tag;
@Schema(description = "文件类型标识",example = "0,1,2")
private String content;
}

View File

@ -0,0 +1,38 @@
package cn.iocoder.yudao.module.knowledge.controller.requestdto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
/**
* 题答案表查询
*
* @author admin
* @since 1.0.0 2024-04-16
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Schema(description = "题答案表类")
public class TQuestionAnswersRequest extends PageParam {
@TableId(value = "id", type = IdType.AUTO)
@Schema(description = "主键")
private Long id;
@Schema(description = "题干表id", example = "1")
private Long questionStemId;
@Schema(description = "内容", example = "dsfs")
private String content;
@Schema(description = "文件地址", example = "/d/ddw")
private String fileUrl;
@Schema(description = "选项", example = "A")
private String options;
}

Some files were not shown because too many files have changed in this diff Show More