diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java deleted file mode 100644 index 09df8c87..00000000 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.hxkj.admin.controller.setting; - -import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.setting.IBasicsService; -import com.hxkj.common.core.AjaxResult; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.Map; - -/** - * 基础设置管理 - */ -@RestController -@RequestMapping("api/setting/basics") -public class BasicsController { - - @Resource - IBasicsService iBasicsService; - - /** - * “获取”网站信息 - * - * @author fzr - * @return Object - */ - @Log(title = "网站信息") - @GetMapping("/getWebsite") - public Object getWebsite() { - Map map = iBasicsService.getWebsite(); - return AjaxResult.success(map); - } - - /** - * “修改”网站信息 - * - * @author fzr - * @return Object - */ - @Log(title = "网站信息") - @PostMapping("/setWebsite") - public Object setWebsite(@RequestBody Map params) { - try { - iBasicsService.setWebsite(params); - return AjaxResult.success(); - } catch (Exception e) { - return AjaxResult.success(e.getMessage()); - } - } - - /** - * “获取”备案信息 - * - * @author fzr - * @return Object - */ - @Log(title = "备案信息") - @GetMapping("/getCopyright") - public Object getCopyright() { - Map map = iBasicsService.getCopyright(); - return AjaxResult.success(map); - } - - /** - * “修改”备案信息 - * - * @author fzr - * @return Object - */ - @Log(title = "备案信息") - @PostMapping("/setCopyright") - public Object copyright(@RequestBody Map params) { - try { - iBasicsService.setCopyright(params); - return AjaxResult.success(); - } catch (Exception e) { - return AjaxResult.success(e.getMessage()); - } - } - -} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java index 8dfbd465..8ecb738f 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java @@ -1,6 +1,6 @@ package com.hxkj.admin.controller.setting; -import com.hxkj.admin.service.setting.IDictDataService; +import com.hxkj.admin.service.setting.ISettingDictDataService; import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.setting.DictDataParam; import com.hxkj.admin.vo.setting.DictDataVo; @@ -18,7 +18,7 @@ import java.util.Map; public class DictDataController { @Resource - IDictDataService iDictDataService; + ISettingDictDataService iSettingDictDataService; /** * 字典数据列表 @@ -31,7 +31,7 @@ public class DictDataController { @GetMapping("/list") public Object list(@Validated PageParam pageParam, @RequestParam Map params) { - PageResult list = iDictDataService.list(pageParam, params); + PageResult list = iSettingDictDataService.list(pageParam, params); return AjaxResult.success(list); } @@ -44,7 +44,7 @@ public class DictDataController { */ @GetMapping("/detail") public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { - DictDataVo vo = iDictDataService.detail(id); + DictDataVo vo = iSettingDictDataService.detail(id); return AjaxResult.success(vo); } @@ -57,7 +57,7 @@ public class DictDataController { */ @PostMapping("/add") public Object add(@Validated(value = DictDataParam.create.class) @RequestBody DictDataParam dictDataParam) { - iDictDataService.add(dictDataParam); + iSettingDictDataService.add(dictDataParam); return AjaxResult.success(); } @@ -70,7 +70,7 @@ public class DictDataController { */ @PostMapping("/edit") public Object edit(@Validated(value = DictDataParam.update.class) @RequestBody DictDataParam dictDataParam) { - iDictDataService.edit(dictDataParam); + iSettingDictDataService.edit(dictDataParam); return AjaxResult.success(); } @@ -83,7 +83,7 @@ public class DictDataController { */ @PostMapping("/del") public Object del(@Validated(value = DictDataParam.delete.class) @RequestBody DictDataParam dictDataParam) { - iDictDataService.del(dictDataParam.getId()); + iSettingDictDataService.del(dictDataParam.getId()); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictTypeController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictTypeController.java index 68cfaae9..fca70080 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictTypeController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictTypeController.java @@ -1,6 +1,6 @@ package com.hxkj.admin.controller.setting; -import com.hxkj.admin.service.setting.IDictTypeService; +import com.hxkj.admin.service.setting.ISettingDictTypeService; import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.setting.DictTypeParam; import com.hxkj.admin.vo.setting.DictTypeVo; @@ -18,7 +18,7 @@ import java.util.Map; public class DictTypeController { @Resource - IDictTypeService iDictTypeService; + ISettingDictTypeService iSettingDictTypeService; /** * 字典类型列表 @@ -31,7 +31,7 @@ public class DictTypeController { @GetMapping("/list") public Object list(@Validated PageParam pageParam, @RequestParam Map params) { - PageResult list = iDictTypeService.list(pageParam, params); + PageResult list = iSettingDictTypeService.list(pageParam, params); return AjaxResult.success(list); } @@ -44,7 +44,7 @@ public class DictTypeController { */ @GetMapping("/detail") public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { - DictTypeVo vo = iDictTypeService.detail(id); + DictTypeVo vo = iSettingDictTypeService.detail(id); return AjaxResult.success(vo); } @@ -57,7 +57,7 @@ public class DictTypeController { */ @PostMapping("/add") public Object add(@Validated(value = DictTypeParam.create.class) @RequestBody DictTypeParam dictTypeParam) { - iDictTypeService.add(dictTypeParam); + iSettingDictTypeService.add(dictTypeParam); return AjaxResult.success(); } @@ -70,7 +70,7 @@ public class DictTypeController { */ @PostMapping("/edit") public Object edit(@Validated(value = DictTypeParam.update.class) @RequestBody DictTypeParam dictTypeParam) { - iDictTypeService.edit(dictTypeParam); + iSettingDictTypeService.edit(dictTypeParam); return AjaxResult.success(); } @@ -83,7 +83,7 @@ public class DictTypeController { */ @PostMapping("/del") public Object del(@Validated(value = DictTypeParam.delete.class) @RequestBody DictTypeParam dictTypeParam) { - iDictTypeService.del(dictTypeParam.getId()); + iSettingDictTypeService.del(dictTypeParam.getId()); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IBasicsService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IBasicsService.java deleted file mode 100644 index e2c37e73..00000000 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IBasicsService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hxkj.admin.service.setting; - -import java.util.Map; - -/** - * 基础配置服务接口类 - */ -public interface IBasicsService { - - /** - * 获取网站信息 - * - * @author fzr - * @return Map - */ - Map getWebsite(); - - /** - * 获取版权信息 - * - * @author fzr - * @return Map - */ - Map getCopyright(); - - /** - * 设置网站信息 - * - * @author fzr - * @param params 参数 - */ - void setWebsite(Map params); - - /** - * 设置版权信息 - * - * @author fzr - * @param params 参数 - */ - void setCopyright(Map params); - -} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IDictDataService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/service/setting/IDictDataService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java index 54c2c618..c7429071 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IDictDataService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java @@ -10,7 +10,7 @@ import java.util.Map; /** * 字典数据服务接口类 */ -public interface IDictDataService { +public interface ISettingDictDataService { /** * 字典数据列表 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IDictTypeService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictTypeService.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/service/setting/IDictTypeService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictTypeService.java index 7991743a..620d39f7 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IDictTypeService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictTypeService.java @@ -10,7 +10,7 @@ import java.util.Map; /** * 字典类型服务接口类 */ -public interface IDictTypeService { +public interface ISettingDictTypeService { /** * 字典类型列表 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/BasicsServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/BasicsServiceImpl.java deleted file mode 100644 index c0550ce3..00000000 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/BasicsServiceImpl.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.hxkj.admin.service.setting.impl; - -import com.hxkj.admin.service.setting.IBasicsService; -import com.hxkj.common.utils.ConfigUtil; -import com.hxkj.common.utils.UrlUtil; -import org.springframework.stereotype.Service; - -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * 基础配置服务实现类 - */ -@Service -public class BasicsServiceImpl implements IBasicsService { - - /** - * 获取网站信息 - * - * @author fzr - * @return Map - */ - @Override - public Map getWebsite() { - Map config = ConfigUtil.get("website"); - - Map map = new LinkedHashMap<>(); - map.put("name", config.getOrDefault("name", "")); - map.put("logo", UrlUtil.toAbsoluteUrl(config.getOrDefault("logo", ""))); - map.put("favicon", UrlUtil.toAbsoluteUrl(config.getOrDefault("favicon", ""))); - map.put("backdrop", UrlUtil.toAbsoluteUrl(config.getOrDefault("backdrop", ""))); - return map; - } - - /** - * 获取版权信息 - * - * @author fzr - * @return Map - */ - @Override - public Map getCopyright() { - Map config = ConfigUtil.get("copyright"); - - Map map = new LinkedHashMap<>(); - map.put("privilege", config.getOrDefault("privilege", "")); - map.put("icpNumber", config.getOrDefault("icpNumber", "")); - map.put("icpLink", config.getOrDefault("icpLink", "")); - map.put("gaNumber", config.getOrDefault("gaNumber", "")); - map.put("gaLink", config.getOrDefault("gaLink", "")); - return map; - } - - /** - * 设置网站信息 - * - * @author fzr - * @param params 参数 - */ - @Override - public void setWebsite(Map params) { - ConfigUtil.set("website", "name", params.getOrDefault("name", "")); - ConfigUtil.set("website", "logo", UrlUtil.toRelativeUrl(params.getOrDefault("logo", ""))); - ConfigUtil.set("website", "favicon", UrlUtil.toRelativeUrl(params.getOrDefault("favicon", ""))); - ConfigUtil.set("website", "backdrop", UrlUtil.toRelativeUrl(params.getOrDefault("backdrop", ""))); - } - - /** - * 设置版权信息 - * - * @author fzr - * @param params 参数 - */ - @Override - public void setCopyright(Map params) { - ConfigUtil.set("copyright", "privilege", params.getOrDefault("privilege", "")); - ConfigUtil.set("copyright", "icpNumber", params.getOrDefault("icpNumber", "")); - ConfigUtil.set("copyright", "icpLink", params.getOrDefault("icpLink", "")); - ConfigUtil.set("copyright", "gaNumber", params.getOrDefault("gaNumber", "")); - ConfigUtil.set("copyright", "gaLink", params.getOrDefault("gaLink", "")); - } - -} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/DictDataServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/DictDataServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java index 06a4bfe3..af33f10a 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/DictDataServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hxkj.admin.service.setting.IDictDataService; +import com.hxkj.admin.service.setting.ISettingDictDataService; import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.setting.DictDataParam; import com.hxkj.admin.vo.setting.DictDataVo; @@ -24,7 +24,7 @@ import java.util.Map; * 字典数据服务实现类 */ @Service -public class DictDataServiceImpl implements IDictDataService { +public class SettingDictDataServiceImpl implements ISettingDictDataService { @Resource DictDataMapper dictDataMapper; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/DictTypeServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/DictTypeServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java index 4f60decd..39d58178 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/DictTypeServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hxkj.admin.service.setting.IDictTypeService; +import com.hxkj.admin.service.setting.ISettingDictTypeService; import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.setting.DictTypeParam; import com.hxkj.admin.vo.setting.DictTypeVo; @@ -24,7 +24,7 @@ import java.util.Map; * 字典类型服务实现类 */ @Service -public class DictTypeServiceImpl implements IDictTypeService { +public class SettingDictTypeServiceImpl implements ISettingDictTypeService { @Resource DictTypeMapper dictTypeMapper;