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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
zyk
2026-01-27 15:19:48 +08:00
parent ced5b0b09a 5bcfadfd85
commit 219ac30e28
143 changed files with 2855 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
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 -->
@@ -148,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>4.1.2</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代码生成使用模板 -->
@@ -175,6 +251,7 @@
<artifactId>jjwt</artifactId>
<version>${jwt.version}</version>
</dependency>
<!-- 验证码 -->
<dependency>
<groupId>pro.fessional</groupId>
@@ -216,6 +293,7 @@
<artifactId>zhyc-common</artifactId>
<version>${zhyc.version}</version>
</dependency>
<dependency>
<groupId>zhyc</groupId>
<artifactId>zhyc-module</artifactId>
@@ -234,6 +312,7 @@
<module>zhyc-common</module>
<module>zhyc-module</module>
</modules>
<packaging>pom</packaging>
<build>
@@ -249,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>
@@ -261,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>
@@ -275,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>

1
zhyc-common/src/main/java/com/zhyc/common/core/domain/AjaxResult.java
View File

@@ -90,6 +90,7 @@ public class AjaxResult extends HashMap<String, Object>
return AjaxResult.success(msg, null);
}
/**
* 返回成功消息
*

4
zhyc-framework/src/main/java/com/zhyc/framework/config/SecurityConfig.java
View File

@@ -111,10 +111,12 @@ public class SecurityConfig
.authorizeHttpRequests((requests) -> {
permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
// 对于登录login 注册register 验证码captchaImage 允许匿名访问
requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
requests.antMatchers("/app/**").permitAll()
.antMatchers("/login", "/register", "/captchaImage").permitAll()
// 静态资源，可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
// 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated();
})

128
zhyc-module/pom.xml
View File

@@ -12,7 +12,135 @@
<artifactId>zhyc-module</artifactId>
<properties>
<javacv.platform.windows-x86_64>windows-x86_64</javacv.platform.windows-x86_64>
<djl.platform.windows-x86_64>win-x86_64</djl.platform.windows-x86_64>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>cn.smartjavaai</groupId>
<artifactId>bom</artifactId>
<version>1.1.1</version>
<type>pom</type>
<!-- 注意这里是import -->
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>cn.smartjavaai</groupId>
<artifactId>common</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.9.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>7.10.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.83</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
</dependency>
<!--OCR检测模块-->
<dependency>
<groupId>cn.smartjavaai</groupId>
<artifactId>ocr</artifactId>
<exclusions>
<exclusion>
<groupId>com.microsoft.onnxruntime</groupId>
<artifactId>onnxruntime</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.microsoft.onnxruntime</groupId>
<artifactId>onnxruntime</artifactId>
<version>1.20.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>ai.djl.pytorch</groupId>
<artifactId>pytorch-jni</artifactId>
<version>2.7.1-0.34.0</version>
<scope>runtime</scope>
</dependency>
<!-- windows平台 (保留对应平台的配置，可以减小包大小)-->
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>javacpp</artifactId>
<version>1.5.11</version>
<classifier>${javacv.platform.windows-x86_64}</classifier>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>ffmpeg</artifactId>
<version>6.1.1-1.5.10</version>
<classifier>${javacv.platform.windows-x86_64}</classifier>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.26-1.5.10</version>
<classifier>${javacv.platform.windows-x86_64}</classifier>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>opencv</artifactId>
<version>4.9.0-1.5.10</version>
<classifier>${javacv.platform.windows-x86_64}</classifier>
</dependency>
<dependency>
<groupId>ai.djl.pytorch</groupId>
<artifactId>pytorch-native-cpu</artifactId>
<classifier>${djl.platform.windows-x86_64}</classifier>
<version>2.7.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>zhyc</groupId>
<artifactId>zhyc-common</artifactId>

106
zhyc-module/src/main/java/com/zhyc/module/app/controller/AppErrorLogController.java Normal file
View File

@@ -0,0 +1,106 @@
package com.zhyc.module.app.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.zhyc.module.app.domain.AppErrorLog;
import com.zhyc.module.app.service.IAppErrorLogService;
import org.springframework.security.access.prepost.PreAuthorize;
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.zhyc.common.annotation.Log;
import com.zhyc.common.core.controller.BaseController;
import com.zhyc.common.core.domain.AjaxResult;
import com.zhyc.common.enums.BusinessType;
import com.zhyc.common.utils.poi.ExcelUtil;
import com.zhyc.common.core.page.TableDataInfo;
/**
* App错误日志Controller
*
* @author ruoyi
* @date 2026-01-19
*/
@RestController
@RequestMapping("/app/error")
public class AppErrorLogController extends BaseController
{
@Autowired
private IAppErrorLogService appErrorLogService;
/**
* 查询App错误日志列表
*/
// @PreAuthorize("@ss.hasPermi('app:app:list')")
@GetMapping("/list")
public TableDataInfo list(AppErrorLog appErrorLog)
{
startPage();
List<AppErrorLog> list = appErrorLogService.selectAppErrorLogList(appErrorLog);
return getDataTable(list);
}
/**
* 导出App错误日志列表
*/
// @PreAuthorize("@ss.hasPermi('app:app:export')")
@Log(title = "App错误日志", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, AppErrorLog appErrorLog)
{
List<AppErrorLog> list = appErrorLogService.selectAppErrorLogList(appErrorLog);
ExcelUtil<AppErrorLog> util = new ExcelUtil<AppErrorLog>(AppErrorLog.class);
util.exportExcel(response, list, "App错误日志数据");
}
/**
* 获取App错误日志详细信息
*/
// @PreAuthorize("@ss.hasPermi('app:app:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(appErrorLogService.selectAppErrorLogById(id));
}
/**
* 新增App错误日志
*/
// @PreAuthorize("@ss.hasPermi('app:app:add')")
@Log(title = "App错误日志", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody AppErrorLog appErrorLog)
{
return toAjax(appErrorLogService.insertAppErrorLog(appErrorLog));
}
/**
* 修改App错误日志
*/
// @PreAuthorize("@ss.hasPermi('app:app:edit')")
@Log(title = "App错误日志", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody AppErrorLog appErrorLog)
{
return toAjax(appErrorLogService.updateAppErrorLog(appErrorLog));
}
/**
* 删除App错误日志
*/
// @PreAuthorize("@ss.hasPermi('app:app:remove')")
@Log(title = "App错误日志", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(appErrorLogService.deleteAppErrorLogByIds(ids));
}
}

106
zhyc-module/src/main/java/com/zhyc/module/app/controller/AppSettingsController.java Normal file
View File

@@ -0,0 +1,106 @@
package com.zhyc.module.app.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.zhyc.module.app.domain.AppSettings;
import com.zhyc.module.app.service.IAppSettingsService;
import org.springframework.security.access.prepost.PreAuthorize;
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.zhyc.common.annotation.Log;
import com.zhyc.common.core.controller.BaseController;
import com.zhyc.common.core.domain.AjaxResult;
import com.zhyc.common.enums.BusinessType;
import com.zhyc.common.utils.poi.ExcelUtil;
import com.zhyc.common.core.page.TableDataInfo;
/**
* 应用设置Controller
*
* @author ruoyi
* @date 2026-01-20
*/
@RestController
@RequestMapping("/app/settings")
public class AppSettingsController extends BaseController
{
@Autowired
private IAppSettingsService appSettingsService;
/**
* 查询应用设置列表
*/
// @PreAuthorize("@ss.hasPermi('app:settings:list')")
@GetMapping("/list")
public TableDataInfo list(AppSettings appSettings)
{
startPage();
List<AppSettings> list = appSettingsService.selectAppSettingsList(appSettings);
return getDataTable(list);
}
/**
* 导出应用设置列表
*/
// @PreAuthorize("@ss.hasPermi('app:settings:export')")
@Log(title = "应用设置", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, AppSettings appSettings)
{
List<AppSettings> list = appSettingsService.selectAppSettingsList(appSettings);
ExcelUtil<AppSettings> util = new ExcelUtil<AppSettings>(AppSettings.class);
util.exportExcel(response, list, "应用设置数据");
}
/**
* 获取应用设置详细信息
*/
// @PreAuthorize("@ss.hasPermi('app:settings:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(appSettingsService.selectAppSettingsById(id));
}
/**
* 新增应用设置
*/
// @PreAuthorize("@ss.hasPermi('app:settings:add')")
@Log(title = "应用设置", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody AppSettings appSettings)
{
return toAjax(appSettingsService.insertAppSettings(appSettings));
}
/**
* 修改应用设置
*/
// @PreAuthorize("@ss.hasPermi('app:settings:edit')")
@Log(title = "应用设置", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody AppSettings appSettings)
{
return toAjax(appSettingsService.updateAppSettings(appSettings));
}
/**
* 删除应用设置
*/
// @PreAuthorize("@ss.hasPermi('app:settings:remove')")
@Log(title = "应用设置", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(appSettingsService.deleteAppSettingsByIds(ids));
}
}

66
zhyc-module/src/main/java/com/zhyc/module/app/controller/ImageController.java Normal file
View File

@@ -0,0 +1,66 @@
package com.zhyc.module.app.controller;
import com.zhyc.common.config.RuoYiConfig;
import com.zhyc.common.core.domain.AjaxResult;
import com.zhyc.module.app.util.OcrRecognizeUtil;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
//图片返回base64
@RestController
@RequestMapping("/app/image")
public class ImageController {
@PostMapping
public AjaxResult getImageBase64(String path) {
// 添加空值检查
if (path == null || path.trim().isEmpty()) {
return AjaxResult.error("路径不能为空");
}
path = path.replace("/profile", "");
try {
// 构建完整的文件路径
String fullPath = RuoYiConfig.getProfile() + path;
// 读取文件并转换为字节数组
byte[] fileBytes = java.nio.file.Files.readAllBytes(java.nio.file.Paths.get(fullPath));
// 将字节数组转换为base64字符串
String base64String = java.util.Base64.getEncoder().encodeToString(fileBytes);
// 获取文件扩展名以确定MIME类型
String mimeType = getMimeType(path);
// 返回base64数据，格式为 data:image/xxx;base64,xxxxx
String result = "data:" + mimeType + ";base64," + base64String;
return AjaxResult.success("操作成功",result);
} catch (Exception e) {
return AjaxResult.error("读取图片失败: " + e.getMessage());
}
}
/**
* 根据文件扩展名获取MIME类型
*/
private String getMimeType(String fileName) {
String extension = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase();
switch (extension) {
case "jpg":
case "jpeg":
return "image/jpeg";
case "png":
return "image/png";
case "gif":
return "image/gif";
case "bmp":
return "image/bmp";
default:
return "image/jpeg"; // 默认返回jpeg类型
}
}
}

50
zhyc-module/src/main/java/com/zhyc/module/app/controller/OrcController.java Normal file
View File

@@ -0,0 +1,50 @@
package com.zhyc.module.app.controller;
import com.zhyc.common.config.RuoYiConfig;
import com.zhyc.common.core.domain.AjaxResult;
import com.zhyc.module.app.util.OcrRecognizeUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.io.File;
//文字识别
@RestController
@RequestMapping("/ocr")
public class OrcController {
@PostMapping
public AjaxResult orcSheepNo(String path) {
// 添加空值检查
if (path == null || path.trim().isEmpty()) {
return AjaxResult.error("路径不能为空");
}
try {
OcrRecognizeUtil ocrRecognizeUtil = new OcrRecognizeUtil();
// 移除 /profile
path = path.replace("/profile", "");
path = RuoYiConfig.getProfile() + path;
// 验证文件是否存在
File file = new File(path);
if (!file.exists()) {
return AjaxResult.error("文件不存在: " + path);
}
if (!file.isFile()) {
return AjaxResult.error("路径不是一个有效文件: " + path);
}
if (!file.canRead()) {
return AjaxResult.error("无权限读取文件: " + path);
}
String recognize = ocrRecognizeUtil.recognizeTwo(path);
return AjaxResult.success("操作成功", recognize);
} catch (Exception e) {
return AjaxResult.error("OCR识别失败: " + e.getMessage());
}
}
}

96
zhyc-module/src/main/java/com/zhyc/module/app/domain/AppErrorLog.java Normal file
View File

