From 98c6385eb6560f70d71e0ab32faf0522c519748c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Wed, 15 Oct 2025 15:47:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E8=8E=B7=E5=8F=96=E5=8F=8A=E5=AD=98=E5=82=A8=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/NuBizNuCustomerServer.java | 16 +++ .../NuBizNuCustomerServerServiceImpl.java | 130 +++++++++++------- 2 files changed, 96 insertions(+), 50 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java index b8865f8..4163227 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java @@ -101,6 +101,22 @@ public class NuBizNuCustomerServer implements Serializable { /**服务指令图片小图*/ @ApiModelProperty(value = "服务指令图片小图") private java.lang.String previewFileSmall; + /**即时指令图标*/ + @ApiModelProperty(value = "即时指令图标") + @TableField(exist = false) + private java.lang.String netImmediateFile; + /**即时指令焦点图标*/ + @ApiModelProperty(value = "即时指令图标") + @TableField(exist = false) + private java.lang.String netImmediateFileFocus; + /**服务指令图片大图*/ + @ApiModelProperty(value = "服务指令图片大图") + @TableField(exist = false) + private java.lang.String netPreviewFile; + /**服务指令图片小图*/ + @ApiModelProperty(value = "服务指令图片小图") + @TableField(exist = false) + private java.lang.String netPreviewFileSmall; /**定位*/ @Excel(name = "定位", width = 15) @ApiModelProperty(value = "定位") diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java index 28c6b21..dd5b1b8 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java @@ -64,57 +64,87 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl> childrenList = new ArrayList<>(); for(NuBizNuCustomerServer par : groupList){ // if(StringUtils.equals(groupPositioning1,par.getPositioning())){ - Map map = new HashMap<>(); - map.put("nuId",nuBizNuCustomerServer.getNuId()); - map.put("customerId",nuBizNuCustomerServer.getCustomerId()); - map.put("directiveId",par.getId()); - map.put("directiveName",par.getDirectiveName()); - map.put("typeId",par.getTypeId()); - map.put("typeName",par.getTypeName()); - map.put("categoryId",par.getCategoryId()); - map.put("categoryName",par.getCategoryName()); - map.put("tagName",par.getTagName()); - map.put("startTime",par.getStartTime()); - map.put("endTime",par.getEndTime()); - map.put("cycleTypeId",par.getCycleType()); - map.put("cycleType",par.getCycleType()); - map.put("cycleValue",par.getCycleValue()); - map.put("positioningLong",par.getPositioningLong()); - map.put("positioning",par.getPositioning()); - map.put("izPackage",par.getIzPackage()); - if(par.getImmediateFile()!=null&&!par.getImmediateFile().equals("")){ - String immediateFile = getImageNetUrl(par.getImmediateFile()); - map.put("immediateFile",par.getImmediateFile()); - map.put("netImmediateFile",immediateFile); - }else{ - map.put("immediateFile",""); - map.put("netImmediateFile",""); - } - if(par.getImmediateFileFocus()!=null&&!par.getImmediateFile().equals("")){ - String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus()); - map.put("immediateFileFocus",par.getImmediateFileFocus()); - map.put("netImmediateFileFocus",immediateFileFocus); - }else{ - map.put("immediateFileFocus",""); - map.put("netImmediateFileFocus",""); - } - if(par.getPreviewFile()!=null&&!par.getImmediateFile().equals("")){ - String previewFile = getImageNetUrl(par.getPreviewFile()); - map.put("previewFile",par.getPreviewFile()); - map.put("netPreviewFile",previewFile); - }else{ - map.put("previewFile",""); - map.put("netPreviewFile",""); - } - if(par.getPreviewFileSmall()!=null&&!par.getImmediateFile().equals("")){ - String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall()); - map.put("previewFileSmall",par.getPreviewFileSmall()); - map.put("netPreviewFileSmall",previewFileSmall); - }else{ - map.put("previewFileSmall",""); - map.put("netPreviewFileSmall",""); - } +// Map map = new HashMap<>(); +// map.put("nuId",nuBizNuCustomerServer.getNuId()); +// map.put("customerId",nuBizNuCustomerServer.getCustomerId()); +// map.put("directiveId",par.getId()); +// map.put("directiveName",par.getDirectiveName()); +// map.put("typeId",par.getTypeId()); +// map.put("typeName",par.getTypeName()); +// map.put("categoryId",par.getCategoryId()); +// map.put("categoryName",par.getCategoryName()); +// map.put("tagName",par.getTagName()); +// map.put("startTime",par.getStartTime()); +// map.put("endTime",par.getEndTime()); +// map.put("cycleTypeId",par.getCycleType()); +// map.put("cycleType",par.getCycleType()); +// map.put("cycleValue",par.getCycleValue()); +// map.put("positioningLong",par.getPositioningLong()); +// map.put("positioning",par.getPositioning()); +// map.put("izPackage",par.getIzPackage()); +// if(par.getImmediateFile()!=null&&!par.getImmediateFile().equals("")){ +// String immediateFile = getImageNetUrl(par.getImmediateFile()); +// map.put("immediateFile",par.getImmediateFile()); +// map.put("netImmediateFile",immediateFile); +// }else{ +// map.put("immediateFile",""); +// map.put("netImmediateFile",""); +// } +// if(par.getImmediateFileFocus()!=null&&!par.getImmediateFile().equals("")){ +// String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus()); +// map.put("immediateFileFocus",par.getImmediateFileFocus()); +// map.put("netImmediateFileFocus",immediateFileFocus); +// }else{ +// map.put("immediateFileFocus",""); +// map.put("netImmediateFileFocus",""); +// } +// if(par.getPreviewFile()!=null&&!par.getImmediateFile().equals("")){ +// String previewFile = getImageNetUrl(par.getPreviewFile()); +// map.put("previewFile",par.getPreviewFile()); +// map.put("netPreviewFile",previewFile); +// }else{ +// map.put("previewFile",""); +// map.put("netPreviewFile",""); +// } +// if(par.getPreviewFileSmall()!=null&&!par.getImmediateFile().equals("")){ +// String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall()); +// map.put("previewFileSmall",par.getPreviewFileSmall()); +// map.put("netPreviewFileSmall",previewFileSmall); +// }else{ +// map.put("previewFileSmall",""); +// map.put("netPreviewFileSmall",""); +// } // childrenList.add(map); + + if(par.getImmediateFile()!=null&&!par.getImmediateFile().equals("")){ + String immediateFile = getImageNetUrl(par.getImmediateFile()); + par.setNetImmediateFile(immediateFile); + }else{ + par.setImmediateFile(""); + par.setNetImmediateFile(""); + } + if(par.getImmediateFileFocus()!=null&&!par.getImmediateFileFocus().equals("")){ + String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus()); + par.setNetImmediateFileFocus(immediateFileFocus); + }else{ + par.setImmediateFileFocus(""); + par.setNetImmediateFileFocus(""); + } + if(par.getPreviewFile()!=null&&!par.getPreviewFile().equals("")){ + String previewFile = getImageNetUrl(par.getPreviewFile()); + par.setNetPreviewFile(previewFile); + }else{ + par.setPreviewFile(""); + par.setNetPreviewFile(""); + } + if(par.getPreviewFileSmall()!=null&&!par.getPreviewFileSmall().equals("")){ + String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall()); + par.setNetPreviewFileSmall(previewFileSmall); + }else{ + par.setPreviewFileSmall(""); + par.setNetPreviewFileSmall(""); + } + // } } // posMap.put("children",childrenList);