From c305d7f9b47e381eece7d9e4f9d99d3c70fa5d93 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Wed, 17 Jul 2024 10:29:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=952?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusAgentInfoController.java | 1 + .../controller/BusSaleInfoController.java | 3 ++ .../controller/BusStoreInfoController.java | 2 +- .../controller/BusTemplateInfoController.java | 19 ++++++++--- .../business/domain/BusTemplateInfo.java | 14 +++++++- .../service/IBusTemplateInfoService.java | 2 ++ .../impl/BusTemplateInfoServiceImpl.java | 34 ++++++++++++++++++- .../mapper/system/SysLogininforMapper.xml | 3 ++ ruoyi-ui/src/views/market/self/index.vue | 6 ++-- ruoyi-ui/src/views/market/whole/index.vue | 15 ++++---- 10 files changed, 83 insertions(+), 16 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java index 1bbb023..ed381f4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java @@ -95,6 +95,7 @@ public class BusAgentInfoController extends BaseController { } SysLogininfor sysLogininfor = new SysLogininfor(); sysLogininfor.setUserName(bean.getAgentAccount()); + sysLogininfor.setStatus("0"); sysLogininfor.setMsg("登录成功"); List llll = iSysLogininforService.selectLogininforList(sysLogininfor); bean.setLoginNum(llll.size()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusSaleInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusSaleInfoController.java index 7b026e7..ea7992a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusSaleInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusSaleInfoController.java @@ -56,6 +56,9 @@ public class BusSaleInfoController extends BaseController public TableDataInfo list(BusSaleInfo busSaleInfo) { startPage(); + if(!"admin".equals(SecurityUtils.getUsername())){ + busSaleInfo.setCreateId(SecurityUtils.getUserId()); + } List list = busSaleInfoService.selectBusSaleInfoList(busSaleInfo); List tableList = list.stream() .map(info -> { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java index b9aa5f8..a1ec6e7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java @@ -109,7 +109,7 @@ public class BusStoreInfoController extends BaseController { BusStoreInfo busStoreInfo = new BusStoreInfo(); BeanUtils.copyProperties(reqBusStoreInfo, busStoreInfo); LoginUser user = SecurityUtils.getLoginUser(); - if (!"OK777".equals(user.getUsername())) { + if (!"admin".equals(user.getUsername())) { busStoreInfo.setBindUser(user.getUsername()); } List list = busStoreInfoService.selectBusStoreInfoList(busStoreInfo); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusTemplateInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusTemplateInfoController.java index a96df7e..6492a32 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusTemplateInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusTemplateInfoController.java @@ -2,6 +2,9 @@ package com.ruoyi.business.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -27,6 +30,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * @author ruoyi * @date 2024-07-16 */ +@Api(tags = "模版") @RestController @RequestMapping("/business/template") public class BusTemplateInfoController extends BaseController @@ -37,7 +41,7 @@ public class BusTemplateInfoController extends BaseController /** * 查询模版列表 */ - @PreAuthorize("@ss.hasPermi('business:template:list')") +// @PreAuthorize("@ss.hasPermi('business:template:list')") @GetMapping("/list") public TableDataInfo list(BusTemplateInfo busTemplateInfo) { @@ -62,17 +66,24 @@ public class BusTemplateInfoController extends BaseController /** * 获取模版详细信息 */ - @PreAuthorize("@ss.hasPermi('business:template:query')") +// @PreAuthorize("@ss.hasPermi('business:template:query')") + @ApiOperation("根据模版id获取模版详情") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { return success(busTemplateInfoService.selectBusTemplateInfoById(id)); } + @ApiOperation("根据单前登录人获取模版详情") + @GetMapping(value = "/getTemplateInfo") + public AjaxResult getTemplateInfo() + { + return success(busTemplateInfoService.getTemplateInfo()); + } /** * 新增模版 */ - @PreAuthorize("@ss.hasPermi('business:template:add')") +// @PreAuthorize("@ss.hasPermi('business:template:add')") @Log(title = "模版", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody BusTemplateInfo busTemplateInfo) @@ -83,7 +94,7 @@ public class BusTemplateInfoController extends BaseController /** * 修改模版 */ - @PreAuthorize("@ss.hasPermi('business:template:edit')") +// @PreAuthorize("@ss.hasPermi('business:template:edit')") @Log(title = "模版", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody BusTemplateInfo busTemplateInfo) diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusTemplateInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusTemplateInfo.java index 5a1f80c..76b43cc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusTemplateInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusTemplateInfo.java @@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.List; + /** * 模版对象 bus_template_info * @@ -54,7 +56,17 @@ public class BusTemplateInfo extends BaseEntity @Excel(name = "排序") private Long sort; - public void setId(Long id) + private List attrInfoList; + + public List getAttrInfoList() { + return attrInfoList; + } + + public void setAttrInfoList(List attrInfoList) { + this.attrInfoList = attrInfoList; + } + + public void setId(Long id) { this.id = id; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusTemplateInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusTemplateInfoService.java index 114ed66..d5a0e83 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusTemplateInfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusTemplateInfoService.java @@ -58,4 +58,6 @@ public interface IBusTemplateInfoService * @return 结果 */ public int deleteBusTemplateInfoById(Long id); + + public BusTemplateInfo getTemplateInfo(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusTemplateInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusTemplateInfoServiceImpl.java index 80b1211..7d3df99 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusTemplateInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusTemplateInfoServiceImpl.java @@ -1,7 +1,13 @@ package com.ruoyi.business.service.impl; import java.util.List; + +import com.ruoyi.business.domain.BusTemplateAttrInfo; +import com.ruoyi.business.mapper.BusTemplateAttrInfoMapper; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.business.mapper.BusTemplateInfoMapper; @@ -20,6 +26,9 @@ public class BusTemplateInfoServiceImpl implements IBusTemplateInfoService @Autowired private BusTemplateInfoMapper busTemplateInfoMapper; + @Autowired + private BusTemplateAttrInfoMapper busTemplateAttrInfoMapper; + /** * 查询模版 * @@ -29,7 +38,12 @@ public class BusTemplateInfoServiceImpl implements IBusTemplateInfoService @Override public BusTemplateInfo selectBusTemplateInfoById(Long id) { - return busTemplateInfoMapper.selectBusTemplateInfoById(id); + BusTemplateInfo busTemplateInfo = busTemplateInfoMapper.selectBusTemplateInfoById(id); + BusTemplateAttrInfo busTemplateAttrInfo = new BusTemplateAttrInfo(); + busTemplateAttrInfo.setTemplateId(id); + List list1 = busTemplateAttrInfoMapper.selectBusTemplateAttrInfoList(busTemplateAttrInfo); + busTemplateInfo.setAttrInfoList(list1); + return busTemplateInfo; } /** @@ -93,4 +107,22 @@ public class BusTemplateInfoServiceImpl implements IBusTemplateInfoService { return busTemplateInfoMapper.deleteBusTemplateInfoById(id); } + + @Override + public BusTemplateInfo getTemplateInfo() { + LoginUser user = SecurityUtils.getLoginUser(); + BusTemplateInfo busTemplateInfo = new BusTemplateInfo(); + busTemplateInfo.setCreateId(user.getUserId()); + busTemplateInfo.setTemplateStatus("1"); + List list = busTemplateInfoMapper.selectBusTemplateInfoList(busTemplateInfo); + if(list.size() == 1){ + BusTemplateInfo busTemplateInfo1 = list.get(0); + BusTemplateAttrInfo busTemplateAttrInfo = new BusTemplateAttrInfo(); + busTemplateAttrInfo.setTemplateId(busTemplateInfo1.getId()); + List list1 = busTemplateAttrInfoMapper.selectBusTemplateAttrInfoList(busTemplateAttrInfo); + busTemplateInfo1.setAttrInfoList(list1); + return busTemplateInfo1; + } + throw new ServiceException("模版信息异常！"); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 822d665..bc2b57f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -33,6 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND user_name like concat('%', #{userName}, '%') + + AND msg like concat('%', #{msg}, '%') + AND login_time >= #{params.beginTime} diff --git a/ruoyi-ui/src/views/market/self/index.vue b/ruoyi-ui/src/views/market/self/index.vue index d36ad0a..1eab399 100644 --- a/ruoyi-ui/src/views/market/self/index.vue +++ b/ruoyi-ui/src/views/market/self/index.vue @@ -186,13 +186,13 @@