diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccCardHisController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccCardHisController.java new file mode 100644 index 0000000..38af3de --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccCardHisController.java @@ -0,0 +1,119 @@ +package com.bonus.canteen.core.account.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import com.bonus.common.log.enums.OperaType; +import com.bonus.canteen.core.common.annotation.PreventRepeatSubmit; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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.bonus.common.log.annotation.SysLog; +import com.bonus.common.security.annotation.RequiresPermissions; +import com.bonus.canteen.core.account.domain.AccCardHis; +import com.bonus.canteen.core.account.service.IAccCardHisService; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.utils.poi.ExcelUtil; +import com.bonus.common.core.web.page.TableDataInfo; + +/** + * 人员换卡历史记录Controller + * + * @author xsheng + * @date 2025-04-23 + */ +@Api(tags = "人员换卡历史记录接口") +@RestController +@RequestMapping("/acc_card_his") +public class AccCardHisController extends BaseController { + @Autowired + private IAccCardHisService accCardHisService; + + /** + * 查询人员换卡历史记录列表 + */ + @ApiOperation(value = "查询人员换卡历史记录列表") + //@RequiresPermissions("account:his:list") + @GetMapping("/list") + public TableDataInfo list(AccCardHis accCardHis) { + startPage(); + List list = accCardHisService.selectAccCardHisList(accCardHis); + return getDataTable(list); + } + + /** + * 导出人员换卡历史记录列表 + */ + @ApiOperation(value = "导出人员换卡历史记录列表") + //@PreventRepeatSubmit + //@RequiresPermissions("account:his:export") + @SysLog(title = "人员换卡历史记录", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出人员换卡历史记录") + @PostMapping("/export") + public void export(HttpServletResponse response, AccCardHis accCardHis) { + List list = accCardHisService.selectAccCardHisList(accCardHis); + ExcelUtil util = new ExcelUtil(AccCardHis.class); + util.exportExcel(response, list, "人员换卡历史记录数据"); + } + + /** + * 获取人员换卡历史记录详细信息 + */ + @ApiOperation(value = "获取人员换卡历史记录详细信息") + //@RequiresPermissions("account:his:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(accCardHisService.selectAccCardHisById(id)); + } + + /** + * 新增人员换卡历史记录 + */ + @ApiOperation(value = "新增人员换卡历史记录") + //@PreventRepeatSubmit + //@RequiresPermissions("account:his:add") + @SysLog(title = "人员换卡历史记录", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增人员换卡历史记录") + @PostMapping + public AjaxResult add(@RequestBody AccCardHis accCardHis) { + try { + return toAjax(accCardHisService.insertAccCardHis(accCardHis)); + } catch (Exception e) { + return error("系统错误, " + e.getMessage()); + } + } + + /** + * 修改人员换卡历史记录 + */ + @ApiOperation(value = "修改人员换卡历史记录") + //@PreventRepeatSubmit + //@RequiresPermissions("account:his:edit") + @SysLog(title = "人员换卡历史记录", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改人员换卡历史记录") + @PostMapping("/edit") + public AjaxResult edit(@RequestBody AccCardHis accCardHis) { + try { + return toAjax(accCardHisService.updateAccCardHis(accCardHis)); + } catch (Exception e) { + return error("系统错误, " + e.getMessage()); + } + } + + /** + * 删除人员换卡历史记录 + */ + @ApiOperation(value = "删除人员换卡历史记录") + //@PreventRepeatSubmit + //@RequiresPermissions("account:his:remove") + @SysLog(title = "人员换卡历史记录", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除人员换卡历史记录") + @PostMapping("/del/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(accCardHisService.deleteAccCardHisByIds(ids)); + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccCardHis.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccCardHis.java new file mode 100644 index 0000000..b89e1f5 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccCardHis.java @@ -0,0 +1,86 @@ +package com.bonus.canteen.core.account.domain; + +import com.bonus.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; +import com.bonus.common.core.web.domain.BaseEntity; + +/** + * 人员换卡历史记录对象 acc_card_his + * + * @author xsheng + * @date 2025-04-23 + */ + + +@Data +@ToString +public class AccCardHis extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键自增 */ + private Long id; + + /** 账户id */ + @Excel(name = "账户id") + @ApiModelProperty(value = "账户id") + private Long accId; + + /** 人员id */ + @Excel(name = "人员id") + @ApiModelProperty(value = "人员id") + private Long userId; + + /** 卡号 */ + @Excel(name = "卡号") + @ApiModelProperty(value = "卡号") + private String cardNum; + + /** 卡序列号 */ + @Excel(name = "卡序列号") + @ApiModelProperty(value = "卡序列号") + private String serialNum; + + /** 卡类型 */ + @Excel(name = "卡类型") + @ApiModelProperty(value = "卡类型") + private Long cardType; + + /** 记录类型 1-发卡2-退卡3-换卡 */ + @Excel(name = "记录类型 1-发卡2-退卡3-换卡") + @ApiModelProperty(value = "记录类型 1-发卡2-退卡3-换卡") + private Long recordType; + + /** 押金 单位分 */ + @Excel(name = "押金 单位分") + @ApiModelProperty(value = "押金 单位分") + private Long deposit; + + /** 工本费 单位分 */ + @Excel(name = "工本费 单位分") + @ApiModelProperty(value = "工本费 单位分") + private Long productCost; + + /** 押金、工本费支付方式 */ + @Excel(name = "押金、工本费支付方式 ") + @ApiModelProperty(value = "押金、工本费支付方式 ") + private Integer payType; + + /** 押金、工本费支付渠道 */ + @Excel(name = "押金、工本费支付渠道") + @ApiModelProperty(value = "押金、工本费支付渠道") + private Integer payChannel; + + /** 卡面号 */ + @Excel(name = "卡面号") + @ApiModelProperty(value = "卡面号") + private String cardFaceNum; + + /** 乐观锁 */ + @Excel(name = "乐观锁") + @ApiModelProperty(value = "乐观锁") + private Long revision; + + +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccCardHisMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccCardHisMapper.java new file mode 100644 index 0000000..e188c64 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccCardHisMapper.java @@ -0,0 +1,60 @@ +package com.bonus.canteen.core.account.mapper; + +import java.util.List; +import com.bonus.canteen.core.account.domain.AccCardHis; + +/** + * 人员换卡历史记录Mapper接口 + * + * @author xsheng + * @date 2025-04-23 + */ +public interface AccCardHisMapper { + /** + * 查询人员换卡历史记录 + * + * @param id 人员换卡历史记录主键 + * @return 人员换卡历史记录 + */ + public AccCardHis selectAccCardHisById(Long id); + + /** + * 查询人员换卡历史记录列表 + * + * @param accCardHis 人员换卡历史记录 + * @return 人员换卡历史记录集合 + */ + public List selectAccCardHisList(AccCardHis accCardHis); + + /** + * 新增人员换卡历史记录 + * + * @param accCardHis 人员换卡历史记录 + * @return 结果 + */ + public int insertAccCardHis(AccCardHis accCardHis); + + /** + * 修改人员换卡历史记录 + * + * @param accCardHis 人员换卡历史记录 + * @return 结果 + */ + public int updateAccCardHis(AccCardHis accCardHis); + + /** + * 删除人员换卡历史记录 + * + * @param id 人员换卡历史记录主键 + * @return 结果 + */ + public int deleteAccCardHisById(Long id); + + /** + * 批量删除人员换卡历史记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteAccCardHisByIds(Long[] ids); +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/IAccCardHisService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/IAccCardHisService.java new file mode 100644 index 0000000..295f952 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/IAccCardHisService.java @@ -0,0 +1,60 @@ +package com.bonus.canteen.core.account.service; + +import java.util.List; +import com.bonus.canteen.core.account.domain.AccCardHis; + +/** + * 人员换卡历史记录Service接口 + * + * @author xsheng + * @date 2025-04-23 + */ +public interface IAccCardHisService { + /** + * 查询人员换卡历史记录 + * + * @param id 人员换卡历史记录主键 + * @return 人员换卡历史记录 + */ + public AccCardHis selectAccCardHisById(Long id); + + /** + * 查询人员换卡历史记录列表 + * + * @param accCardHis 人员换卡历史记录 + * @return 人员换卡历史记录集合 + */ + public List selectAccCardHisList(AccCardHis accCardHis); + + /** + * 新增人员换卡历史记录 + * + * @param accCardHis 人员换卡历史记录 + * @return 结果 + */ + public int insertAccCardHis(AccCardHis accCardHis); + + /** + * 修改人员换卡历史记录 + * + * @param accCardHis 人员换卡历史记录 + * @return 结果 + */ + public int updateAccCardHis(AccCardHis accCardHis); + + /** + * 批量删除人员换卡历史记录 + * + * @param ids 需要删除的人员换卡历史记录主键集合 + * @return 结果 + */ + public int deleteAccCardHisByIds(Long[] ids); + + /** + * 删除人员换卡历史记录信息 + * + * @param id 人员换卡历史记录主键 + * @return 结果 + */ + public int deleteAccCardHisById(Long id); +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardHisServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardHisServiceImpl.java new file mode 100644 index 0000000..09c8b4c --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardHisServiceImpl.java @@ -0,0 +1,98 @@ +package com.bonus.canteen.core.account.service.impl; + +import java.util.List; +import com.bonus.common.core.exception.ServiceException; +import com.bonus.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.bonus.canteen.core.account.mapper.AccCardHisMapper; +import com.bonus.canteen.core.account.domain.AccCardHis; +import com.bonus.canteen.core.account.service.IAccCardHisService; + +/** + * 人员换卡历史记录Service业务层处理 + * + * @author xsheng + * @date 2025-04-23 + */ +@Service +public class AccCardHisServiceImpl implements IAccCardHisService { + @Autowired + private AccCardHisMapper accCardHisMapper; + + /** + * 查询人员换卡历史记录 + * + * @param id 人员换卡历史记录主键 + * @return 人员换卡历史记录 + */ + @Override + public AccCardHis selectAccCardHisById(Long id) { + return accCardHisMapper.selectAccCardHisById(id); + } + + /** + * 查询人员换卡历史记录列表 + * + * @param accCardHis 人员换卡历史记录 + * @return 人员换卡历史记录 + */ + @Override + public List selectAccCardHisList(AccCardHis accCardHis) { + return accCardHisMapper.selectAccCardHisList(accCardHis); + } + + /** + * 新增人员换卡历史记录 + * + * @param accCardHis 人员换卡历史记录 + * @return 结果 + */ + @Override + public int insertAccCardHis(AccCardHis accCardHis) { + accCardHis.setCreateTime(DateUtils.getNowDate()); + try { + return accCardHisMapper.insertAccCardHis(accCardHis); + } catch (Exception e) { + throw new ServiceException("错误信息描述, " + e.getMessage()); + } + } + + /** + * 修改人员换卡历史记录 + * + * @param accCardHis 人员换卡历史记录 + * @return 结果 + */ + @Override + public int updateAccCardHis(AccCardHis accCardHis) { + accCardHis.setUpdateTime(DateUtils.getNowDate()); + try { + return accCardHisMapper.updateAccCardHis(accCardHis); + } catch (Exception e) { + throw new ServiceException("错误信息描述, " + e.getMessage()); + } + } + + /** + * 批量删除人员换卡历史记录 + * + * @param ids 需要删除的人员换卡历史记录主键 + * @return 结果 + */ + @Override + public int deleteAccCardHisByIds(Long[] ids) { + return accCardHisMapper.deleteAccCardHisByIds(ids); + } + + /** + * 删除人员换卡历史记录信息 + * + * @param id 人员换卡历史记录主键 + * @return 结果 + */ + @Override + public int deleteAccCardHisById(Long id) { + return accCardHisMapper.deleteAccCardHisById(id); + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccCardHisMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccCardHisMapper.xml new file mode 100644 index 0000000..5eb585d --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccCardHisMapper.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select id, acc_id, user_id, card_num, serial_num, card_type, record_type, deposit, product_cost, pay_type, pay_channel, remark, card_face_num, revision, create_by, create_time, update_by, update_time from acc_card_his + + + + + + + + insert into acc_card_his + + acc_id, + user_id, + card_num, + serial_num, + card_type, + record_type, + deposit, + product_cost, + pay_type, + pay_channel, + remark, + card_face_num, + revision, + create_by, + create_time, + update_by, + update_time, + + + #{accId}, + #{userId}, + #{cardNum}, + #{serialNum}, + #{cardType}, + #{recordType}, + #{deposit}, + #{productCost}, + #{payType}, + #{payChannel}, + #{remark}, + #{cardFaceNum}, + #{revision}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update acc_card_his + + acc_id = #{accId}, + user_id = #{userId}, + card_num = #{cardNum}, + serial_num = #{serialNum}, + card_type = #{cardType}, + record_type = #{recordType}, + deposit = #{deposit}, + product_cost = #{productCost}, + pay_type = #{payType}, + pay_channel = #{payChannel}, + remark = #{remark}, + card_face_num = #{cardFaceNum}, + revision = #{revision}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from acc_card_his where id = #{id} + + + + delete from acc_card_his where id in + + #{id} + + + \ No newline at end of file