@@ -0,0 +1,96 @@
package com.zhyc.module.app.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zhyc.common.annotation.Excel;
import com.zhyc.common.core.domain.BaseEntity;
/**
* App错误日志对象 app_error_log
*
* @author ruoyi
* @date 2026-01-19
*/
@EqualsAndHashCode(callSuper = true)
@Data
@AllArgsConstructor
@NoArgsConstructor
public class AppErrorLog extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键ID，自增 */
private Long id;
/** 设备唯一标识 */
@Excel(name = "设备唯一标识")
private String deviceId;
/** 用户ID */
@Excel(name = "用户ID")
private Long userId;
/** App版本号 */
@Excel(name = "App版本号")
private String appVersion;
/** App版本号 */
@Excel(name = "App版本号")
private Long appCode;
/** 平台类型 */
@Excel(name = "平台类型")
private String platform;
/** 操作系统版本 */
@Excel(name = "操作系统版本")
private String osVersion;
/** 错误类型分类 */
@Excel(name = "错误类型分类")
private String errorType;
/** 错误代码 */
@Excel(name = "错误代码")
private String errorCode;
/** 错误描述信息 */
@Excel(name = "错误描述信息")
private String errorMessage;
/** 错误堆栈跟踪 */
@Excel(name = "错误堆栈跟踪")
private String stackTrace;
/** 页面路径 */
@Excel(name = "页面路径")
private String pageUrl;
/** API接口地址 */
@Excel(name = "API接口地址")
private String apiUrl;
/** API调用参数 */
@Excel(name = "API调用参数")
private String apiParams;
/** 网络类型 */
@Excel(name = "网络类型")
private String networkType;
/** 屏幕宽度 */
@Excel(name = "屏幕宽度")
private Long screenWidth;
/** 屏幕高度 */
@Excel(name = "屏幕高度")
private Long screenHeight;
/** 自定义扩展数据，JSON格式 */
@Excel(name = "自定义扩展数据，JSON格式")
private String customData;
}

71
zhyc-module/src/main/java/com/zhyc/module/app/domain/AppSettings.java Normal file
View File

@@ -0,0 +1,71 @@
package com.zhyc.module.app.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zhyc.common.annotation.Excel;
import com.zhyc.common.core.domain.BaseEntity;
/**
* 应用设置对象 app_settings
*
* @author ruoyi
* @date 2026-01-20
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class AppSettings extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键ID */
private Long id;
/** 用户ID，0为全局 */
@Excel(name = "用户ID，0为全局")
private Long userId;
/** 设置键名 */
@Excel(name = "设置键名")
private String settingKey;
/** 设置 */
@Excel(name = "设置")
private String settingValue;
/** 值类型 */
@Excel(name = "值类型")
private String settingType;
/** 设置分组 */
@Excel(name = "设置分组")
private String settingGroup;
/** 设置描述 */
@Excel(name = "设置描述")
private String settingDesc;
/** 适用平台 */
@Excel(name = "适用平台")
private String platform;
/** 适用版本范围 */
@Excel(name = "适用版本范围")
private String versionRange;
/** 状态 */
@Excel(name = "状态")
private Integer status;
/** 逻辑位 */
@Excel(name = "逻辑位")
private Integer logical;
/** 自定义扩展数据，JSON格式 */
@Excel(name = "自定义扩展数据，JSON格式")
private String customData;
}

64
zhyc-module/src/main/java/com/zhyc/module/app/mapper/AppErrorLogMapper.java Normal file
View File

