修改程序集

DOAN.Admin.WebApi/Controllers/CommonController.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Service.System;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Service.System;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 公共模块

DOAN.Admin.WebApi/Controllers/MES/andon/AndonDataAnalysisController .cs

@@ -1,9 +1,9 @@
-using ZR.Admin.WebApi.Filters;
+using DOAN.Admin.WebApi.Filters;
 using Microsoft.AspNetCore.Mvc;
-using ZR.Service.MES.andon.IService;
-using ZR.Model.MES.andon.Dto;
-using ZR.Model.Dto;
-using ZR.Service.MES.andon;
+using DOAN.Service.MES.andon.IService;
+using DOAN.Model.MES.andon.Dto;
+using DOAN.Model.Dto;
+using DOAN.Service.MES.andon;
 
 namespace DOAN.WebApi.Controllers.MES.andon
 {

DOAN.Admin.WebApi/Controllers/MES/andon/AndonFaultRecordController.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Model.Dto;
-using ZR.Model.MES.andon;
-using ZR.Model.MES.andon.Dto;
-using ZR.Service.MES.andon.IService;
-using ZR.Admin.WebApi.Filters;
+using DOAN.Model.Dto;
+using DOAN.Model.MES.andon;
+using DOAN.Model.MES.andon.Dto;
+using DOAN.Service.MES.andon.IService;
+using DOAN.Admin.WebApi.Filters;
 
 //创建时间：2024-06-20
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 故障记录表
@@ -109,7 +109,7 @@ namespace ZR.Admin.WebApi.Controllers
         [Log(Title = "故障记录表", BusinessType = BusinessType.DELETE)]
         public IActionResult DeleteAndonFaultRecord(string ids)
         {
-            int[] idsArr = Tools.SpitIntArrary(ids);
+            long[] idsArr = Tools.SpitLongArrary(ids);
             if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
 
             var response = _AndonFaultRecordService.Delete(idsArr);

DOAN.Admin.WebApi/Controllers/MES/andon/AndonInteractionController.cs

@@ -1,8 +1,8 @@
-using ZR.Admin.WebApi.Filters;
+using DOAN.Admin.WebApi.Filters;
 using Microsoft.AspNetCore.Mvc;
-using ZR.Service.MES.andon.IService;
-using ZR.Model.Dto;
-using ZR.Model.MES.andon;
+using DOAN.Service.MES.andon.IService;
+using DOAN.Model.Dto;
+using DOAN.Model.MES.andon;
 
 namespace DOAN.WebApi.Controllers.MES.andon
 {

DOAN.Admin.WebApi/Controllers/MES/dev/DeviceAccountController.cs

@@ -1,13 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Model.Dto;
-using ZR.Service.MES.dev.IService;
-using ZR.Model.MES.dev.Dto;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.MES.dev.Dto;
-using ZR.Model.MES.dev;
+using DOAN.Model.Dto;
+using DOAN.Service.MES.dev.IService;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Model.MES.dev;
 
 //创建时间：2024-05-20
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 设备台账

DOAN.Admin.WebApi/Controllers/MES/dev/DeviceDataAnalysisController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.MES.dev.Dto;
-using ZR.Service.MES.dev.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Service.MES.dev.IService;
 
 namespace DOAN.WebApi.Controllers.MES.dev
 {

DOAN.Admin.WebApi/Controllers/MES/dev/DeviceFormConfigController.cs

@@ -1,13 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Model.Dto;
-using ZR.Service.MES.dev.IService;
-using ZR.Model.MES.dev.Dto;
-using ZR.Admin.WebApi.Filters;
+using DOAN.Model.Dto;
+using DOAN.Service.MES.dev.IService;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Admin.WebApi.Filters;
 
-using ZR.Model.MES.dev;
+using DOAN.Model.MES.dev;
 
 //创建时间：2024-05-22
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 设备检查项表单配置表

DOAN.Admin.WebApi/Controllers/MES/dev/DeviceInspectController.cs

@@ -1,15 +1,15 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Model.Dto;
-using ZR.Service.MES.dev.IService;
-using ZR.Model.MES.dev.Dto;
-using ZR.Admin.WebApi.Filters;
+using DOAN.Model.Dto;
+using DOAN.Service.MES.dev.IService;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Admin.WebApi.Filters;
 
-using ZR.Model.MES.dev;
+using DOAN.Model.MES.dev;
 using Org.BouncyCastle.Crypto;
 using Aliyun.OSS;
 
 //创建时间：2024-05-21
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 设备检查项

DOAN.Admin.WebApi/Controllers/MES/dev/DeviceMaintenanceRecordController.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Service.MES.dev.IService;
-using ZR.Model.MES.dev.Dto;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.MES.dev.Dto;
-using ZR.Model.MES.dev;
+using DOAN.Service.MES.dev.IService;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Model.MES.dev;
 
 //创建时间：2024-05-27
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 维修记录

DOAN.Admin.WebApi/Controllers/MES/dev/DevicePointInspectionPlanController.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Service.MES.dev.IService;
-using ZR.Model.MES.dev.Dto;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.MES.dev.Dto;
-using ZR.Model.MES.dev;
+using DOAN.Service.MES.dev.IService;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Model.MES.dev;
 
 //创建时间：2024-05-27
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 点检任务

DOAN.Admin.WebApi/Controllers/MES/dev/DeviceRepairController.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Service.MES.dev.IService;
-using ZR.Model.MES.dev.Dto;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.MES.dev.Dto;
-using ZR.Model.MES.dev;
+using DOAN.Service.MES.dev.IService;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Model.MES.dev;
 
 //创建时间：2024-05-28
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 报修单

DOAN.Admin.WebApi/Controllers/MES/dev/DeviceRouteInspectionPlanController.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Service.MES.dev.IService;
-using ZR.Model.MES.dev.Dto;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.MES.dev.Dto;
-using ZR.Model.MES.dev;
+using DOAN.Service.MES.dev.IService;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Model.MES.dev;
 
 //创建时间：2024-05-27
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 巡检计划

DOAN.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteController.cs

@@ -1,16 +1,16 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Model.Dto;
+using DOAN.Model.Dto;
 
-using ZR.Service.MES.dev.IService;
-using ZR.Model.MES.dev.Dto;
-using ZR.Admin.WebApi.Filters;
+using DOAN.Service.MES.dev.IService;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Admin.WebApi.Filters;
 using MiniExcelLibs;
-using ZR.Model.MES.dev.Dto;
-using ZR.Model.MES.dev;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Model.MES.dev;
 using Org.BouncyCastle.Crypto;
 
 //创建时间：2024-05-31
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 任务执行

DOAN.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteResultController.cs

@@ -1,14 +1,14 @@
 using Microsoft.AspNetCore.Mvc;
 
 
-using ZR.Model.MES.dev.Dto;
-using ZR.Model.MES.dev;
-using ZR.Service.MES.dev.IService;
-using ZR.Admin.WebApi.Filters;
-using ZR.Service.MES.dev;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Model.MES.dev;
+using DOAN.Service.MES.dev.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Service.MES.dev;
 
 //创建时间：2024-06-11
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 巡检/点检任务结果表

DOAN.Admin.WebApi/Controllers/MES/dev/DeviceTypeController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.MES.dev.Dto;
-using ZR.Model.MES.dev;
-using ZR.Service.MES.dev.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Model.MES.dev;
+using DOAN.Service.MES.dev.IService;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 1.设备类型

DOAN.Admin.WebApi/Controllers/MES/qu/upload/UploadController.cs

@@ -6,12 +6,12 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Collections.Generic;
 using System.IO;
-using ZR.Admin.WebApi.Extensions;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.MES.upload;
-using ZR.Model.System;
-using ZR.Service.quality.upload;
+using DOAN.Admin.WebApi.Extensions;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.MES.upload;
+using DOAN.Model.System;
+using DOAN.Service.quality.upload;
 using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace DOAN.WebApi.Controllers.MES.quality.upload

DOAN.Admin.WebApi/Controllers/System/ArticleCategoryController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Extensions;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.Dto;
-using ZR.Model.System;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Extensions;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.Dto;
+using DOAN.Model.System;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 文章目录Controller

DOAN.Admin.WebApi/Controllers/System/ArticleController.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using ZR.Admin.WebApi.Extensions;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Extensions;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 文章管理

DOAN.Admin.WebApi/Controllers/System/CodeGeneratorController.cs

@@ -1,16 +1,16 @@
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using ZR.Admin.WebApi.Extensions;
-using ZR.Admin.WebApi.Filters;
-using ZR.CodeGenerator;
-using ZR.CodeGenerator.Model;
-using ZR.CodeGenerator.Service;
-using ZR.Model;
-using ZR.Model.System.Dto;
-using ZR.Model.System.Generate;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Extensions;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.CodeGenerator;
+using DOAN.CodeGenerator.Model;
+using DOAN.CodeGenerator.Service;
+using DOAN.Model;
+using DOAN.Model.System.Dto;
+using DOAN.Model.System.Generate;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 代码生成
@@ -269,7 +269,7 @@ namespace ZR.Admin.WebApi.Controllers
                 dto.GenCodePath = Path.Combine(dto.ZipPath, DateTime.Now.ToString("yyyyMMdd"));
             }
             //生成压缩包
-            string zipReturnFileName = $"ZrAdmin.NET-{genTableInfo.TableComment}-{DateTime.Now:MMddHHmmss}.zip";
+            string zipReturnFileName = $"DOANAdmin.NET-{genTableInfo.TableComment}-{DateTime.Now:MMddHHmmss}.zip";
 
             //生成代码到指定文件夹
             CodeGeneratorTool.Generate(dto);

DOAN.Admin.WebApi/Controllers/System/CommonLangController.cs

@@ -1,13 +1,13 @@
 using Infrastructure.Extensions;
 using Microsoft.AspNetCore.Mvc;
 using MiniExcelLibs;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.Dto;
-using ZR.Model.Models;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.Dto;
+using DOAN.Model.Models;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 多语言配置Controller

DOAN.Admin.WebApi/Controllers/System/SysConfigController.cs

@@ -1,13 +1,13 @@
 using Infrastructure.Extensions;
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using ZR.Admin.WebApi.Extensions;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Extensions;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 参数配置Controller

DOAN.Admin.WebApi/Controllers/System/SysDeptController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Collections;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 部门

DOAN.Admin.WebApi/Controllers/System/SysDictDataController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 数据字典信息

DOAN.Admin.WebApi/Controllers/System/SysDictTypeController.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Extensions;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Extensions;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 数据字典信息

DOAN.Admin.WebApi/Controllers/System/SysFileController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 文件存储Controller

DOAN.Admin.WebApi/Controllers/System/SysLoginController.cs

@@ -1,13 +1,13 @@
 using Lazy.Captcha.Core;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.Service.System;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 登录

DOAN.Admin.WebApi/Controllers/System/SysMenuController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 系统菜单

DOAN.Admin.WebApi/Controllers/System/SysNoticeController.cs

@@ -1,14 +1,14 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 using SqlSugar;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
-using ZR.ServiceCore.Signalr;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System.IService;
+using DOAN.ServiceCore.Signalr;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 系统通知

DOAN.Admin.WebApi/Controllers/System/SysPostController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.System;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.System;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 岗位管理

DOAN.Admin.WebApi/Controllers/System/SysProfileController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 个人中心

DOAN.Admin.WebApi/Controllers/System/SysRoleController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 角色信息

DOAN.Admin.WebApi/Controllers/System/SysUserController.cs

@@ -1,13 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
 using MiniExcelLibs;
 using SqlSugar;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 用户管理

DOAN.Admin.WebApi/Controllers/System/SysUserRoleController.cs

@@ -1,9 +1,9 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 用户角色管理

DOAN.Admin.WebApi/Controllers/System/TasksController.cs

@@ -1,13 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
 using Quartz;
 using SqlSugar;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
-using ZR.Tasks;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System.IService;
+using DOAN.Tasks;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 计划任务

DOAN.Admin.WebApi/Controllers/System/TasksLogController.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 任务日志

DOAN.Admin.WebApi/Controllers/System/monitor/MonitorController.cs

@@ -4,7 +4,7 @@ using Microsoft.Extensions.Options;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
-namespace ZR.Admin.WebApi.Controllers.monitor
+namespace DOAN.Admin.WebApi.Controllers.monitor
 {
     /// <summary>
     /// 系统监控

DOAN.Admin.WebApi/Controllers/System/monitor/SqlDiffLogController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System.IService;
 
 //创建时间：2023-08-17
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 数据差异日志

DOAN.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using ZR.Admin.WebApi.Extensions;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.System;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Extensions;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.System;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers.monitor
+namespace DOAN.Admin.WebApi.Controllers.monitor
 {
     /// <summary>
     /// 系统访问记录

DOAN.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Extensions;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+using DOAN.Admin.WebApi.Extensions;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System.Dto;
+using DOAN.Service.System.IService;
 
-namespace ZR.Admin.WebApi.Controllers.monitor
+namespace DOAN.Admin.WebApi.Controllers.monitor
 {
     /// <summary>
     /// 操作日志记录

DOAN.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.System.Dto;
-using ZR.ServiceCore.Signalr;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.System.Dto;
+using DOAN.ServiceCore.Signalr;
 
-namespace ZR.Admin.WebApi.Controllers.monitor
+namespace DOAN.Admin.WebApi.Controllers.monitor
 {
     /// <summary>
     /// 在线用户

DOAN.Admin.WebApi/Controllers/WxOpenController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Web;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 微信公众号

DOAN.Admin.WebApi/DOAN.WebApi.csproj

@@ -18,12 +18,6 @@
 	  <None Remove="wwwroot\cloudUpload\**" />
 	  <None Remove="wwwroot\device\**" />
 	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\ZR.CodeGenerator\ZR.CodeGenerator.csproj" />
-		<ProjectReference Include="..\ZR.Service\ZR.Service.csproj" />
-		<ProjectReference Include="..\ZR.Tasks\ZR.Tasks.csproj" />
-	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Lazy.Captcha.Core" Version="2.0.7" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
@@ -38,6 +32,13 @@
 		<Folder Include="Properties\PublishProfiles\" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <ProjectReference Include="..\DOAN.CodeGenerator\DOAN.CodeGenerator.csproj" />
+	  <ProjectReference Include="..\DOAN.Model\DOAN.Model.csproj" />
+	  <ProjectReference Include="..\DOAN.Service\DOAN.Service.csproj" />
+	  <ProjectReference Include="..\DOAN.Tasks\DOAN.Tasks.csproj" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<None Update="ip2region.db">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>

DOAN.Admin.WebApi/Dockerfile

@@ -17,5 +17,5 @@ RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 #COPY . app/
 WORKDIR /app
 
-#等价于 dotnet ZR.Admin.WebApi.dll，如果不指定启动端口默认在docker里面启动端口是80端口
-ENTRYPOINT ["dotnet", "ZR.Admin.WebApi.dll", "--server.urls","http://*:8888"]
+#等价于 dotnet DOAN.Admin.WebApi.dll，如果不指定启动端口默认在docker里面启动端口是80端口
+ENTRYPOINT ["dotnet", "DOAN.Admin.WebApi.dll", "--server.urls","http://*:8888"]

DOAN.Admin.WebApi/Extensions/SwaggerExtension.cs

@@ -4,7 +4,7 @@ using Swashbuckle.AspNetCore.Filters;
 using Swashbuckle.AspNetCore.SwaggerUI;
 using System.Reflection;
 
-namespace ZR.Admin.WebApi.Extensions
+namespace DOAN.Admin.WebApi.Extensions
 {
     public static class SwaggerExtension
     {
@@ -51,21 +51,21 @@ namespace ZR.Admin.WebApi.Extensions
             {
                 c.SwaggerDoc("sys", new OpenApiInfo
                 {
-                    Title = "ZrAdmin.NET Api",
+                    Title = "DOANAdmin.NET Api",
                     Version = "v1",
                     Description = "系统管理",
-                    Contact = new OpenApiContact { Name = "ZRAdmin doc", Url = new Uri("https://www.izhaorui.cn/doc") }
+                    Contact = new OpenApiContact { Name = "DOANAdmin doc", Url = new Uri("https://www.izhaorui.cn/doc") }
                 });
                 c.SwaggerDoc("article", new OpenApiInfo
                 {
-                    Title = "ZrAdmin.NET Api",
+                    Title = "DOANAdmin.NET Api",
                     Version = "v1",
                     Description = "文章管理",
-                    Contact = new OpenApiContact { Name = "ZRAdmin doc", Url = new Uri("https://www.izhaorui.cn/doc") }
+                    Contact = new OpenApiContact { Name = "DOANAdmin doc", Url = new Uri("https://www.izhaorui.cn/doc") }
                 });
                 c.SwaggerDoc("v1", new OpenApiInfo
                 {
-                    Title = "ZrAdmin.NET Api",
+                    Title = "DOANAdmin.NET Api",
                     Version = "v1",
                     Description = "",
                 });
@@ -74,10 +74,10 @@ namespace ZR.Admin.WebApi.Extensions
                     //var tempPath = hostEnvironment.ContentRootPath;
                     //添加文档注释
                     var baseDir = AppContext.BaseDirectory;
-                    c.IncludeXmlComments(Path.Combine(baseDir, "ZR.Model.xml"), true);
-                    c.IncludeXmlComments(Path.Combine(baseDir, "ZR.ServiceCore.xml"), true);
-                    c.IncludeXmlComments(Path.Combine(baseDir, "ZR.Service.xml"), true);
-                    c.IncludeXmlComments(Path.Combine(baseDir, "ZR.Admin.WebApi.xml"), true);
+                    c.IncludeXmlComments(Path.Combine(baseDir, "DOAN.Model.xml"), true);
+                    c.IncludeXmlComments(Path.Combine(baseDir, "DOAN.ServiceCore.xml"), true);
+                    c.IncludeXmlComments(Path.Combine(baseDir, "DOAN.Service.xml"), true);
+                    c.IncludeXmlComments(Path.Combine(baseDir, "DOAN.Admin.WebApi.xml"), true);
 
                     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
                     var xmlPath = Path.Combine(baseDir, xmlFile);

DOAN.Admin.WebApi/Extensions/TasksExtension.cs

@@ -1,9 +1,9 @@
 using Quartz.Spi;
 using SqlSugar.IOC;
-using ZR.Model.System;
-using ZR.Tasks;
+using DOAN.Model.System;
+using DOAN.Tasks;
 
-namespace ZR.Admin.WebApi.Extensions
+namespace DOAN.Admin.WebApi.Extensions
 {
     /// <summary>
     /// 定时任务扩展方法

DOAN.Admin.WebApi/GlobalUsing.cs

@@ -1,4 +1,4 @@
-global using ZR.Common;
+global using DOAN.Common;
 global using Microsoft.AspNetCore.Authorization;
 global using Infrastructure;
 global using Infrastructure.Attribute;
@@ -7,4 +7,4 @@ global using Infrastructure.Model;
 global using Mapster;
 global using Infrastructure.Extensions;
 global using Infrastructure.Controllers;
-global using ZR.ServiceCore.Middleware;
+global using DOAN.ServiceCore.Middleware;

DOAN.Admin.WebApi/Program.cs

@@ -5,11 +5,11 @@ using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.FileProviders;
 using NLog.Web;
 using System.Text.Json;
-using ZR.Admin.WebApi.Extensions;
-using ZR.Common.Cache;
-using ZR.Infrastructure.WebExtensions;
-using ZR.ServiceCore.Signalr;
-using ZR.ServiceCore.SqlSugar;
+using DOAN.Admin.WebApi.Extensions;
+using DOAN.Common.Cache;
+using DOAN.Infrastructure.WebExtensions;
+using DOAN.ServiceCore.Signalr;
+using DOAN.ServiceCore.SqlSugar;
 
 var builder = WebApplication.CreateBuilder(args);
 // NLog: Setup NLog for Dependency injection

DOAN.Admin.WebApi/Properties/launchSettings.json

@@ -9,7 +9,7 @@
     }
   },
   "profiles": {
-    "ZR.Admin.WebApi": {
+    "DOAN.Admin.WebApi": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchUrl": "",

DOAN.Admin.WebApi/appsettings.Development.json

@@ -35,7 +35,7 @@
     "RefreshTokenTime": 5, //分钟
     "TokenType": "Bearer"
   },
-  "InjectClass": [ "ZR.Repository", "ZR.Service", "ZR.Tasks", "ZR.ServiceCore" ], //自动注入类
+  "InjectClass": [ "DOAN.Repository", "DOAN.Service", "DOAN.Tasks", "DOAN.ServiceCore" ], //自动注入类
   "ShowDbLog": true, //是否打印db日志
   "InitDb": false, //是否初始化db
   "DemoMode": false, //是否演示模式
@@ -76,7 +76,7 @@
     "autoPre": true,
     "author": "admin",
     "tablePrefix": "sys_", //"表前缀（生成类名不会包含表前缀，多个用逗号分隔）",
-    "vuePath": "", //前端代码存储路径eg：D:\Work\ZRAdmin-Vue3
+    "vuePath": "", //前端代码存储路径eg：D:\Work\DOANAdmin-Vue3
     "csharpTypeArr": {
       "string": [ "varchar", "nvarchar", "text", "longtext" ],
       "int": [ "int", "integer", "smallint", "int4", "int8", "int2" ],
@@ -145,7 +145,7 @@
   //钉钉应用
   "dingding": {
     "AppKey": "dingadx9vkznmxpz3zkc",
-    "AppSecret": "2fAF0Ntlkoc-sl8c4gLr-H4XtbhvCSVKrfOGZMuzr2ovwFpw8sqMQaUmSok2CacM",
+    "AppSecret": "2fAF0Ntlkoc-sl8c4gLr-H4XtbhvCSVKrfOGZMuDOAN2ovwFpw8sqMQaUmSok2CacM",
     "SystemToken": "J8C66JD12ZZE0XEW9ZVAHDQYT0JG2W6W56LNL9"
   },
   //宜搭表单

DOAN.Admin.WebApi/appsettings.Production.json

@@ -33,7 +33,7 @@
     "RefreshTokenTime": 5, //分钟
     "TokenType": "Bearer"
   },
-  "InjectClass": [ "ZR.Repository", "ZR.Service", "ZR.Tasks", "ZR.ServiceCore" ], //自动注入类
+  "InjectClass": [ "DOAN.Repository", "DOAN.Service", "DOAN.Tasks", "DOAN.ServiceCore" ], //自动注入类
   "ShowDbLog": true, //是否打印db日志
   "InitDb": false, //是否初始化db
   "DemoMode": false, //是否演示模式
@@ -74,7 +74,7 @@
     "autoPre": true,
     "author": "admin",
     "tablePrefix": "sys_", //"表前缀（生成类名不会包含表前缀，多个用逗号分隔）",
-    "vuePath": "", //前端代码存储路径eg：D:\Work\ZRAdmin-Vue3
+    "vuePath": "", //前端代码存储路径eg：D:\Work\DOANAdmin-Vue3
     "csharpTypeArr": {
       "string": [ "varchar", "nvarchar", "text", "longtext" ],
       "int": [ "int", "integer", "smallint", "int4", "int8", "int2" ],
@@ -142,7 +142,7 @@
   //钉钉应用
   "dingding": {
     "AppKey": "dingadx9vkznmxpz3zkc",
-    "AppSecret": "2fAF0Ntlkoc-sl8c4gLr-H4XtbhvCSVKrfOGZMuzr2ovwFpw8sqMQaUmSok2CacM",
+    "AppSecret": "2fAF0Ntlkoc-sl8c4gLr-H4XtbhvCSVKrfOGZMuDOAN2ovwFpw8sqMQaUmSok2CacM",
     "SystemToken": "J8C66JD12ZZE0XEW9ZVAHDQYT0JG2W6W56LNL9"
   },
   //宜搭表单

DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/MySqlTemplate.txt

@@ -1,4 +1,4 @@
-use ZrAdmin;
+use DOANAdmin;
 
 -- 菜单
 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) 

DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/PgSql.txt

@@ -1,4 +1,4 @@
-use ZrAdmin;
+use DOANAdmin;
 
 -- ${genTable.functionName}菜单
 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) 

DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/SqlTemplate.txt

@@ -1,4 +1,4 @@
-use ZrAdmin;
+use DOANAdmin;
 
 -- ${genTable.functionName}菜单
 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) 

DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Admin.WebApi/Controllers/Business/DeviceTaskExecuteResult1Controller.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Model.Dto;
-using ZR.Model.Business;
-using ZR.Service.Business.IBusinessService;
-using ZR.Admin.WebApi.Filters;
+using DOAN.Model.Dto;
+using DOAN.Model.Business;
+using DOAN.Service.Business.IBusinessService;
+using DOAN.Admin.WebApi.Filters;
 
 //创建时间：2024-06-11
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 巡检/点检任务结果表

DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Model/Dto/Business/DeviceTaskExecuteResult1Dto.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace ZR.Model.Dto
+namespace DOAN.Model.Dto
 {
     /// <summary>
     /// 巡检/点检任务结果表查询对象

DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Model/Models/Business/DeviceTaskExecuteResult1.cs

@@ -1,5 +1,5 @@
 
-namespace ZR.Model.Business
+namespace DOAN.Model.Business
 {
     /// <summary>
     /// 巡检/点检任务结果表

DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Service/Business/DeviceTaskExecuteResult1Service.cs

@@ -2,14 +2,14 @@ using System;
 using SqlSugar;
 using Infrastructure.Attribute;
 using Infrastructure.Extensions;
-using ZR.Model;
-using ZR.Model.Dto;
-using ZR.Model.Business;
-using ZR.Repository;
-using ZR.Service.Business.IBusinessService;
+using DOAN.Model;
+using DOAN.Model.Dto;
+using DOAN.Model.Business;
+using DOAN.Repository;
+using DOAN.Service.Business.IBusinessService;
 using System.Linq;
 
-namespace ZR.Service.Business
+namespace DOAN.Service.Business
 {
     /// <summary>
     /// 巡检/点检任务结果表Service业务层处理

DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Service/Business/IBusinessService/IDeviceTaskExecuteResult1Service.cs

@@ -1,10 +1,10 @@
 using System;
-using ZR.Model;
-using ZR.Model.Dto;
-using ZR.Model.Business;
+using DOAN.Model;
+using DOAN.Model.Dto;
+using DOAN.Model.Business;
 using System.Collections.Generic;
 
-namespace ZR.Service.Business.IBusinessService
+namespace DOAN.Service.Business.IBusinessService
 {
     /// <summary>
     /// 巡检/点检任务结果表service接口

DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/sql/DeviceTaskExecuteResult1.sql

@@ -1,4 +1,4 @@
-use ZrAdmin;
+use DOANAdmin;