|
@@ -1,6 +1,5 @@
|
|
package com.persagy.adm.diagram.controller;
|
|
package com.persagy.adm.diagram.controller;
|
|
|
|
|
|
-import cn.hutool.crypto.digest.DigestUtil;
|
|
|
|
import cn.hutool.http.HttpUtil;
|
|
import cn.hutool.http.HttpUtil;
|
|
import com.persagy.adm.diagram.entity.IconEntity;
|
|
import com.persagy.adm.diagram.entity.IconEntity;
|
|
import com.persagy.adm.diagram.frame.BdtpRequest;
|
|
import com.persagy.adm.diagram.frame.BdtpRequest;
|
|
@@ -51,6 +50,7 @@ public class IconController {
|
|
*
|
|
*
|
|
* @param file 文件
|
|
* @param file 文件
|
|
* @param legendId 所关联的图例id
|
|
* @param legendId 所关联的图例id
|
|
|
|
+ * @param system 图例所属系统类型
|
|
* @param skin 皮肤
|
|
* @param skin 皮肤
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@@ -58,6 +58,7 @@ public class IconController {
|
|
@PostMapping("/uploadIcon")
|
|
@PostMapping("/uploadIcon")
|
|
public CommonResult<Object> uploadIcon(@RequestParam("file") MultipartFile file,
|
|
public CommonResult<Object> uploadIcon(@RequestParam("file") MultipartFile file,
|
|
@RequestParam String legendId,
|
|
@RequestParam String legendId,
|
|
|
|
+ @RequestParam String system,
|
|
@RequestParam(required = false) String skin) {
|
|
@RequestParam(required = false) String skin) {
|
|
String fileName = file.getOriginalFilename();
|
|
String fileName = file.getOriginalFilename();
|
|
long size = file.getSize();
|
|
long size = file.getSize();
|
|
@@ -65,6 +66,7 @@ public class IconController {
|
|
IconEntity entity = new IconEntity();
|
|
IconEntity entity = new IconEntity();
|
|
entity.setIconSkin(skin);
|
|
entity.setIconSkin(skin);
|
|
entity.setLegendId(legendId);
|
|
entity.setLegendId(legendId);
|
|
|
|
+ entity.setSystemType(system);
|
|
entity.setIconSize(String.valueOf(size));
|
|
entity.setIconSize(String.valueOf(size));
|
|
|
|
|
|
Optional.ofNullable(fileName).ifPresent(s -> {
|
|
Optional.ofNullable(fileName).ifPresent(s -> {
|
|
@@ -157,8 +159,19 @@ public class IconController {
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@ApiOperation("获取所有图标")
|
|
@ApiOperation("获取所有图标")
|
|
- @GetMapping("/cons")
|
|
|
|
|
|
+ @GetMapping("/icons")
|
|
public CommonResult<List<IconEntity>> getIcons() {
|
|
public CommonResult<List<IconEntity>> getIcons() {
|
|
return ResultHelper.multi(iconService.getIcons());
|
|
return ResultHelper.multi(iconService.getIcons());
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 根据系统类型获取所有图标
|
|
|
|
+ *
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ @ApiOperation("根据系统类型获取所有图标")
|
|
|
|
+ @GetMapping("/icons/type")
|
|
|
|
+ public CommonResult<List<IconEntity>> getIconsBySystemType(String system) {
|
|
|
|
+ return ResultHelper.multi(iconService.getIconsBySystemType(system));
|
|
|
|
+ }
|
|
}
|
|
}
|