From 427ada4f925cf8471edad3a6a2767c60cb109470 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 16 Nov 2026 17:20:27 +0800 Subject: [PATCH] =?UTF-8?q?2026-11-16=20=E6=8A=A5=E8=A1=A8=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductionReportController.java | 16 ++++ .../shopOrder/dao/ProductionReportMapper.java | 3 + .../Impl/ProductionReportServiceImpl.java | 89 ++++++++++++------- .../service/ProductionReportService.java | 2 + .../shopOrder/ProductionReportMapper.xml | 4 + 5 files changed, 84 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java b/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java index 8964ada..d991fe3 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java +++ b/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java @@ -1,13 +1,17 @@ package com.gaotao.modules.shopOrder.controller; +import com.gaotao.common.utils.R; import com.gaotao.modules.base.entity.WorkCenterData; import com.gaotao.modules.pda.utils.ResponseData; import com.gaotao.modules.rollNoReview.data.SFDCRollsOutData; import com.gaotao.modules.shopOrder.entity.*; import com.gaotao.modules.shopOrder.entity.SfdcRollsReportExecuteData; import com.gaotao.modules.shopOrder.service.ProductionReportService; +import com.gaotao.modules.sys.entity.SysUserEntity; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -292,6 +296,18 @@ public class ProductionReportController { return responseData; } + /** + * 当前登录人在 AccessSite 中的工厂权限。 + */ + @GetMapping("/getSiteList") + @ResponseBody + public R getSiteList() { + Object principal = SecurityUtils.getSubject().getPrincipal(); + String userName = principal instanceof SysUserEntity ? ((SysUserEntity) principal).getUsername() : ""; + List siteList = productionReportService.getAccessSiteList(userName); + return R.ok().put("siteList", siteList); + } + /** * 面损明细。返回列名顺序与存储过程一致。 */ diff --git a/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java b/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java index 68eb08b..08b8bfb 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java +++ b/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java @@ -4,6 +4,7 @@ import com.gaotao.modules.base.entity.WorkCenterData; import com.gaotao.modules.rollNoReview.data.SFDCRollsOutData; import com.gaotao.modules.shopOrder.entity.*; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -157,4 +158,6 @@ public interface ProductionReportMapper { java.util.List> getOrderRollDefectReport(OrderRollDefectReportQuery query); java.util.List> getOrderDowntimeReport(OrderRollDefectReportQuery query); + + List getAccessSiteList(@Param("userName") String userName); } diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java index 13cc7fd..d0d4b54 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java +++ b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java @@ -215,25 +215,15 @@ public class ProductionReportServiceImpl implements ProductionReportService { @Override public Map getOrderRollDefectReport(OrderRollDefectReportQuery query) { - if (query == null || query.getSite() == null || query.getSite().trim().isEmpty()) { - throw new XJException("工厂编码不能为空"); - } - if (query.getStartDate() == null || query.getStartDate().trim().isEmpty() - || query.getEndDate() == null || query.getEndDate().trim().isEmpty()) { - throw new XJException("请选择报告日期"); - } - query.setSite(query.getSite().trim()); - query.setOrderNo(blankToEmpty(query.getOrderNo())); - query.setSeqNo(blankToEmpty(query.getSeqNo())); - query.setWorkCenter(blankToEmpty(query.getWorkCenter())); - query.setResource(blankToEmpty(query.getResource())); - query.setStartDate(normalizeReportDate(query.getStartDate(), false)); - query.setEndDate(normalizeReportDate(query.getEndDate(), true)); - + prepareReportQuery(query); List> rows = productionReportMapper.getOrderRollDefectReport(query); if (rows == null) { rows = new ArrayList<>(); } + String procedureMessage = procedureRejectMessage(rows); + if (procedureMessage != null) { + throw new XJException(procedureMessage); + } SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); List columns = new ArrayList<>(ORDER_ROLL_DEFECT_FIXED_COLUMNS); if (!rows.isEmpty()) { @@ -262,25 +252,15 @@ public class ProductionReportServiceImpl implements ProductionReportService { @Override public Map getOrderDowntimeReport(OrderRollDefectReportQuery query) { - if (query == null || query.getSite() == null || query.getSite().trim().isEmpty()) { - throw new XJException("工厂编码不能为空"); - } - if (query.getStartDate() == null || query.getStartDate().trim().isEmpty() - || query.getEndDate() == null || query.getEndDate().trim().isEmpty()) { - throw new XJException("请选择创建日期"); - } - query.setSite(query.getSite().trim()); - query.setOrderNo(blankToEmpty(query.getOrderNo())); - query.setSeqNo(blankToEmpty(query.getSeqNo())); - query.setWorkCenter(blankToEmpty(query.getWorkCenter())); - query.setResource(blankToEmpty(query.getResource())); - query.setStartDate(normalizeReportDate(query.getStartDate(), false)); - query.setEndDate(normalizeReportDate(query.getEndDate(), true)); - + prepareReportQuery(query); List> rows = productionReportMapper.getOrderDowntimeReport(query); if (rows == null) { rows = new ArrayList<>(); } + String procedureMessage = procedureRejectMessage(rows); + if (procedureMessage != null) { + throw new XJException(procedureMessage); + } SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); List> normalizedRows = new ArrayList<>(); for (LinkedHashMap row : rows) { @@ -332,11 +312,60 @@ public class ProductionReportServiceImpl implements ProductionReportService { } } + @Override + public List getAccessSiteList(String userName) { + if (userName == null || userName.trim().isEmpty()) { + return new ArrayList<>(); + } + List siteList = productionReportMapper.getAccessSiteList(userName.trim()); + return siteList == null ? new ArrayList<>() : siteList; + } + + private void prepareReportQuery(OrderRollDefectReportQuery query) { + if (query == null) { + throw new XJException("查询条件不能为空"); + } + query.setSite(blankToEmpty(query.getSite())); + query.setOrderNo(blankToEmpty(query.getOrderNo())); + query.setSeqNo(blankToEmpty(query.getSeqNo())); + query.setWorkCenter(blankToEmpty(query.getWorkCenter())); + query.setResource(blankToEmpty(query.getResource())); + query.setStartDate(normalizeReportDate(query.getStartDate(), false)); + query.setEndDate(normalizeReportDate(query.getEndDate(), true)); + } + + private String procedureRejectMessage(List> rows) { + if (rows == null || rows.isEmpty()) { + return null; + } + Object code = mapValue(rows.get(0), "resultCode"); + if (code == null || !"400".equals(String.valueOf(code).trim())) { + return null; + } + Object message = mapValue(rows.get(0), "resultMsg"); + return message == null || String.valueOf(message).trim().isEmpty() ? "请输入筛选条件后再试!" : String.valueOf(message); + } + + private Object mapValue(Map row, String name) { + if (row.containsKey(name)) { + return row.get(name); + } + for (Map.Entry entry : row.entrySet()) { + if (entry.getKey() != null && entry.getKey().equalsIgnoreCase(name)) { + return entry.getValue(); + } + } + return null; + } + private String blankToEmpty(String value) { return value == null ? "" : value.trim(); } private String normalizeReportDate(String value, boolean endOfDay) { + if (value == null || value.trim().isEmpty()) { + return ""; + } String text = value.trim(); if (text.length() == 10) { return text + (endOfDay ? " 23:59:59" : " 00:00:00"); diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java b/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java index 200dcb5..d1b11c1 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java +++ b/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java @@ -140,4 +140,6 @@ public interface ProductionReportService { * 停机明细。前六列固定,其后为动态停机类型列。 */ java.util.Map getOrderDowntimeReport(OrderRollDefectReportQuery query); + + List getAccessSiteList(String userName); } diff --git a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml index c63710c..f6c5122 100644 --- a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml +++ b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml @@ -670,6 +670,10 @@ + +