From a89870bea91985fa104706cfbba95d5ca0a1373a Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 20 Apr 2023 15:20:07 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=AB=99=E7=82=B9=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/PileStationWhitelistController.java | 125 +++++++++--------- .../impl/PileStationWhitelistServiceImpl.java | 16 ++- .../views/pile/station/stationWhiteList.vue | 9 +- 3 files changed, 80 insertions(+), 70 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java index ce2012d6c..aa649d72c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java @@ -24,82 +24,75 @@ import java.util.List; /** * 站点白名单Controller - * + * * @author jsowell * @date 2023-04-20 */ @RestController @RequestMapping("/pile/whitelist") -public class PileStationWhitelistController extends BaseController -{ - @Autowired - private IPileStationWhitelistService pileStationWhitelistService; +public class PileStationWhitelistController extends BaseController { + @Autowired + private IPileStationWhitelistService pileStationWhitelistService; - /** - * 查询站点白名单列表 - */ - @PreAuthorize("@ss.hasPermi('pile:whitelist:list')") - @GetMapping("/list") - public TableDataInfo list(PileStationWhitelist pileStationWhitelist) - { - startPage(); - List list = pileStationWhitelistService.selectPileStationWhitelistList(pileStationWhitelist); - return getDataTable(list); - } + /** + * 查询站点白名单列表 + */ + @PreAuthorize("@ss.hasPermi('pile:whitelist:list')") + @GetMapping("/list") + public TableDataInfo list(PileStationWhitelist pileStationWhitelist) { + startPage(); + List list = pileStationWhitelistService.selectPileStationWhitelistList(pileStationWhitelist); + return getDataTable(list); + } - /** - * 导出站点白名单列表 - */ - @PreAuthorize("@ss.hasPermi('pile:whitelist:export')") - @Log(title = "站点白名单", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, PileStationWhitelist pileStationWhitelist) - { - List list = pileStationWhitelistService.selectPileStationWhitelistList(pileStationWhitelist); - ExcelUtil util = new ExcelUtil(PileStationWhitelist.class); - util.exportExcel(response, list, "站点白名单数据"); - } + /** + * 导出站点白名单列表 + */ + @PreAuthorize("@ss.hasPermi('pile:whitelist:export')") + @Log(title = "站点白名单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, PileStationWhitelist pileStationWhitelist) { + List list = pileStationWhitelistService.selectPileStationWhitelistList(pileStationWhitelist); + ExcelUtil util = new ExcelUtil(PileStationWhitelist.class); + util.exportExcel(response, list, "站点白名单数据"); + } - /** - * 获取站点白名单详细信息 - */ - @PreAuthorize("@ss.hasPermi('pile:whitelist:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(pileStationWhitelistService.selectPileStationWhitelistById(id)); - } + /** + * 获取站点白名单详细信息 + */ + @PreAuthorize("@ss.hasPermi('pile:whitelist:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(pileStationWhitelistService.selectPileStationWhitelistById(id)); + } - /** - * 新增站点白名单 - */ - @PreAuthorize("@ss.hasPermi('pile:whitelist:add')") - @Log(title = "站点白名单", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody PileStationWhitelist pileStationWhitelist) - { - return toAjax(pileStationWhitelistService.insertPileStationWhitelist(pileStationWhitelist)); - } + /** + * 新增站点白名单 + */ + @PreAuthorize("@ss.hasPermi('pile:whitelist:add')") + @Log(title = "站点白名单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody PileStationWhitelist pileStationWhitelist) { + return toAjax(pileStationWhitelistService.insertPileStationWhitelist(pileStationWhitelist)); + } - /** - * 修改站点白名单 - */ - @PreAuthorize("@ss.hasPermi('pile:whitelist:edit')") - @Log(title = "站点白名单", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody PileStationWhitelist pileStationWhitelist) - { - return toAjax(pileStationWhitelistService.updatePileStationWhitelist(pileStationWhitelist)); - } + /** + * 修改站点白名单 + */ + @PreAuthorize("@ss.hasPermi('pile:whitelist:edit')") + @Log(title = "站点白名单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody PileStationWhitelist pileStationWhitelist) { + return toAjax(pileStationWhitelistService.updatePileStationWhitelist(pileStationWhitelist)); + } - /** - * 删除站点白名单 - */ - @PreAuthorize("@ss.hasPermi('pile:whitelist:remove')") - @Log(title = "站点白名单", businessType = BusinessType.DELETE) + /** + * 删除站点白名单 + */ + @PreAuthorize("@ss.hasPermi('pile:whitelist:remove')") + @Log(title = "站点白名单", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(pileStationWhitelistService.deletePileStationWhitelistByIds(ids)); - } + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(pileStationWhitelistService.deletePileStationWhitelistByIds(ids)); + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java index f320e0128..2c89d9c00 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java @@ -1,8 +1,11 @@ package com.jsowell.pile.service.impl; import com.jsowell.common.util.DateUtils; +import com.jsowell.common.util.StringUtils; +import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.domain.PileStationWhitelist; import com.jsowell.pile.mapper.PileStationWhitelistMapper; +import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.service.IPileStationWhitelistService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,6 +23,9 @@ public class PileStationWhitelistServiceImpl implements IPileStationWhitelistSer @Autowired private PileStationWhitelistMapper pileStationWhitelistMapper; + @Autowired + private IMemberBasicInfoService memberBasicInfoService; + /** * 查询站点白名单 * @@ -50,7 +56,15 @@ public class PileStationWhitelistServiceImpl implements IPileStationWhitelistSer */ @Override public int insertPileStationWhitelist(PileStationWhitelist pileStationWhitelist) { - pileStationWhitelist.setCreateTime(DateUtils.getNowDate()); + // pileStationWhitelist.setCreateTime(DateUtils.getNowDate()); + if (StringUtils.isBlank(pileStationWhitelist.getMobileNumber())) { + return 0; + } + MemberBasicInfo info = memberBasicInfoService.selectInfoByMobileNumber(pileStationWhitelist.getMobileNumber()); + if (info == null) { + return 0; + } + pileStationWhitelist.setMemberId(info.getMemberId()); return pileStationWhitelistMapper.insertPileStationWhitelist(pileStationWhitelist); } diff --git a/jsowell-ui/src/views/pile/station/stationWhiteList.vue b/jsowell-ui/src/views/pile/station/stationWhiteList.vue index 898337cf0..5d1d06cdb 100644 --- a/jsowell-ui/src/views/pile/station/stationWhiteList.vue +++ b/jsowell-ui/src/views/pile/station/stationWhiteList.vue @@ -72,7 +72,7 @@ - + @@ -109,9 +109,9 @@ - + @@ -152,6 +152,7 @@ export default { title: "", // 是否显示弹出层 open: false, + stationId: this.$route.params.id, // 查询参数 queryParams: { pageNum: 1, @@ -174,6 +175,7 @@ export default { /** 查询站点白名单列表 */ getList() { this.loading = true; + this.queryParams.stationId = this.stationId; listWhitelist(this.queryParams).then(response => { this.whitelistList = response.rows; this.total = response.total; @@ -243,6 +245,7 @@ export default { this.getList(); }); } else { + this.form.stationId = this.stationId; addWhitelist(this.form).then(response => { this.$modal.msgSuccess("新增成功"); this.open = false;