admin/zhyc-sheep
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: admin:21cfba87ea4c8d6705270854e91f7a3735938800
Branches Tags
admin:main admin:refactor/database-div
...
compare: admin:89a78cb5cd420ff97236c564157ed9cf6507cf7e
Branches Tags
admin:main admin:refactor/database-div

2 Commits
21cfba87ea ... 89a78cb5cd

Author SHA1 Message Date
漂泊
89a78cb5cd Merge remote-tracking branch 'origin/main' 2026-01-16 21:11:54 +08:00
漂泊
d7732e8e4a opi(execl表格)依赖冲突解决，还有权限字符串修改 2026-01-16 21:08:23 +08:00
6 changed files with 169 additions and 31 deletions
Expand all files Collapse all files

146
pom.xml
View File

@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>
<groupId>zhyc</groupId>
<artifactId>zhyc</artifactId>
<version>3.8.9</version>
@@ -11,7 +11,7 @@
<name>zhyc</name>
<url>http://www.ruoyi.vip</url>
<description>智慧羊场</description>
<properties>
<zhyc.version>3.8.9</zhyc.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -27,7 +27,14 @@
<fastjson.version>2.0.53</fastjson.version>
<oshi.version>6.8.1</oshi.version>
<commons.io.version>2.19.0</commons.io.version>
<poi.version>4.1.2</poi.version>
<!-- 升级 POI 版本解决 AbstractMethodError -->
<poi.version>5.2.3</poi.version>
<!-- POI 相关依赖版本 -->
<commons-compress.version>1.26.2</commons-compress.version>
<xmlbeans.version>5.2.0</xmlbeans.version>
<commons-collections4.version>4.4</commons-collections4.version>
<curvesapi.version>1.08</curvesapi.version>
<commons-math3.version>3.6.1</commons-math3.version>
<velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version>
<!-- override dependency version -->
@@ -35,7 +42,6 @@
<logback.version>1.2.13</logback.version>
<spring-security.version>5.7.12</spring-security.version>
<spring-framework.version>5.3.39</spring-framework.version>
</properties>
<!-- 依赖声明 -->
@@ -149,11 +155,80 @@
<version>${commons.io.version}</version>
</dependency>
<!-- excel工具 -->
<!-- Excel 工具依赖 - 解决 AbstractMethodError -->
<!-- 主要 POI 依赖 -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
</exclusion>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
<version>${poi.version}</version>
</dependency>
<!-- POI 相关依赖 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>${xmlbeans.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>${commons-collections4.version}</version>
</dependency>
<dependency>
<groupId>com.github.virtuald</groupId>
<artifactId>curvesapi</artifactId>
<version>${curvesapi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>${commons-math3.version}</version>
</dependency>
<!-- 兼容性依赖 -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.16.1</version>
</dependency>
<!-- velocity代码生成使用模板 -->
@@ -176,6 +251,7 @@
<artifactId>jjwt</artifactId>
<version>${jwt.version}</version>
</dependency>
<!-- 验证码 -->
<dependency>
<groupId>pro.fessional</groupId>
@@ -217,6 +293,7 @@
<artifactId>zhyc-common</artifactId>
<version>${zhyc.version}</version>
</dependency>
<dependency>
<groupId>zhyc</groupId>
<artifactId>zhyc-module</artifactId>
@@ -235,6 +312,7 @@
<module>zhyc-common</module>
<module>zhyc-module</module>
</modules>
<packaging>pom</packaging>
<build>
@@ -250,6 +328,24 @@
</configuration>
</plugin>
<!-- 添加依赖分析插件，帮助解决冲突 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.2</version>
<executions>
<execution>
<id>analyze</id>
<goals>
<goal>analyze-only</goal>
</goals>
<configuration>
<failOnWarning>false</failOnWarning>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
@@ -262,6 +358,32 @@
<enabled>true</enabled>
</releases>
</repository>
<!-- 添加阿里云 Spring Boot 仓库 -->
<repository>
<id>spring</id>
<name>Spring Repository</name>
<url>https://maven.aliyun.com/repository/spring</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<!-- 添加 Apache 仓库 -->
<repository>
<id>apache</id>
<name>Apache Repository</name>
<url>https://repository.apache.org/content/repositories/releases/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
@@ -276,6 +398,18 @@
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>spring</id>
<name>Spring Plugin Repository</name>
<url>https://maven.aliyun.com/repository/spring-plugin</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project>

12
zhyc-admin/pom.xml
View File

@@ -87,15 +87,15 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<warName>${project.artifactId}</warName>
</configuration>
</plugin>
</configuration>
</plugin>
</plugins>
<finalName>${project.artifactId}</finalName>
</build>

4
zhyc-common/pom.xml
View File

@@ -118,6 +118,10 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
</dependency>
</dependencies>

12
zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepTypeController.java
View File

@@ -41,7 +41,7 @@ public class BasSheepTypeController extends BaseController
/**
* 查询羊只类型列表
*/
@PreAuthorize("@ss.hasPermi('base:base:list')")
// @PreAuthorize("@ss.hasPermi('base:base:list')")
@GetMapping("/list")
public TableDataInfo list(BasSheepType basSheepType)
{
@@ -53,7 +53,7 @@ public class BasSheepTypeController extends BaseController
/**
* 导出羊只类型列表
*/
@PreAuthorize("@ss.hasPermi('base:base:export')")
// @PreAuthorize("@ss.hasPermi('base:base:export')")
@Log(title = "羊只类型", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BasSheepType basSheepType)
@@ -66,7 +66,7 @@ public class BasSheepTypeController extends BaseController
/**
* 获取羊只类型详细信息
*/
@PreAuthorize("@ss.hasPermi('base:base:query')")
// @PreAuthorize("@ss.hasPermi('base:base:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Integer id)
{
@@ -76,7 +76,7 @@ public class BasSheepTypeController extends BaseController
/**
* 新增羊只类型
*/
@PreAuthorize("@ss.hasPermi('base:base:add')")
// @PreAuthorize("@ss.hasPermi('base:base:add')")
@Log(title = "羊只类型", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BasSheepType basSheepType)
@@ -87,7 +87,7 @@ public class BasSheepTypeController extends BaseController
/**
* 修改羊只类型
*/
@PreAuthorize("@ss.hasPermi('base:base:edit')")
// @PreAuthorize("@ss.hasPermi('base:base:edit')")
@Log(title = "羊只类型", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BasSheepType basSheepType)
@@ -98,7 +98,7 @@ public class BasSheepTypeController extends BaseController
/**
* 删除羊只类型
*/
@PreAuthorize("@ss.hasPermi('base:base:remove')")
// @PreAuthorize("@ss.hasPermi('base:base:remove')")
@Log(title = "羊只类型", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Integer[] ids)

14
zhyc-module/src/main/java/com/zhyc/module/base/controller/DaRanchController.java
View File

@@ -42,7 +42,7 @@ public class DaRanchController extends BaseController
/**
* 查询牧场管理列表
*/
@PreAuthorize("@ss.hasPermi('ranch:ranch:list')")
// @PreAuthorize("@ss.hasPermi('ranch:ranch:list')")
@GetMapping("/list")
public TableDataInfo list(DaRanch daRanch)
{
@@ -54,7 +54,7 @@ public class DaRanchController extends BaseController
/**
* 导出牧场管理列表
*/
@PreAuthorize("@ss.hasPermi('ranch:ranch:export')")
// @PreAuthorize("@ss.hasPermi('ranch:ranch:export')")
@Log(title = "牧场管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, DaRanch daRanch)
@@ -67,7 +67,7 @@ public class DaRanchController extends BaseController
/**
* 获取牧场管理详细信息
*/
@PreAuthorize("@ss.hasPermi('ranch:ranch:query')")
// @PreAuthorize("@ss.hasPermi('ranch:ranch:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -77,7 +77,7 @@ public class DaRanchController extends BaseController
/**
* 获取指定牧场下的所有羊只耳号
*/
@GetMapping("/getSheepByRanchId/{ranchId}")
// @GetMapping("/getSheepByRanchId/{ranchId}")
public AjaxResult getSheepByRanchId(@PathVariable Long ranchId) {
List<BasSheep> sheepList = basSheepService.getSheepByRanchId(ranchId);
return AjaxResult.success(sheepList);
@@ -87,7 +87,7 @@ public class DaRanchController extends BaseController
/**
* 新增牧场管理
*/
@PreAuthorize("@ss.hasPermi('ranch:ranch:add')")
// @PreAuthorize("@ss.hasPermi('ranch:ranch:add')")
@Log(title = "牧场管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody DaRanch daRanch)
@@ -98,7 +98,7 @@ public class DaRanchController extends BaseController
/**
* 修改牧场管理
*/
@PreAuthorize("@ss.hasPermi('ranch:ranch:edit')")
// @PreAuthorize("@ss.hasPermi('ranch:ranch:edit')")
@Log(title = "牧场管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody DaRanch daRanch)
@@ -109,7 +109,7 @@ public class DaRanchController extends BaseController
/**
* 删除牧场管理
*/
@PreAuthorize("@ss.hasPermi('ranch:ranch:remove')")
// @PreAuthorize("@ss.hasPermi('ranch:ranch:remove')")
@Log(title = "牧场管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)

12
zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwDiseaseController.java
View File

@@ -37,7 +37,7 @@ public class SwDiseaseController extends BaseController
/**
* 查询疾病列表
*/
@PreAuthorize("@ss.hasPermi('disease:disease:list')")
@PreAuthorize("@ss.hasPermi('biosafety:disease:list')")
@GetMapping("/list")
public AjaxResult list(SwDisease swDisease)
{
@@ -48,7 +48,7 @@ public class SwDiseaseController extends BaseController
/**
* 导出疾病列表
*/
@PreAuthorize("@ss.hasPermi('disease:disease:export')")
@PreAuthorize("@ss.hasPermi('biosafety:disease:export')")
@Log(title = "疾病", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SwDisease swDisease)
@@ -61,7 +61,7 @@ public class SwDiseaseController extends BaseController
/**
* 获取疾病详细信息
*/
@PreAuthorize("@ss.hasPermi('disease:disease:query')")
@PreAuthorize("@ss.hasPermi('biosafety:disease:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -71,7 +71,7 @@ public class SwDiseaseController extends BaseController
/**
* 新增疾病
*/
@PreAuthorize("@ss.hasPermi('disease:disease:add')")
@PreAuthorize("@ss.hasPermi('biosafety:disease:add')")
@Log(title = "疾病", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SwDisease swDisease)
@@ -82,7 +82,7 @@ public class SwDiseaseController extends BaseController
/**
* 修改疾病
*/
@PreAuthorize("@ss.hasPermi('disease:disease:edit')")
@PreAuthorize("@ss.hasPermi('biosafety:disease:edit')")
@Log(title = "疾病", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SwDisease swDisease)
@@ -93,7 +93,7 @@ public class SwDiseaseController extends BaseController
/**
* 删除疾病
*/
@PreAuthorize("@ss.hasPermi('disease:disease:remove')")
@PreAuthorize("@ss.hasPermi('biosafety:disease:remove')")
@Log(title = "疾病", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)