23 changed files with 330 additions and 89 deletions
-
6system/src/main/java/com/canvas/web/modules/device/criteria/DeviceQueryCriteria.java
-
26system/src/main/java/com/canvas/web/modules/device/criteria/DeviceSettingCriteria.java
-
16system/src/main/java/com/canvas/web/modules/device/rest/DeviceController.java
-
2system/src/main/java/com/canvas/web/modules/device/service/impl/DeviceServiceImpl.java
-
38system/src/main/java/com/canvas/web/modules/device/vo/DeviceVO.java
-
10system/src/main/java/com/canvas/web/modules/material/criteria/MaterialQueryCriteria.java
-
37system/src/main/java/com/canvas/web/modules/material/criteria/ThemeQueryCriteria.java
-
2system/src/main/java/com/canvas/web/modules/material/domain/Material.java
-
17system/src/main/java/com/canvas/web/modules/material/dto/FolderDTO.java
-
33system/src/main/java/com/canvas/web/modules/material/dto/MaterialDTO.java
-
9system/src/main/java/com/canvas/web/modules/material/repository/MaterialFolderRepository.java
-
18system/src/main/java/com/canvas/web/modules/material/repository/MaterialInFolderRepository.java
-
22system/src/main/java/com/canvas/web/modules/material/repository/MaterialRepository.java
-
4system/src/main/java/com/canvas/web/modules/material/repository/ThemeClassRepository.java
-
8system/src/main/java/com/canvas/web/modules/material/repository/ThemeFolderRepository.java
-
15system/src/main/java/com/canvas/web/modules/material/repository/ThemeInFolderRepository.java
-
44system/src/main/java/com/canvas/web/modules/material/rest/MaterialController.java
-
4system/src/main/java/com/canvas/web/modules/material/rest/ThemeClassController.java
-
10system/src/main/java/com/canvas/web/modules/material/service/MaterialService.java
-
62system/src/main/java/com/canvas/web/modules/material/service/impl/MaterialServiceImpl.java
-
2system/src/main/java/com/canvas/web/modules/material/vo/AlbumVO.java
-
2system/src/main/java/com/canvas/web/modules/material/vo/MyMaterialVO.java
-
32system/src/main/java/com/canvas/web/modules/material/vo/ThemeVO.java
@ -1,21 +1,31 @@ |
|||||
package com.canvas.web.modules.material.criteria; |
package com.canvas.web.modules.material.criteria; |
||||
|
|
||||
|
|
||||
|
import com.alibaba.fastjson.annotation.JSONField; |
||||
import com.canvas.web.annotation.Query; |
import com.canvas.web.annotation.Query; |
||||
|
import com.fasterxml.jackson.annotation.JsonProperty; |
||||
import lombok.Data; |
import lombok.Data; |
||||
|
|
||||
@Data |
@Data |
||||
public class MaterialQueryCriteria { |
public class MaterialQueryCriteria { |
||||
|
|
||||
@Query |
@Query |
||||
|
@JSONField(name="material_name") |
||||
|
@JsonProperty("material_name") |
||||
private String materialName; |
private String materialName; |
||||
|
|
||||
@Query |
@Query |
||||
|
@JSONField(name="material_type") |
||||
|
@JsonProperty("material_type") |
||||
private Integer materialType; |
private Integer materialType; |
||||
|
|
||||
@Query |
@Query |
||||
|
@JSONField(name="orga_id") |
||||
|
@JsonProperty("orga_id") |
||||
private String orgaId; |
private String orgaId; |
||||
|
|
||||
@Query |
@Query |
||||
|
@JSONField(name="folder_id") |
||||
|
@JsonProperty("folder_id") |
||||
private String folderId; |
private String folderId; |
||||
} |
} |
@ -1,14 +1,31 @@ |
|||||
package com.canvas.web.modules.material.dto; |
package com.canvas.web.modules.material.dto; |
||||
|
|
||||
|
import com.alibaba.fastjson.annotation.JSONField; |
||||
|
import com.fasterxml.jackson.annotation.JsonProperty; |
||||
import lombok.Getter; |
import lombok.Getter; |
||||
import lombok.Setter; |
import lombok.Setter; |
||||
|
|
||||
@Getter |
@Getter |
||||
@Setter |
@Setter |
||||
public class FolderDTO { |
public class FolderDTO { |
||||
|
|
||||
|
@JSONField(name="id") |
||||
|
@JsonProperty("id") |
||||
private String id; |
private String id; |
||||
|
|
||||
|
@JSONField(name="name") |
||||
|
@JsonProperty("name") |
||||
private String name; |
private String name; |
||||
|
|
||||
|
@JSONField(name="fid") |
||||
|
@JsonProperty("fid") |
||||
private String fid; |
private String fid; |
||||
|
|
||||
|
@JSONField(name="img_path") |
||||
|
@JsonProperty("img_path") |
||||
private String imgPath; |
private String imgPath; |
||||
|
|
||||
|
@JSONField(name="orga_id") |
||||
|
@JsonProperty("orga_id") |
||||
private String orgaId; |
private String orgaId; |
||||
} |
} |
Write
Preview
Loading…
Cancel
Save
Reference in new issue