From 02b8eefc8de2285b46f230aeb4f5fdbd5e785a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BC=82=E6=B3=8A?= <1913856125@qq.com>
Date: Thu, 22 Jan 2026 19:58:46 +0800
Subject: [PATCH] =?UTF-8?q?app=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=EF=BC=8C=E7=94=9F=E7=89=A9=E5=AE=89=E5=85=A8=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 2 +-
.../zhyc/framework/config/SecurityConfig.java | 4 +-
.../app/controller/AppErrorLogController.java | 106 +++++++++++++
.../app/controller/AppSettingsController.java | 106 +++++++++++++
.../zhyc/module/app/domain/AppErrorLog.java | 96 ++++++++++++
.../zhyc/module/app/domain/AppSettings.java | 71 +++++++++
.../module/app/mapper/AppErrorLogMapper.java | 64 ++++++++
.../module/app/mapper/AppSettingsMapper.java | 62 ++++++++
.../app/service/IAppErrorLogService.java | 62 ++++++++
.../app/service/IAppSettingsService.java | 63 ++++++++
.../service/impl/AppErrorLogServiceImpl.java | 97 ++++++++++++
.../service/impl/AppSettingsServiceImpl.java | 96 ++++++++++++
.../service/impl/DewormServiceImpl.java | 11 +-
.../service/impl/DiagnosisServiceImpl.java | 6 +-
.../service/impl/HealthServiceImpl.java | 6 +-
.../service/impl/ImmunityServiceImpl.java | 6 +-
.../impl/QuarantineReportServiceImpl.java | 6 +-
.../mapper/app/AppErrorLogMapper.xml | 140 ++++++++++++++++++
.../mapper/app/AppSettingsMapper.xml | 114 ++++++++++++++
.../stock/WzMaterialsManagementMapper.xml | 2 +-
.../resources/mapper/work/WorkOrderMapper.xml | 2 +-
21 files changed, 1097 insertions(+), 25 deletions(-)
create mode 100644 zhyc-module/src/main/java/com/zhyc/module/app/controller/AppErrorLogController.java
create mode 100644 zhyc-module/src/main/java/com/zhyc/module/app/controller/AppSettingsController.java
create mode 100644 zhyc-module/src/main/java/com/zhyc/module/app/domain/AppErrorLog.java
create mode 100644 zhyc-module/src/main/java/com/zhyc/module/app/domain/AppSettings.java
create mode 100644 zhyc-module/src/main/java/com/zhyc/module/app/mapper/AppErrorLogMapper.java
create mode 100644 zhyc-module/src/main/java/com/zhyc/module/app/mapper/AppSettingsMapper.java
create mode 100644 zhyc-module/src/main/java/com/zhyc/module/app/service/IAppErrorLogService.java
create mode 100644 zhyc-module/src/main/java/com/zhyc/module/app/service/IAppSettingsService.java
create mode 100644 zhyc-module/src/main/java/com/zhyc/module/app/service/impl/AppErrorLogServiceImpl.java
create mode 100644 zhyc-module/src/main/java/com/zhyc/module/app/service/impl/AppSettingsServiceImpl.java
create mode 100644 zhyc-module/src/main/resources/mapper/app/AppErrorLogMapper.xml
create mode 100644 zhyc-module/src/main/resources/mapper/app/AppSettingsMapper.xml
diff --git a/pom.xml b/pom.xml
index ff96c7d..3c3a3f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,7 +190,7 @@
org.apache.poi
poi-ooxml-schemas
- ${poi.version}
+ 4.1.2
diff --git a/zhyc-framework/src/main/java/com/zhyc/framework/config/SecurityConfig.java b/zhyc-framework/src/main/java/com/zhyc/framework/config/SecurityConfig.java
index 3f75552..c9d425f 100644
--- a/zhyc-framework/src/main/java/com/zhyc/framework/config/SecurityConfig.java
+++ b/zhyc-framework/src/main/java/com/zhyc/framework/config/SecurityConfig.java
@@ -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();
})
diff --git a/zhyc-module/src/main/java/com/zhyc/module/app/controller/AppErrorLogController.java b/zhyc-module/src/main/java/com/zhyc/module/app/controller/AppErrorLogController.java
new file mode 100644
index 0000000..71dfa9b
--- /dev/null
+++ b/zhyc-module/src/main/java/com/zhyc/module/app/controller/AppErrorLogController.java
@@ -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 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 list = appErrorLogService.selectAppErrorLogList(appErrorLog);
+ ExcelUtil util = new ExcelUtil(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));
+ }
+}
diff --git a/zhyc-module/src/main/java/com/zhyc/module/app/controller/AppSettingsController.java b/zhyc-module/src/main/java/com/zhyc/module/app/controller/AppSettingsController.java
new file mode 100644
index 0000000..d1a0e6f
--- /dev/null
+++ b/zhyc-module/src/main/java/com/zhyc/module/app/controller/AppSettingsController.java
@@ -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 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 list = appSettingsService.selectAppSettingsList(appSettings);
+ ExcelUtil util = new ExcelUtil(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));
+ }
+}
diff --git a/zhyc-module/src/main/java/com/zhyc/module/app/domain/AppErrorLog.java b/zhyc-module/src/main/java/com/zhyc/module/app/domain/AppErrorLog.java
new file mode 100644
index 0000000..1376fa4
--- /dev/null
+++ b/zhyc-module/src/main/java/com/zhyc/module/app/domain/AppErrorLog.java
@@ -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;
+}
diff --git a/zhyc-module/src/main/java/com/zhyc/module/app/domain/AppSettings.java b/zhyc-module/src/main/java/com/zhyc/module/app/domain/AppSettings.java
new file mode 100644
index 0000000..5bd120d
--- /dev/null
+++ b/zhyc-module/src/main/java/com/zhyc/module/app/domain/AppSettings.java
@@ -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;
+
+}
diff --git a/zhyc-module/src/main/java/com/zhyc/module/app/mapper/AppErrorLogMapper.java b/zhyc-module/src/main/java/com/zhyc/module/app/mapper/AppErrorLogMapper.java
new file mode 100644
index 0000000..504db29
--- /dev/null
+++ b/zhyc-module/src/main/java/com/zhyc/module/app/mapper/AppErrorLogMapper.java
@@ -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 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);
+}
diff --git a/zhyc-module/src/main/java/com/zhyc/module/app/mapper/AppSettingsMapper.java b/zhyc-module/src/main/java/com/zhyc/module/app/mapper/AppSettingsMapper.java
new file mode 100644
index 0000000..bb44087
--- /dev/null
+++ b/zhyc-module/src/main/java/com/zhyc/module/app/mapper/AppSettingsMapper.java
@@ -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 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);
+}
diff --git a/zhyc-module/src/main/java/com/zhyc/module/app/service/IAppErrorLogService.java b/zhyc-module/src/main/java/com/zhyc/module/app/service/IAppErrorLogService.java
new file mode 100644
index 0000000..c92fd06
--- /dev/null
+++ b/zhyc-module/src/main/java/com/zhyc/module/app/service/IAppErrorLogService.java
@@ -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 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);
+}
diff --git a/zhyc-module/src/main/java/com/zhyc/module/app/service/IAppSettingsService.java b/zhyc-module/src/main/java/com/zhyc/module/app/service/IAppSettingsService.java
new file mode 100644
index 0000000..fbb184d
--- /dev/null
+++ b/zhyc-module/src/main/java/com/zhyc/module/app/service/IAppSettingsService.java
@@ -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 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);
+}
diff --git a/zhyc-module/src/main/java/com/zhyc/module/app/service/impl/AppErrorLogServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/app/service/impl/AppErrorLogServiceImpl.java
new file mode 100644
index 0000000..ef12dd6
--- /dev/null
+++ b/zhyc-module/src/main/java/com/zhyc/module/app/service/impl/AppErrorLogServiceImpl.java
@@ -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 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);
+ }
+}
diff --git a/zhyc-module/src/main/java/com/zhyc/module/app/service/impl/AppSettingsServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/app/service/impl/AppSettingsServiceImpl.java
new file mode 100644
index 0000000..13e787b
--- /dev/null
+++ b/zhyc-module/src/main/java/com/zhyc/module/app/service/impl/AppSettingsServiceImpl.java
@@ -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 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);
+ }
+}
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java
index d1d9502..cad4485 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java
@@ -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;
@@ -61,13 +62,13 @@ public class DewormServiceImpl implements IDewormService
{
String[] sheepNos = null;
if (deworm.getSheepNo() != null && !deworm.getSheepNo().isEmpty()) {
- if (deworm.getSheepNo().contains(",")) {
- sheepNos = deworm.getSheepNo().split(",");
- } else {
- sheepNos = new String[]{deworm.getSheepNo()};
+ if (deworm.getSheepNo().contains(" ")) {
+ sheepNos = deworm.getSheepNo().split(" ");
+ deworm.setSheepNos(sheepNos);
+ deworm.setSheepNo(null);
}
}
- deworm.setSheepNos(sheepNos);
+
return dewormMapper.selectDewormList(deworm);
}
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java
index ac68499..5c89e11 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java
@@ -64,10 +64,8 @@ public class DiagnosisServiceImpl implements IDiagnosisService
{
String[] sheepNos = null;
if (diagnosis.getSheepNo() != null && !diagnosis.getSheepNo().isEmpty()) {
- if (diagnosis.getSheepNo().contains(",")) {
- sheepNos = diagnosis.getSheepNo().split(",");
- } else {
- sheepNos = new String[]{diagnosis.getSheepNo()};
+ if (diagnosis.getSheepNo().contains(" ")) {
+ sheepNos = diagnosis.getSheepNo().split(" ");
}
}
diagnosis.setSheepNos(sheepNos);
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java
index 80140cf..5535cce 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java
@@ -66,10 +66,8 @@ public class HealthServiceImpl implements IHealthService
{
String[] sheepNos = null;
if (health.getSheepNo() != null && !health.getSheepNo().isEmpty()) {
- if (health.getSheepNo().contains(",")) {
- sheepNos = health.getSheepNo().split(",");
- } else {
- sheepNos = new String[]{health.getSheepNo()};
+ if (health.getSheepNo().contains(" ")) {
+ sheepNos = health.getSheepNo().split(" ");
}
}
health.setSheepNos(sheepNos);
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java
index 61af3b2..88d0428 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java
@@ -65,10 +65,8 @@ public class ImmunityServiceImpl implements IImmunityService
{
String[] sheepNos = null;
if (immunity.getSheepNo() != null && !immunity.getSheepNo().isEmpty()) {
- if (immunity.getSheepNo().contains(",")) {
- sheepNos = immunity.getSheepNo().split(",");
- } else {
- sheepNos = new String[]{immunity.getSheepNo()};
+ if (immunity.getSheepNo().contains(" ")) {
+ sheepNos = immunity.getSheepNo().split(" ");
}
}
immunity.setSheepNos(sheepNos);
diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java
index ae6b728..d83e8bd 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java
@@ -50,10 +50,8 @@ public class QuarantineReportServiceImpl implements IQuarantineReportService
{
String[] sheepNos = null;
if (quarantineReport.getSheepNo() != null && !quarantineReport.getSheepNo().isEmpty()) {
- if (quarantineReport.getSheepNo().contains(",")) {
- sheepNos = quarantineReport.getSheepNo().split(",");
- } else {
- sheepNos = new String[]{quarantineReport.getSheepNo()};
+ if (quarantineReport.getSheepNo().contains(" ")) {
+ sheepNos = quarantineReport.getSheepNo().split(" ");
}
}
quarantineReport.setSheepNos(sheepNos);
diff --git a/zhyc-module/src/main/resources/mapper/app/AppErrorLogMapper.xml b/zhyc-module/src/main/resources/mapper/app/AppErrorLogMapper.xml
new file mode 100644
index 0000000..53f3b5a
--- /dev/null
+++ b/zhyc-module/src/main/resources/mapper/app/AppErrorLogMapper.xml
@@ -0,0 +1,140 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select id, device_id, user_id, app_version, app_code, platform, os_version, error_type, error_code, error_message, stack_trace, page_url, api_url, api_params, network_type, screen_width, screen_height, custom_data, create_time from app_error_log
+
+
+
+
+
+
+
+ insert into app_error_log
+
+ device_id,
+ user_id,
+ app_version,
+ app_code,
+ platform,
+ os_version,
+ error_type,
+ error_code,
+ error_message,
+ stack_trace,
+ page_url,
+ api_url,
+ api_params,
+ network_type,
+ screen_width,
+ screen_height,
+ custom_data,
+ create_time,
+
+
+ #{deviceId},
+ #{userId},
+ #{appVersion},
+ #{appCode},
+ #{platform},
+ #{osVersion},
+ #{errorType},
+ #{errorCode},
+ #{errorMessage},
+ #{stackTrace},
+ #{pageUrl},
+ #{apiUrl},
+ #{apiParams},
+ #{networkType},
+ #{screenWidth},
+ #{screenHeight},
+ #{customData},
+ #{createTime},
+
+
+
+
+ update app_error_log
+
+ device_id = #{deviceId},
+ user_id = #{userId},
+ app_version = #{appVersion},
+ app_code = #{appCode},
+ platform = #{platform},
+ os_version = #{osVersion},
+ error_type = #{errorType},
+ error_code = #{errorCode},
+ error_message = #{errorMessage},
+ stack_trace = #{stackTrace},
+ page_url = #{pageUrl},
+ api_url = #{apiUrl},
+ api_params = #{apiParams},
+ network_type = #{networkType},
+ screen_width = #{screenWidth},
+ screen_height = #{screenHeight},
+ custom_data = #{customData},
+ create_time = #{createTime},
+
+ where id = #{id}
+
+
+
+ delete from app_error_log where id = #{id}
+
+
+
+ delete from app_error_log where id in
+
+ #{id}
+
+
+
\ No newline at end of file
diff --git a/zhyc-module/src/main/resources/mapper/app/AppSettingsMapper.xml b/zhyc-module/src/main/resources/mapper/app/AppSettingsMapper.xml
new file mode 100644
index 0000000..e754912
--- /dev/null
+++ b/zhyc-module/src/main/resources/mapper/app/AppSettingsMapper.xml
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select id, user_id, setting_key, setting_value, setting_type, setting_group, setting_desc, platform, version_range, status, logical, custom_data, create_time, update_time from app_settings
+
+
+
+
+
+
+
+ insert into app_settings
+
+ user_id,
+ setting_key,
+ setting_value,
+ setting_type,
+ setting_group,
+ setting_desc,
+ platform,
+ version_range,
+ status,
+ logical,
+ custom_data,
+ create_time,
+ update_time,
+
+
+ #{userId},
+ #{settingKey},
+ #{settingValue},
+ #{settingType},
+ #{settingGroup},
+ #{settingDesc},
+ #{platform},
+ #{versionRange},
+ #{status},
+ #{logical},
+ #{customData},
+ #{createTime},
+ #{updateTime},
+
+
+
+
+ update app_settings
+
+ user_id = #{userId},
+ setting_key = #{settingKey},
+ setting_value = #{settingValue},
+ setting_type = #{settingType},
+ setting_group = #{settingGroup},
+ setting_desc = #{settingDesc},
+ platform = #{platform},
+ version_range = #{versionRange},
+ status = #{status},
+ logical = #{logical},
+ custom_data = #{customData},
+ create_time = #{createTime},
+ update_time = #{updateTime},
+
+ where id = #{id}
+
+
+
+ delete from app_settings where id = #{id}
+
+
+
+ delete from app_settings where id in
+
+ #{id}
+
+
+
\ No newline at end of file
diff --git a/zhyc-module/src/main/resources/mapper/stock/WzMaterialsManagementMapper.xml b/zhyc-module/src/main/resources/mapper/stock/WzMaterialsManagementMapper.xml
index 7caa4fd..8145bc7 100644
--- a/zhyc-module/src/main/resources/mapper/stock/WzMaterialsManagementMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/stock/WzMaterialsManagementMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
diff --git a/zhyc-module/src/main/resources/mapper/work/WorkOrderMapper.xml b/zhyc-module/src/main/resources/mapper/work/WorkOrderMapper.xml
index 0937b9a..d38b162 100644
--- a/zhyc-module/src/main/resources/mapper/work/WorkOrderMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/work/WorkOrderMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+