From ee530992793ed7d0b7f16f1ce07b6c53ae265068 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 22 七月 2025 13:56:40 +0800
Subject: [PATCH] art: 技术状态变更申请-字典转译
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 1529 ++++++++++++++--------------------------------------------
1 files changed, 367 insertions(+), 1,162 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index e4dc0fb..c9b3516 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -1,1199 +1,404 @@
package org.jeecg.modules.eam.controller;
-import java.time.LocalDate;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.dto.message.MessageDTO;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.PermissionData;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.api.ISysBaseAPI;
-import org.jeecg.common.system.base.entity.SysUpload;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.base.entity.Constructor;
-import org.jeecg.modules.base.service.IConstructorService;
-import org.jeecg.modules.base.service.IFactoryModelService;
-import org.jeecg.modules.eam.entity.*;
-import org.jeecg.modules.eam.model.DepartVo;
-import org.jeecg.modules.eam.model.MaintenanceCycleVo;
-import org.jeecg.modules.eam.service.*;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
-
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.service.ISysDepartService;
-import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TranslateDictTextUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.dto.EamEquipmentDto;
+import org.jeecg.modules.eam.entity.EamEquipment;
+import org.jeecg.modules.eam.entity.EamEquipmentExtend;
+import org.jeecg.modules.eam.request.EamEquipmentQuery;
+import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.eam.vo.EamEquipmentTree;
+import org.jeecg.modules.eam.vo.EquipmentSearchResult;
+import org.jeecg.modules.system.entity.BaseFactory;
+import org.jeecg.modules.system.entity.EamBaseRepairDepart;
+import org.jeecg.modules.system.service.IBaseFactoryService;
+import org.jeecg.modules.system.service.IEamBaseRepairDepartService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
- /**
- * @Description: mom_eam_equipment
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: 璁惧鍙拌处
* @Author: jeecg-boot
- * @Date: 2023-03-23
+ * @Date: 2025-03-19
* @Version: V1.0
*/
-@Api(tags="mom_eam_equipment")
+@Slf4j
+@Api(tags = "璁惧鍙拌处")
@RestController
@RequestMapping("/eam/equipment")
-@Slf4j
-public class EamEquipmentController extends JeecgController<Equipment, IEamEquipmentService> {
- @Autowired
- private IEamEquipmentService equipmentService;
+public class EamEquipmentController extends JeecgController<EamEquipment, IEamEquipmentService> {
+ @Autowired
+ private IEamEquipmentService eamEquipmentService;
- @Autowired
- private IPrecisionParametersTemplateDetailService precisionParametersTemplateDetailService;
+ @Autowired
+ private IEamEquipmentExtendService eamEquipmentExtendService;
- @Autowired
- private IProcessParametersTemplateDetailService processParametersTemplateDetailService;
+// @Autowired
+// private IMdcEquipmentService mdcEquipmentService;
- @Autowired
- private IEquipmentProcessParametersService equipmentProcessParametersService;
-
- @Autowired
- private IEquipmentPrecisionParametersService equipmentPrecisionParametersService;
-
- @Autowired
- private IPrecisionParametersTemplateService precisionParametersTemplateService;
-
- @Autowired
- private IProcessParametersTemplateService processParametersTemplateService;
-
- @Autowired
- private ISysBaseAPI sysBaseApi;
-
- @Autowired
- @Lazy
- private IEquipmentSealDetailService equipmentSealDetailService;
-
- @Autowired
- @Lazy
- private IInspectionOrderDetailService inspectionOrderDetailService;
-
- @Autowired
- @Lazy
- private ISpecialtyInspectionOrderDetailService specialtyInspectionOrderDetailService;
-
- @Autowired
- private ICalibrationOrderDetailService calibrationOrderDetailService;
-
- @Autowired
- private ICalibrationOrderReportService calibrationOrderReportService;
-
- @Autowired
- private IEquipmentCategoryService equipmentCategoryService;
-
- @Autowired
- private ISysDepartService departService;
-
- @Autowired
- private ITeamService teamService;
-
- @Autowired
- private IConstructorService constructorService;
-
- @Autowired
- private IAreaService areaService;
-
- @Autowired
- private IDailyInspectionStandardService dailyInspectionStandardService;
-
- @Autowired
- private IMaintenanceStandardService maintenanceStandardService;
-
- @Autowired
- private ISysUserService sysUserService;
-
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param equipment
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<Equipment>> queryPageList(Equipment equipment,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- //QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
- QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
- if(StringUtils.isNotBlank(equipment.getNum())){
- queryWrapper.like("num",equipment.getNum());
- }
- if(StringUtils.isNotBlank(equipment.getName())){
- queryWrapper.like("name",equipment.getName());
- }
- if(StringUtils.isNotBlank(equipment.getEquipmentStatus())){
- queryWrapper.eq("equipment_status",equipment.getEquipmentStatus());
- }
- if(StringUtils.isNotBlank(equipment.getTechnologyStatus())){
- queryWrapper.eq("technology_status",equipment.getTechnologyStatus());
- }
- if(StringUtils.isNotBlank(equipment.getEquipmentCategoryId())){
- queryWrapper.eq("equipment_category_id",equipment.getEquipmentCategoryId());
- }
- List<String> userWorkCenterIds = getUserWorkCenterIds();
- if(CollectionUtils.isNotEmpty(userWorkCenterIds)) {
- queryWrapper.in("work_center_id",userWorkCenterIds);
- }
- if(StringUtils.isNotBlank(equipment.getWorkCenterId())){
- queryWrapper.eq("work_center_id",equipment.getWorkCenterId());
- }
- queryWrapper.isNull("line_id");
- queryWrapper.eq("status","1");
- queryWrapper.eq("del_flag",0);
- queryWrapper.orderByDesc("create_time");
-
- Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
- IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
- List<Equipment> equipmentList = pageList.getRecords();
- for (Equipment eq : equipmentList) {
- String precisionParametersTemplateId = eq.getPrecisionParametersTemplateId();
- if(StringUtils.isNotBlank(precisionParametersTemplateId)){
- PrecisionParametersTemplate precisionParametersTemplate = precisionParametersTemplateService.getById(precisionParametersTemplateId);
- if(precisionParametersTemplate != null){
- eq.setPrecisionParametersTemplateName(precisionParametersTemplate.getName());
- }else{
- eq.setPrecisionParametersTemplateName("");
- }
- }else{
- eq.setPrecisionParametersTemplateName("");
- }
-
- String processParametersTemplateId = eq.getProcessParametersTemplateId();
- if(StringUtils.isNotBlank(processParametersTemplateId)){
- ProcessParametersTemplate processParametersTemplate = processParametersTemplateService.getById(processParametersTemplateId);
- if(processParametersTemplate != null){
- eq.setProcessParametersTemplateName(processParametersTemplate.getName());
- }else{
- eq.setProcessParametersTemplateName("");
- }
- }else{
- eq.setProcessParametersTemplateName("");
- }
- //鏌ヨ灏佸瓨鍘熷洜鍜屽皝瀛樻棩鏈�
- List<EquipmentSealDetail> equipmentSealDetailList = equipmentSealDetailService.lambdaQuery().eq(EquipmentSealDetail::getEquipmentId,eq.getId())
- .eq(EquipmentSealDetail::getDelFlag, CommonConstant.DEL_FLAG_0).orderByDesc(EquipmentSealDetail::getCreateTime).list();
- if(CollectionUtils.isNotEmpty(equipmentSealDetailList)){
- eq.setSealReason(equipmentSealDetailList.get(0).getSealReason());
- eq.setSealDate(equipmentSealDetailList.get(0).getSealDate());
- }
- }
- return Result.OK(pageList);
- }
-
- @ApiOperation(value="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/showEquipmentList")
- public Result<IPage<Equipment>> showEquipmentList(Equipment equipment,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
- if(StringUtils.isNotBlank(equipment.getNum())){
- queryWrapper.like("num",equipment.getNum());
- }
- if(StringUtils.isNotBlank(equipment.getName())){
- queryWrapper.like("name",equipment.getName());
- }
-// queryWrapper.eq("equipment_status","1");
- queryWrapper.in("technology_status","qualified","limitedUse");
- queryWrapper.eq("status","1");
- queryWrapper.eq("del_flag",0);
- queryWrapper.orderByDesc("create_time");
-
- Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
- IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- @ApiOperation(value="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/findEquipmentList")
- public Result<IPage<Equipment>> findEquipmentList(Equipment equipment,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
- if(StringUtils.isNotBlank(equipment.getNum())){
- queryWrapper.like("num",equipment.getNum());
- }
- if(StringUtils.isNotBlank(equipment.getName())){
- queryWrapper.like("name",equipment.getName());
- }
-// queryWrapper.eq("equipment_status","1");
- queryWrapper.in("technology_status","qualified","limitedUse");
- queryWrapper.in("equipment_importance_id","A","B","C");
- queryWrapper.eq("status","1");
- queryWrapper.eq("del_flag",0);
- queryWrapper.orderByDesc("create_time");
-
- Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
- IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
-
- @ApiOperation(value="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/queryEquipmentList")
- public Result<IPage<Equipment>> queryEquipmentList(Equipment equipment,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
- if(StringUtils.isNotBlank(equipment.getNum())){
- queryWrapper.like("num",equipment.getNum());
- }
- if(StringUtils.isNotBlank(equipment.getName())){
- queryWrapper.like("name",equipment.getName());
- }
- queryWrapper.eq("use_id",equipment.getUseId());
- queryWrapper.eq("del_flag",0);
- queryWrapper.orderByDesc("create_time");
-
- Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
- IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
-
- /**
- * 璁惧淇濅慨 鑾峰彇璁惧鍒楄〃缁勪欢
- * qsw 2023-7-14
- */
-
- @GetMapping(value = "/getEquipmentList")
- @PermissionData
- public Result<IPage<Equipment>> getEquipmentList(Equipment equipment,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
- Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
- IPage<Equipment> pageList = equipmentService.getEquipmentList(page, equipment);
- return Result.OK(pageList);
- }
-
- /**
- * 璁惧淇濅慨 鑾峰彇璁惧鍒楄〃缁勪欢
- * qsw 2023-7-14
- */
- @GetMapping(value = "/getEquipmentTZList")
- @PermissionData
- public Result<IPage<Equipment>> getEquipmentTZList(Equipment equipment,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- //QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
- Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
- IPage<Equipment> pageList = equipmentService.getEquipmentTZList(page, equipment);
- List<Equipment> list = pageList.getRecords();
- list.forEach(equip -> {
- String id = equip.getId();
- List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
- .eq(DailyInspectionStandard::getEquipmentId, id)
- .eq(DailyInspectionStandard::getVersionStatus, "2")
- .list();
- if (dailyInspectionStandards.size() > 0) {
- equip.setYseNoInspectionStandard("0");
- } else {
- equip.setYseNoInspectionStandard("1");
- }
- List<MaintenanceStandard> maintenance2Standards = maintenanceStandardService.lambdaQuery()
- .eq(MaintenanceStandard::getEquipmentId, id)
- .eq(MaintenanceStandard::getMaintenanceType, "2")
- .eq(MaintenanceStandard::getVersionStatus, "2").list();
- if (maintenance2Standards.size() > 0) {
- equip.setYseNoMaintenance2Standard("0");
- } else {
- equip.setYseNoMaintenance2Standard("1");
- }
-
- List<MaintenanceStandard> maintenance3Standards = maintenanceStandardService.lambdaQuery()
- .eq(MaintenanceStandard::getEquipmentId, id)
- .eq(MaintenanceStandard::getMaintenanceType, "3")
- .eq(MaintenanceStandard::getVersionStatus, "2").list();
- if (maintenance3Standards.size() > 0) {
- equip.setYseNoMaintenance3Standard("0");
- } else {
- equip.setYseNoMaintenance3Standard("1");
- }
- });
- return Result.OK(pageList);
- }
-
- @GetMapping(value = "/pageEquipment")
- public Result<IPage<Equipment>> pageEquipment(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
- IPage<Equipment> pageList = equipmentService.pageEquipment(pageNo, pageSize, params);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param equipment
- * @return
- */
- @AutoLog(value = "mom_eam_equipment-娣诲姞")
- @ApiOperation(value="mom_eam_equipment-娣诲姞", notes="mom_eam_equipment-娣诲姞")
- @PostMapping(value = "/add")
- @Transactional(rollbackFor = { Exception.class })
- public Result<String> add(@RequestBody Equipment equipment) {
- //涓嬫涓変繚鏃ユ湡澶勭悊
- if(equipment.getThirdMaintenanceTime() == null && equipment.getAcceptanceCheckDate() != null && StringUtils.isNotBlank(equipment.getCheckPeriod())){
- //濡傛灉娌℃湁涓変繚鏃ユ湡 鎸夌収楠屾敹鏃ユ湡璁＄畻涓嬫涓変繚鏃ユ湡
- int checkPeriod = Integer.parseInt(equipment.getCheckPeriod()) - 1;
- LocalDate acceptanceCheckDate = LocalDate.parse(equipment.getAcceptanceCheckDate());
- LocalDate localDate = acceptanceCheckDate.plusDays(checkPeriod);
- Date date = DateUtils.str2Date(localDate.toString(), DateUtils.date_sdf.get());
- equipment.setNextThirdMaintenanceTime(date);
- }else if(equipment.getThirdMaintenanceTime() != null && StringUtils.isNotBlank(equipment.getCheckPeriod())){
- //濡傛灉鏈変笁淇濇棩鏈� 鍒欎娇鐢ㄤ笁淇濇棩鏈熻绠� 涓嬫涓変繚鏃ユ湡
- int checkPeriod = Integer.parseInt(equipment.getCheckPeriod()) - 1;
- Date date = DateUtils.getDayAfter(equipment.getThirdMaintenanceTime(), checkPeriod);
- equipment.setNextThirdMaintenanceTime(date);
- }
- equipmentService.save(equipment);
- //鑾峰彇宸ヨ壓鍙傛暟妯℃澘鏄庣粏
- String processParametersTemplateId = equipment.getProcessParametersTemplateId();
- List<ProcessParametersTemplateDetail> processParameters = processParametersTemplateDetailService.lambdaQuery()
- .eq(ProcessParametersTemplateDetail::getProcessParametersTemplateId, processParametersTemplateId)
- .eq(ProcessParametersTemplateDetail::getDelFlag, 0).list();
- for (ProcessParametersTemplateDetail processParameter : processParameters) {
- EquipmentProcessParameters equipmentProcessParameters = new EquipmentProcessParameters();
- equipmentProcessParameters.setEquipmentId(equipment.getId());
- equipmentProcessParameters.setProcessParametersId(processParameter.getProcessParametersId());
- equipmentProcessParametersService.save(equipmentProcessParameters);
- }
- //鑾峰彇璁惧绮惧害鍙傛暟妯℃澘鏄庣粏
- String precisionParametersTemplateId = equipment.getPrecisionParametersTemplateId();
- List<PrecisionParametersTemplateDetail> precisionParameters = precisionParametersTemplateDetailService.lambdaQuery()
- .eq(PrecisionParametersTemplateDetail::getPrecisionParametersTemplateId, precisionParametersTemplateId)
- .eq(PrecisionParametersTemplateDetail::getDelFlag, 0).list();
- for (PrecisionParametersTemplateDetail precisionParameter : precisionParameters) {
- EquipmentPrecisionParameters equipmentPrecisionParameters = new EquipmentPrecisionParameters();
- equipmentPrecisionParameters.setEquipmentId(equipment.getId());
- equipmentPrecisionParameters.setPrecisionParametersId(precisionParameter.getPrecisionParametersId());
- equipmentPrecisionParametersService.save(equipmentPrecisionParameters);
- }
-
- List<SysUpload> sysUploads = equipment.getSysUploadList();
- if (sysUploads!= null){
-// uploadRelaService.saveOrUpdateUploadRale(equipment.getId(), "equipment_photo",sysUploads.get(0).getId());
- sysBaseApi.saveOrUpdateUploadRale(equipment.getId(), "equipment_photo",sysUploads.get(0).getId());
- }
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param equipment
- * @return
- */
- @AutoLog(value = "mom_eam_equipment-缂栬緫")
- @ApiOperation(value="mom_eam_equipment-缂栬緫", notes="mom_eam_equipment-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- @Transactional(rollbackFor = { Exception.class })
- public Result<String> edit(@RequestBody Equipment equipment) {
-
- List<EquipmentProcessParameters> proParameters = equipmentProcessParametersService.lambdaQuery()
- .eq(EquipmentProcessParameters::getEquipmentId, equipment.getId())
- .eq(EquipmentProcessParameters::getDelFlag, 0).list();
- for (EquipmentProcessParameters proParameter : proParameters) {
- equipmentProcessParametersService.removeById(proParameter);
- }
-
- List<EquipmentPrecisionParameters> preParameters = equipmentPrecisionParametersService.lambdaQuery()
- .eq(EquipmentPrecisionParameters::getEquipmentId, equipment.getId())
- .eq(EquipmentPrecisionParameters::getDelFlag, 0).list();
- for (EquipmentPrecisionParameters preParameter : preParameters) {
- equipmentPrecisionParametersService.removeById(preParameter);
- }
-
- //鑾峰彇宸ヨ壓鍙傛暟妯℃澘鏄庣粏
- String processParametersTemplateId = equipment.getProcessParametersTemplateId();
- List<ProcessParametersTemplateDetail> processParameters = processParametersTemplateDetailService.lambdaQuery()
- .eq(ProcessParametersTemplateDetail::getProcessParametersTemplateId, processParametersTemplateId)
- .eq(ProcessParametersTemplateDetail::getDelFlag, 0).list();
- for (ProcessParametersTemplateDetail processParameter : processParameters) {
- EquipmentProcessParameters equipmentProcessParameters = new EquipmentProcessParameters();
- equipmentProcessParameters.setEquipmentId(equipment.getId());
- equipmentProcessParameters.setProcessParametersId(processParameter.getProcessParametersId());
- equipmentProcessParametersService.save(equipmentProcessParameters);
- }
- //鑾峰彇璁惧绮惧害鍙傛暟妯℃澘鏄庣粏
- String precisionParametersTemplateId = equipment.getPrecisionParametersTemplateId();
- List<PrecisionParametersTemplateDetail> precisionParameters = precisionParametersTemplateDetailService.lambdaQuery()
- .eq(PrecisionParametersTemplateDetail::getPrecisionParametersTemplateId, precisionParametersTemplateId)
- .eq(PrecisionParametersTemplateDetail::getDelFlag, 0).list();
- for (PrecisionParametersTemplateDetail precisionParameter : precisionParameters) {
- EquipmentPrecisionParameters equipmentPrecisionParameters = new EquipmentPrecisionParameters();
- equipmentPrecisionParameters.setEquipmentId(equipment.getId());
- equipmentPrecisionParameters.setPrecisionParametersId(precisionParameter.getPrecisionParametersId());
- equipmentPrecisionParametersService.save(equipmentPrecisionParameters);
- }
-
- //涓嬫涓変繚鏃ユ湡澶勭悊
- if(equipment.getThirdMaintenanceTime() == null && equipment.getAcceptanceCheckDate() != null && StringUtils.isNotBlank(equipment.getCheckPeriod())){
- //濡傛灉娌℃湁涓変繚鏃ユ湡 鎸夌収楠屾敹鏃ユ湡璁＄畻涓嬫涓変繚鏃ユ湡
- int checkPeriod = Integer.parseInt(equipment.getCheckPeriod()) - 1;
- LocalDate acceptanceCheckDate = LocalDate.parse(equipment.getAcceptanceCheckDate());
- LocalDate localDate = acceptanceCheckDate.plusDays(checkPeriod);
- Date date = DateUtils.str2Date(localDate.toString(), DateUtils.date_sdf.get());
- equipment.setNextThirdMaintenanceTime(date);
- }else if(equipment.getThirdMaintenanceTime() != null && StringUtils.isNotBlank(equipment.getCheckPeriod())){
- //濡傛灉鏈変笁淇濇棩鏈� 鍒欎娇鐢ㄤ笁淇濇棩鏈熻绠� 涓嬫涓変繚鏃ユ湡
- int checkPeriod = Integer.parseInt(equipment.getCheckPeriod()) - 1;
- Date date = DateUtils.getDayAfter(equipment.getThirdMaintenanceTime(), checkPeriod);
- equipment.setNextThirdMaintenanceTime(date);
- }
-
- equipmentService.updateById(equipment);
-
- List<SysUpload> sysUploads = equipment.getSysUploadList();
- if (sysUploads!= null){
-// uploadRelaService.saveOrUpdateUploadRale(equipment.getId(), "equipment_photo",sysUploads.get(0).getId());
- sysBaseApi.saveOrUpdateUploadRale(equipment.getId(), "equipment_photo",sysUploads.get(0).getId());
- }
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "mom_eam_equipment-閫氳繃id鍒犻櫎")
- @ApiOperation(value="mom_eam_equipment-閫氳繃id鍒犻櫎", notes="mom_eam_equipment-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_eam_equipment:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- Equipment equipment = equipmentService.getById(id);
- equipmentService.update(new UpdateWrapper<Equipment>().eq("line_id",id).set("line_id",null).set("is_meta",null));
- equipment.setDelFlag(1);
- equipmentService.updateById(equipment);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "mom_eam_equipment-鎵归噺鍒犻櫎")
- @ApiOperation(value="mom_eam_equipment-鎵归噺鍒犻櫎", notes="mom_eam_equipment-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_eam_equipment:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- List<String> stringList = Arrays.asList(ids.split(","));
- for (String id : stringList) {
- Equipment equipment = equipmentService.getById(id);
- equipment.setDelFlag(1);
- equipmentService.updateById(equipment);
- }
-// this.equipmentService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "mom_eam_equipment-閫氳繃id鏌ヨ")
- @ApiOperation(value="mom_eam_equipment-閫氳繃id鏌ヨ", notes="mom_eam_equipment-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<Equipment> queryById(@RequestParam(name="id",required=true) String id) {
- Equipment equipment = equipmentService.getById(id);
- if(equipment==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(equipment);
- }
-
+ @Autowired
+ private ObjectMapper objectMapper;
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
+ @Autowired
+ private IBaseFactoryService baseFactoryService;
+ @Autowired
+ private IEamBaseRepairDepartService eamBaseRepairDepartService;
/**
- * 瀵煎嚭excel
- *
- * @param request
- * @param equipment
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_eam_equipment:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, Equipment equipment) {
- return super.exportXls(request, equipment, Equipment.class, "璁惧鍙拌处瀵煎嚭");
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param eamEquipment
+ * @param pageNo
+ * @param pageSize
+ * @return
+ */
+// @AutoLog(value = "璁惧鍙拌处-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "璁惧鍙拌处-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧鍙拌处-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(EamEquipmentQuery eamEquipment,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+// QueryWrapper<EamEquipment> queryWrapper = QueryGenerator.initQueryWrapper(eamEquipment, req.getParameterMap());
+ IPage<EamEquipment> page = new Page<>(pageNo, pageSize);
+ IPage<EamEquipment> pageList = eamEquipmentService.queryPageList(page, eamEquipment);
+ return Result.OK(pageList);
}
-// /**
-// * 閫氳繃excel瀵煎叆鏁版嵁
-// *
-// * @param request
-// * @param response
-// * @return
-// */
-// //@RequiresPermissions("mom_eam_equipment:importExcel")
-// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-// public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-// return super.importExcel(request, response, Equipment.class);
-// }
+ /**
+ * 娣诲姞
+ *
+ * @param eamEquipment
+ * @return
+ */
+// @AutoLog(value = "璁惧鍙拌处-娣诲姞")
+ @ApiOperation(value = "璁惧鍙拌处-娣诲姞", notes = "璁惧鍙拌处-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody EamEquipment eamEquipment) {
+ EamEquipment entity = eamEquipmentService.saveEquipment(eamEquipment);
+ if (entity == null) {
+ return Result.OK("娣诲姞澶辫触锛�");
+ }
+ //璋冪敤mdcEquipment鎻掑叆MDC璁惧
+// if (CommonConstant.DEFAULT_1.equals(eamEquipment.getMdcFlag())) {
+ //鎻掑叆MDC璁惧
+// MdcEquipment mdcEquipment = new MdcEquipment();
+// mdcEquipment.setEquipmentId(entity.getEquipmentCode());
+// mdcEquipment.setEquipmentType(entity.getDeviceType());
+// mdcEquipment.setEquipmentName(entity.getEquipmentName());
+// mdcEquipmentService.addNewEquipmentFromEam(mdcEquipment, eamEquipment.getOrgId());
+// }
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+ /**
+ * 缂栬緫
+ *
+ * @param eamEquipment
+ * @return
+ */
+ @ApiOperation(value = "璁惧鍙拌处-缂栬緫", notes = "璁惧鍙拌处-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody EamEquipment eamEquipment) {
+ eamEquipmentService.updateEquipment(eamEquipment);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
- /**
- * 璁惧寤鸿处 鑾峰彇缁勭粐閮ㄩ棬
- * qsw 2023-4-28
- */
- @GetMapping("getSysDeparts")
- public Result<?> getSysDeparts() {
- List<DepartVo> sysDeparts = equipmentService.getSysDeparts();
- return Result.ok(sysDeparts);
- }
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "璁惧鍙拌处-閫氳繃id鍒犻櫎", notes = "璁惧鍙拌处-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ EamEquipment entity = eamEquipmentService.getById(id);
+ if (entity != null) {
+ entity.setDelFlag(CommonConstant.DEL_FLAG_1);
+ eamEquipmentService.updateById(entity);
+ }
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @ApiOperation(value = "璁惧鍙拌处-鎵归噺鍒犻櫎", notes = "璁惧鍙拌处-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ List<String> list = Arrays.asList(ids.split(","));
+ list.forEach(id -> {
+ EamEquipment entity = eamEquipmentService.getById(id);
+ if (entity != null) {
+ entity.setDelFlag(CommonConstant.DEL_FLAG_1);
+ eamEquipmentService.updateById(entity);
+ }
+ });
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+ }
- /**
- *璁惧灞ュ巻 鑾峰彇璁惧浣跨敤璁板綍
- * qsw 2023-7-28
- */
- @GetMapping(value = "/getResumeUseRecordList")
- public Result<?> getResumeUseRecordList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
- IPage<Map<String, Object>> resumeUseRecordList = equipmentService.getResumeUseRecordList(pageNo, pageSize, params);
- return Result.ok(resumeUseRecordList);
- }
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "璁惧鍙拌处-閫氳繃id鏌ヨ", notes = "璁惧鍙拌处-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ EamEquipment eamEquipment = eamEquipmentService.getById(id);
+ if (eamEquipment == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ EamEquipmentExtend extend = eamEquipmentExtendService.getById(id);
+ if(extend != null){
+ eamEquipment.setRepairStatus(extend.getRepairStatus());
+ eamEquipment.setMaintenanceStatus(extend.getMaintenanceStatus());
+ }
+ try {
+ String json = objectMapper.writeValueAsString(eamEquipment);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("createBy", eamEquipment.getCreateBy(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("updateBy", eamEquipment.getUpdateBy(), item, "sys_user,realname,username");
+// translateDictTextUtils.translateField("technologyStatus", eamEquipment.getTechnologyStatus(), item, "technology_status");
+// translateDictTextUtils.translateField("orgId", eamEquipment.getOrgId(), item, "mdc_production,production_name,id");
+// translateDictTextUtils.translateField("equipmentManager", eamEquipment.getEquipmentManager(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("equipmentCategory", eamEquipment.getEquipmentCategory(), item, "equipment_category");
+ translateDictTextUtils.translateField("assetStatus", eamEquipment.getAssetStatus(), item, "asset_status");
+ translateDictTextUtils.translateField("repairStatus", eamEquipment.getRepairStatus(), item, "equipment_repair_status");
+ translateDictTextUtils.translateField("maintenanceStatus", eamEquipment.getMaintenanceStatus(), item, "equipment_maintenance_status");
+ return Result.OK(item);
+ } catch (JsonProcessingException e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
+ }
- /**
- *璁惧灞ュ巻 鑾峰彇璁惧鐐规璁板綍
- * qsw 2023-7-28
- */
- @GetMapping(value = "/getResumeInspectionRecordList")
- public Result<?> getResumeInspectionRecordList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
- IPage<Map<String, Object>> resumeInspectionRecordList = equipmentService.getResumeInspectionRecordList(pageNo, pageSize, params);
- LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
- for (Map<String, Object> record : resumeInspectionRecordList.getRecords()) {
- String id = (String)record.get("id");
- String inspectionType = (String)record.get("inspectionType");
- if("鏃ュ父鐐规".equals(inspectionType)){
- List<InspectionOrderDetail> failCount = inspectionOrderDetailService.lambdaQuery()
- .eq(InspectionOrderDetail::getInspectionOrderId, id)
- .eq(InspectionOrderDetail::getJudgmentResult, "fail")
- .eq(InspectionOrderDetail::getDelFlag, 0).list();
+ /**
+ * 瀵煎嚭excel
+ * @param eamEquipment
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request,EamEquipmentQuery eamEquipment) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ List<EamEquipment> equipmentList=eamEquipmentService.exportList(eamEquipment);
+ List<EamEquipmentDto> eamEquipmentDtos=new ArrayList<>();
+ String selections = request.getParameter("selections");
+ if (oConvertUtils.isNotEmpty(selections)) {
+ List<String> selectionList = Arrays.asList(selections.split(","));
+ equipmentList = equipmentList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
+ }
+ equipmentList.forEach(item -> {
+ EamEquipmentDto eamEquipmentDto = new EamEquipmentDto();
+ BeanUtils.copyProperties(item,eamEquipmentDto);
+ if (eamEquipmentDto.getFactoryOrgCode().length()==12){
+ eamEquipmentDto.setFactoryOrgCode(
+ baseFactoryService.factoryDataNameByOrgCode(eamEquipmentDto.getZxfactoryOrgCode())
+ +"/"+baseFactoryService.factoryDataNameByOrgCode(eamEquipmentDto.getGqfactoryOrgCode())+"/"+
+ baseFactoryService.factoryDataNameByOrgCode(eamEquipmentDto.getFactoryOrgCode()));
+ }else {
+ eamEquipmentDto.setFactoryOrgCode(
+ baseFactoryService.factoryDataNameByOrgCode(eamEquipmentDto.getZxfactoryOrgCode())
+ +"/"+ baseFactoryService.factoryDataNameByOrgCode(eamEquipmentDto.getFactoryOrgCode()));
+ }
+ if (eamEquipmentDto.getEquipmentWeight()!=null){
+ eamEquipmentDto.setEquipmentWeightStr(eamEquipmentDto.getEquipmentWeight().toEngineeringString());
+ }
+ eamEquipmentDtos.add(eamEquipmentDto);
+ });
+ // Step.3 AutoPoi 瀵煎嚭Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ mv.addObject(NormalExcelConstants.FILE_NAME, "璁惧鍙拌处"); //姝ゅ璁剧疆鐨刦ilename鏃犳晥 ,鍓嶇浼氶噸鏇存柊璁剧疆涓�涓�
+ mv.addObject(NormalExcelConstants.CLASS, EamEquipmentDto.class);
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("璁惧鍙拌处" + "鎶ヨ〃", "瀵煎嚭浜�:" + sysUser.getRealname(), "璁惧鍙拌处"));
+ mv.addObject(NormalExcelConstants.DATA_LIST, eamEquipmentDtos);
+ return mv;
- List<InspectionOrderDetail> passCount = inspectionOrderDetailService.lambdaQuery()
- .eq(InspectionOrderDetail::getInspectionOrderId, id)
- .eq(InspectionOrderDetail::getJudgmentResult,"pass")
- .eq(InspectionOrderDetail::getDelFlag, 0).list();
- record.put("result","姝ｅ父:"+passCount.size()+"锛�"+"寮傚父:"+failCount.size());
- }else{
- List<SpecialtyInspectionOrderDetail> failCount = specialtyInspectionOrderDetailService.lambdaQuery()
- .eq(SpecialtyInspectionOrderDetail::getSpecialtyInspectionOrderId, id)
- .eq(SpecialtyInspectionOrderDetail::getJudgmentResult,"fail")
- .eq(SpecialtyInspectionOrderDetail::getDelFlag, 0).list();
+ }
- List<SpecialtyInspectionOrderDetail> passCount = specialtyInspectionOrderDetailService.lambdaQuery()
- .eq(SpecialtyInspectionOrderDetail::getSpecialtyInspectionOrderId, id)
- .eq(SpecialtyInspectionOrderDetail::getJudgmentResult,"pass")
- .eq(SpecialtyInspectionOrderDetail::getDelFlag, 0).list();
- record.put("result","姝ｅ父:"+passCount.size()+"锛�"+"寮傚父:"+failCount.size());
- }
- }
- return Result.ok(resumeInspectionRecordList);
- }
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+ for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+ // 鑾峰彇涓婁紶鏂囦欢瀵硅薄
+ MultipartFile file = entity.getValue();
+ ImportParams params = new ImportParams();
+ params.setTitleRows(2);
+ params.setHeadRows(1);
+ params.setNeedSave(true);
+ params.setStartSheetIndex(0);
+ params.setSheetNum(1);
+ try {
+ List<EamEquipment> list = ExcelImportUtil.importExcel(file.getInputStream(), EamEquipment.class, params);
+ //update-begin-author:taoyan date:20190528 for:鎵归噺鎻掑叆鏁版嵁
+ long start = System.currentTimeMillis();
+// service.saveBatch(list);
+ StringBuilder sb = new StringBuilder();
+ for (EamEquipment eamEquipment : list) {
+ //蹇呭～瀛楁鏍￠獙
+ if (StringUtils.isBlank(eamEquipment.getEquipmentCode()) || StringUtils.isBlank(eamEquipment.getEquipmentName())) {
+ sb.append(String.format("璁惧缂栫爜[%s]鎴栬澶囧悕绉癧%s]涓虹┖锛屾棤娉曞鍏n\n", eamEquipment.getEquipmentCode(), eamEquipment.getEquipmentName()));
+ continue;
+ }
+ if (StringUtils.isBlank(eamEquipment.getEquipmentCategory())) {
+ sb.append(String.format("璁惧缂栫爜[%s]璁惧鍒嗙被涓虹┖锛屾棤娉曞鍏n\n", eamEquipment.getEquipmentCode()));
+ continue;
+ }
+ EamEquipment one = eamEquipmentService.getOne(new LambdaQueryWrapper<EamEquipment>().eq(EamEquipment::getEquipmentCode, eamEquipment.getEquipmentCode()).eq(EamEquipment::getDelFlag, CommonConstant.DEL_FLAG_0));
+ if (one != null) {
+ sb.append(String.format("璁惧缂栫爜[%s]宸插瓨鍦紝鏃犳硶閲嶅瀵煎叆\n\r", eamEquipment.getEquipmentCode()));
+ continue;
+ }
+ BaseFactory baseFactory=baseFactoryService.searchCenterByKeyWord(eamEquipment.getFactoryOrgCode());
+ if(baseFactory==null){
+ sb.append(String.format("EAM涓績淇℃伅[%s]涓嶅瓨鍦紝鏃犳硶瀵煎叆\n\r", eamEquipment.getFactoryOrgCode()));
+ continue;
+ }else {
+ eamEquipment.setFactoryOrgCode(baseFactory.getOrgCode());
+ }
+ EamBaseRepairDepart eamBaseRepairDepart=eamBaseRepairDepartService.searchCenterByKeyWord(eamEquipment.getRepairDepartOrgCode());
+ if(eamBaseRepairDepart==null){
+ sb.append(String.format("缁翠慨鐝粍淇℃伅[%s]涓嶅瓨鍦紝鏃犳硶瀵煎叆\n\r", eamEquipment.getRepairDepartOrgCode()));
+ continue;
+ }else {
+ eamEquipment.setRepairDepartOrgCode(eamBaseRepairDepart.getOrgCode());
+ }
+ EamEquipment equipment = eamEquipmentService.saveEquipment(eamEquipment);
+ if (equipment == null) {
+ //淇濆瓨澶辫触锛岃烦杩囨湰娆″惊鐜�
+ sb.append(String.format("璁惧缂栫爜[%s]淇濆瓨澶辫触锛屾棤娉曞鍏n\r", eamEquipment.getEquipmentCode()));
+ continue;
+ }
+ EamEquipmentExtend eamEquipmentExtend=new EamEquipmentExtend();
+ BeanUtils.copyProperties(eamEquipmentExtend,equipment);
+ eamEquipmentExtendService.save(eamEquipmentExtend);
+ }
+ log.info("娑堣�楁椂闂�" + (System.currentTimeMillis() - start) + "姣");
+ //update-end-author:taoyan date:20190528 for:鎵归噺鎻掑叆鏁版嵁
+ if (sb.length() > 0) {
+ return Result.ok(sb.toString());
+ }
+ return Result.ok("鏂囦欢瀵煎叆鎴愬姛锛佹暟鎹鏁帮細" + list.size());
+ } catch (Exception e) {
+ //update-begin-author:taoyan date:20211124 for: 瀵煎叆鏁版嵁閲嶅澧炲姞鎻愮ず
+ String msg = e.getMessage();
+ log.error(msg, e);
+ if (msg != null && msg.indexOf("Duplicate entry") >= 0) {
+ return Result.error("鏂囦欢瀵煎叆澶辫触:鏈夐噸澶嶆暟鎹紒");
+ } else {
+ return Result.error("鏂囦欢瀵煎叆澶辫触:" + e.getMessage());
+ }
+ //update-end-author:taoyan date:20211124 for: 瀵煎叆鏁版嵁閲嶅澧炲姞鎻愮ず
+ } finally {
+ try {
+ file.getInputStream().close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return Result.error("鏂囦欢瀵煎叆澶辫触锛�");
+ }
- /**
- *璁惧灞ュ巻 鑾峰彇璁惧淇濆吇璁板綍
- * qsw 2023-7-31
- */
- @GetMapping(value = "/getResumeMaintenanceRecordList")
- public Result<?> getResumeMaintenanceRecordList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
- IPage<Map<String, Object>> resumeMaintenanceRecordList = equipmentService.getResumeMaintenanceRecordList(pageNo, pageSize, params);
- return Result.ok(resumeMaintenanceRecordList);
- }
+ @ApiOperation(value = "璁惧琛�-閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�", notes = "璁惧琛�-閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�")
+ @GetMapping(value = "/loadTreeListByProductionIds")
+ public Result<List<EamEquipmentTree>> loadTreeListByProductionIds(@RequestParam(name = "ids", required = true) String ids) {
+ Result<List<EamEquipmentTree>> result = new Result<>();
+ try {
+ List<EamEquipmentTree> mdcEquipmentTreeList = eamEquipmentService.loadTreeListByProductionIds(ids);
+ result.setSuccess(true);
+ result.setResult(mdcEquipmentTreeList);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ return result;
+ }
- /**
- *璁惧灞ュ巻 鑾峰彇璁惧缁翠慨璁板綍
- * qsw 2023-7-31
- */
- @GetMapping(value = "/getResumeRepairRecordList")
- public Result<?> getResumeRepairRecordList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
- IPage<Map<String, Object>> resumeRepairRecordList = equipmentService.getResumeRepairRecordList(pageNo, pageSize, params);
- return Result.ok(resumeRepairRecordList);
- }
+ @ApiOperation(value = "璁惧琛�-閫氳繃EAM涓績ids鑾峰彇璁惧鏍�", notes = "璁惧琛�-閫氳繃EAM涓績ids鑾峰彇璁惧鏍�")
+ @GetMapping(value = "/loadTreeListByEamCenterIds")
+ public Result<List<EamEquipmentTree>> loadTreeListByEamCenterIds(@RequestParam(name = "ids", required = true) String ids) {
+ Result<List<EamEquipmentTree>> result = new Result<>();
+ try {
+ List<EamEquipmentTree> mdcEquipmentTreeList = eamEquipmentService.loadTreeListByEamCenterIds(ids);
+ result.setSuccess(true);
+ result.setResult(mdcEquipmentTreeList);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ return result;
+ }
- /**
- *璁惧灞ュ巻 鑾峰彇璁惧妫�瀹氳褰�
- * qsw 2023-7-31
- */
- @GetMapping(value = "/getResumeCalibrationRecordList")
- public Result<?> getResumeCalibrationRecordList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
- IPage<Map<String, Object>> resumeCalibrationRecordList = equipmentService.getResumeCalibrationRecordList(pageNo, pageSize, params);
-// for (Map<String, Object> record : resumeCalibrationRecordList.getRecords()) {
-// String id = (String)record.get("id");
-// String status = (String)record.get("status");
-// String managementMode = (String)record.get("managementMode");
-// if("4".equals(status)){
-// if("data".equals(managementMode)){
-// List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery()
-// .eq(CalibrationOrderDetail::getCalibrationOrderId, id)
-// .eq(CalibrationOrderDetail::getJudgmentResult, "fail")
-// .eq(CalibrationOrderDetail::getDelFlag,"0").list();
-// if(calibrationOrderDetails.size()>0){
-// record.put("calibrationResult","寮傚父");
-// }else{
-// record.put("calibrationResult","姝ｅ父甯�");
-// }
-// }else{
-// List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery()
-// .eq(CalibrationOrderReport::getCalibrationOrderId, id)
-// .eq(CalibrationOrderReport::getJudgmentResult, "fail")
-// .eq(CalibrationOrderReport::getDelFlag, "0").list();
-// if(calibrationOrderReports.size()>0){
-// record.put("calibrationResult","寮傚父");
-// }else{
-// record.put("calibrationResult","姝ｅ父甯�");
-// }
-// }
-// }
-// }
- return Result.ok(resumeCalibrationRecordList);
- }
-
- /**
- *璁惧灞ュ巻 鑾峰彇璁惧澶勭疆璁板綍
- * qsw 2023-7-31
- */
- @GetMapping(value = "/getResumeChangeRecordList")
- public Result<?> getResumeChangeRecordList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
- IPage<Map<String, Object>> resumeChangeRecordList = equipmentService.getResumeChangeRecordList(pageNo, pageSize, params);
- return Result.ok(resumeChangeRecordList);
- }
-
- /**
- * 鏍规嵁鐘舵�佹煡璇㈣澶囧垪琛�
- */
- @GetMapping(value = "/getEquipmentListByStatus")
- public Result<IPage<Equipment>> getEquipmentList(Equipment equipment,String status,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
- List<String> statusList = Arrays.asList(status.split(","));
- Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
- queryWrapper.in("equipment_status",statusList);
- IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
- /**
- * 瀵煎叆
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- @Transactional(rollbackFor = Exception.class)
- //宸ュ尯銆佸瀷鍙枫�佽澶囩姸鎬併�佹妧鏈姸鎬併�丄BC鏍囪瘑鏈夌┖鍊硷紱缁存姢閮ㄩ棬銆佺淮淇彮缁勪负缂栫爜闇�瑕佹湁瀵圭収鍊笺��
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
- Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
- String exceptionInfo = "";
- int exceptionNum = 0;
- for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
- MultipartFile file = entity.getValue();
- ImportParams params = new ImportParams();
- params.setNeedSave(true);
- try {
- List<EquipmentImportVo> list = ExcelImportUtil.importExcel(file.getInputStream(), EquipmentImportVo.class, params);
- for(int i = 0;i<list.size();i++){
- Equipment equipment = new Equipment();
- EquipmentImportVo equipmentImportVo = list.get(i);
- String equipmentCategoryName = equipmentImportVo.getEquipmentCategoryName();
- String useId = equipmentImportVo.getUseId();
- String workCenterId = equipmentImportVo.getWorkCenterId();//涓績
- String areaId = equipmentImportVo.getFactoryModelId();//宸ュ尯
- String productionId = equipmentImportVo.getAreaId();//宸ユ
- String manageId = equipmentImportVo.getManageId();
- String constructorId = equipmentImportVo.getConstructorId();
- String teamId = equipmentImportVo.getTeamId();
- String propertyStatus = equipmentImportVo.getPropertyStatus();
- String abc = equipmentImportVo.getEquipmentImportanceId();
- Date thirdMaintenanceTime = equipmentImportVo.getThirdMaintenanceTime();
- Date technologyStatusQualificationTime = equipmentImportVo.getTechnologyStatusQualificationTime();
- if(StringUtils.isBlank(equipmentImportVo.getNum())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁熶竴缂栫爜缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
- else if(StringUtils.isBlank(equipmentImportVo.getName())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍚嶇О缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
-// else if(StringUtils.isBlank(equipmentImportVo.getEquipmentImportanceId())){
-// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:ABC鏍囪瘑缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
-// exceptionNum++;
-// continue;
-// }
- else if(StringUtils.isBlank(equipmentImportVo.getEquipmentStatus())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鐘舵�佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
- else if(StringUtils.isBlank(equipmentImportVo.getTechnologyStatus())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鎶�鏈姸鎬佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
-// else if(StringUtils.isBlank(equipmentImportVo.getModel())){
-// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍨嬪彿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
-// exceptionNum++;
-// continue;
-// }
- else if(StringUtils.isBlank(useId)){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:浣跨敤閮ㄩ棬缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
- else if(StringUtils.isBlank(workCenterId)){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓績缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
- else if(StringUtils.isBlank(areaId)){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:宸ュ尯缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
- else if(StringUtils.isBlank(manageId)){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁存姢閮ㄩ棬缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
- else if(StringUtils.isBlank(equipmentCategoryName)){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍒嗙被缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
- else if(StringUtils.isBlank(teamId)){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁翠慨鐝粍缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
- //闈炲繀濉」
- // else if(ObjectUtils.isNotNull(equipmentImportVo.getWarrantyStart())){
-// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璐ㄤ繚寮�濮嬫棩鏈熺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
-// exceptionNum++;
-// }
-// else if(StringUtils.isBlank(equipmentImportVo.getPropertyStatus())){
-// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璧勪骇鐘舵�佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
-// exceptionNum++;
-// }
-// else if(StringUtils.isBlank(equipmentImportVo.getEquipmentUda5())){
-// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍔熻兘浣嶇疆缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
-// exceptionNum++;
-// }
-// else if(StringUtils.isBlank(equipmentImportVo.getLocation())){
-// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:瀹夎浣嶇疆缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
-// exceptionNum++;
-// }
-// else if(StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())){
-// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍑哄巶鏃ユ湡缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
-// exceptionNum++;
-// }
-// else if(StringUtils.isBlank(equipmentImportVo.getProjectApprovalNo())){
-// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:绔嬮」鍗″彿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
-// exceptionNum++;
-// }
-// else if(StringUtils.isBlank(equipmentImportVo.getFundSource())){
-// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璧勯噾鏉ユ簮缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
-// exceptionNum++;
-// }
-// else if(StringUtils.isBlank(equipmentImportVo.getAcceptanceCheckDate())){
-// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:楠屾敹鏃ユ湡缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
-// exceptionNum++;
-// }
-// else if(StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())){
-// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍑哄巶鏃ユ湡缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
-// exceptionNum++;
-// }
-// else if(StringUtils.isBlank(equipmentImportVo.getFactoryNo())){
-// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍑哄巶缂栧彿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
-// exceptionNum++;
-// }
-// else if( StringUtils.isBlank(equipmentImportVo.getConstructorId())){
-// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璧勪骇鍒堕�犲晢缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
-// exceptionNum++;
-// }
-// else if(StringUtils.isBlank(equipmentImportVo.getSpecification())){
-// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧瑙勬牸缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
-// exceptionNum++;
-// }
-// else if(StringUtils.isBlank(equipmentImportVo.getGpo())){
-// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍔熺巼缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
-// exceptionNum++;
-// }
- else{
- SysDepart use = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",useId.trim()).eq("del_flag",0),false);
- if(ObjectUtils.isNotNull(use)){
- equipment.setUseId(use.getId());
- }else {
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ浣跨敤閮ㄩ棬,璇风淮鎶ら儴闂ㄦ暟鎹悗鍐嶅鍏�;";
- exceptionNum++;
- continue;
- }
- //涓績
- Area workCenterArea = areaService.getOne(new QueryWrapper<Area>().eq("name",workCenterId.trim()).eq("del_flag",0));
- if(ObjectUtils.isNotNull(workCenterArea)){
- equipment.setWorkCenterId(workCenterArea.getId());
-// }else if(ObjectUtils.isNotNull(area1)) {
-// equipment.setFactoryModelId(area1.getId());
- }else {
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ涓績,璇风淮鎶や腑蹇冩暟鎹悗鍐嶅鍏�;";
- exceptionNum++;
- continue;
- }
- //宸ュ尯
- Area area = areaService.getOne(new QueryWrapper<Area>().eq("name",areaId.trim()).eq("del_flag",0));
- Area area1 = areaService.getOne(new QueryWrapper<Area>().eq("num",areaId.trim()).eq("del_flag",0));
- if(ObjectUtils.isNotNull(area)){
- equipment.setFactoryModelId(area.getId());
- }else if(ObjectUtils.isNotNull(area1)) {
- equipment.setFactoryModelId(area1.getId());
- }else {
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ宸ュ尯,璇风淮鎶ゅ伐鍖烘暟鎹悗鍐嶅鍏�;";
- exceptionNum++;
- continue;
- }
-
- //宸ユ
- Area productionArea = areaService.getOne(new QueryWrapper<Area>().eq("name",productionId.trim()).eq("del_flag",0));
- if(ObjectUtils.isNotNull(productionArea)){
- equipment.setAreaId(productionArea.getId());
- }
-
- SysDepart manage = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",manageId.trim()).eq("del_flag",0));
- if(ObjectUtils.isNotNull(manage)){
- equipment.setManageId(manage.getId());
- }else{
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ缁存姢閮ㄩ棬,璇峰厛缁存姢閮ㄩ棬鏁版嵁鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
- EquipmentCategory equipmentCategory = equipmentCategoryService
- .getOne(new QueryWrapper<EquipmentCategory>()
- .eq("name",equipmentCategoryName.trim()).eq("del_flag",0),false);
- if(ObjectUtils.isNotNull(equipmentCategory)){
- equipment.setEquipmentCategoryId(equipmentCategory.getId());
- }
- else {
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ璁惧鍒嗙被,璇峰厛缁存姢璁惧鍒嗙被鏁版嵁鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
- Team team = teamService.getOne(new QueryWrapper<Team>().eq("name",teamId.trim()).eq("del_flag",0),false);
- Team team1 = teamService.getOne(new QueryWrapper<Team>().eq("num",teamId.trim()).eq("del_flag",0),false);
- if(ObjectUtils.isNotNull(team)){
- equipment.setTeamId(team.getId());
- }else if(ObjectUtils.isNotNull(team1)) {
- equipment.setTeamId(team1.getId());
- }else {
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ鐝粍,璇峰厛缁存姢鐝粍鏁版嵁鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
- if(StringUtils.isNotBlank(constructorId)){
- Constructor constructor = constructorService.getByName(constructorId.trim());
- if(ObjectUtils.isNotNull(constructor)){
- equipment.setConstructorId(constructor.getId());
- }else {
- constructor = new Constructor();
- constructor.setName(constructorId);
- constructor.setDelFlag(0);
- constructorService.save(constructor);
- equipment.setConstructorId(constructor.getId());
- }
- }
- if(StringUtils.isNotBlank(propertyStatus)&&propertyStatus.equals("warranty")){
- if(
- ObjectUtils.isNull(equipmentImportVo.getWarrantyStart())
- ||ObjectUtils.isNull(equipmentImportVo.getWarrantyEnd())
- ){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璇ヨ澶囧浜庤川淇濇湡锛岃川淇濅俊鎭己澶憋紝璇峰厛缁存姢璐ㄤ繚寮�濮嬫椂闂存垨缁撴潫鏃堕棿;";
- exceptionNum++;
- continue;
- }
-
- }else{
- Equipment oriEquipment = equipmentService
- .getOne(new QueryWrapper<Equipment>()
- .eq("num",equipmentImportVo.getNum()).eq("del_flag",0),false);
- if(ObjectUtils.isNull(oriEquipment)){
- equipment.setNum(equipmentImportVo.getNum())
- .setName(equipmentImportVo.getName())
- .setTechnologyStatus(equipmentImportVo.getTechnologyStatus())
- .setEquipmentImportanceId(equipmentImportVo.getEquipmentImportanceId())
- .setSpecificEquipment(equipmentImportVo.getKeyEquipmentIdentification())
- .setSecurityConfiguration(equipmentImportVo.getSecurityConfiguration())
- .setCoolingSystem(equipmentImportVo.getCoolingSystem())
- .setFireExtinguisher(equipmentImportVo.getFireExtinguisher())
- .setFireExtinguisherValidityPeriod(equipmentImportVo.getFireExtinguisherValidityPeriod())
- .setSystem(equipmentImportVo.getSystem())
- .setPort(equipmentImportVo.getPort())
- .setCoordinateNum(equipmentImportVo.getCoordinateNum())
- .setEquipmentStatus(equipmentImportVo.getEquipmentStatus())
- .setEquipmentUda3(equipmentImportVo.getEquipmentUda3())
- .setEquipmentUda4(equipmentImportVo.getEquipmentUda4())
- .setEquipmentUda5(equipmentImportVo.getEquipmentUda5())
- .setLocation(equipmentImportVo.getLocation())
- .setLastVerificationDate(equipmentImportVo.getLeaveFactoryDate())
- .setProjectApprovalNo(equipmentImportVo.getProjectApprovalNo())
- .setFundSource(equipmentImportVo.getFundSource())
- .setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate())
- .setFactoryNumber(equipmentImportVo.getFactoryNumber())
- .setSourceCountry(equipmentImportVo.getSourceCountry())
- .setModel(equipmentImportVo.getModel())
- .setSpecification(equipmentImportVo.getSpecification())
- .setPropertyStatus("normal")
- .setWarrantyStart(equipmentImportVo.getWarrantyStart())
- .setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
- .setIsLineEquip("no")
- .setIsLine("no")
- .setNextTechnologyStatusQualificationTime(equipmentImportVo.getNextTechnologyStatusQualificationTime())
- .setThirdMaintenanceTime(equipmentImportVo.getThirdMaintenanceTime())
- .setTechnologyStatusQualificationTime(equipmentImportVo.getTechnologyStatusQualificationTime())
- .setGpo(equipmentImportVo.getGpo());
- if(equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")){
- equipment.setCheckPeriod(365*3+"");
- }
- if(equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")){
- equipment.setCheckPeriod(365*4+"");
- }
- if(equipmentCategory.getEquipmentCategoryUda1().equals("tester")){
- equipment.setCheckPeriod(365*1+"");
- }
- if(
- !equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")
- &&!equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")
- &&!equipmentCategory.getEquipmentCategoryUda1().equals("tester")
- ){
- if(StringUtils.isNotBlank(abc)){
- if(abc.equals("A")){
- equipment.setCheckPeriod(365*3+"");
- }
- if(
- abc.equals("B")
- ||abc.equals("C")
- ||abc.equals("D")
- ){
- equipment.setCheckPeriod(365*4+"");
- }
- }
- }
- //涓嬫涓変繚鏃ユ湡澶勭悊
- if(equipment.getThirdMaintenanceTime() == null && equipment.getAcceptanceCheckDate() != null && StringUtils.isNotBlank(equipment.getCheckPeriod())){
- //濡傛灉娌℃湁涓変繚鏃ユ湡 鎸夌収楠屾敹鏃ユ湡璁＄畻涓嬫涓変繚鏃ユ湡
- int checkPeriod = Integer.parseInt(equipment.getCheckPeriod()) - 1;
- LocalDate acceptanceCheckDate = LocalDate.parse(equipment.getAcceptanceCheckDate());
- LocalDate localDate = acceptanceCheckDate.plusDays(checkPeriod);
- Date date = DateUtils.str2Date(localDate.toString(), DateUtils.date_sdf.get());
- equipment.setNextThirdMaintenanceTime(date);
- }else if(equipment.getThirdMaintenanceTime() != null && StringUtils.isNotBlank(equipment.getCheckPeriod())){
- //濡傛灉鏈変笁淇濇棩鏈� 鍒欎娇鐢ㄤ笁淇濇棩鏈熻绠� 涓嬫涓変繚鏃ユ湡
- int checkPeriod = Integer.parseInt(equipment.getCheckPeriod()) - 1;
- Date date = DateUtils.getDayAfter(equipment.getThirdMaintenanceTime(), checkPeriod);
- equipment.setNextThirdMaintenanceTime(date);
- }
- equipmentService.save(equipment);
- }else {
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐ワ紝鍘熷洜锛氱粺涓�缂栫爜宸插瓨鍦紝鏁版嵁閲嶅瀵煎叆;";
- exceptionNum++;
- continue;
- }
- }
- }
- }
- if(exceptionNum!=0){
- String headInfo = "灏忓鎻愰啋鎮�!璁惧鍙拌处锛氬鍏ユ垚鍔�"+(list.size()-exceptionNum)+"鏉�,澶辫触"+exceptionNum+"鏉�";
- MessageDTO messageDTO = new MessageDTO();
- messageDTO.setTitle(headInfo);
- messageDTO.setFromUser("鏁版嵁瀵煎叆灏忓姪鎵�-灏忓");
- messageDTO.setCategory("瀵煎叆鎿嶄綔闄勫姞淇℃伅");
- messageDTO.setContent(exceptionInfo);
- messageDTO.setToUser(user.getUsername());
- sysBaseApi.sendSysAnnouncement(messageDTO);
- return Result.OK(headInfo+",鍙湪-绯荤粺娑堟伅-鏌ョ湅瀵煎叆璇︽儏");
- }
- return Result.OK("瀵煎叆鎴愬姛锛屽凡瀵煎叆鍏ㄩ儴鏁版嵁銆�");
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return Result.error("鏂囦欢瀵煎叆澶辫触:" + e.getMessage());
- }
- }
- return Result.error("鏂囦欢瀵煎叆澶辫触锛�");
- }
- @GetMapping(value = "/getEquipmentStansdardList")
- @PermissionData
- public Result<IPage<DailyInspectionStandardDetail>> getEquipmentStansdardList(DailyInspectionStandardDetail standardDetail,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<DailyInspectionStandardDetail> queryWrapper = QueryGenerator.initQueryWrapper(standardDetail, req.getParameterMap());
- Page<DailyInspectionStandardDetail> page = new Page<DailyInspectionStandardDetail>(pageNo, pageSize);
- IPage<DailyInspectionStandardDetail> pageList = equipmentService.getStandardList(page,standardDetail.getEquipmentId(),standardDetail.getType());
- return Result.OK(pageList);
- }
- @PostMapping("addLine")
- @Transactional(rollbackFor = {Exception.class})
- public Result<?> addLine(@RequestBody Equipment equipment){
- equipment.setIsLineEquip("no");
- equipment.setIsLine("yes");
- equipmentService.save(equipment);
- List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
- for(Equipment equipment1:equipmentList){
- equipment1.setId(equipment1.getShowId());
- equipment1.setIsLineEquip("yes");
- equipment1.setLineId(equipment.getId());
- }
- equipmentService.updateBatchById(equipmentList);
- return Result.OK("娣诲姞鎴愬姛");
- }
- @PutMapping("editLine")
- @Transactional(rollbackFor = {Exception.class})
- public Result<?> editLine(@RequestBody Equipment equipment){
- equipmentService.updateById(equipment);
- equipmentService.update(new UpdateWrapper<Equipment>()
- .eq("line_id",equipment.getId())
- .set("line_id",null)
- .set("is_meta",null)
- .set("is_line_equip","no"));
- List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
- for(Equipment equipment1:equipmentList){
- equipment1.setLineId(equipment.getId());
- String id = equipment1.getId();
- if(StringUtils.isBlank(id)){
- equipment1.setId(equipment1.getShowId());
- }
- equipment1.setIsLineEquip("yes");
- }
- equipmentService.updateBatchById(equipmentList);
- return Result.OK("缂栬緫鎴愬姛");
- }
- @PostMapping("/updateKeyEquipment")
- public Result<?>updateKeyEquipment(@RequestBody Equipment equipment){
- equipmentService.update(new UpdateWrapper<Equipment>().eq("specific_equipment","0").set("specific_equipment",null));
- List<Equipment> keyEquipmentUpdateList = equipment.getKeyEquipmentUpdateList();
- for(Equipment updateEquipment:keyEquipmentUpdateList){
- updateEquipment.setId(updateEquipment.getEquipmentId());
- equipmentService.updateById(updateEquipment);
- }
- return Result.OK("淇敼鎴愬姛");
- }
-
- /**
- *璁惧鍙扮珯-淇濆吇鏍囧噯
- */
- @GetMapping("getEquipmentListAllStandard")
- public Result<?> getEquipmentListAllStandard(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
- IPage<Map<String, Object>> equipmentListAllStandards = equipmentService.getEquipmentListAllStandard(pageNo, pageSize, params);
- List<Map<String, Object>> records = equipmentListAllStandards.getRecords();
- for (Map<String, Object> record : records) {
- String id = (String) record.get("id");
- String precisionParameters = (String)record.get("precisionParameters");
- if("1".equals(precisionParameters)){
- record.put("yseNoPrecisionParameters","0");
- }else{
- record.put("yseNoPrecisionParameters","1");
- }
- List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
- .eq(DailyInspectionStandard::getEquipmentId, id)
- .eq(DailyInspectionStandard::getVersionStatus, "2")
- .list();
- if(dailyInspectionStandards.size()>0){
- record.put("yseNoInspectionStandard","0");
- }else{
- record.put("yseNoInspectionStandard","1");
- }
- List<MaintenanceStandard> maintenance2Standards = maintenanceStandardService.lambdaQuery()
- .eq(MaintenanceStandard::getEquipmentId, id)
- .eq(MaintenanceStandard::getMaintenanceType, "2")
- .eq(MaintenanceStandard::getVersionStatus, "2").list();
- if(maintenance2Standards.size()>0){
- record.put("yseNoMaintenance2Standard","0");
- }else{
- record.put("yseNoMaintenance2Standard","1");
- }
-
- List<MaintenanceStandard> maintenance3Standards = maintenanceStandardService.lambdaQuery()
- .eq(MaintenanceStandard::getEquipmentId, id)
- .eq(MaintenanceStandard::getMaintenanceType, "3")
- .eq(MaintenanceStandard::getVersionStatus, "2").list();
- if(maintenance3Standards.size()>0){
- record.put("yseNoMaintenance3Standard","0");
- }else{
- record.put("yseNoMaintenance3Standard","1");
- }
-
- }
- return Result.ok(equipmentListAllStandards);
- }
- @GetMapping(value = "/planEquipmentList")
- @PermissionData
- public Result<IPage<Equipment>> planEquipmentList(Equipment equipment,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
- //鏍规嵁涓嬫涓変繚鏃堕棿鎺掑簭
- queryWrapper.orderByAsc("next_third_maintenance_time");
- //濡傛灉startTime鍜宔ndTime涓嶄负绌猴紝鍒欐煡璇笅娆′笁淇濇椂闂村湪杩欎釜鏃堕棿娈靛唴鐨勮澶�
- if(equipment.getStartTime()!=null && equipment.getEndTime()!=null){
- queryWrapper.between("next_third_maintenance_time",equipment.getStartTime(),equipment.getEndTime());
- }
- Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
- IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- private List<String> getUserWorkCenterIds(){
- LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
- SysUser sysUser = sysUserService.getById(user.getId());
- String areaId = sysUser.getAreaId();
- List<String> workCenterIds = null;
- if(StringUtils.isNotBlank(areaId)){
-// strings = new ArrayList<>();
- String[] split = areaId.split(",");
- workCenterIds = Arrays.asList(split);
- }
- return workCenterIds;
- }
+ /**
+ * 妫�绱㈣澶�
+ * @param keyword 鏌ヨ鍏抽敭璇� 璁惧缂栧彿锛岃澶囧悕绉版ā绯婂尮閰�
+ * @param pageSize 涓�娆¤繑鍥炲灏戣褰�
+ * @param id 璁惧涓婚敭
+ * @return
+ */
+ @ApiOperation(value = "璁惧琛�-寮傛鍔犺浇璁惧鍒楄〃", notes = "璁惧琛�-寮傛鍔犺浇璁惧鍒楄〃")
+ @GetMapping(value = "/asyncLoadEquipment")
+ public Result<?> asyncLoadEquipment(@RequestParam(name="keyword",required = false) String keyword,
+ @RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize,
+ @RequestParam(name="id",required = false) String id,
+ @RequestParam(name="factoryOrgCode",required = false) String factoryOrgCode) {
+ List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipment(keyword, pageSize, id, factoryOrgCode);
+ List<JSONObject> items = new ArrayList<>();
+ try {
+ for(EquipmentSearchResult vo : resultList) {
+ String json = objectMapper.writeValueAsString(vo);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("factoryOrgCode", vo.getFactoryOrgCode(), item, "eam_base_factory,factory_name,org_code");
+ items.add(item);
+ }
+ return Result.OK(items);
+ }catch (Exception e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
+ }
}
--
Gitblit v1.9.3