yzc 1 жил өмнө
parent
commit
781706aead

+ 3 - 3
code/src/test/java/AccountDataSource.java

@@ -4,9 +4,9 @@ public class AccountDataSource {
 
 
     public static void main(String[] args) {
     public static void main(String[] args) {
         GeneratorApplication.builder()
         GeneratorApplication.builder()
-                .url("jdbc:mysql://36.134.91.96:12333/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
-                .username("root")
-                .password("Fjhx@pwd123")
+                .url(DataSourceInfo.URL)
+                .username(DataSourceInfo.USER_NAME)
+                .password(DataSourceInfo.PASSWORD)
                 .port(9989)
                 .port(9989)
                 .module("hx-account")
                 .module("hx-account")
                 .parent("com.fjhx.account")
                 .parent("com.fjhx.account")

+ 79 - 0
hx-account/src/main/java/com/fjhx/account/controller/account/AccountSubjectsController.java

@@ -0,0 +1,79 @@
+package com.fjhx.account.controller.account;
+
+import com.fjhx.account.entity.account.dto.AccountSubjectsDto;
+import com.fjhx.account.entity.account.dto.AccountSubjectsSelectDto;
+import com.fjhx.account.entity.account.vo.AccountSubjectsVo;
+import com.fjhx.account.service.account.AccountSubjectsService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 记账科目 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@RestController
+@RequestMapping("/accountSubjects")
+public class AccountSubjectsController {
+
+    @Autowired
+    private AccountSubjectsService accountSubjectsService;
+
+    /**
+     * 记账科目列表
+     */
+    @PostMapping("/list")
+    public List<AccountSubjectsVo> list(@RequestBody AccountSubjectsSelectDto dto) {
+        return accountSubjectsService.getList(dto);
+    }
+
+//    /**
+//     * 记账科目分页
+//     */
+//    @PostMapping("/page")
+//    public Page<AccountSubjectsVo> page(@RequestBody AccountSubjectsSelectDto dto) {
+//        return accountSubjectsService.getPage(dto);
+//    }
+//
+//    /**
+//     * 记账科目明细
+//     */
+//    @PostMapping("/detail")
+//    public AccountSubjectsVo detail(@RequestBody BaseSelectDto dto) {
+//        return accountSubjectsService.detail(dto.getId());
+//    }
+
+    /**
+     * 记账科目新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody AccountSubjectsDto accountSubjectsDto) {
+        accountSubjectsService.add(accountSubjectsDto);
+    }
+
+    /**
+     * 记账科目编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody AccountSubjectsDto accountSubjectsDto) {
+        accountSubjectsService.edit(accountSubjectsDto);
+    }
+
+    /**
+     * 记账科目删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        accountSubjectsService.delete(dto.getId());
+    }
+
+}

+ 17 - 0
hx-account/src/main/java/com/fjhx/account/entity/account/dto/AccountSubjectsDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.fjhx.account.entity.account.po.AccountSubjects;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 记账科目新增编辑入参实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class AccountSubjectsDto extends AccountSubjects {
+
+}

+ 17 - 0
hx-account/src/main/java/com/fjhx/account/entity/account/dto/AccountSubjectsSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 记账科目列表查询入参实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class AccountSubjectsSelectDto extends BaseSelectDto {
+
+}

+ 51 - 0
hx-account/src/main/java/com/fjhx/account/entity/account/po/AccountSubjects.java

@@ -0,0 +1,51 @@
+package com.fjhx.account.entity.account.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 记账科目
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+@TableName("account_subjects")
+public class AccountSubjects extends BasePo {
+
+    /**
+     * 父级分类id
+     */
+    private Long parentId;
+
+    /**
+     * 父级分类id集合,用,拼接
+     */
+    private String parentIdSet;
+
+    /**
+     * 科目名称
+     */
+    private String subjectsName;
+
+    /**
+     * 核算项目名称
+     */
+    private String calculateItemName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+}

+ 17 - 0
hx-account/src/main/java/com/fjhx/account/entity/account/vo/AccountSubjectsVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.account.vo;
+
+import com.fjhx.account.entity.account.po.AccountSubjects;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 记账科目列表查询返回值实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class AccountSubjectsVo extends AccountSubjects {
+
+}

+ 32 - 0
hx-account/src/main/java/com/fjhx/account/mapper/account/AccountSubjectsMapper.java

@@ -0,0 +1,32 @@
+package com.fjhx.account.mapper.account;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.po.AccountSubjects;
+import com.fjhx.account.entity.account.vo.AccountSubjectsVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 记账科目 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+public interface AccountSubjectsMapper extends BaseMapper<AccountSubjects> {
+
+    /**
+     * 记账科目列表
+     */
+    List<AccountSubjectsVo> getList(@Param("ew") IWrapper<AccountSubjects> wrapper);
+
+    /**
+     * 记账科目分页
+     */
+    Page<AccountSubjectsVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<AccountSubjects> wrapper);
+
+}

+ 52 - 0
hx-account/src/main/java/com/fjhx/account/service/account/AccountSubjectsService.java

@@ -0,0 +1,52 @@
+package com.fjhx.account.service.account;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.dto.AccountSubjectsDto;
+import com.fjhx.account.entity.account.dto.AccountSubjectsSelectDto;
+import com.fjhx.account.entity.account.po.AccountSubjects;
+import com.fjhx.account.entity.account.vo.AccountSubjectsVo;
+import com.ruoyi.common.core.service.BaseService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 记账科目 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+public interface AccountSubjectsService extends BaseService<AccountSubjects> {
+
+    /**
+     * 记账科目列表
+     */
+    List<AccountSubjectsVo> getList(AccountSubjectsSelectDto dto);
+
+    /**
+     * 记账科目分页
+     */
+    Page<AccountSubjectsVo> getPage(AccountSubjectsSelectDto dto);
+
+    /**
+     * 记账科目明细
+     */
+    AccountSubjectsVo detail(Long id);
+
+    /**
+     * 记账科目新增
+     */
+    void add(AccountSubjectsDto accountSubjectsDto);
+
+    /**
+     * 记账科目编辑
+     */
+    void edit(AccountSubjectsDto accountSubjectsDto);
+
+    /**
+     * 记账科目删除
+     */
+    void delete(Long id);
+
+}

+ 66 - 0
hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountSubjectsServiceImpl.java

@@ -0,0 +1,66 @@
+package com.fjhx.account.service.account.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.account.entity.account.dto.AccountSubjectsDto;
+import com.fjhx.account.entity.account.dto.AccountSubjectsSelectDto;
+import com.fjhx.account.entity.account.po.AccountSubjects;
+import com.fjhx.account.entity.account.vo.AccountSubjectsVo;
+import com.fjhx.account.mapper.account.AccountSubjectsMapper;
+import com.fjhx.account.service.account.AccountSubjectsService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 记账科目 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Service
+public class AccountSubjectsServiceImpl extends ServiceImpl<AccountSubjectsMapper, AccountSubjects> implements AccountSubjectsService {
+
+    @Override
+    public List<AccountSubjectsVo> getList(AccountSubjectsSelectDto dto) {
+        IWrapper<AccountSubjects> wrapper = getWrapper();
+        wrapper.orderByDesc("asu", AccountSubjects::getId);
+        List<AccountSubjectsVo> list = this.baseMapper.getList(wrapper);
+        return list;
+    }
+
+    @Override
+    public Page<AccountSubjectsVo> getPage(AccountSubjectsSelectDto dto) {
+        IWrapper<AccountSubjects> wrapper = getWrapper();
+        wrapper.orderByDesc("asu", AccountSubjects::getId);
+        Page<AccountSubjectsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public AccountSubjectsVo detail(Long id) {
+        AccountSubjects AccountSubjects = this.getById(id);
+        AccountSubjectsVo result = BeanUtil.toBean(AccountSubjects, AccountSubjectsVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(AccountSubjectsDto accountSubjectsDto) {
+        this.save(accountSubjectsDto);
+    }
+
+    @Override
+    public void edit(AccountSubjectsDto accountSubjectsDto) {
+        this.updateById(accountSubjectsDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

+ 16 - 0
hx-account/src/main/resources/mapper/account/AccountSubjectsMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.account.mapper.account.AccountSubjectsMapper">
+    <select id="getList" resultType="com.fjhx.account.entity.account.vo.AccountSubjectsVo">
+        select asu.*
+        from account_subjects asu
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountSubjectsVo">
+        select asu.*
+        from account_subjects asu
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>