From d7732e8e4a6cf7dbfff89e3a2518690ff84e4cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BC=82=E6=B3=8A?= <1913856125@qq.com> Date: Fri, 16 Jan 2026 21:08:23 +0800 Subject: [PATCH] =?UTF-8?q?opi(execl=E8=A1=A8=E6=A0=BC)=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3=EF=BC=8C=E8=BF=98=E6=9C=89?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=AD=97=E7=AC=A6=E4=B8=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 146 +++++++++++++++++- zhyc-admin/pom.xml | 12 +- zhyc-common/pom.xml | 4 + .../controller/BasSheepTypeController.java | 12 +- .../base/controller/DaRanchController.java | 14 +- .../controller/SwDiseaseController.java | 12 +- 6 files changed, 169 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 729e2b1..ff96c7d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,8 +2,8 @@ - 4.0.0 - + 4.0.0 + zhyc zhyc 3.8.9 @@ -11,7 +11,7 @@ zhyc http://www.ruoyi.vip 智慧羊场 - + 3.8.9 UTF-8 @@ -27,7 +27,14 @@ 2.0.53 6.8.1 2.19.0 - 4.1.2 + + 5.2.3 + + 1.26.2 + 5.2.0 + 4.4 + 1.08 + 3.6.1 2.3 0.9.1 @@ -35,7 +42,6 @@ 1.2.13 5.7.12 5.3.39 - @@ -149,11 +155,80 @@ ${commons.io.version} - + + + + org.apache.poi + poi + ${poi.version} + + org.apache.poi poi-ooxml ${poi.version} + + + org.apache.poi + poi + + + org.apache.poi + poi-ooxml-schemas + + + stax + stax-api + + + commons-codec + commons-codec + + + + + + org.apache.poi + poi-ooxml-schemas + ${poi.version} + + + + + org.apache.commons + commons-compress + ${commons-compress.version} + + + + org.apache.xmlbeans + xmlbeans + ${xmlbeans.version} + + + + org.apache.commons + commons-collections4 + ${commons-collections4.version} + + + + com.github.virtuald + curvesapi + ${curvesapi.version} + + + + org.apache.commons + commons-math3 + ${commons-math3.version} + + + + + commons-codec + commons-codec + 1.16.1 @@ -176,6 +251,7 @@ jjwt ${jwt.version} + pro.fessional @@ -217,6 +293,7 @@ zhyc-common ${zhyc.version} + zhyc zhyc-module @@ -235,6 +312,7 @@ zhyc-common zhyc-module + pom @@ -250,6 +328,24 @@ + + + org.apache.maven.plugins + maven-dependency-plugin + 3.1.2 + + + analyze + + analyze-only + + + false + + + + + @@ -262,6 +358,32 @@ true + + + + spring + Spring Repository + https://maven.aliyun.com/repository/spring + + true + + + false + + + + + + apache + Apache Repository + https://repository.apache.org/content/repositories/releases/ + + true + + + false + + @@ -276,6 +398,18 @@ false + + + spring + Spring Plugin Repository + https://maven.aliyun.com/repository/spring-plugin + + true + + + false + + \ No newline at end of file diff --git a/zhyc-admin/pom.xml b/zhyc-admin/pom.xml index eb68fae..c637a6d 100644 --- a/zhyc-admin/pom.xml +++ b/zhyc-admin/pom.xml @@ -87,15 +87,15 @@ - - org.apache.maven.plugins - maven-war-plugin - 3.1.0 + + org.apache.maven.plugins + maven-war-plugin + 3.1.0 false ${project.artifactId} - - + + ${project.artifactId} diff --git a/zhyc-common/pom.xml b/zhyc-common/pom.xml index da6df39..188d7ee 100644 --- a/zhyc-common/pom.xml +++ b/zhyc-common/pom.xml @@ -118,6 +118,10 @@ javax.servlet javax.servlet-api + + org.apache.poi + poi + diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepTypeController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepTypeController.java index 1667a96..eb6e52f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepTypeController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepTypeController.java @@ -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) diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/controller/DaRanchController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/DaRanchController.java index a519335..14a3ac5 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/DaRanchController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/DaRanchController.java @@ -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 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) diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwDiseaseController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwDiseaseController.java index d049ae6..3f7011e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwDiseaseController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwDiseaseController.java @@ -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)