diff --git a/backend/src/main/java/com/xly/erp/common/security/SecurityConfig.java b/backend/src/main/java/com/xly/erp/common/security/SecurityConfig.java index 18d3dd9..066a86f 100644 --- a/backend/src/main/java/com/xly/erp/common/security/SecurityConfig.java +++ b/backend/src/main/java/com/xly/erp/common/security/SecurityConfig.java @@ -1,5 +1,6 @@ package com.xly.erp.common.security; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; @@ -9,6 +10,7 @@ import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; @Configuration +@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) public class SecurityConfig { private final JwtAuthenticationFilter jwtFilter; diff --git a/backend/src/main/java/com/xly/erp/module/mod/entity/Module.java b/backend/src/main/java/com/xly/erp/module/mod/entity/Module.java new file mode 100644 index 0000000..ab122ff --- /dev/null +++ b/backend/src/main/java/com/xly/erp/module/mod/entity/Module.java @@ -0,0 +1,98 @@ +package com.xly.erp.module.mod.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.time.LocalDateTime; + +@TableName("tModule") +public class Module { + + @TableId(value = "iIncrement", type = IdType.AUTO) + private Integer iIncrement; + + @TableField("sId") + private String sId; + + @TableField("sBrandsId") + private String sBrandsId; + + @TableField("sSubsidiaryId") + private String sSubsidiaryId; + + @TableField("tCreateDate") + private LocalDateTime tCreateDate; + + @TableField("sDisplayType") + private String sDisplayType; + + @TableField("sProcedureName") + private String sProcedureName; + + @TableField("sModuleType") + private String sModuleType; + + @TableField("sManageDeptEn") + private String sManageDeptEn; + + @TableField("bShowPermission") + private Boolean bShowPermission; + + @TableField("sModuleNameZh") + private String sModuleNameZh; + + @TableField("iParentId") + private Integer iParentId; + + @TableField("iSortOrder") + private Integer iSortOrder; + + @TableField("sCreatedBy") + private String sCreatedBy; + + @TableField("bDeleted") + private Boolean bDeleted; + + @TableField("tDeletedDate") + private LocalDateTime tDeletedDate; + + @TableField("sDeletedBy") + private String sDeletedBy; + + public Integer getIIncrement() { return iIncrement; } + public void setIIncrement(Integer iIncrement) { this.iIncrement = iIncrement; } + public String getSId() { return sId; } + public void setSId(String sId) { this.sId = sId; } + public String getSBrandsId() { return sBrandsId; } + public void setSBrandsId(String sBrandsId) { this.sBrandsId = sBrandsId; } + public String getSSubsidiaryId() { return sSubsidiaryId; } + public void setSSubsidiaryId(String sSubsidiaryId) { this.sSubsidiaryId = sSubsidiaryId; } + public LocalDateTime getTCreateDate() { return tCreateDate; } + public void setTCreateDate(LocalDateTime tCreateDate) { this.tCreateDate = tCreateDate; } + public String getSDisplayType() { return sDisplayType; } + public void setSDisplayType(String sDisplayType) { this.sDisplayType = sDisplayType; } + public String getSProcedureName() { return sProcedureName; } + public void setSProcedureName(String sProcedureName) { this.sProcedureName = sProcedureName; } + public String getSModuleType() { return sModuleType; } + public void setSModuleType(String sModuleType) { this.sModuleType = sModuleType; } + public String getSManageDeptEn() { return sManageDeptEn; } + public void setSManageDeptEn(String sManageDeptEn) { this.sManageDeptEn = sManageDeptEn; } + public Boolean getBShowPermission() { return bShowPermission; } + public void setBShowPermission(Boolean bShowPermission) { this.bShowPermission = bShowPermission; } + public String getSModuleNameZh() { return sModuleNameZh; } + public void setSModuleNameZh(String sModuleNameZh) { this.sModuleNameZh = sModuleNameZh; } + public Integer getIParentId() { return iParentId; } + public void setIParentId(Integer iParentId) { this.iParentId = iParentId; } + public Integer getISortOrder() { return iSortOrder; } + public void setISortOrder(Integer iSortOrder) { this.iSortOrder = iSortOrder; } + public String getSCreatedBy() { return sCreatedBy; } + public void setSCreatedBy(String sCreatedBy) { this.sCreatedBy = sCreatedBy; } + public Boolean getBDeleted() { return bDeleted; } + public void setBDeleted(Boolean bDeleted) { this.bDeleted = bDeleted; } + public LocalDateTime getTDeletedDate() { return tDeletedDate; } + public void setTDeletedDate(LocalDateTime tDeletedDate) { this.tDeletedDate = tDeletedDate; } + public String getSDeletedBy() { return sDeletedBy; } + public void setSDeletedBy(String sDeletedBy) { this.sDeletedBy = sDeletedBy; } +} diff --git a/backend/src/main/java/com/xly/erp/module/mod/mapper/ModuleMapper.java b/backend/src/main/java/com/xly/erp/module/mod/mapper/ModuleMapper.java new file mode 100644 index 0000000..15001f6 --- /dev/null +++ b/backend/src/main/java/com/xly/erp/module/mod/mapper/ModuleMapper.java @@ -0,0 +1,16 @@ +package com.xly.erp.module.mod.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xly.erp.module.mod.entity.Module; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +public interface ModuleMapper extends BaseMapper { + + @Select("SELECT 1 FROM tModule WHERE iIncrement = #{id} AND bDeleted = 0 LIMIT 1") + Integer findActiveFlagById(@Param("id") Integer iIncrement); + + default boolean existsActiveById(Integer iIncrement) { + return findActiveFlagById(iIncrement) != null; + } +} diff --git a/backend/src/test/java/com/xly/erp/module/mod/mapper/ModuleMapperIT.java b/backend/src/test/java/com/xly/erp/module/mod/mapper/ModuleMapperIT.java new file mode 100644 index 0000000..3dc888a --- /dev/null +++ b/backend/src/test/java/com/xly/erp/module/mod/mapper/ModuleMapperIT.java @@ -0,0 +1,80 @@ +package com.xly.erp.module.mod.mapper; + +import com.xly.erp.module.mod.entity.Module; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.test.context.ActiveProfiles; + +import java.time.LocalDateTime; + +import static org.assertj.core.api.Assertions.assertThat; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) +@ActiveProfiles("test") +class ModuleMapperIT { + + @Autowired + private ModuleMapper moduleMapper; + + @Autowired + private JdbcTemplate jdbcTemplate; + + @BeforeEach + @AfterEach + void cleanup() { + jdbcTemplate.update("DELETE FROM tModule WHERE sProcedureName LIKE 'sp_test_%'"); + } + + @Test + void insertAndSelectById_persistsAllStandardCols() { + Module m = newModule("sp_test_insert", "插入用例", null); + int rows = moduleMapper.insert(m); + assertThat(rows).isEqualTo(1); + assertThat(m.getIIncrement()).isNotNull(); + + Module loaded = moduleMapper.selectById(m.getIIncrement()); + assertThat(loaded.getSProcedureName()).isEqualTo("sp_test_insert"); + assertThat(loaded.getSBrandsId()).isEqualTo("XLY"); + assertThat(loaded.getSSubsidiaryId()).isEqualTo("XLY"); + assertThat(loaded.getSDisplayType()).isEqualTo("手机端"); + assertThat(loaded.getSModuleNameZh()).isEqualTo("插入用例"); + assertThat(loaded.getBDeleted()).isFalse(); + assertThat(loaded.getBShowPermission()).isFalse(); + } + + @Test + void existsActiveById_trueForAlive_falseForDeleted() { + Module alive = newModule("sp_test_alive", "活的", null); + moduleMapper.insert(alive); + + Module dead = newModule("sp_test_dead", "死的", null); + dead.setBDeleted(true); + moduleMapper.insert(dead); + + assertThat(moduleMapper.existsActiveById(alive.getIIncrement())).isTrue(); + assertThat(moduleMapper.existsActiveById(dead.getIIncrement())).isFalse(); + assertThat(moduleMapper.existsActiveById(99999999)).isFalse(); + } + + private Module newModule(String procedureName, String nameZh, Integer parentId) { + Module m = new Module(); + m.setSBrandsId("XLY"); + m.setSSubsidiaryId("XLY"); + m.setTCreateDate(LocalDateTime.now()); + m.setSDisplayType("手机端"); + m.setSProcedureName(procedureName); + m.setSModuleType("业务模块"); + m.setSManageDeptEn("IT"); + m.setBShowPermission(false); + m.setSModuleNameZh(nameZh); + m.setIParentId(parentId); + m.setISortOrder(0); + m.setSCreatedBy("STUB_ADMIN"); + m.setBDeleted(false); + return m; + } +}