@@ -0,0 +1,64 @@
package com.zhyc.module.app.mapper;
import java.util.List;
import com.zhyc.module.app.domain.AppErrorLog;
import org.apache.ibatis.annotations.Mapper;
/**
* App错误日志Mapper接口
*
* @author ruoyi
* @date 2026-01-19
*/
@Mapper
public interface AppErrorLogMapper
{
/**
* 查询App错误日志
*
* @param id App错误日志主键
* @return App错误日志
*/
public AppErrorLog selectAppErrorLogById(Long id);
/**
* 查询App错误日志列表
*
* @param appErrorLog App错误日志
* @return App错误日志集合
*/
public List<AppErrorLog> selectAppErrorLogList(AppErrorLog appErrorLog);
/**
* 新增App错误日志
*
* @param appErrorLog App错误日志
* @return 结果
*/
public int insertAppErrorLog(AppErrorLog appErrorLog);
/**
* 修改App错误日志
*
* @param appErrorLog App错误日志
* @return 结果
*/
public int updateAppErrorLog(AppErrorLog appErrorLog);
/**
* 删除App错误日志
*
* @param id App错误日志主键
* @return 结果
*/
public int deleteAppErrorLogById(Long id);
/**
* 批量删除App错误日志
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteAppErrorLogByIds(Long[] ids);
}

62
zhyc-module/src/main/java/com/zhyc/module/app/mapper/AppSettingsMapper.java Normal file
View File

@@ -0,0 +1,62 @@
package com.zhyc.module.app.mapper;
import com.zhyc.module.app.domain.AppSettings;
import java.util.List;
/**
* 应用设置Mapper接口
*
* @author ruoyi
* @date 2026-01-20
*/
public interface AppSettingsMapper
{
/**
* 查询应用设置
*
* @param id 应用设置主键
* @return 应用设置
*/
public AppSettings selectAppSettingsById(Long id);
/**
* 查询应用设置列表
*
* @param appSettings 应用设置
* @return 应用设置集合
*/
public List<AppSettings> selectAppSettingsList(AppSettings appSettings);
/**
* 新增应用设置
*
* @param appSettings 应用设置
* @return 结果
*/
public int insertAppSettings(AppSettings appSettings);
/**
* 修改应用设置
*
* @param appSettings 应用设置
* @return 结果
*/
public int updateAppSettings(AppSettings appSettings);
/**
* 删除应用设置
*
* @param id 应用设置主键
* @return 结果
*/
public int deleteAppSettingsById(Long id);
/**
* 批量删除应用设置
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteAppSettingsByIds(Long[] ids);
}

62
zhyc-module/src/main/java/com/zhyc/module/app/service/IAppErrorLogService.java Normal file
View File

@@ -0,0 +1,62 @@
package com.zhyc.module.app.service;
import com.zhyc.module.app.domain.AppErrorLog;
import java.util.List;
/**
* App错误日志Service接口
*
* @author ruoyi
* @date 2026-01-19
*/
public interface IAppErrorLogService
{
/**
* 查询App错误日志
*
* @param id App错误日志主键
* @return App错误日志
*/
public AppErrorLog selectAppErrorLogById(Long id);
/**
* 查询App错误日志列表
*
* @param appErrorLog App错误日志
* @return App错误日志集合
*/
public List<AppErrorLog> selectAppErrorLogList(AppErrorLog appErrorLog);
/**
* 新增App错误日志
*
* @param appErrorLog App错误日志
* @return 结果
*/
public int insertAppErrorLog(AppErrorLog appErrorLog);
/**
* 修改App错误日志
*
* @param appErrorLog App错误日志
* @return 结果
*/
public int updateAppErrorLog(AppErrorLog appErrorLog);
/**
* 批量删除App错误日志
*
* @param ids 需要删除的App错误日志主键集合
* @return 结果
*/
public int deleteAppErrorLogByIds(Long[] ids);
/**
* 删除App错误日志信息
*
* @param id App错误日志主键
* @return 结果
*/
public int deleteAppErrorLogById(Long id);
}

63
zhyc-module/src/main/java/com/zhyc/module/app/service/IAppSettingsService.java Normal file
View File

@@ -0,0 +1,63 @@
package com.zhyc.module.app.service;
import com.zhyc.module.app.domain.AppSettings;
import java.util.List;
/**
* 应用设置Service接口
*
* @author ruoyi
* @date 2026-01-20
*/
public interface IAppSettingsService
{
/**
* 查询应用设置
*
* @param id 应用设置主键
* @return 应用设置
*/
public AppSettings selectAppSettingsById(Long id);
/**
* 查询应用设置列表
*
* @param appSettings 应用设置
* @return 应用设置集合
*/
public List<AppSettings> selectAppSettingsList(AppSettings appSettings);
/**
* 新增应用设置
*
* @param appSettings 应用设置
* @return 结果
*/
public int insertAppSettings(AppSettings appSettings);
/**
* 修改应用设置
*
* @param appSettings 应用设置
* @return 结果
*/
public int updateAppSettings(AppSettings appSettings);
/**
* 批量删除应用设置
*
* @param ids 需要删除的应用设置主键集合
* @return 结果
*/
public int deleteAppSettingsByIds(Long[] ids);
/**
* 删除应用设置信息
*
* @param id 应用设置主键
* @return 结果
*/
public int deleteAppSettingsById(Long id);
}

97
zhyc-module/src/main/java/com/zhyc/module/app/service/impl/AppErrorLogServiceImpl.java Normal file
View File

@@ -0,0 +1,97 @@
package com.zhyc.module.app.service.impl;
import java.util.List;
import com.zhyc.common.utils.DateUtils;
import com.zhyc.module.app.domain.AppErrorLog;
import com.zhyc.module.app.mapper.AppErrorLogMapper;
import com.zhyc.module.app.service.IAppErrorLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* App错误日志Service业务层处理
*
* @author ruoyi
* @date 2026-01-19
*/
@Service
public class AppErrorLogServiceImpl implements IAppErrorLogService
{
@Autowired
private AppErrorLogMapper appErrorLogMapper;
/**
* 查询App错误日志
*
* @param id App错误日志主键
* @return App错误日志
*/
@Override
public AppErrorLog selectAppErrorLogById(Long id)
{
return appErrorLogMapper.selectAppErrorLogById(id);
}
/**
* 查询App错误日志列表
*
* @param appErrorLog App错误日志
* @return App错误日志
*/
@Override
public List<AppErrorLog> selectAppErrorLogList(AppErrorLog appErrorLog)
{
return appErrorLogMapper.selectAppErrorLogList(appErrorLog);
}
/**
* 新增App错误日志
*
* @param appErrorLog App错误日志
* @return 结果
*/
@Override
public int insertAppErrorLog(AppErrorLog appErrorLog)
{
appErrorLog.setCreateTime(DateUtils.getNowDate());
return appErrorLogMapper.insertAppErrorLog(appErrorLog);
}
/**
* 修改App错误日志
*
* @param appErrorLog App错误日志
* @return 结果
*/
@Override
public int updateAppErrorLog(AppErrorLog appErrorLog)
{
return appErrorLogMapper.updateAppErrorLog(appErrorLog);
}
/**
* 批量删除App错误日志
*
* @param ids 需要删除的App错误日志主键
* @return 结果
*/
@Override
public int deleteAppErrorLogByIds(Long[] ids)
{
return appErrorLogMapper.deleteAppErrorLogByIds(ids);
}
/**
* 删除App错误日志信息
*
* @param id App错误日志主键
* @return 结果
*/
@Override
public int deleteAppErrorLogById(Long id)
{
return appErrorLogMapper.deleteAppErrorLogById(id);
}
}

96
zhyc-module/src/main/java/com/zhyc/module/app/service/impl/AppSettingsServiceImpl.java Normal file
View File

@@ -0,0 +1,96 @@
package com.zhyc.module.app.service.impl;
import java.util.List;
import com.zhyc.common.utils.DateUtils;
import com.zhyc.module.app.domain.AppSettings;
import com.zhyc.module.app.mapper.AppSettingsMapper;
import com.zhyc.module.app.service.IAppSettingsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* 应用设置Service业务层处理
*
* @author ruoyi
* @date 2026-01-20
*/
@Service
public class AppSettingsServiceImpl implements IAppSettingsService
{
@Autowired
private AppSettingsMapper appSettingsMapper;
/**
* 查询应用设置
*
* @param id 应用设置主键
* @return 应用设置
*/
@Override
public AppSettings selectAppSettingsById(Long id)
{
return appSettingsMapper.selectAppSettingsById(id);
}
/**
* 查询应用设置列表
*
* @param appSettings 应用设置
* @return 应用设置
*/
@Override
public List<AppSettings> selectAppSettingsList(AppSettings appSettings)
{
return appSettingsMapper.selectAppSettingsList(appSettings);
}
/**
* 新增应用设置
*
* @param appSettings 应用设置
* @return 结果
*/
@Override
public int insertAppSettings(AppSettings appSettings)
{
appSettings.setCreateTime(DateUtils.getNowDate());
return appSettingsMapper.insertAppSettings(appSettings);
}
/**
* 修改应用设置
*
* @param appSettings 应用设置
* @return 结果
*/
@Override
public int updateAppSettings(AppSettings appSettings)
{
appSettings.setUpdateTime(DateUtils.getNowDate());
return appSettingsMapper.updateAppSettings(appSettings);
}
/**
* 批量删除应用设置
*
* @param ids 需要删除的应用设置主键
* @return 结果
*/
@Override
public int deleteAppSettingsByIds(Long[] ids)
{
return appSettingsMapper.deleteAppSettingsByIds(ids);
}
/**
* 删除应用设置信息
*
* @param id 应用设置主键
* @return 结果
*/
@Override
public int deleteAppSettingsById(Long id)
{
return appSettingsMapper.deleteAppSettingsById(id);
}
}

257
zhyc-module/src/main/java/com/zhyc/module/app/util/OcrRecognizeUtil.java Normal file
View File

@@ -0,0 +1,257 @@
package com.zhyc.module.app.util;
import ai.djl.modality.cv.Image;
import cn.smartjavaai.common.cv.SmartImageFactory;
import cn.smartjavaai.common.enums.DeviceEnum;
import cn.smartjavaai.common.utils.ImageUtils;
import cn.smartjavaai.ocr.config.DirectionModelConfig;
import cn.smartjavaai.ocr.config.OcrDetModelConfig;
import cn.smartjavaai.ocr.config.OcrRecModelConfig;
import cn.smartjavaai.ocr.config.OcrRecOptions;
import cn.smartjavaai.ocr.entity.OcrInfo;
import cn.smartjavaai.ocr.enums.CommonDetModelEnum;
import cn.smartjavaai.ocr.enums.CommonRecModelEnum;
import cn.smartjavaai.ocr.enums.DirectionModelEnum;
import cn.smartjavaai.ocr.factory.OcrModelFactory;
import cn.smartjavaai.ocr.model.common.detect.OcrCommonDetModel;
import cn.smartjavaai.ocr.model.common.direction.OcrDirectionModel;
import cn.smartjavaai.ocr.model.common.recognize.OcrCommonRecModel;
import com.alibaba.fastjson.JSONObject;
import com.zhyc.common.config.RuoYiConfig;
import lombok.extern.slf4j.Slf4j;
import org.junit.BeforeClass;
import org.junit.Test;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
/**
* OCR 文本识别 示例
* 模型下载地址：https://pan.baidu.com/s/1MLfd73Vjdpnuls9-oqc9uw?pwd=1234 提取码: 1234
* 开发文档：http://doc.smartjavaai.cn/
*/
/**
* OCR识别工具类
* 提供文本识别相关的功能，包括获取不同类型的识别模型、文本检测模型、方向检测模型等
* 支持普通识别、手写识别、带方向矫正的识别以及批量识别等功能
*/
@Slf4j
public class OcrRecognizeUtil {
//设备类型
public static DeviceEnum device =DeviceEnum.CPU;
/**
* 测试初始化方法，在所有测试用例执行前调用一次
* 设置SmartImageFactory使用的引擎为OpenCV，并可选配置缓存路径
*
* @throws IOException 当初始化过程中发生IO异常时抛出
*/
@BeforeClass
public static void beforeAll() throws IOException {
SmartImageFactory.setEngine(SmartImageFactory.Engine.OPENCV);
//修改缓存路径
//Config.setCachePath("/Users/xxx/smartjavaai_cache");
}
/**
* 获取通用识别模型（高精确度模型）
* 注意事项：高精度模型，识别准确度高，速度慢
*
* @return 返回高精度的OCR通用识别模型实例
*/
public OcrCommonRecModel getProRecModel(){
OcrRecModelConfig recModelConfig = new OcrRecModelConfig();
//指定文本识别模型，切换模型需要同时修改modelEnum及modelPath
recModelConfig.setRecModelEnum(CommonRecModelEnum.PP_OCR_V5_SERVER_REC_MODEL);
//指定识别模型位置，需要更改为自己的模型路径（下载地址请查看文档）
recModelConfig.setRecModelPath("C:/wwwroot/ocr/rec/PP-OCRv5_server_rec_infer/PP-OCRv5_server_rec.onnx");
recModelConfig.setDevice(device);
recModelConfig.setTextDetModel(getProDetectionModel());
recModelConfig.setDirectionModel(getDirectionModel());
return OcrModelFactory.getInstance().getRecModel(recModelConfig);
}
/**
* 获取通用识别模型（极速模型）
* 注意事项：极速模型，识别准确度低，速度快
*
* @return 返回极速的OCR通用识别模型实例
*/
public OcrCommonRecModel getFastRecModel(){
OcrRecModelConfig recModelConfig = new OcrRecModelConfig();
//指定文本识别模型，切换模型需要同时修改modelEnum及modelPath
recModelConfig.setRecModelEnum(CommonRecModelEnum.PP_OCR_V5_MOBILE_REC_MODEL);
//指定识别模型位置，需要更改为自己的模型路径（下载地址请查看文档）
recModelConfig.setRecModelPath("C:/wwwroot/ocr/rec/PP-OCRv5_mobile_rec_infer/PP-OCRv5_mobile_rec_infer.onnx");
recModelConfig.setDevice(device);
recModelConfig.setTextDetModel(getFastDetectionModel());
recModelConfig.setDirectionModel(getDirectionModel()); // 添加方向模型配置
return OcrModelFactory.getInstance().getRecModel(recModelConfig);
}
/**
* 获取文本检测模型(极速模型)
* 注意事项：极速模型，识别准确度低，速度快
*
* @return 返回极速的OCR通用检测模型实例
*/
public OcrCommonDetModel getFastDetectionModel() {
OcrDetModelConfig config = new OcrDetModelConfig();
//指定检测模型，切换模型需要同时修改modelEnum及modelPath
config.setModelEnum(CommonDetModelEnum.PP_OCR_V5_MOBILE_DET_MODEL);
//指定模型位置，需要更改为自己的模型路径（下载地址请查看文档）
config.setDetModelPath("C:/wwwroot/ocr/det/PP-OCRv5_mobile_det_infer/PP-OCRv5_mobile_det_infer.onnx");
config.setDevice(device);
return OcrModelFactory.getInstance().getDetModel(config);
}
/**
* 获取文本检测模型(高精确度模型)
* 注意事项：高精度模型，识别准确度高，速度慢
*
* @return 返回高精度的OCR通用检测模型实例
*/
public OcrCommonDetModel getProDetectionModel() {
OcrDetModelConfig config = new OcrDetModelConfig();
//指定检测模型，切换模型需要同时修改modelEnum及modelPath
config.setModelEnum(CommonDetModelEnum.PP_OCR_V5_SERVER_DET_MODEL);
//指定模型位置，需要更改为自己的模型路径（下载地址请查看文档）
config.setDetModelPath("C:/wwwroot/ocr/det/PP-OCRv5_server_det_infer/PP-OCRv5_server_det.onnx");
config.setDevice(device);
return OcrModelFactory.getInstance().getDetModel(config);
}
/**
* 获取方向检测模型
*
* @return 返回OCR方向检测模型实例
*/
public OcrDirectionModel getDirectionModel(){
DirectionModelConfig directionModelConfig = new DirectionModelConfig();
//指定行文本方向检测模型，切换模型需要同时修改modelEnum及modelPath
directionModelConfig.setModelEnum(DirectionModelEnum.PP_LCNET_X0_25);
//指定行文本方向检测模型路径，需要更改为自己的模型路径（下载地址请查看文档）
directionModelConfig.setModelPath("C:/wwwroot/ocr/ori/PP-LCNet_x0_25_textline_ori_infer.onnx");
directionModelConfig.setDevice(device);
return OcrModelFactory.getInstance().getDirectionModel(directionModelConfig);
}
/**
* 文本识别
* 支持简体中文、繁体中文、英文、日文四种主要语言，以及手写、竖版、拼音、生僻字
* 流程：文本检测 -> 文本识别
* 注意事项：
* 1、批量检测时，模型应统一放在外层 try 中使用，避免重复加载，自动释放资源更安全。
* 2、模型文件需要放在单独文件夹
*/
public String recognize(String path){
try {
OcrCommonRecModel recModel = getFastRecModel();
//不带方向矫正，分行返回文本
OcrRecOptions options = new OcrRecOptions(false, true);
//创建Image对象，可以从文件、url、InputStream创建、BufferedImage、Base64创建，具体使用方法可以查看文档
Image image = SmartImageFactory.getInstance().fromFile(path);
OcrInfo ocrInfo = recModel.recognize(image, options);
log.info("OCR识别结果：{}", JSONObject.toJSONString(ocrInfo.getFullText()));
// 识别成功后删除原图片
deleteFile(path);
return ocrInfo.getFullText();
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
/**
* 文本识别（手写字）
* 支持简体中文、繁体中文、英文、日文四种主要语言，以及手写、竖版、拼音、生僻字
* 流程：文本检测 -> 文本识别
* 注意事项：
* 1、批量检测时，模型应统一放在外层 try 中使用，避免重复加载，自动释放资源更安全。
* 2、模型文件需要放在单独文件夹
* 3、识别完成后会删除原图片文件
*/
public void recognizeHandWriting(String path){
try {
OcrCommonRecModel recModel = getFastRecModel();
//创建Image对象，可以从文件、url、InputStream创建、BufferedImage、Base64创建，具体使用方法可以查看文档
Image image = SmartImageFactory.getInstance().fromFile(path);
OcrInfo ocrInfo = recModel.recognize(image, new OcrRecOptions());
log.info("OCR识别结果：{}", JSONObject.toJSONString(ocrInfo));
// 识别成功后删除原图片
deleteFile(path);
} catch (Exception e) {
e.printStackTrace();
}
}
/**
* 文本识别（带方向矫正）
* 支持简体中文、繁体中文、英文、日文四种主要语言，以及手写、竖版、拼音、生僻字
* 本方法支持多角度文字识别
* 流程：文本检测 -> 方向检测 -> 方向矫正 -> 文本识别
* 注意事项：
* 1、批量检测时，模型应统一放在外层 try 中使用，避免重复加载，自动释放资源更安全。
* 2、模型文件需要放在单独文件夹
* 3、识别完成后会删除原图片文件
*/
public String recognizeTwo(String path){
try {
OcrCommonRecModel recModel = getFastRecModel();
//带方向矫正，分行返回文本
OcrRecOptions options = new OcrRecOptions(true, true);
//创建Image对象，可以从文件、url、InputStream创建、BufferedImage、Base64创建，具体使用方法可以查看文档
Image image = SmartImageFactory.getInstance().fromFile(path);
OcrInfo ocrInfo = recModel.recognize(image, options);
log.info("OCR识别结果：{}", JSONObject.toJSONString(ocrInfo));
// 识别成功后删除原图片
deleteFile(path);
return ocrInfo.getFullText();
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
/**
* 删除指定路径的文件
*
* @param filePath 要删除的文件路径
* @return 删除是否成功
*/
private boolean deleteFile(String filePath) {
try {
File file = new File(filePath);
if (file.exists()) {
boolean deleted = file.delete();
if (deleted) {
log.info("已删除文件: {}", filePath);
} else {
log.warn("删除文件失败: {}", filePath);
}
return deleted;
} else {
log.warn("文件不存在: {}", filePath);
return false;
}
} catch (Exception e) {
log.error("删除文件时发生异常: {}", filePath, e);
return false;
}
}
}

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)

16
zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java
View File

@@ -59,13 +59,29 @@ public class SheepFileController extends BaseController
} catch (NumberFormatException e) {
// 使用默认值
}
} else if (queryParams.containsKey("page") && queryParams.get("page") != null) {
// 如果 pageNum 不存在，则尝试使用 page
try {
pageNum = Integer.parseInt(queryParams.get("page").toString());
} catch (NumberFormatException e) {
// 使用默认值
}
}
if (queryParams.containsKey("pageSize") && queryParams.get("pageSize") != null) {
try {
pageSize = Integer.parseInt(queryParams.get("pageSize").toString());
} catch (NumberFormatException e) {
// 使用默认值
}
}else if (queryParams.containsKey("limit") && queryParams.get("limit") != null) {
// 如果 pageSize 不存在，则尝试使用 limit
try {
pageSize = Integer.parseInt(queryParams.get("limit").toString());
} catch (NumberFormatException e) {
// 使用默认值
}
}
// 提取常规查询参数到 SheepFile 对象

2
zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileSqlProvider.java
View File

@@ -33,7 +33,7 @@ public class SheepFileSqlProvider {
// 添加动态条件
addDynamicConditions(sql, conditions);
sql.ORDER_BY("id DESC");
sql.ORDER_BY("id ASC");
return sql.toString();
}

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)

2
zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java
View File

@@ -34,6 +34,8 @@ public class Deworm extends BaseEntity
/** 羊只id */
@Excel(name = "羊只耳号")
private String sheepNo;
private String[] sheepNos;
@Excel(name = "品种")
private String variety;
@Excel(name = "羊只类别")

1
zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java
View File

@@ -37,6 +37,7 @@ public class Diagnosis extends BaseEntity
/** 羊只id */
@Excel(name = "羊只耳号")
private String sheepNo;
private String[] sheepNos;
private Long sheepId;

2
zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java
View File

@@ -37,6 +37,8 @@ public class Health extends BaseEntity
/** 羊只id */
@Excel(name = "羊只耳号")
private String sheepNo;
private String[] sheepNos;
@Excel(name = "品种")
private String variety;
@Excel(name = "羊只类别")

2
zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java
View File

@@ -36,6 +36,8 @@ public class Immunity extends BaseEntity
/** 羊只id */
@Excel(name = "羊只耳号")
private String sheepNo;
private String[] sheepNos;
@Excel(name = "品种")
private String variety;

2
zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java
View File

@@ -36,6 +36,8 @@ public class QuarantineReport extends BaseEntity
@Excel(name = "羊只耳号")
private String sheepNo;
private String[] sheepNos;
@Excel(name = "羊只类别")
private String sheepType;
@Excel(name = "羊只性别")

1
zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java
View File

@@ -32,6 +32,7 @@ public class Treatment extends BaseEntity
/** 羊只耳号 */
@Excel(name = "羊只耳号")
private String sheepNo;
private String[] sheepNos;
private Long sheepId;
// 用于批量新增

22
zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.zhyc.module.biosafety.service.impl;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import com.zhyc.common.utils.DateUtils;
import com.zhyc.common.utils.SecurityUtils;
@@ -59,6 +60,15 @@ public class DewormServiceImpl implements IDewormService
@Override
public List<Deworm> selectDewormList(Deworm deworm)
{
String[] sheepNos = null;
if (deworm.getSheepNo() != null && !deworm.getSheepNo().isEmpty()) {
if (deworm.getSheepNo().contains(" ")) {
sheepNos = deworm.getSheepNo().split(" ");
deworm.setSheepNos(sheepNos);
deworm.setSheepNo(null);
}
}
return dewormMapper.selectDewormList(deworm);
}
@@ -90,12 +100,12 @@ public class DewormServiceImpl implements IDewormService
Deworm dew = new Deworm();
BeanUtils.copyProperties(deworm, dew);
dew.setSheepId(Long.valueOf(sheepId));
dew.setVariety(sheepFile.getVariety());
dew.setSheepType(sheepFile.getName());
dew.setMonthAge(sheepFile.getMonthAge());
dew.setGender(String.valueOf(sheepFile.getGender()));
dew.setBreed(sheepFile.getBreed());
dew.setParity(sheepFile.getParity());
dew.setVariety(sheepFile.getVariety() != null ? sheepFile.getVariety() : "");
dew.setSheepType(sheepFile.getName() != null ? sheepFile.getName() : "");
dew.setMonthAge(sheepFile.getMonthAge() != null ? sheepFile.getMonthAge() : 0);
dew.setGender(sheepFile.getGender() != null ? String.valueOf(sheepFile.getGender()) : "");
dew.setBreed(sheepFile.getBreed() != null ? sheepFile.getBreed() : "");
dew.setParity(sheepFile.getParity() != null ? sheepFile.getParity() : 0);
medicineUsage.setSheepId(sheepId);
// 获取药品使用记录的id

8
zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java
View File

@@ -49,6 +49,7 @@ public class DiagnosisServiceImpl implements IDiagnosisService
@Override
public Diagnosis selectDiagnosisById(Long id)
{
return diagnosisMapper.selectDiagnosisById(id);
}
@@ -61,6 +62,13 @@ public class DiagnosisServiceImpl implements IDiagnosisService
@Override
public List<Diagnosis> selectDiagnosisList(Diagnosis diagnosis)
{
String[] sheepNos = null;
if (diagnosis.getSheepNo() != null && !diagnosis.getSheepNo().isEmpty()) {
if (diagnosis.getSheepNo().contains(" ")) {
sheepNos = diagnosis.getSheepNo().split(" ");
}
}
diagnosis.setSheepNos(sheepNos);
return diagnosisMapper.selectDiagnosisList(diagnosis);
}

23
zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java
View File

@@ -3,6 +3,8 @@ package com.zhyc.module.biosafety.service.impl;
import java.beans.Transient;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import com.zhyc.common.utils.DateUtils;
import com.zhyc.common.utils.SecurityUtils;
import com.zhyc.common.utils.bean.BeanUtils;
@@ -62,6 +64,13 @@ public class HealthServiceImpl implements IHealthService
@Override
public List<Health> selectHealthList(Health health)
{
String[] sheepNos = null;
if (health.getSheepNo() != null && !health.getSheepNo().isEmpty()) {
if (health.getSheepNo().contains(" ")) {
sheepNos = health.getSheepNo().split(" ");
}
}
health.setSheepNos(sheepNos);
return healthMapper.selectHealthList(health);
}
@@ -92,12 +101,14 @@ public class HealthServiceImpl implements IHealthService
Health heal = new Health();
BeanUtils.copyProperties(health, heal);
heal.setSheepId(Long.valueOf(sheepId));
heal.setVariety(sheepFile.getVariety());
heal.setSheepType(sheepFile.getName());
heal.setMonthAge(sheepFile.getMonthAge());
heal.setGender(String.valueOf(sheepFile.getGender()));
heal.setBreed(sheepFile.getBreed());
heal.setParity(sheepFile.getParity());
// 处理数据为空的情况
heal.setVariety(sheepFile.getVariety() != null ? sheepFile.getVariety() : "");
heal.setSheepType(sheepFile.getName() != null ? sheepFile.getName() : "");
heal.setMonthAge(sheepFile.getMonthAge() != null ? sheepFile.getMonthAge() : 0);
heal.setGender(sheepFile.getGender() != null ? String.valueOf(sheepFile.getGender()) : "");
heal.setBreed(sheepFile.getBreed() != null ? sheepFile.getBreed() : "");
heal.setParity(sheepFile.getParity() != null ? sheepFile.getParity() : 0);
medicineUsage.setSheepId(sheepId);
// 获取药品使用记录的id

20
zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java
View File

@@ -63,6 +63,13 @@ public class ImmunityServiceImpl implements IImmunityService
@Override
public List<Immunity> selectImmunityList(Immunity immunity)
{
String[] sheepNos = null;
if (immunity.getSheepNo() != null && !immunity.getSheepNo().isEmpty()) {
if (immunity.getSheepNo().contains(" ")) {
sheepNos = immunity.getSheepNo().split(" ");
}
}
immunity.setSheepNos(sheepNos);
return immunityMapper.selectImmunityList(immunity);
}
@@ -97,13 +104,12 @@ public class ImmunityServiceImpl implements IImmunityService
Immunity imm = new Immunity();
BeanUtils.copyProperties(immunity, imm);
imm.setSheepId(Long.valueOf(sheepId));
imm.setVariety(sheepFile.getVariety());
imm.setSheepType(sheepFile.getName());
imm.setMonthAge(sheepFile.getMonthAge());
imm.setGender(String.valueOf(sheepFile.getGender()));
imm.setBreed(sheepFile.getBreed());
imm.setParity(sheepFile.getParity());
imm.setVariety(sheepFile.getVariety() != null ? sheepFile.getVariety() : "");
imm.setSheepType(sheepFile.getName() != null ? sheepFile.getName() : "");
imm.setMonthAge(sheepFile.getMonthAge() != null ? sheepFile.getMonthAge() : 0);
imm.setGender(sheepFile.getGender() != null ? String.valueOf(sheepFile.getGender()) : "");
imm.setBreed(sheepFile.getBreed() != null ? sheepFile.getBreed() : "");
imm.setParity(sheepFile.getParity() != null ? sheepFile.getParity() : 0);
medicineUsage.setSheepId(sheepId);
// 获取药品使用记录的id
Integer usageId = medicineUsageService.insertSwMedicineUsage(medicineUsage);

7
zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java
View File

@@ -48,6 +48,13 @@ public class QuarantineReportServiceImpl implements IQuarantineReportService
@Override
public List<QuarantineReport> selectQuarantineReportList(QuarantineReport quarantineReport)
{
String[] sheepNos = null;
if (quarantineReport.getSheepNo() != null && !quarantineReport.getSheepNo().isEmpty()) {
if (quarantineReport.getSheepNo().contains(" ")) {
sheepNos = quarantineReport.getSheepNo().split(" ");
}
}
quarantineReport.setSheepNos(sheepNos);
return quarantineReportMapper.selectQuarantineReportList(quarantineReport);
}

9
zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java
View File

@@ -67,6 +67,15 @@ public class TreatmentServiceImpl implements ITreatmentService
@Override
public List<Treatment> selectTreatmentList(Treatment treatment)
{
String[] sheepNos = null;
if (treatment.getSheepNo() != null && !treatment.getSheepNo().isEmpty()) {
if (treatment.getSheepNo().contains(",")) {
sheepNos = treatment.getSheepNo().split(",");
} else {
sheepNos = new String[]{treatment.getSheepNo()};
}
}
treatment.setSheepNos(sheepNos);
return treatmentMapper.selectTreatmentList(treatment);
}

2
zhyc-module/src/main/java/com/zhyc/module/common/controller/UserPostController.java
View File

@@ -32,7 +32,7 @@ public class UserPostController {
// 获取岗位（部门）
@GetMapping("/getPost")
public AjaxResult getPost(){
public AjaxResult getPost(String postName){
List<Post> list = postService.selectPostList();
return AjaxResult.success(list);
}

2
zhyc-module/src/main/java/com/zhyc/module/common/mapper/PostMapper.java
View File

@@ -7,6 +7,6 @@ import java.util.List;
public interface PostMapper {
@Select("select * from sys_post where status = '0' and post_name like '%部'")
@Select("select * from sys_post where status = '0'")
List<Post> selectPostList();
}

38
zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkProdClassesController.java
View File

@@ -28,16 +28,35 @@ public class NpMilkProdClassesController extends BaseController {
public TableDataInfo list(
@RequestParam(required = false) Date datetimeStart,
@RequestParam(required = false) Date datetimeEnd,
@RequestParam(required = false) String manageEarNo, // 改为单个字符串，模糊
@RequestParam(required = false) List<String> allEarNumbers, // 修改处：接收多耳号数组
@RequestParam(required = false) String factory,
@RequestParam(required = false) Integer classes) {
startPage();
// 修改处：将参数封装进实体，以便 Service 和 Mapper 统一处理
NpMilkProdClasses params = new NpMilkProdClasses();
params.setAllEarNumbers(allEarNumbers);
params.setFactory(factory);
params.setClasses(classes);
List<NpMilkProdClasses> list = npMilkProdClassesService
.selectNpMilkProdClassesList(datetimeStart, datetimeEnd,
manageEarNo, factory, classes);
.selectNpMilkProdClassesList(params, datetimeStart, datetimeEnd);
return getDataTable(list);
}
/**
* 修改处：新增耳号模糊查询接口
*/
@PreAuthorize("@ss.hasPermi('milkProdclasses:milkProdclasses:list')")
@GetMapping("/search_ear_numbers")
public AjaxResult searchEarNumbers(@RequestParam("query") String query) {
try {
List<String> earNumbers = npMilkProdClassesService.searchEarNumbers(query);
return success(earNumbers);
} catch (Exception e) {
return error("搜索耳号失败：" + e.getMessage());
}
}
@PreAuthorize("@ss.hasPermi('milkProdclasses:milkProdclasses:import')")
@Log(title = "班次产奶", businessType = BusinessType.IMPORT)
@PostMapping("/import")
@@ -58,14 +77,19 @@ public class NpMilkProdClassesController extends BaseController {
public void export(HttpServletResponse response,
@RequestParam(required = false) Date datetimeStart,
@RequestParam(required = false) Date datetimeEnd,
@RequestParam(required = false) String manageEarNo,
@RequestParam(required = false) List<String> allEarNumbers, // 修改处：接收多耳号
@RequestParam(required = false) String factory,
@RequestParam(required = false) Integer classes) {
NpMilkProdClasses params = new NpMilkProdClasses();
params.setAllEarNumbers(allEarNumbers);
params.setFactory(factory);
params.setClasses(classes);
List<NpMilkProdClasses> list = npMilkProdClassesService.selectNpMilkProdClassesList(
datetimeStart, datetimeEnd, manageEarNo, factory, classes);
params, datetimeStart, datetimeEnd);
ExcelUtil<NpMilkProdClasses> util = new ExcelUtil<>(NpMilkProdClasses.class);
util.exportExcel(response, list, "班次产奶数据");
}
}
}

40
zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpSheepMilkAnalysisController.java
View File

@@ -15,7 +15,7 @@ import java.util.List;
/**
* 奶产量分析控制器
* 只保留：分页列表（只读） + 单条查询 + 导出
* 保留：分页列表（只读） + 单条查询 + 导出 + 耳号模糊查询
*/
@RestController
@RequestMapping("/dairyProducts/sheepMilkAnalysis")
@@ -26,15 +26,36 @@ public class NpSheepMilkAnalysisController extends BaseController {
/**
* 查询奶产量分析列表（只读，分页）
* 支持参数 manageEarTag（耳号模糊） 和 screenDays（筛选天数）
* 支持参数 allEarNumbers（多耳号） 和 screenDays（筛选天数）
*/
@GetMapping("/list")
public TableDataInfo list(NpSheepMilkAnalysis analysis) {
startPage(); // 使用PageHelper分页（注意service中第一个DB调用是distinct sheep id）
public TableDataInfo list(
@RequestParam(required = false) List<String> allEarNumbers, // 修改处：接收多耳号参数
NpSheepMilkAnalysis analysis) {
startPage();
// 修改处：将接收到的 list 设置进对象
if (allEarNumbers != null && !allEarNumbers.isEmpty()) {
analysis.setAllEarNumbers(allEarNumbers);
}
List<NpSheepMilkAnalysis> list = npSheepMilkAnalysisService.selectNpSheepMilkAnalysisList(analysis);
return getDataTable(list);
}
/**
* 修改处：新增搜索耳号接口
*/
@GetMapping("/search_ear_numbers")
public AjaxResult searchEarNumbers(@RequestParam("query") String query) {
try {
List<String> earNumbers = npSheepMilkAnalysisService.searchEarNumbers(query);
return success(earNumbers);
} catch (Exception e) {
return error("搜索耳号失败：" + e.getMessage());
}
}
/**
* 获取单个分析记录详细信息（按sheepId）
*/
@@ -45,11 +66,18 @@ public class NpSheepMilkAnalysisController extends BaseController {
/**
* 导出奶产量分析记录（Excel）
* 支持manageEarTag与screenDays两个查询条件
* 支持 allEarNumbers 与 screenDays 两个查询条件
*/
@Log(title = "奶产量分析 导出", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(NpSheepMilkAnalysis analysis) {
public AjaxResult export(
@RequestParam(required = false) List<String> allEarNumbers, // 修改处：接收多耳号参数
NpSheepMilkAnalysis analysis) {
if (allEarNumbers != null && !allEarNumbers.isEmpty()) {
analysis.setAllEarNumbers(allEarNumbers);
}
List<NpSheepMilkAnalysis> list = npSheepMilkAnalysisService.selectNpSheepMilkAnalysisForExport(analysis);
ExcelUtil<NpSheepMilkAnalysis> util = new ExcelUtil<>(NpSheepMilkAnalysis.class);
return util.exportExcel(list, "羊奶产量分析数据");

23
zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpMilkProdClasses.java
View File

@@ -2,20 +2,19 @@ package com.zhyc.module.dairyProducts.domain;
import java.io.Serializable;
import java.util.Date;
import java.util.List; // 引入 List
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zhyc.common.annotation.Excel;
public class NpMilkProdClasses implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; // 主键ID
private Date createTime; // 创建时间
private Date updateTime; // 更新时间
private Long id;
private Date createTime;
private Date updateTime;
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "日期", dateFormat = "yyyy-MM-dd") // 添加日期格式
@Excel(name = "日期", dateFormat = "yyyy-MM-dd")
private Date datetime;
@Excel(name = "管理耳号")
@@ -41,7 +40,19 @@ public class NpMilkProdClasses implements Serializable {
private String sheepId;
// 修改处：新增字段用于多耳号查询
/** 全部羊耳号列表（用于多耳号查询） */
private List<String> allEarNumbers;
// Getters and Setters
public List<String> getAllEarNumbers() {
return allEarNumbers;
}
public void setAllEarNumbers(List<String> allEarNumbers) {
this.allEarNumbers = allEarNumbers;
}
public Long getId() { return id; }
public void setId(Long id) { this.id = id; }

15
zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpSheepMilkAnalysis.java
View File

@@ -2,6 +2,7 @@ package com.zhyc.module.dairyProducts.domain;
import com.zhyc.common.annotation.Excel;
import java.util.Date;
import java.util.List; // 导入List
public class NpSheepMilkAnalysis {
// 唯一键（可用于前端 row-key）
@@ -12,6 +13,10 @@ public class NpSheepMilkAnalysis {
@Excel(name = "耳号")
private String manageEarTag;
// 修改处：新增多耳号字段
/** 全部羊耳号列表（用于多耳号查询） */
private List<String> allEarNumbers;
@Excel(name = "品种")
private String variety;
@@ -139,6 +144,16 @@ public class NpSheepMilkAnalysis {
private Date lastUpdate;
// getters and setters
// 修改处：添加 allEarNumbers 的 getter/setter
public List<String> getAllEarNumbers() {
return allEarNumbers;
}
public void setAllEarNumbers(List<String> allEarNumbers) {
this.allEarNumbers = allEarNumbers;
}
public String getSheepId() { return sheepId; }
public void setSheepId(String sheepId) { this.sheepId = sheepId; }

10
zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpMilkProdClassesMapper.java
View File

@@ -6,12 +6,14 @@ import java.util.Date;
import java.util.List;
public interface NpMilkProdClassesMapper {
// 修改处：参数改为接收实体类
List<NpMilkProdClasses> selectNpMilkProdClassesList(
@Param("npMilkProdClasses") NpMilkProdClasses npMilkProdClasses,
@Param("datetimeStart") Date datetimeStart,
@Param("datetimeEnd") Date datetimeEnd,
@Param("manageEarNo") String manageEarNo,
@Param("factory") String factory,
@Param("classes") Integer classes);
@Param("datetimeEnd") Date datetimeEnd);
// 修改处：新增搜索方法
List<String> searchEarNumbers(@Param("query") String query);
int insertNpMilkProdClasses(NpMilkProdClasses row);

8
zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpSheepMilkAnalysisMapper.java
View File

@@ -20,8 +20,14 @@ public interface NpSheepMilkAnalysisMapper {
/**
* 根据管理耳标筛选，返回distinct的sheepId列表
* 修改处：参数改为对象，支持 allEarNumbers
*/
List<String> selectDistinctSheepIds(@Param("manageEarTag") String manageEarTag);
List<String> selectDistinctSheepIds(NpSheepMilkAnalysis analysis);
/**
* 修改处：新增耳号模糊查询接口
*/
List<String> searchEarNumbers(@Param("query") String query);
/**
* 根据羊只ID查询羊只档案信息，返回Map结构

10
zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkProdClassesService.java
View File

@@ -5,12 +5,14 @@ import java.util.List;
import com.zhyc.module.dairyProducts.domain.NpMilkProdClasses;
public interface INpMilkProdClassesService {
// 修改处：参数改为接收实体类，以包含多耳号列表
List<NpMilkProdClasses> selectNpMilkProdClassesList(
NpMilkProdClasses npMilkProdClasses,
Date datetimeStart,
Date datetimeEnd,
String manageEarNo, // 改为单个 String
String factory,
Integer classes);
Date datetimeEnd);
// 修改处：新增耳号搜索方法
List<String> searchEarNumbers(String query);
int importMilkProdClasses(List<NpMilkProdClasses> list);
}

3
zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpSheepMilkAnalysisService.java
View File

@@ -9,6 +9,9 @@ public interface INpSheepMilkAnalysisService {
List<NpSheepMilkAnalysis> selectNpSheepMilkAnalysisList(NpSheepMilkAnalysis analysis);
// 修改处：新增模糊查询方法定义
List<String> searchEarNumbers(String query);
/**
* 导出奶产量分析记录
*/

18
zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpMilkProdClassesServiceImpl.java
View File

@@ -16,26 +16,29 @@ public class NpMilkProdClassesServiceImpl implements INpMilkProdClassesService {
private NpMilkProdClassesMapper mapper;
@Override
public List<NpMilkProdClasses> selectNpMilkProdClassesList(Date datetimeStart, Date datetimeEnd,
String manageEarNo, String factory, Integer classes) {
return mapper.selectNpMilkProdClassesList(datetimeStart, datetimeEnd, manageEarNo, factory, classes);
public List<NpMilkProdClasses> selectNpMilkProdClassesList(NpMilkProdClasses npMilkProdClasses, Date datetimeStart, Date datetimeEnd) {
// 修改处：传递实体对象
return mapper.selectNpMilkProdClassesList(npMilkProdClasses, datetimeStart, datetimeEnd);
}
// 修改处：实现搜索方法
@Override
public List<String> searchEarNumbers(String query) {
return mapper.searchEarNumbers(query);
}
@Override
public int importMilkProdClasses(List<NpMilkProdClasses> list) {
int count = 0;
for (NpMilkProdClasses item : list) {
// 根据管理耳号查 sheep_id
String sheepId = mapper.selectSheepIdByManageEarNo(item.getManageEarNo());
if (sheepId == null) continue;
item.setSheepId(sheepId);
// 计算校正奶量
Double correctedMilk = calculateCorrectedMilk(item);
item.setCorrectedMilk(correctedMilk);
// 插入数据
count += mapper.insertNpMilkProdClasses(item);
}
return count;
@@ -45,15 +48,12 @@ public class NpMilkProdClassesServiceImpl implements INpMilkProdClassesService {
Double milk = item.getMilk();
if (milk == null) return null;
// 1. 称重矫正系数
Double weightCorrection = mapper.getWeightCorrection(item.getDatetime(), item.getFactory());
if (weightCorrection == null) weightCorrection = 1.0;
// 2. 胎次矫正系数
Double parityCorrection = mapper.getParityCorrection(item.getParity());
if (parityCorrection == null) parityCorrection = 1.0;
// 3. 干物质矫正系数
Double dryMatterCorrection = mapper.getDryMatterCorrection(item.getDatetime(), item.getFactory());
if (dryMatterCorrection == null) dryMatterCorrection = 1.0;

11
zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpSheepMilkAnalysisServiceImpl.java
View File

@@ -47,12 +47,19 @@ public class NpSheepMilkAnalysisServiceImpl implements INpSheepMilkAnalysisServi
return ana;
}
// 修改处：新增模糊查询实现
@Override
public List<String> searchEarNumbers(String query) {
return npSheepMilkAnalysisMapper.searchEarNumbers(query);
}
@Override
public List<NpSheepMilkAnalysis> selectNpSheepMilkAnalysisList(NpSheepMilkAnalysis analysis) {
int screenDays = (analysis != null && analysis.getScreenDays() != null) ? analysis.getScreenDays() : 100;
String manageEarTagFilter = (analysis != null) ? analysis.getManageEarTag() : null;
List<String> sheepIds = npSheepMilkAnalysisMapper.selectDistinctSheepIds(manageEarTagFilter);
// 修改处：这里改为直接传 analysis 对象，以便 mapper 可以处理 allEarNumbers
List<String> sheepIds = npSheepMilkAnalysisMapper.selectDistinctSheepIds(analysis);
if (CollectionUtils.isEmpty(sheepIds)) return Collections.emptyList();
List<NpSheepMilkAnalysis> resultList = new ArrayList<>();

21
zhyc-module/src/main/java/com/zhyc/module/feed/controller/Exception/MaterialExceptionHandler.java Normal file
View File

@@ -0,0 +1,21 @@
package com.zhyc.module.feed.controller.Exception;
import com.zhyc.common.core.domain.AjaxResult;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import javax.servlet.http.HttpServletRequest;
@ControllerAdvice
public class MaterialExceptionHandler {
@ExceptionHandler({Exception.class, RuntimeException.class})
public AjaxResult handleException(HttpServletRequest request, Exception ex) {
AjaxResult ajaxResult = new AjaxResult();
ajaxResult.put("message", ex.getMessage());
ajaxResult.put("url", request.getRequestURL().toString());
ajaxResult.put("status", 500);
ajaxResult.put("error", "出现了一些错误");
return ajaxResult;
}
}

16
zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgMaterialController.java
View File

@@ -3,6 +3,7 @@ package com.zhyc.module.feed.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
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;
@@ -22,19 +23,16 @@ import com.zhyc.common.core.page.TableDataInfo;
/**
* 原料Controller
*
*
* @author HashMap
* @date 2025-08-11
* @date 2026-01-16
*/
@RestController
@RequestMapping("/feed/material")
public class SgMaterialController extends BaseController
{
private final ISgMaterialService sgMaterialService;
public SgMaterialController(ISgMaterialService sgMaterialService) {
this.sgMaterialService = sgMaterialService;
}
@Autowired
private ISgMaterialService sgMaterialService;
/**
* 查询原料列表
@@ -57,7 +55,7 @@ public class SgMaterialController extends BaseController
public void export(HttpServletResponse response, SgMaterial sgMaterial)
{
List<SgMaterial> list = sgMaterialService.selectSgMaterialList(sgMaterial);
ExcelUtil<SgMaterial> util = new ExcelUtil<>(SgMaterial.class);
ExcelUtil<SgMaterial> util = new ExcelUtil<SgMaterial>(SgMaterial.class);
util.exportExcel(response, list, "原料数据");
}
@@ -98,7 +96,7 @@ public class SgMaterialController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('feed:material:remove')")
@Log(title = "原料", businessType = BusinessType.DELETE)
@DeleteMapping("/{materialIds}")
@DeleteMapping("/{materialIds}")
public AjaxResult remove(@PathVariable String[] materialIds)
{
return toAjax(sgMaterialService.deleteSgMaterialByMaterialIds(materialIds));

65
zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgMaterial.java
View File

@@ -1,15 +1,68 @@
package com.zhyc.module.feed.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zhyc.common.annotation.Excel;
import com.zhyc.common.core.domain.BaseEntity;
import lombok.Getter;
import lombok.Setter;
@Setter
@Getter
public class SgMaterial extends BaseEntity {
/**
* 原料对象 sg_material
*
* @author HashMap
* @date 2026-01-16
*/
public class SgMaterial extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 原料编码 */
@Excel(name = "原料编码")
private String materialId;
/** 原料名称 */
@Excel(name = "原料名称")
private String materialName;
private String isGranular;
/** 颗粒料 */
@Excel(name = "颗粒料")
private Integer isGranular;
public void setMaterialId(String materialId)
{
this.materialId = materialId;
}
public String getMaterialId()
{
return materialId;
}
public void setMaterialName(String materialName)
{
this.materialName = materialName;
}
public String getMaterialName()
{
return materialName;
}
public void setIsGranular(Integer isGranular)
{
this.isGranular = isGranular;
}
public Integer getIsGranular()
{
return isGranular;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("materialId", getMaterialId())
.append("materialName", getMaterialName())
.append("isGranular", getIsGranular())
.toString();
}
}

18
zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgMaterialMapper.java
View File

@@ -6,16 +6,16 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 原料Mapper接口
*
*
* @author HashMap
* @date 2025-08-11
* @date 2026-01-16
*/
@Mapper
public interface SgMaterialMapper
public interface SgMaterialMapper
{
/**
* 查询原料
*
*
* @param materialId 原料主键
* @return 原料
*/
@@ -23,7 +23,7 @@ public interface SgMaterialMapper
/**
* 查询原料列表
*
*
* @param sgMaterial 原料
* @return 原料集合
*/
@@ -31,7 +31,7 @@ public interface SgMaterialMapper
/**
* 新增原料
*
*
* @param sgMaterial 原料
* @return 结果
*/
@@ -39,7 +39,7 @@ public interface SgMaterialMapper
/**
* 修改原料
*
*
* @param sgMaterial 原料
* @return 结果
*/
@@ -47,7 +47,7 @@ public interface SgMaterialMapper
/**
* 删除原料
*
*
* @param materialId 原料主键
* @return 结果
*/
@@ -55,7 +55,7 @@ public interface SgMaterialMapper
/**
* 批量删除原料
*
*
* @param materialIds 需要删除的数据主键集合
* @return 结果
*/

30
zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgMaterialService.java
View File

@@ -5,57 +5,57 @@ import com.zhyc.module.feed.domain.SgMaterial;
/**
* 原料Service接口
*
*
* @author HashMap
* @date 2025-08-11
* @date 2026-01-16
*/
public interface ISgMaterialService
public interface ISgMaterialService
{
/**
* 查询原料
*
*
* @param materialId 原料主键
* @return 原料
*/
SgMaterial selectSgMaterialByMaterialId(String materialId);
public SgMaterial selectSgMaterialByMaterialId(String materialId);
/**
* 查询原料列表
*
*
* @param sgMaterial 原料
* @return 原料集合
*/
List<SgMaterial> selectSgMaterialList(SgMaterial sgMaterial);
public List<SgMaterial> selectSgMaterialList(SgMaterial sgMaterial);
/**
* 新增原料
*
*
* @param sgMaterial 原料
* @return 结果
*/
int insertSgMaterial(SgMaterial sgMaterial);
public int insertSgMaterial(SgMaterial sgMaterial);
/**
* 修改原料
*
*
* @param sgMaterial 原料
* @return 结果
*/
int updateSgMaterial(SgMaterial sgMaterial);
public int updateSgMaterial(SgMaterial sgMaterial);
/**
* 批量删除原料
*
*
* @param materialIds 需要删除的原料主键集合
* @return 结果
*/
int deleteSgMaterialByMaterialIds(String[] materialIds);
public int deleteSgMaterialByMaterialIds(String[] materialIds);
/**
* 删除原料信息
*
*
* @param materialId 原料主键
* @return 结果
*/
int deleteSgMaterialByMaterialId(String materialId);
public int deleteSgMaterialByMaterialId(String materialId);
}

34
zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgMaterialServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.zhyc.module.feed.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zhyc.module.feed.mapper.SgMaterialMapper;
import com.zhyc.module.feed.domain.SgMaterial;
@@ -11,16 +12,12 @@ import com.zhyc.module.feed.service.ISgMaterialService;
* 原料Service业务层处理
*
* @author HashMap
* @date 2025-08-11
* @date 2026-01-16
*/
@Service
public class SgMaterialServiceImpl implements ISgMaterialService
{
private final SgMaterialMapper sgMaterialMapper;
public SgMaterialServiceImpl(SgMaterialMapper sgMaterialMapper) {
this.sgMaterialMapper = sgMaterialMapper;
}
public class SgMaterialServiceImpl implements ISgMaterialService {
@Autowired
private SgMaterialMapper sgMaterialMapper;
/**
* 查询原料
@@ -29,8 +26,7 @@ public class SgMaterialServiceImpl implements ISgMaterialService
* @return 原料
*/
@Override
public SgMaterial selectSgMaterialByMaterialId(String materialId)
{
public SgMaterial selectSgMaterialByMaterialId(String materialId) {
return sgMaterialMapper.selectSgMaterialByMaterialId(materialId);
}
@@ -41,8 +37,7 @@ public class SgMaterialServiceImpl implements ISgMaterialService
* @return 原料
*/
@Override
public List<SgMaterial> selectSgMaterialList(SgMaterial sgMaterial)
{
public List<SgMaterial> selectSgMaterialList(SgMaterial sgMaterial) {
return sgMaterialMapper.selectSgMaterialList(sgMaterial);
}
@@ -53,8 +48,10 @@ public class SgMaterialServiceImpl implements ISgMaterialService
* @return 结果
*/
@Override
public int insertSgMaterial(SgMaterial sgMaterial)
{
public int insertSgMaterial(SgMaterial sgMaterial) {
if (sgMaterialMapper.selectSgMaterialByMaterialId(sgMaterial.getMaterialId()) != null) {
throw new RuntimeException("重复的编码或名称");
}
return sgMaterialMapper.insertSgMaterial(sgMaterial);
}
@@ -65,8 +62,7 @@ public class SgMaterialServiceImpl implements ISgMaterialService
* @return 结果
*/
@Override
public int updateSgMaterial(SgMaterial sgMaterial)
{
public int updateSgMaterial(SgMaterial sgMaterial) {
return sgMaterialMapper.updateSgMaterial(sgMaterial);
}
@@ -77,8 +73,7 @@ public class SgMaterialServiceImpl implements ISgMaterialService
* @return 结果
*/
@Override
public int deleteSgMaterialByMaterialIds(String[] materialIds)
{
public int deleteSgMaterialByMaterialIds(String[] materialIds) {
return sgMaterialMapper.deleteSgMaterialByMaterialIds(materialIds);
}
@@ -89,8 +84,7 @@ public class SgMaterialServiceImpl implements ISgMaterialService
* @return 结果
*/
@Override
public int deleteSgMaterialByMaterialId(String materialId)
{
public int deleteSgMaterialByMaterialId(String materialId) {
return sgMaterialMapper.deleteSgMaterialByMaterialId(materialId);
}
}

14
zhyc-module/src/main/java/com/zhyc/module/frozen/controller/DdFsController.java
View File

@@ -37,7 +37,7 @@ public class DdFsController extends BaseController
/**
* 查询冻精库存列表
*/
@PreAuthorize("@ss.hasPermi('sperm:sperm:list')")
@PreAuthorize("@ss.hasPermi('frozen:sperm:list')")
@GetMapping("/list")
public TableDataInfo list(DdFs ddFs)
{
@@ -49,7 +49,7 @@ public class DdFsController extends BaseController
/**
* 导出冻精库存列表
*/
@PreAuthorize("@ss.hasPermi('sperm:sperm:export')")
@PreAuthorize("@ss.hasPermi('frozen:sperm:export')")
@Log(title = "冻精库存", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, DdFs ddFs)
@@ -62,7 +62,7 @@ public class DdFsController extends BaseController
/**
* 获取冻精库存详细信息
*/
@PreAuthorize("@ss.hasPermi('sperm:sperm:query')")
@PreAuthorize("@ss.hasPermi('frozen:sperm:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@ public class DdFsController extends BaseController
/**
* 新增冻精库存
*/
@PreAuthorize("@ss.hasPermi('sperm:sperm:add')")
@PreAuthorize("@ss.hasPermi('frozen:sperm:add')")
@Log(title = "冻精库存", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody DdFs ddFs)
@@ -83,7 +83,7 @@ public class DdFsController extends BaseController
/**
* 修改冻精库存
*/
@PreAuthorize("@ss.hasPermi('sperm:sperm:edit')")
@PreAuthorize("@ss.hasPermi('frozen:sperm:edit')")
@Log(title = "冻精库存", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody DdFs ddFs)
@@ -94,7 +94,7 @@ public class DdFsController extends BaseController
/**
* 删除冻精库存
*/
@PreAuthorize("@ss.hasPermi('sperm:sperm:remove')")
@PreAuthorize("@ss.hasPermi('frozen:sperm:remove')")
@Log(title = "冻精库存", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
@@ -105,7 +105,7 @@ public class DdFsController extends BaseController
/**
* 批量废弃
*/
@PreAuthorize("@ss.hasPermi('sperm:sperm:discard')")
@PreAuthorize("@ss.hasPermi('frozen:sperm:discard')")
@Log(title = "冻精库存", businessType = BusinessType.UPDATE)
@PutMapping("/discard")
public AjaxResult discard(@RequestBody List<DdFs> list) {

2
zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdFe.java
View File

@@ -90,7 +90,7 @@ public class DdFe extends BaseEntity
@Excel(name = "废弃原因")
private String discardTxt;
public void setId(Long id)
public void setId(Long id)
{
this.id = id;
}

14
zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyMeasureController.java
View File

@@ -5,14 +5,7 @@ import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
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 org.springframework.web.bind.annotation.*;
import com.zhyc.common.annotation.Log;
import com.zhyc.common.core.controller.BaseController;
import com.zhyc.common.core.domain.AjaxResult;
@@ -103,4 +96,9 @@ public class ScBodyMeasureController extends BaseController
{
return toAjax(scBodyMeasureService.deleteScBodyMeasureByIds(ids));
}
@GetMapping("/search_ear_numbers")
public AjaxResult searchEarNumbers(@RequestParam("query") String query){
return success(scBodyMeasureService.searchEarNumbers(query.trim()));
}
}

14
zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyScoreController.java
View File

@@ -4,14 +4,7 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
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 org.springframework.web.bind.annotation.*;
import com.zhyc.common.annotation.Log;
import com.zhyc.common.core.controller.BaseController;
import com.zhyc.common.core.domain.AjaxResult;
@@ -101,4 +94,9 @@ public class ScBodyScoreController extends BaseController
{
return toAjax(scBodyScoreService.deleteScBodyScoreByIds(ids));
}
@GetMapping("/search_ear_numbers")
public AjaxResult searchEarNumbers(@RequestParam("query") String query){
return success(scBodyScoreService.searchEarNumbers(query.trim()));
}
}

14
zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBreastRatingController.java
View File

@@ -4,14 +4,7 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
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 org.springframework.web.bind.annotation.*;
import com.zhyc.common.annotation.Log;
import com.zhyc.common.core.controller.BaseController;
import com.zhyc.common.core.domain.AjaxResult;
@@ -101,4 +94,9 @@ public class ScBreastRatingController extends BaseController
{
return toAjax(scBreastRatingService.deleteScBreastRatingByIds(ids));
}
@GetMapping("/search_ear_numbers")
public AjaxResult searchEarNumbers(@RequestParam("query") String query){
return success(scBreastRatingService.searchEarNumbers(query.trim()));
}
}

11
zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyMeasure.java
View File

@@ -8,6 +8,7 @@ import com.zhyc.common.core.domain.BaseEntity;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
/**
* 体尺测量对象 sc_body_measure
@@ -184,13 +185,7 @@ public class ScBodyMeasure extends BaseEntity {
@Excel(name = "技术员")
private String technician;
/**
* 排序字段
*/
private String orderBy;
/**
* 排序方向
*/
private String sortDirection;
/** 前端多耳号查询条件，非表字段 */
private List<String> manageTagsList;
}

12
zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyScore.java
View File

@@ -1,6 +1,7 @@
package com.zhyc.module.produce.bodyManage.domain;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
@@ -77,13 +78,6 @@ public class ScBodyScore extends BaseEntity {
@Excel(name = "技术员")
private String technician;
/**
* 排序字段
*/
private String orderBy;
/**
* 排序方向
*/
private String sortDirection;
/** 前端多耳号查询条件，非表字段 */
private List<String> manageTagsList;
}

11
zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBreastRating.java
View File

@@ -8,6 +8,7 @@ import com.zhyc.common.annotation.Excel;
import com.zhyc.common.core.domain.BaseEntity;
import java.time.LocalDate;
import java.util.List;
/**
* 乳房评分对象 sc_breast_rating
@@ -110,13 +111,7 @@ public class ScBreastRating extends BaseEntity {
@Excel(name = "技术员")
private String technician;
/**
* 排序字段
*/
private String orderBy;
/**
* 排序方向
*/
private String sortDirection;
/** 前端多耳号查询条件，非表字段 */
private List<String> manageTagsList;
}

11
zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/mapper/ScBodyMeasureMapper.java
View File

@@ -2,6 +2,7 @@ package com.zhyc.module.produce.bodyManage.mapper;
import java.util.List;
import com.zhyc.module.produce.bodyManage.domain.ScBodyMeasure;
import org.apache.ibatis.annotations.Param;
/**
* 体尺测量Mapper接口
@@ -58,4 +59,14 @@ public interface ScBodyMeasureMapper
* @return 结果
*/
public int deleteScBodyMeasureByIds(Long[] ids);
/**
* 模糊搜索耳号
*/
List<String> searchEarNumbers(@Param("query") String query);
/* 列表查询支持多耳号模糊 */
List<ScBodyMeasure> selectScBodyMeasureList(
@Param("sc") ScBodyMeasure sc,
@Param("manageTagsList") List<String> manageTagsList);
}

10
zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/mapper/ScBodyScoreMapper.java
View File

@@ -2,6 +2,7 @@ package com.zhyc.module.produce.bodyManage.mapper;
import java.util.List;
import com.zhyc.module.produce.bodyManage.domain.ScBodyScore;
import org.apache.ibatis.annotations.Param;
/**
* 体况评分Mapper接口
@@ -58,4 +59,13 @@ public interface ScBodyScoreMapper
* @return 结果
*/
public int deleteScBodyScoreByIds(Long[] ids);
/**
* 模糊搜索耳号
*/
List<String> searchEarNumbers(@Param("query") String query);
/* 列表查询支持多耳号模糊 */
List<ScBodyScore> selectScBodyScoreList(
@Param("sc") ScBodyScore sc,
@Param("manageTagsList") List<String> manageTagsList);
}

11
zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/mapper/ScBreastRatingMapper.java
View File

@@ -2,6 +2,7 @@ package com.zhyc.module.produce.bodyManage.mapper;
import java.util.List;
import com.zhyc.module.produce.bodyManage.domain.ScBreastRating;
import org.apache.ibatis.annotations.Param;
/**
* 乳房评分Mapper接口
@@ -58,4 +59,14 @@ public interface ScBreastRatingMapper
* @return 结果
*/
public int deleteScBreastRatingByIds(Long[] ids);
/**
* 模糊搜索耳号
*/
List<String> searchEarNumbers(@Param("query") String query);
/* 列表查询支持多耳号模糊 */
List<ScBreastRating> selectScBreastRatingList(
@Param("sc") ScBreastRating sc,
@Param("manageTagsList") List<String> manageTagsList);
}

2
zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/IScBodyMeasureService.java
View File

@@ -58,4 +58,6 @@ public interface IScBodyMeasureService
* @return 结果
*/
public int deleteScBodyMeasureById(Long id);
List<String> searchEarNumbers(String query);
}

2
zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/IScBodyScoreService.java
View File

@@ -58,4 +58,6 @@ public interface IScBodyScoreService
* @return 结果
*/
public int deleteScBodyScoreById(Long id);
List<String> searchEarNumbers(String query);
}

2
zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/IScBreastRatingService.java
View File

@@ -58,4 +58,6 @@ public interface IScBreastRatingService
* @return 结果
*/
public int deleteScBreastRatingById(Long id);
List<String> searchEarNumbers(String query);
}

11
zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/impl/ScBodyMeasureServiceImpl.java
View File

@@ -44,9 +44,14 @@ public class ScBodyMeasureServiceImpl implements IScBodyMeasureService
* @return 体尺测量
*/
@Override
public List<ScBodyMeasure> selectScBodyMeasureList(ScBodyMeasure scBodyMeasure)
{
return scBodyMeasureMapper.selectScBodyMeasureList(scBodyMeasure);
public List<ScBodyMeasure> selectScBodyMeasureList(ScBodyMeasure scBodyMeasure) {
return scBodyMeasureMapper.selectScBodyMeasureList(scBodyMeasure,
scBodyMeasure.getManageTagsList());
}
@Override
public List<String> searchEarNumbers(String query) {
return scBodyMeasureMapper.searchEarNumbers(query.trim());
}
/**

8
zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/impl/ScBodyScoreServiceImpl.java
View File

@@ -49,7 +49,13 @@ public class ScBodyScoreServiceImpl implements IScBodyScoreService {
*/
@Override
public List<ScBodyScore> selectScBodyScoreList(ScBodyScore scBodyScore) {
return scBodyScoreMapper.selectScBodyScoreList(scBodyScore);
return scBodyScoreMapper.selectScBodyScoreList(scBodyScore,
scBodyScore.getManageTagsList());
}
@Override
public List<String> searchEarNumbers(String query) {
return scBodyScoreMapper.searchEarNumbers(query.trim());
}
/**

8
zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/impl/ScBreastRatingServiceImpl.java
View File

@@ -52,7 +52,13 @@ public class ScBreastRatingServiceImpl implements IScBreastRatingService {
*/
@Override
public List<ScBreastRating> selectScBreastRatingList(ScBreastRating scBreastRating) {
return scBreastRatingMapper.selectScBreastRatingList(scBreastRating);
return scBreastRatingMapper.selectScBreastRatingList(scBreastRating,
scBreastRating.getManageTagsList());
}
@Override
public List<String> searchEarNumbers(String query) {
return scBreastRatingMapper.searchEarNumbers(query.trim());
}
/**

14
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScChangeCommentController.java
View File

@@ -4,14 +4,7 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
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 org.springframework.web.bind.annotation.*;
import com.zhyc.common.annotation.Log;
import com.zhyc.common.core.controller.BaseController;
import com.zhyc.common.core.domain.AjaxResult;
@@ -101,4 +94,9 @@ public class ScChangeCommentController extends BaseController
{
return toAjax(scChangeCommentService.deleteScChangeCommentByIds(ids));
}
@GetMapping("/search_ear_numbers")
public AjaxResult searchEarNumbers(@RequestParam("query") String query){
return success(scChangeCommentService.searchEarNumbers(query.trim()));
}
}

15
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScChangeEarController.java
View File

@@ -7,14 +7,7 @@ import com.zhyc.module.base.domain.BasSheep;
import com.zhyc.module.base.service.IBasSheepService;
import org.springframework.security.access.prepost.PreAuthorize;
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 org.springframework.web.bind.annotation.*;
import com.zhyc.common.annotation.Log;
import com.zhyc.common.core.controller.BaseController;
import com.zhyc.common.core.domain.AjaxResult;
@@ -23,6 +16,7 @@ import com.zhyc.module.produce.manage_sheep.domain.ScChangeEar;
import com.zhyc.module.produce.manage_sheep.service.IScChangeEarService;
import com.zhyc.common.utils.poi.ExcelUtil;
import com.zhyc.common.core.page.TableDataInfo;
import org.springframework.web.bind.annotation.RequestParam;
/**
* 修改电子耳号记录Controller
@@ -116,4 +110,9 @@ public class ScChangeEarController extends BaseController
{
return toAjax(scChangeEarService.deleteScChangeEarByIds(ids));
}
@GetMapping("/search_ear_numbers")
public AjaxResult searchEarNumbers(@RequestParam("query") String query){
return success(scChangeEarService.searchEarNumbers(query.trim()));
}
}

14
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScChangeVarietyController.java
View File

@@ -4,14 +4,7 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
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 org.springframework.web.bind.annotation.*;
import com.zhyc.common.annotation.Log;
import com.zhyc.common.core.controller.BaseController;
import com.zhyc.common.core.domain.AjaxResult;
@@ -101,4 +94,9 @@ public class ScChangeVarietyController extends BaseController
{
return toAjax(scChangeVarietyService.deleteScChangeVarietyByIds(ids));
}
@GetMapping("/search_ear_numbers")
public AjaxResult searchEarNumbers(@RequestParam("query") String query){
return success(scChangeVarietyService.searchEarNumbers(query.trim()));
}
}

21
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransGroupController.java
View File

@@ -8,14 +8,7 @@ import com.zhyc.module.produce.manage_sheep.domain.ScTransGroup;
import com.zhyc.module.produce.manage_sheep.service.IScTransGroupService;
import org.springframework.security.access.prepost.PreAuthorize;
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 org.springframework.web.bind.annotation.*;
import com.zhyc.common.annotation.Log;
import com.zhyc.common.core.controller.BaseController;
import com.zhyc.common.core.domain.AjaxResult;
@@ -97,12 +90,8 @@ public class ScTransGroupController extends BaseController {
return toAjax(scTransGroupService.deleteScTransGroupByIds(ids));
}
/**
* 审批转群记录
*/
// @PutMapping("/approve")
// public AjaxResult approve(@RequestBody ScTransGroup scTransGroup) {
// return toAjax(scTransGroupService.approveScTransGroup(scTransGroup));
// }
@GetMapping("/search_ear_numbers")
public AjaxResult searchEarNumbers(@RequestParam("query") String query){
return success(scTransGroupService.searchEarNumbers(query.trim()));
}
}

14
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransitionInfoController.java
View File

@@ -5,14 +5,7 @@ import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
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 org.springframework.web.bind.annotation.*;
import com.zhyc.common.annotation.Log;
import com.zhyc.common.core.controller.BaseController;
import com.zhyc.common.core.domain.AjaxResult;
@@ -116,4 +109,9 @@ public class ScTransitionInfoController extends BaseController {
int rows = scTransitionInfoService.approveScTransitionInfo(scTransitionInfo);
return toAjax(rows);
}
@GetMapping("/search_ear_numbers")
public AjaxResult searchEarNumbers(@RequestParam("query") String query){
return success(scTransitionInfoService.searchEarNumbers(query.trim()));
}
}

4
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScAddSheep.java
View File

@@ -90,7 +90,9 @@ public class ScAddSheep extends BaseEntity {
@Excel(name = "技术员")
private String technician;
/** 断奶体重(仅接收，不入库) */
@Excel(name = "断奶体重")
private BigDecimal weaningWeight;
private String createBy;
private Date createTime;

4
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeComment.java
View File

@@ -8,6 +8,7 @@ import com.zhyc.common.annotation.Excel;
import com.zhyc.common.core.domain.BaseEntity;
import java.util.Date;
import java.util.List;
/**
* 改备注对象 sc_change_comment
@@ -67,4 +68,7 @@ public class ScChangeComment extends BaseEntity {
*/
@Excel(name = "技术员")
private String technician;
/** 前端多耳号条件，非数据库字段 */
private List<String> manageTagsList;
}

4
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeEar.java
View File

@@ -8,6 +8,7 @@ import com.zhyc.common.annotation.Excel;
import com.zhyc.common.core.domain.BaseEntity;
import java.util.Date;
import java.util.List;
/**
* 修改电子耳号记录对象 sc_change_ear
@@ -84,4 +85,7 @@ public class ScChangeEar extends BaseEntity {
@Excel(name = "技术员")
private String technician;
/** 前端多耳号查询条件，非表字段 */
private List<String> manageTagsList;
}

3
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeVariety.java
View File

@@ -1,6 +1,7 @@
package com.zhyc.module.produce.manage_sheep.domain;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
@@ -77,4 +78,6 @@ public class ScChangeVariety extends BaseEntity {
@JsonFormat(pattern = "yyyy-MM-dd")
private Date eventDate;
/** 前端多耳号查询条件，非表字段 */
private List<String> manageTagsList;
}

5
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java
View File

@@ -6,6 +6,8 @@ import lombok.NoArgsConstructor;
import com.zhyc.common.annotation.Excel;
import com.zhyc.common.core.domain.BaseEntity;
import java.util.List;
/**
* 转群记录对象 sc_trans_group
*
@@ -112,5 +114,6 @@ public class ScTransGroup extends BaseEntity {
@Excel(name = "备注")
private String comment;
/** 前端多耳号查询条件，非表字段 */
private List<String> manageTagsList;
}

4
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java
View File

@@ -7,6 +7,7 @@ import com.zhyc.common.annotation.Excel;
import com.zhyc.common.core.domain.BaseEntity;
import java.time.LocalDate;
import java.util.List;
/**
* 转场对象 sc_transition_info
@@ -96,5 +97,6 @@ public class ScTransitionInfo extends BaseEntity {
@Excel(name = "备注")
private String comment;
/** 前端多耳号查询条件，非表字段 */
private List<String> manageTagsList;
}

10
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeCommentMapper.java
View File

@@ -2,6 +2,7 @@ package com.zhyc.module.produce.manage_sheep.mapper;
import java.util.List;
import com.zhyc.module.produce.manage_sheep.domain.ScChangeComment;
import org.apache.ibatis.annotations.Param;
/**
* 改备注Mapper接口
@@ -58,4 +59,13 @@ public interface ScChangeCommentMapper
* @return 结果
*/
public int deleteScChangeCommentByIds(Long[] ids);
List<ScChangeComment> selectScChangeCommentList(
@Param("sc") ScChangeComment sc,
@Param("manageTagsList") List<String> manageTagsList);
/**
* 模糊搜索耳号
*/
List<String> searchEarNumbers(@Param("query") String query);
}

11
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeEarMapper.java
View File

@@ -2,6 +2,7 @@ package com.zhyc.module.produce.manage_sheep.mapper;
import java.util.List;
import com.zhyc.module.produce.manage_sheep.domain.ScChangeEar;
import org.apache.ibatis.annotations.Param;
/**
* 修改电子耳号记录Mapper接口
@@ -58,4 +59,14 @@ public interface ScChangeEarMapper
* @return 结果
*/
public int deleteScChangeEarByIds(Integer[] ids);
/**
* 模糊搜索耳号
*/
List<String> searchEarNumbers(@Param("query") String query);
/* 列表查询支持多耳号模糊 */
List<ScChangeEar> selectScChangeEarList(
@Param("sc") ScChangeEar sc,
@Param("manageTagsList") List<String> manageTagsList);
}

11
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeVarietyMapper.java
View File

@@ -2,6 +2,7 @@ package com.zhyc.module.produce.manage_sheep.mapper;
import java.util.List;
import com.zhyc.module.produce.manage_sheep.domain.ScChangeVariety;
import org.apache.ibatis.annotations.Param;
/**
* 改品种记录Mapper接口
@@ -58,4 +59,14 @@ public interface ScChangeVarietyMapper
* @return 结果
*/
public int deleteScChangeVarietyByIds(Integer[] ids);
/**
* 模糊搜索耳号
*/
List<String> searchEarNumbers(@Param("query") String query);
/* 列表查询支持多耳号模糊 */
List<ScChangeVariety> selectScChangeVarietyList(
@Param("sc") ScChangeVariety sc,
@Param("manageTagsList") List<String> manageTagsList);
}

11
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransGroupMapper.java
View File

@@ -4,6 +4,7 @@ import java.util.List;
import com.zhyc.module.produce.manage_sheep.domain.ScTransGroup;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 转群记录Mapper接口
@@ -60,4 +61,14 @@ public interface ScTransGroupMapper {
* @return 结果
*/
public int deleteScTransGroupByIds(Integer[] ids);
/**
* 模糊搜索耳号
*/
List<String> searchEarNumbers(@Param("query") String query);
/* 列表查询支持多耳号模糊 */
List<ScTransGroup> selectScTransGroupList(
@Param("sc") ScTransGroup sc,
@Param("manageTagsList") List<String> manageTagsList);
}

9
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransitionInfoMapper.java
View File

@@ -64,4 +64,13 @@ public interface ScTransitionInfoMapper
//批量转场
int insertScTransitionInfoBatch(@Param("list") List<ScTransitionInfo> transitionInfoList);
/**
* 模糊搜索耳号
*/
List<String> searchEarNumbers(@Param("query") String query);
/* 列表查询支持多耳号模糊 */
List<ScTransitionInfo> selectScTransitionInfoList(
@Param("sc") ScTransitionInfo sc,
@Param("manageTagsList") List<String> manageTagsList);
}

5
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScChangeCommentService.java
View File

@@ -58,4 +58,9 @@ public interface IScChangeCommentService
* @return 结果
*/
public int deleteScChangeCommentById(Long id);
/**
* 远程模糊搜索耳号（下拉用）
*/
List<String> searchEarNumbers(String query);
}

2
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScChangeEarService.java
View File

@@ -58,4 +58,6 @@ public interface IScChangeEarService
* @return 结果
*/
public int deleteScChangeEarById(Integer id);
List<String> searchEarNumbers(String query);
}

2
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScChangeVarietyService.java
View File

@@ -58,4 +58,6 @@ public interface IScChangeVarietyService
* @return 结果
*/
public int deleteScChangeVarietyById(Integer id);
List<String> searchEarNumbers(String query);
}

2
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransGroupService.java
View File

@@ -64,4 +64,6 @@ public interface IScTransGroupService {
* 审批转群记录
*/
int approveScTransGroup(ScTransGroup scTransGroup);
List<String> searchEarNumbers(String query);
}

1
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransitionInfoService.java
View File

@@ -71,4 +71,5 @@ public interface IScTransitionInfoService {
//审批转场
public int approveScTransitionInfo(ScTransitionInfo scTransitionInfo);
List<String> searchEarNumbers(String query);
}

2
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScAddSheepServiceImpl.java
View File

@@ -61,6 +61,7 @@ public class ScAddSheepServiceImpl implements IScAddSheepService {
bs.setFatherId(null);
bs.setMotherId(null);
bs.setBirthWeight(scAddSheep.getBornWeight().longValue());
bs.setWeaningWeight(scAddSheep.getWeaningWeight().longValue());
bs.setSource(String.valueOf(2));
bs.setBirthday(scAddSheep.getBirthday());
bs.setGender(scAddSheep.getGender().longValue());
@@ -72,6 +73,7 @@ public class ScAddSheepServiceImpl implements IScAddSheepService {
bs.setVarietyId(scAddSheep.getVarietyId().longValue());
bs.setSourceDate(scAddSheep.getJoinDate());
bs.setComment(scAddSheep.getComment());
bs.setCreateBy(scAddSheep.getCreateBy());
bs.setCreateTime(new Date());
if (scAddSheep.getTypeId() != null) {

9
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeCommentServiceImpl.java
View File

@@ -49,9 +49,14 @@ public class ScChangeCommentServiceImpl implements IScChangeCommentService
@Override
public List<ScChangeComment> selectScChangeCommentList(ScChangeComment scChangeComment)
{
return scChangeCommentMapper.selectScChangeCommentList(scChangeComment);
// 把实体和独立参数一起传过去
return scChangeCommentMapper.selectScChangeCommentList(scChangeComment,
scChangeComment.getManageTagsList());
}
@Override
public List<String> searchEarNumbers(String query) {
return scChangeCommentMapper.searchEarNumbers(query);
}
/**
* 新增改备注
*

10
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeEarServiceImpl.java
View File

@@ -67,8 +67,8 @@ public class ScChangeEarServiceImpl implements IScChangeEarService
*/
@Override
public List<ScChangeEar> selectScChangeEarList(ScChangeEar scChangeEar) {
List<ScChangeEar> list = scChangeEarMapper.selectScChangeEarList(scChangeEar);
return list;
return scChangeEarMapper.selectScChangeEarList(scChangeEar,
scChangeEar.getManageTagsList());
}
/**
@@ -166,4 +166,10 @@ public class ScChangeEarServiceImpl implements IScChangeEarService
{
return scChangeEarMapper.deleteScChangeEarById(id);
}
@Override
public List<String> searchEarNumbers(String query) {
return scChangeEarMapper.searchEarNumbers(query.trim());
}
}

8
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeVarietyServiceImpl.java
View File

@@ -52,7 +52,8 @@ public class ScChangeVarietyServiceImpl implements IScChangeVarietyService
@Override
public List<ScChangeVariety> selectScChangeVarietyList(ScChangeVariety scChangeVariety)
{
return scChangeVarietyMapper.selectScChangeVarietyList(scChangeVariety);
return scChangeVarietyMapper.selectScChangeVarietyList(scChangeVariety,
scChangeVariety.getManageTagsList());
}
/**
@@ -133,4 +134,9 @@ public class ScChangeVarietyServiceImpl implements IScChangeVarietyService
{
return scChangeVarietyMapper.deleteScChangeVarietyById(id);
}
@Override
public List<String> searchEarNumbers(String query) {
return scChangeVarietyMapper.searchEarNumbers(query.trim());
}
}

8
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransGroupServiceImpl.java
View File

@@ -56,7 +56,8 @@ public class ScTransGroupServiceImpl implements IScTransGroupService {
*/
@Override
public List<ScTransGroup> selectScTransGroupList(ScTransGroup scTransGroup) {
List<ScTransGroup> list = scTransGroupMapper.selectScTransGroupList(scTransGroup);
List<ScTransGroup> list = scTransGroupMapper.selectScTransGroupList(scTransGroup,
scTransGroup.getManageTagsList());
list.forEach(group -> {
group.setReasonText(convertReason(group.getReason()));
group.setStatusText(convertStatus(group.getStatus()));
@@ -209,4 +210,9 @@ public class ScTransGroupServiceImpl implements IScTransGroupService {
eventTypeMap.put(4, "预售转群");
return eventTypeMap.getOrDefault(eventType, "未知");
}
@Override
public List<String> searchEarNumbers(String query) {
return scTransGroupMapper.searchEarNumbers(query.trim());
}
}

8
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java
View File

@@ -55,7 +55,8 @@ public class ScTransitionInfoServiceImpl implements IScTransitionInfoService
@Override
public List<ScTransitionInfo> selectScTransitionInfoList(ScTransitionInfo scTransitionInfo)
{
return scTransitionInfoMapper.selectScTransitionInfoList(scTransitionInfo);
return scTransitionInfoMapper.selectScTransitionInfoList(scTransitionInfo,
scTransitionInfo.getManageTagsList());
}
/**
@@ -212,4 +213,9 @@ public class ScTransitionInfoServiceImpl implements IScTransitionInfoService
transTypeMap.put(2, "育肥调拨");
return transTypeMap.getOrDefault(transTypeCode, "未知类型");
}
@Override
public List<String> searchEarNumbers(String query) {
return scTransitionInfoMapper.searchEarNumbers(query.trim());
}
}

14
zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScCastrateController.java
View File

@@ -7,14 +7,7 @@ import com.zhyc.module.produce.other.domain.ScCastrate;
import com.zhyc.module.produce.other.service.IScCastrateService;
import org.springframework.security.access.prepost.PreAuthorize;
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 org.springframework.web.bind.annotation.*;
import com.zhyc.common.annotation.Log;
import com.zhyc.common.core.controller.BaseController;
import com.zhyc.common.core.domain.AjaxResult;
@@ -102,4 +95,9 @@ public class ScCastrateController extends BaseController
{
return toAjax(scCastrateService.deleteScCastrateByIds(ids));
}
@GetMapping("/search_ear_numbers")
public AjaxResult searchEarNumbers(@RequestParam("query") String query){
return success(scCastrateService.searchEarNumbers(query.trim()));
}
}

5
zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScFixHoofController.java
View File

@@ -107,7 +107,10 @@ public class ScFixHoofController extends BaseController
return toAjax(scFixHoofService.deleteScFixHoofByIds(ids));
}
@GetMapping("/search_ear_numbers")
public AjaxResult searchEarNumbers(@RequestParam("query") String query){
return success(scFixHoofService.searchEarNumbers(query.trim()));
}
}

Some files were not shown because too many files have changed in this diff Show More