diff --git a/server/ZR.Service/Business/OdfCableFaultsService.cs b/server/ZR.Service/Business/OdfCableFaultsService.cs index 1d6c2c1..16f3d3e 100644 --- a/server/ZR.Service/Business/OdfCableFaultsService.cs +++ b/server/ZR.Service/Business/OdfCableFaultsService.cs @@ -24,7 +24,8 @@ namespace ZR.Service.Business { var predicate = QueryExp(parm); - var response = Queryable() + var total = 0; + var list = Queryable() .Where(predicate.ToExpression()) .LeftJoin((f, c) => f.CableId == c.Id) .OrderByDescending((f, c) => f.FaultTime) @@ -43,9 +44,16 @@ namespace ZR.Service.Business f.CreatedAt, CableName = c.CableName }) - .ToPage(parm); + .MergeTable() + .ToPageList(parm.PageNum, parm.PageSize, ref total); - return response; + return new PagedInfo + { + Result = list.Cast().ToList(), + TotalNum = total, + PageIndex = parm.PageNum, + PageSize = parm.PageSize + }; } /// diff --git a/server/ZR.Service/Business/OdfCheckinService.cs b/server/ZR.Service/Business/OdfCheckinService.cs index b2613cd..714ab55 100644 --- a/server/ZR.Service/Business/OdfCheckinService.cs +++ b/server/ZR.Service/Business/OdfCheckinService.cs @@ -1,3 +1,4 @@ +using Infrastructure; using Infrastructure.Attribute; using ZR.Model; using ZR.Model.Business; diff --git a/server/ZR.Vue/Dockerfile b/server/ZR.Vue/Dockerfile new file mode 100644 index 0000000..a9d3ee2 --- /dev/null +++ b/server/ZR.Vue/Dockerfile @@ -0,0 +1,14 @@ +# 构建阶段 +FROM node:20-alpine AS build +WORKDIR /app +COPY package*.json ./ +RUN rm -f package-lock.json && npm install +COPY . . +RUN npm run build:prod + +# 生产阶段 +FROM nginx:alpine +COPY --from=build /app/dist /usr/share/nginx/html +COPY nginx.conf /etc/nginx/conf.d/default.conf +EXPOSE 80 +CMD ["nginx", "-g", "daemon off;"] diff --git a/server/ZR.Vue/nginx.conf b/server/ZR.Vue/nginx.conf new file mode 100644 index 0000000..121c279 --- /dev/null +++ b/server/ZR.Vue/nginx.conf @@ -0,0 +1,27 @@ +server { + listen 80; + server_name localhost; + root /usr/share/nginx/html; + index index.html; + + location / { + try_files $uri $uri/ /index.html; + } + + location /prod-api/ { + proxy_pass http://odf-new-server:8888/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + + location /msghub { + proxy_pass http://odf-new-server:8888/msghub; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + } +}