From 66a1be326a7d5582b1decc978134ca25d8a9a438 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Sun, 18 Aug 2024 03:20:21 +0800 Subject: [PATCH] =?UTF-8?q?1;=E5=B8=90=E5=88=86=E5=BF=AB=E7=85=A7-50%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusIntegralHistoryInfoController.java | 104 +++++++++++++++++ .../domain/BusIntegralHistoryInfo.java | 109 ++++++++++++++++++ .../mapper/BusIntegralHistoryInfoMapper.java | 61 ++++++++++ .../IBusIntegralHistoryInfoService.java | 61 ++++++++++ .../business/service/impl/AiConsumer.java | 3 +- .../BusIntegralHistoryInfoServiceImpl.java | 95 +++++++++++++++ .../business/BusIntegralHistoryInfoMapper.xml | 84 ++++++++++++++ 7 files changed, 516 insertions(+), 1 deletion(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralHistoryInfoController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralHistoryInfo.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusIntegralHistoryInfoMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/business/service/IBusIntegralHistoryInfoService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusIntegralHistoryInfoServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/business/BusIntegralHistoryInfoMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralHistoryInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralHistoryInfoController.java new file mode 100644 index 0000000..1ddf262 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralHistoryInfoController.java @@ -0,0 +1,104 @@ +package com.ruoyi.business.controller; + +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; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.business.domain.BusIntegralHistoryInfo; +import com.ruoyi.business.service.IBusIntegralHistoryInfoService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 帐分历史快照Controller + * + * @author ruoyi + * @date 2024-08-18 + */ +@RestController +@RequestMapping("/integral/integral") +public class BusIntegralHistoryInfoController extends BaseController +{ + @Autowired + private IBusIntegralHistoryInfoService busIntegralHistoryInfoService; + + /** + * 查询帐分历史快照列表 + */ + @PreAuthorize("@ss.hasPermi('integral:integral:list')") + @GetMapping("/list") + public TableDataInfo list(BusIntegralHistoryInfo busIntegralHistoryInfo) + { + startPage(); + List list = busIntegralHistoryInfoService.selectBusIntegralHistoryInfoList(busIntegralHistoryInfo); + return getDataTable(list); + } + + /** + * 导出帐分历史快照列表 + */ + @PreAuthorize("@ss.hasPermi('integral:integral:export')") + @Log(title = "帐分历史快照", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BusIntegralHistoryInfo busIntegralHistoryInfo) + { + List list = busIntegralHistoryInfoService.selectBusIntegralHistoryInfoList(busIntegralHistoryInfo); + ExcelUtil util = new ExcelUtil(BusIntegralHistoryInfo.class); + util.exportExcel(response, list, "帐分历史快照数据"); + } + + /** + * 获取帐分历史快照详细信息 + */ + @PreAuthorize("@ss.hasPermi('integral:integral:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(busIntegralHistoryInfoService.selectBusIntegralHistoryInfoById(id)); + } + + /** + * 新增帐分历史快照 + */ + @PreAuthorize("@ss.hasPermi('integral:integral:add')") + @Log(title = "帐分历史快照", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BusIntegralHistoryInfo busIntegralHistoryInfo) + { + return toAjax(busIntegralHistoryInfoService.insertBusIntegralHistoryInfo(busIntegralHistoryInfo)); + } + + /** + * 修改帐分历史快照 + */ + @PreAuthorize("@ss.hasPermi('integral:integral:edit')") + @Log(title = "帐分历史快照", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BusIntegralHistoryInfo busIntegralHistoryInfo) + { + return toAjax(busIntegralHistoryInfoService.updateBusIntegralHistoryInfo(busIntegralHistoryInfo)); + } + + /** + * 删除帐分历史快照 + */ + @PreAuthorize("@ss.hasPermi('integral:integral:remove')") + @Log(title = "帐分历史快照", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(busIntegralHistoryInfoService.deleteBusIntegralHistoryInfoByIds(ids)); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralHistoryInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralHistoryInfo.java new file mode 100644 index 0000000..d275a2c --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralHistoryInfo.java @@ -0,0 +1,109 @@ +package com.ruoyi.business.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 帐分历史快照对象 bus_integral_history_info + * + * @author ruoyi + * @date 2024-08-18 + */ +public class BusIntegralHistoryInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 账号 */ + @Excel(name = "账号") + private String account; + + /** 账户名 */ + @Excel(name = "账户名") + private String accountName; + + /** 上级账号 */ + @Excel(name = "上级账号") + private String superiorAgentCode; + + /** ai帐分 */ + @Excel(name = "ai帐分") + private Long aiIntegralBalance; + + /** sms帐分 */ + @Excel(name = "sms帐分") + private Long integralBalance; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setAccount(String account) + { + this.account = account; + } + + public String getAccount() + { + return account; + } + public void setAccountName(String accountName) + { + this.accountName = accountName; + } + + public String getAccountName() + { + return accountName; + } + public void setSuperiorAgentCode(String superiorAgentCode) + { + this.superiorAgentCode = superiorAgentCode; + } + + public String getSuperiorAgentCode() + { + return superiorAgentCode; + } + public void setAiIntegralBalance(Long aiIntegralBalance) + { + this.aiIntegralBalance = aiIntegralBalance; + } + + public Long getAiIntegralBalance() + { + return aiIntegralBalance; + } + public void setIntegralBalance(Long integralBalance) + { + this.integralBalance = integralBalance; + } + + public Long getIntegralBalance() + { + return integralBalance; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("account", getAccount()) + .append("accountName", getAccountName()) + .append("superiorAgentCode", getSuperiorAgentCode()) + .append("aiIntegralBalance", getAiIntegralBalance()) + .append("integralBalance", getIntegralBalance()) + .append("createTime", getCreateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusIntegralHistoryInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusIntegralHistoryInfoMapper.java new file mode 100644 index 0000000..22731dd --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusIntegralHistoryInfoMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.business.mapper; + +import java.util.List; +import com.ruoyi.business.domain.BusIntegralHistoryInfo; + +/** + * 帐分历史快照Mapper接口 + * + * @author ruoyi + * @date 2024-08-18 + */ +public interface BusIntegralHistoryInfoMapper +{ + /** + * 查询帐分历史快照 + * + * @param id 帐分历史快照主键 + * @return 帐分历史快照 + */ + public BusIntegralHistoryInfo selectBusIntegralHistoryInfoById(Long id); + + /** + * 查询帐分历史快照列表 + * + * @param busIntegralHistoryInfo 帐分历史快照 + * @return 帐分历史快照集合 + */ + public List selectBusIntegralHistoryInfoList(BusIntegralHistoryInfo busIntegralHistoryInfo); + + /** + * 新增帐分历史快照 + * + * @param busIntegralHistoryInfo 帐分历史快照 + * @return 结果 + */ + public int insertBusIntegralHistoryInfo(BusIntegralHistoryInfo busIntegralHistoryInfo); + + /** + * 修改帐分历史快照 + * + * @param busIntegralHistoryInfo 帐分历史快照 + * @return 结果 + */ + public int updateBusIntegralHistoryInfo(BusIntegralHistoryInfo busIntegralHistoryInfo); + + /** + * 删除帐分历史快照 + * + * @param id 帐分历史快照主键 + * @return 结果 + */ + public int deleteBusIntegralHistoryInfoById(Long id); + + /** + * 批量删除帐分历史快照 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBusIntegralHistoryInfoByIds(Long[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusIntegralHistoryInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusIntegralHistoryInfoService.java new file mode 100644 index 0000000..5707e94 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusIntegralHistoryInfoService.java @@ -0,0 +1,61 @@ +package com.ruoyi.business.service; + +import java.util.List; +import com.ruoyi.business.domain.BusIntegralHistoryInfo; + +/** + * 帐分历史快照Service接口 + * + * @author ruoyi + * @date 2024-08-18 + */ +public interface IBusIntegralHistoryInfoService +{ + /** + * 查询帐分历史快照 + * + * @param id 帐分历史快照主键 + * @return 帐分历史快照 + */ + public BusIntegralHistoryInfo selectBusIntegralHistoryInfoById(Long id); + + /** + * 查询帐分历史快照列表 + * + * @param busIntegralHistoryInfo 帐分历史快照 + * @return 帐分历史快照集合 + */ + public List selectBusIntegralHistoryInfoList(BusIntegralHistoryInfo busIntegralHistoryInfo); + + /** + * 新增帐分历史快照 + * + * @param busIntegralHistoryInfo 帐分历史快照 + * @return 结果 + */ + public int insertBusIntegralHistoryInfo(BusIntegralHistoryInfo busIntegralHistoryInfo); + + /** + * 修改帐分历史快照 + * + * @param busIntegralHistoryInfo 帐分历史快照 + * @return 结果 + */ + public int updateBusIntegralHistoryInfo(BusIntegralHistoryInfo busIntegralHistoryInfo); + + /** + * 批量删除帐分历史快照 + * + * @param ids 需要删除的帐分历史快照主键集合 + * @return 结果 + */ + public int deleteBusIntegralHistoryInfoByIds(Long[] ids); + + /** + * 删除帐分历史快照信息 + * + * @param id 帐分历史快照主键 + * @return 结果 + */ + public int deleteBusIntegralHistoryInfoById(Long id); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiConsumer.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiConsumer.java index 5020078..cb8203d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiConsumer.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiConsumer.java @@ -245,8 +245,9 @@ public class AiConsumer { e.printStackTrace(); log.error("营销事件推出-下次继续====================="); throw new ServiceException("营销事件推出-下次继续:"+busOrderInfo.getOrderNo()); + }finally { + System.out.println(("一共耗时time: " + (System.currentTimeMillis() - startTime) / 1000 + " s")); } - System.out.println(("一共耗时time: " + (System.currentTimeMillis() - startTime) / 1000 + " s")); } } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusIntegralHistoryInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusIntegralHistoryInfoServiceImpl.java new file mode 100644 index 0000000..73f4143 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusIntegralHistoryInfoServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.business.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.business.mapper.BusIntegralHistoryInfoMapper; +import com.ruoyi.business.domain.BusIntegralHistoryInfo; +import com.ruoyi.business.service.IBusIntegralHistoryInfoService; + +/** + * 帐分历史快照Service业务层处理 + * + * @author ruoyi + * @date 2024-08-18 + */ +@Service +public class BusIntegralHistoryInfoServiceImpl implements IBusIntegralHistoryInfoService +{ + @Autowired + private BusIntegralHistoryInfoMapper busIntegralHistoryInfoMapper; + + /** + * 查询帐分历史快照 + * + * @param id 帐分历史快照主键 + * @return 帐分历史快照 + */ + @Override + public BusIntegralHistoryInfo selectBusIntegralHistoryInfoById(Long id) + { + return busIntegralHistoryInfoMapper.selectBusIntegralHistoryInfoById(id); + } + + /** + * 查询帐分历史快照列表 + * + * @param busIntegralHistoryInfo 帐分历史快照 + * @return 帐分历史快照 + */ + @Override + public List selectBusIntegralHistoryInfoList(BusIntegralHistoryInfo busIntegralHistoryInfo) + { + return busIntegralHistoryInfoMapper.selectBusIntegralHistoryInfoList(busIntegralHistoryInfo); + } + + /** + * 新增帐分历史快照 + * + * @param busIntegralHistoryInfo 帐分历史快照 + * @return 结果 + */ + @Override + public int insertBusIntegralHistoryInfo(BusIntegralHistoryInfo busIntegralHistoryInfo) + { + busIntegralHistoryInfo.setCreateTime(DateUtils.getNowDate()); + return busIntegralHistoryInfoMapper.insertBusIntegralHistoryInfo(busIntegralHistoryInfo); + } + + /** + * 修改帐分历史快照 + * + * @param busIntegralHistoryInfo 帐分历史快照 + * @return 结果 + */ + @Override + public int updateBusIntegralHistoryInfo(BusIntegralHistoryInfo busIntegralHistoryInfo) + { + return busIntegralHistoryInfoMapper.updateBusIntegralHistoryInfo(busIntegralHistoryInfo); + } + + /** + * 批量删除帐分历史快照 + * + * @param ids 需要删除的帐分历史快照主键 + * @return 结果 + */ + @Override + public int deleteBusIntegralHistoryInfoByIds(Long[] ids) + { + return busIntegralHistoryInfoMapper.deleteBusIntegralHistoryInfoByIds(ids); + } + + /** + * 删除帐分历史快照信息 + * + * @param id 帐分历史快照主键 + * @return 结果 + */ + @Override + public int deleteBusIntegralHistoryInfoById(Long id) + { + return busIntegralHistoryInfoMapper.deleteBusIntegralHistoryInfoById(id); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/business/BusIntegralHistoryInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusIntegralHistoryInfoMapper.xml new file mode 100644 index 0000000..209c3ff --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/business/BusIntegralHistoryInfoMapper.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + select id, account, account_name, superior_agent_code, ai_integral_balance, integral_balance, create_time, remark from bus_integral_history_info + + + + + + + + insert into bus_integral_history_info + + account, + account_name, + superior_agent_code, + ai_integral_balance, + integral_balance, + create_time, + remark, + + + #{account}, + #{accountName}, + #{superiorAgentCode}, + #{aiIntegralBalance}, + #{integralBalance}, + #{createTime}, + #{remark}, + + + + + update bus_integral_history_info + + account = #{account}, + account_name = #{accountName}, + superior_agent_code = #{superiorAgentCode}, + ai_integral_balance = #{aiIntegralBalance}, + integral_balance = #{integralBalance}, + create_time = #{createTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from bus_integral_history_info where id = #{id} + + + + delete from bus_integral_history_info where id in + + #{id} + + + \ No newline at end of file