| | |
| | | /** |
| | | * æå±åç±» |
| | | */ |
| | | @Excel(name = "æå±åç±»", width = 15, orderNum = "5") |
| | | @Excel(name = "æå±åç±»", width = 15, orderNum = "5",dicCode = "equipment_category") |
| | | @ApiModelProperty(value = "æå±åç±»") |
| | | @Dict(dicCode = "equipment_category") |
| | | private String equipmentCategory; |
| | |
| | | /** |
| | | * è´¨ä¿å¼å§æ¥æ |
| | | */ |
| | | @Excel(name = "è´¨ä¿å¼å§æ¥æ", width = 15, orderNum = "36") |
| | | @Excel(name = "è´¨ä¿å¼å§æ¥æ", width = 15, format = "yyyy/MM/dd", orderNum = "36") |
| | | @ApiModelProperty(value = "è´¨ä¿å¼å§æ¥æ") |
| | | @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | |
| | | /** |
| | | * è´¨ä¿ç»ææ¥æ |
| | | */ |
| | | @Excel(name = "è´¨ä¿ç»ææ¥æ", width = 15, orderNum = "37") |
| | | @Excel(name = "è´¨ä¿ç»ææ¥æ", width = 15, format = "yyyy/MM/dd", orderNum = "37") |
| | | @ApiModelProperty(value = "è´¨ä¿ç»ææ¥æ") |
| | | @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | |
| | | |
| | | /**ææ°äºä¿æ¥æ*/ |
| | | @TableField(exist = false) |
| | | @Excel(name = "ææ°äºä¿æ¥æ", width = 15, orderNum = "39") |
| | | @Excel(name = "ææ°äºä¿æ¥æ", width = 15, format = "yyyy/MM/dd", orderNum = "39") |
| | | @ApiModelProperty(value = "ææ°äºä¿æ¥æ") |
| | | @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | |
| | | |
| | | /**䏿¬¡äºä¿æ¥æ*/ |
| | | @TableField(exist = false) |
| | | @Excel(name = "䏿¬¡äºä¿æ¥æ", width = 15, orderNum = "40") |
| | | @Excel(name = "䏿¬¡äºä¿æ¥æ", width = 15, format = "yyyy/MM/dd", orderNum = "40") |
| | | @ApiModelProperty(value = "䏿¬¡äºä¿æ¥æ") |
| | | @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | |
| | | |
| | | /**æ¬æ¬¡ä¸ä¿æ¥æ*/ |
| | | @TableField(exist = false) |
| | | @Excel(name = "æ¬æ¬¡ä¸ä¿æ¥æ", width = 15, orderNum = "41") |
| | | @Excel(name = "æ¬æ¬¡ä¸ä¿æ¥æ", width = 15, format = "yyyy/MM/dd", orderNum = "41") |
| | | @ApiModelProperty(value = "æ¬æ¬¡ä¸ä¿æ¥æ") |
| | | @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | |
| | | |
| | | /**䏿¬¡ä¸ä¿æ¥æ*/ |
| | | @TableField(exist = false) |
| | | @Excel(name = "䏿¬¡ä¸ä¿æ¥æ", width = 15, orderNum = "42") |
| | | @Excel(name = "䏿¬¡ä¸ä¿æ¥æ", width = 15, format = "yyyy/MM/dd", orderNum = "42") |
| | | @ApiModelProperty(value = "䏿¬¡ä¸ä¿æ¥æ") |
| | | @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | |
| | | |
| | | /**ææ°ææ¯ç¶æé´å®æ¥æ*/ |
| | | @TableField(exist = false) |
| | | @Excel(name = "ææ°ææ¯ç¶æé´å®æ¥æ", width = 15, orderNum = "44") |
| | | @Excel(name = "ææ°ææ¯ç¶æé´å®æ¥æ", width = 15, format = "yyyy/MM/dd", orderNum = "44") |
| | | @ApiModelProperty(value = "ææ°ææ¯ç¶æé´å®æ¥æ") |
| | | @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | | private java.util.Date latestTechnologyCheck; |
| | | /**ææ¯ç¶æä¸æ¬¡é´å®æ¥æ*/ |
| | | @TableField(exist = false) |
| | | @Excel(name = "ææ¯ç¶æä¸æ¬¡é´å®æ¥æ", width = 15, orderNum = "45") |
| | | @Excel(name = "ææ¯ç¶æä¸æ¬¡é´å®æ¥æ", width = 15, format = "yyyy/MM/dd", orderNum = "45") |
| | | @ApiModelProperty(value = "ææ¯ç¶æä¸æ¬¡é´å®æ¥æ") |
| | | @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | |
| | | /** |
| | | * æå±åç±» |
| | | */ |
| | | @Excel(name = "æå±åç±»", width = 15, orderNum = "5") |
| | | @Excel(name = "æå±åç±»", width = 15, orderNum = "5",dicCode = "equipment_category") |
| | | @ApiModelProperty(value = "æå±åç±»") |
| | | @Dict(dicCode = "equipment_category") |
| | | private String equipmentCategory; |
| | |
| | | /** |
| | | * è´¨ä¿å¼å§æ¥æ |
| | | */ |
| | | @Excel(name = "è´¨ä¿å¼å§æ¥æ", width = 15, orderNum = "36") |
| | | @Excel(name = "è´¨ä¿å¼å§æ¥æ", width = 25, format = "yyyy/MM/dd", orderNum = "36") |
| | | @ApiModelProperty(value = "è´¨ä¿å¼å§æ¥æ") |
| | | @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | |
| | | /** |
| | | * è´¨ä¿ç»ææ¥æ |
| | | */ |
| | | @Excel(name = "è´¨ä¿ç»ææ¥æ", width = 15, orderNum = "37") |
| | | @Excel(name = "è´¨ä¿ç»ææ¥æ", width = 15, format = "yyyy/MM/dd", orderNum = "37") |
| | | @ApiModelProperty(value = "è´¨ä¿ç»ææ¥æ") |
| | | @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | |
| | | |
| | | /**ææ°äºä¿æ¥æ*/ |
| | | @TableField(exist = false) |
| | | @Excel(name = "ææ°äºä¿æ¥æ", width = 15, orderNum = "39") |
| | | @Excel(name = "ææ°äºä¿æ¥æ", width = 15, format = "yyyy/MM/dd", orderNum = "39") |
| | | @ApiModelProperty(value = "ææ°äºä¿æ¥æ") |
| | | @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | |
| | | |
| | | /**䏿¬¡äºä¿æ¥æ*/ |
| | | @TableField(exist = false) |
| | | @Excel(name = "䏿¬¡äºä¿æ¥æ", width = 15, orderNum = "40") |
| | | @Excel(name = "䏿¬¡äºä¿æ¥æ", width = 15, format = "yyyy/MM/dd", orderNum = "40") |
| | | @ApiModelProperty(value = "䏿¬¡äºä¿æ¥æ") |
| | | @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | |
| | | |
| | | /**æ¬æ¬¡ä¸ä¿æ¥æ*/ |
| | | @TableField(exist = false) |
| | | @Excel(name = "æ¬æ¬¡ä¸ä¿æ¥æ", width = 15, orderNum = "41") |
| | | @Excel(name = "æ¬æ¬¡ä¸ä¿æ¥æ", width = 15, format = "yyyy/MM/dd",orderNum = "41") |
| | | @ApiModelProperty(value = "æ¬æ¬¡ä¸ä¿æ¥æ") |
| | | @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | |
| | | |
| | | /**䏿¬¡ä¸ä¿æ¥æ*/ |
| | | @TableField(exist = false) |
| | | @Excel(name = "䏿¬¡ä¸ä¿æ¥æ", width = 15, orderNum = "42") |
| | | @Excel(name = "䏿¬¡ä¸ä¿æ¥æ", width = 15, format = "yyyy/MM/dd", orderNum = "42") |
| | | @ApiModelProperty(value = "䏿¬¡ä¸ä¿æ¥æ") |
| | | @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | |
| | | |
| | | /**ææ°ææ¯ç¶æé´å®æ¥æ*/ |
| | | @TableField(exist = false) |
| | | @Excel(name = "ææ°ææ¯ç¶æé´å®æ¥æ", width = 15, orderNum = "44") |
| | | @Excel(name = "ææ°ææ¯ç¶æé´å®æ¥æ", width = 15, format = "yyyy/MM/dd", orderNum = "44") |
| | | @ApiModelProperty(value = "ææ°ææ¯ç¶æé´å®æ¥æ") |
| | | @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | | private java.util.Date latestTechnologyCheck; |
| | | /**ææ¯ç¶æä¸æ¬¡é´å®æ¥æ*/ |
| | | @TableField(exist = false) |
| | | @Excel(name = "ææ¯ç¶æä¸æ¬¡é´å®æ¥æ", width = 15, orderNum = "45") |
| | | @Excel(name = "ææ¯ç¶æä¸æ¬¡é´å®æ¥æ", width = 15, format = "yyyy/MM/dd", orderNum = "45") |
| | | @ApiModelProperty(value = "ææ¯ç¶æä¸æ¬¡é´å®æ¥æ") |
| | | @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | |
| | | 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:æ¹éæå
¥æ°æ® |
| | |
| | | |
| | | import javax.servlet.http.HttpServletRequest; |
| | | import java.util.*; |
| | | import java.util.concurrent.atomic.AtomicInteger; |
| | | |
| | | /** |
| | | * @Description: ä¿å
»æ å |
| | |
| | | @DeleteMapping(value = "/deleteBatch") |
| | | public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { |
| | | List<String> list = Arrays.asList(ids.split(",")); |
| | | AtomicInteger i = new AtomicInteger(); |
| | | list.forEach(id -> { |
| | | EamMaintenanceStandard entity = eamMaintenanceStandardService.getById(id); |
| | | if (entity != null&&entity.getStandardStatus().equals(MaintenanceStandardStatusEnum.WAIT_SUBMIT.name())) { |
| | | //åªå é¤ç¶æä¸ºå¾
æäº¤ç |
| | | i.getAndIncrement(); |
| | | entity.setDelFlag(CommonConstant.DEL_FLAG_1); |
| | | eamMaintenanceStandardService.updateById(entity); |
| | | } |
| | | }); |
| | | return Result.OK("æ¹éå 餿åï¼"); |
| | | return Result.OK("æ¹éå 餿å,å·²å é¤ç¶æä¸ºå¾
æäº¤çä¿å
»æ åï¼å 餿°é为"+i); |
| | | } |
| | | |
| | | /** |
| | |
| | | |
| | | for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { |
| | | MultipartFile file = entity.getValue(); |
| | | file.getOriginalFilename(); |
| | | return eamMaintenanceStandardService.importPointInspectionExcel(file); |
| | | String fileName = file.getOriginalFilename(); |
| | | Result<?> importResult=eamMaintenanceStandardService.importPointInspectionExcel(file); |
| | | if (importResult.isSuccess()) { |
| | | successCount++; |
| | | } else { |
| | | results.put(fileName, importResult.getMessage()); |
| | | failureCount++; |
| | | } |
| | | } |
| | | |
| | | // æå»ºååº |
| | | Map<String, Object> response = new HashMap<>(); |
| | | response.put("results", results); |
| | | response.put("totalFiles", fileMap.size()); |
| | | response.put("successCount", successCount); |
| | | response.put("failureCount", failureCount); |
| | | |
| | | return Result.ok("导å
¥å®æ" + response); |
| | | // æå»ºæç»ååº |
| | | return getResult(results, fileMap.size(), successCount, failureCount); |
| | | |
| | | } catch (Exception e) { |
| | | log.error("ç¹æ£å¯¼å
¥å¤çå¼å¸¸", e); |
| | |
| | | |
| | | for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { |
| | | MultipartFile file = entity.getValue(); |
| | | file.getOriginalFilename(); |
| | | return eamMaintenanceStandardService.importMaintenanceStandard(file, "SECOND"); |
| | | String fileName = file.getOriginalFilename(); |
| | | Result<?> importResult=eamMaintenanceStandardService.importMaintenanceStandard(file, "SECOND"); |
| | | if (importResult.isSuccess()) { |
| | | successCount++; |
| | | } else { |
| | | results.put(fileName, importResult.getMessage()); |
| | | failureCount++; |
| | | } |
| | | } |
| | | |
| | | // æå»ºæç»ååº |
| | | Map<String, Object> response = new HashMap<>(); |
| | | response.put("results", results); |
| | | response.put("totalFiles", fileMap.size()); |
| | | response.put("successCount", successCount); |
| | | response.put("failureCount", failureCount); |
| | | |
| | | return Result.ok("导å
¥å®æ"+response); |
| | | return getResult(results, fileMap.size(), successCount, failureCount); |
| | | |
| | | } catch (Exception e) { |
| | | log.error("导å
¥å¤çå¼å¸¸", e); |
| | |
| | | |
| | | for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { |
| | | MultipartFile file = entity.getValue(); |
| | | file.getOriginalFilename(); |
| | | return eamMaintenanceStandardService.importMaintenanceStandard(file, "THIRD"); |
| | | String fileName = file.getOriginalFilename(); |
| | | Result<?> importResult= eamMaintenanceStandardService.importMaintenanceStandard(file, "THIRD"); |
| | | if (importResult.isSuccess()) { |
| | | successCount++; |
| | | } else { |
| | | results.put(fileName, importResult.getMessage()); |
| | | failureCount++; |
| | | } |
| | | } |
| | | |
| | | // æå»ºæç»ååº |
| | | Map<String, Object> response = new HashMap<>(); |
| | | response.put("results", results); |
| | | response.put("totalFiles", fileMap.size()); |
| | | response.put("successCount", successCount); |
| | | response.put("failureCount", failureCount); |
| | | |
| | | return Result.ok("导å
¥å®æ"+response); |
| | | return getResult(results, fileMap.size(), successCount, failureCount); |
| | | |
| | | } catch (Exception e) { |
| | | log.error("导å
¥å¤çå¼å¸¸", e); |
| | |
| | | } |
| | | } |
| | | |
| | | private Result<?> getResult(Map<String, String> results, int fileCount, int successCount, int failureCount) { |
| | | List<String> response = new ArrayList<>(); |
| | | response.add("æ»æä»¶æ°ï¼" + fileCount); |
| | | response.add("æåæ°ï¼" + successCount); |
| | | response.add("失败æ°ï¼" + failureCount); |
| | | if (failureCount > 0) { |
| | | response.add("é误信æ¯ï¼" + results.values()); |
| | | return Result.error("é¨åæä»¶å¯¼å
¥å¤±è´¥ï¼" + response); |
| | | } |
| | | return Result.ok("æææä»¶å¯¼å
¥æåï¼" + response); |
| | | } |
| | | |
| | | } |