From 28c220206bd9475748602977ffa06091b93deaeb Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 29 Nov 2023 15:03:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=20=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0=E9=85=8D=E7=BD=AE=E5=90=8E=E7=AE=A1?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ThirdPartySettingInfoController.java | 44 +-- .../thirdparty/amap/AMapController.java | 2 +- .../lianlian/LianLianController.java | 2 +- .../thirdparty/nanrui/NRController.java | 2 +- .../ningxiajiaotou/NXJTController.java | 2 +- .../thirdparty/ruanjie/RJController.java | 2 +- .../yongchengboche/YCBCController.java | 2 +- .../zhongdianlian/ZDLController.java | 2 +- .../src/main/resources/application-dev.yml | 8 +- .../src/api/thirdParty/thirdPartySetting.js | 44 +++ .../thirdParty/thirdPartySetting/index.vue | 361 ++++++++++++++++++ 11 files changed, 435 insertions(+), 36 deletions(-) rename jsowell-admin/src/main/java/com/jsowell/web/controller/{pile => thirdparty}/ThirdPartySettingInfoController.java (80%) rename jsowell-admin/src/main/java/com/jsowell/{ => web/controller}/thirdparty/amap/AMapController.java (98%) rename jsowell-admin/src/main/java/com/jsowell/{ => web/controller}/thirdparty/lianlian/LianLianController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/{ => web/controller}/thirdparty/nanrui/NRController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/{ => web/controller}/thirdparty/ningxiajiaotou/NXJTController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/{ => web/controller}/thirdparty/ruanjie/RJController.java (96%) rename jsowell-admin/src/main/java/com/jsowell/{ => web/controller}/thirdparty/yongchengboche/YCBCController.java (99%) rename jsowell-admin/src/main/java/com/jsowell/{ => web/controller}/thirdparty/zhongdianlian/ZDLController.java (99%) create mode 100644 jsowell-ui/src/api/thirdParty/thirdPartySetting.js create mode 100644 jsowell-ui/src/views/thirdParty/thirdPartySetting/index.vue diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/ThirdPartySettingInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartySettingInfoController.java similarity index 80% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/pile/ThirdPartySettingInfoController.java rename to jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartySettingInfoController.java index b37ddfdd3..6343dc2d3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/ThirdPartySettingInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartySettingInfoController.java @@ -1,7 +1,8 @@ -package com.jsowell.web.controller.pile; +package com.jsowell.web.controller.thirdparty; import java.util.List; import javax.servlet.http.HttpServletResponse; + import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -23,24 +24,22 @@ import com.jsowell.common.core.page.TableDataInfo; /** * 第三方平台配置Controller - * + * * @author jsowell - * @date 2023-05-24 + * @date 2023-11-29 */ @RestController -@RequestMapping("/pile/info") -public class ThirdPartySettingInfoController extends BaseController -{ +@RequestMapping("/thirdParty/thirdPartySetting") +public class ThirdPartySettingInfoController extends BaseController { @Autowired private IThirdPartySettingInfoService thirdPartySettingInfoService; /** * 查询第三方平台配置列表 */ - @PreAuthorize("@ss.hasPermi('pile:info:list')") + @PreAuthorize("@ss.hasPermi('thirdParty:thirdPartySetting:list')") @GetMapping("/list") - public TableDataInfo list(ThirdPartySettingInfo thirdPartySettingInfo) - { + public TableDataInfo list(ThirdPartySettingInfo thirdPartySettingInfo) { startPage(); List list = thirdPartySettingInfoService.selectThirdPartySettingInfoList(thirdPartySettingInfo); return getDataTable(list); @@ -49,11 +48,10 @@ public class ThirdPartySettingInfoController extends BaseController /** * 导出第三方平台配置列表 */ - @PreAuthorize("@ss.hasPermi('pile:info:export')") + @PreAuthorize("@ss.hasPermi('thirdParty:thirdPartySetting:export')") @Log(title = "第三方平台配置", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, ThirdPartySettingInfo thirdPartySettingInfo) - { + public void export(HttpServletResponse response, ThirdPartySettingInfo thirdPartySettingInfo) { List list = thirdPartySettingInfoService.selectThirdPartySettingInfoList(thirdPartySettingInfo); ExcelUtil util = new ExcelUtil(ThirdPartySettingInfo.class); util.exportExcel(response, list, "第三方平台配置数据"); @@ -62,43 +60,39 @@ public class ThirdPartySettingInfoController extends BaseController /** * 获取第三方平台配置详细信息 */ - @PreAuthorize("@ss.hasPermi('pile:info:query')") + @PreAuthorize("@ss.hasPermi('thirdParty:thirdPartySetting:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(thirdPartySettingInfoService.selectThirdPartySettingInfoById(id)); } /** * 新增第三方平台配置 */ - @PreAuthorize("@ss.hasPermi('pile:info:add')") + @PreAuthorize("@ss.hasPermi('thirdParty:thirdPartySetting:add')") @Log(title = "第三方平台配置", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody ThirdPartySettingInfo thirdPartySettingInfo) - { + public AjaxResult add(@RequestBody ThirdPartySettingInfo thirdPartySettingInfo) { return toAjax(thirdPartySettingInfoService.insertThirdPartySettingInfo(thirdPartySettingInfo)); } /** * 修改第三方平台配置 */ - @PreAuthorize("@ss.hasPermi('pile:info:edit')") + @PreAuthorize("@ss.hasPermi('thirdParty:thirdPartySetting:edit')") @Log(title = "第三方平台配置", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody ThirdPartySettingInfo thirdPartySettingInfo) - { + public AjaxResult edit(@RequestBody ThirdPartySettingInfo thirdPartySettingInfo) { return toAjax(thirdPartySettingInfoService.updateThirdPartySettingInfo(thirdPartySettingInfo)); } /** * 删除第三方平台配置 */ - @PreAuthorize("@ss.hasPermi('pile:info:remove')") + @PreAuthorize("@ss.hasPermi('thirdParty:thirdPartySetting:remove')") @Log(title = "第三方平台配置", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(thirdPartySettingInfoService.deleteThirdPartySettingInfoByIds(ids)); } } diff --git a/jsowell-admin/src/main/java/com/jsowell/thirdparty/amap/AMapController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/amap/AMapController.java similarity index 98% rename from jsowell-admin/src/main/java/com/jsowell/thirdparty/amap/AMapController.java rename to jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/amap/AMapController.java index d923edefe..0e3556327 100644 --- a/jsowell-admin/src/main/java/com/jsowell/thirdparty/amap/AMapController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/amap/AMapController.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.amap; +package com.jsowell.web.controller.thirdparty.amap; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; diff --git a/jsowell-admin/src/main/java/com/jsowell/thirdparty/lianlian/LianLianController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/thirdparty/lianlian/LianLianController.java rename to jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java index f64469050..cb54b0c97 100644 --- a/jsowell-admin/src/main/java/com/jsowell/thirdparty/lianlian/LianLianController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.lianlian; +package com.jsowell.web.controller.thirdparty.lianlian; import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.annotation.Anonymous; diff --git a/jsowell-admin/src/main/java/com/jsowell/thirdparty/nanrui/NRController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/nanrui/NRController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/thirdparty/nanrui/NRController.java rename to jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/nanrui/NRController.java index 40d88a147..f01c89970 100644 --- a/jsowell-admin/src/main/java/com/jsowell/thirdparty/nanrui/NRController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/nanrui/NRController.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.nanrui; +package com.jsowell.web.controller.thirdparty.nanrui; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; diff --git a/jsowell-admin/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/NXJTController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ningxiajiaotou/NXJTController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/NXJTController.java rename to jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ningxiajiaotou/NXJTController.java index 6a7575297..e28059d00 100644 --- a/jsowell-admin/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/NXJTController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ningxiajiaotou/NXJTController.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.ningxiajiaotou; +package com.jsowell.web.controller.thirdparty.ningxiajiaotou; import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.annotation.Anonymous; diff --git a/jsowell-admin/src/main/java/com/jsowell/thirdparty/ruanjie/RJController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ruanjie/RJController.java similarity index 96% rename from jsowell-admin/src/main/java/com/jsowell/thirdparty/ruanjie/RJController.java rename to jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ruanjie/RJController.java index 3ed9d062d..a495df45d 100644 --- a/jsowell-admin/src/main/java/com/jsowell/thirdparty/ruanjie/RJController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ruanjie/RJController.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.ruanjie; +package com.jsowell.web.controller.thirdparty.ruanjie; import com.alibaba.fastjson2.JSON; import com.jsowell.common.annotation.Anonymous; diff --git a/jsowell-admin/src/main/java/com/jsowell/thirdparty/yongchengboche/YCBCController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/yongchengboche/YCBCController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/thirdparty/yongchengboche/YCBCController.java rename to jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/yongchengboche/YCBCController.java index 6c36d01d6..055bf217f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/thirdparty/yongchengboche/YCBCController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/yongchengboche/YCBCController.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.yongchengboche; +package com.jsowell.web.controller.thirdparty.yongchengboche; import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.annotation.Anonymous; diff --git a/jsowell-admin/src/main/java/com/jsowell/thirdparty/zhongdianlian/ZDLController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/thirdparty/zhongdianlian/ZDLController.java rename to jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java index 1a57e46e5..2b435e4d2 100644 --- a/jsowell-admin/src/main/java/com/jsowell/thirdparty/zhongdianlian/ZDLController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.zhongdianlian; +package com.jsowell.web.controller.thirdparty.zhongdianlian; import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.annotation.Anonymous; diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index 248424319..01a6c12db 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -36,10 +36,10 @@ spring: druid: # 主库数据源 master: -# url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: jsowell_dev - url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: jsowell_prd_copy + url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: jsowell_dev +# url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: jsowell_prd_copy password: 123456 # 从库数据源 slave: diff --git a/jsowell-ui/src/api/thirdParty/thirdPartySetting.js b/jsowell-ui/src/api/thirdParty/thirdPartySetting.js new file mode 100644 index 000000000..90d2220da --- /dev/null +++ b/jsowell-ui/src/api/thirdParty/thirdPartySetting.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询第三方平台配置列表 +export function listThirdPartySetting(query) { + return request({ + url: '/thirdParty/thirdPartySetting/list', + method: 'get', + params: query + }) +} + +// 查询第三方平台配置详细 +export function getThirdPartySetting(id) { + return request({ + url: '/thirdParty/thirdPartySetting/' + id, + method: 'get' + }) +} + +// 新增第三方平台配置 +export function addThirdPartySetting(data) { + return request({ + url: '/thirdParty/thirdPartySetting', + method: 'post', + data: data + }) +} + +// 修改第三方平台配置 +export function updateThirdPartySetting(data) { + return request({ + url: '/thirdParty/thirdPartySetting', + method: 'put', + data: data + }) +} + +// 删除第三方平台配置 +export function delThirdPartySetting(id) { + return request({ + url: '/thirdParty/thirdPartySetting/' + id, + method: 'delete' + }) +} diff --git a/jsowell-ui/src/views/thirdParty/thirdPartySetting/index.vue b/jsowell-ui/src/views/thirdParty/thirdPartySetting/index.vue new file mode 100644 index 000000000..69875dc5b --- /dev/null +++ b/jsowell-ui/src/views/thirdParty/thirdPartySetting/index.vue @@ -0,0 +1,361 @@ + + +