From 69f87d438582c452c41d6545595d89202a2fd8ef Mon Sep 17 00:00:00 2001
From: "fangming,xu" <1104570422@qq.com>
Date: Tue, 15 Apr 2025 15:25:08 +0800
Subject: [PATCH] init

---
 .idea/.gitignore                              |    8 +
 .idea/compiler.xml                            |   15 +
 .idea/encodings.xml                           |   10 +
 .idea/ifsm-base.iml                           |    9 +
 .idea/inspectionProfiles/Project_Default.xml  |    7 +
 .idea/jarRepositories.xml                     |   55 +
 .idea/misc.xml                                |   12 +
 .idea/modules.xml                             |    8 +
 .idea/vcs.xml                                 |    6 +
 README.md                                     |   92 +
 nxgx-commons/pom.xml                          |   31 +
 .../com/rootcloud/utils/HashMapChain.java     |   10 +
 .../java/com/rootcloud/utils/JEUuidUtil.java  |  152 ++
 .../com/rootcloud/utils/LocalDateUtils.java   |   74 +
 .../main/java/com/rootcloud/utils/Person.java |    6 +
 .../com/rootcloud/utils/SpringBeanUtils.java  |   33 +
 .../java/com/rootcloud/utils/StringUtil.java  |   86 +
 .../rootcloud/utils/StuInvocationHandler.java |   18 +
 .../java/com/rootcloud/utils/Student.java     |   19 +
 .../com/rootcloud/utils/StudentProxy.java     |   30 +
 .../com/rootcloud/utils/HashMapChain.class    |  Bin 0 -> 870 bytes
 .../com/rootcloud/utils/JEUuidUtil.class      |  Bin 0 -> 3954 bytes
 .../com/rootcloud/utils/LocalDateUtils.class  |  Bin 0 -> 2385 bytes
 .../classes/com/rootcloud/utils/Person.class  |  Bin 0 -> 139 bytes
 .../com/rootcloud/utils/SpringBeanUtils.class |  Bin 0 -> 1302 bytes
 .../com/rootcloud/utils/StringUtil.class      |  Bin 0 -> 2412 bytes
 .../utils/StuInvocationHandler.class          |  Bin 0 -> 1128 bytes
 .../classes/com/rootcloud/utils/Student.class |  Bin 0 -> 915 bytes
 .../com/rootcloud/utils/StudentProxy.class    |  Bin 0 -> 1263 bytes
 .../target/maven-archiver/pom.properties      |    5 +
 .../compile/default-compile/createdFiles.lst  |    9 +
 .../compile/default-compile/inputFiles.lst    |    9 +
 .../target/nxgx-commons-Brussels-SR6.jar      |  Bin 0 -> 11002 bytes
 nxgx-ifsm-base/.gitignore                     |  149 ++
 nxgx-ifsm-base/pom.xml                        |  305 +++
 nxgx-ifsm-base/src/main/docker/Dockerfile     |    6 +
 .../main/java/com/rootcloud/NXGXBaseApp.java  |   56 +
 .../com/rootcloud/common/CheckSumBuilder.java |   42 +
 .../java/com/rootcloud/common/Constants.java  |   84 +
 .../java/com/rootcloud/common/DESUtil.java    |   77 +
 .../java/com/rootcloud/common/DateUtil.java   |  992 ++++++++
 .../com/rootcloud/common/DeflaterUtils.java   |  101 +
 .../com/rootcloud/common/HttpClientUtil.java  |  302 +++
 .../java/com/rootcloud/common/HttpUtils.java  |  453 ++++
 .../java/com/rootcloud/common/I18nUtil.java   |   21 +
 .../com/rootcloud/common/IgnoreSecurity.java  |   18 +
 .../java/com/rootcloud/common/JEUuidUtil.java |  152 ++
 .../com/rootcloud/common/JsonPageResult.java  |   45 +
 .../java/com/rootcloud/common/JsonResult.java |   78 +
 .../com/rootcloud/common/JsonResult2.java     |  105 +
 .../rootcloud/common/JsonResultStatus.java    |   67 +
 .../com/rootcloud/common/LappLiveClient.java  |  462 ++++
 .../java/com/rootcloud/common/NotBlank.java   |   21 +
 .../rootcloud/common/OAuth2Properties.java    |  148 ++
 .../com/rootcloud/common/OAuthResult.java     |  156 ++
 .../java/com/rootcloud/common/PageAO.java     |   47 +
 .../com/rootcloud/common/PageRequest.java     |   41 +
 .../java/com/rootcloud/common/Request.java    |  181 ++
 .../com/rootcloud/common/ResourceUtil.java    |   27 +
 .../common/RootCloudOpenAPIUtil.java          |   78 +
 .../rootcloud/common/SendMessageUtils.java    |   95 +
 .../com/rootcloud/common/SprintBeanUtils.java |   28 +
 .../java/com/rootcloud/common/TokenUtil.java  |  211 ++
 .../common/UserOperationContext.java          |   26 +
 .../java/com/rootcloud/common/Validate.java   |   18 +
 .../rootcloud/common/WebServiceClient.java    |  505 ++++
 .../common/constant/BusinessConstant.java     |   22 +
 .../common/constant/DeviceConstant.java       |   19 +
 .../common/constant/JsonResultStatusBpm.java  |   30 +
 .../common/constant/LappLiveConstant.java     |   56 +
 .../rootcloud/common/constant/Properties.java |   22 +
 .../common/constant/RoleIdConstant.java       |   17 +
 .../common/constant/RootCloudApi.java         |   16 +
 .../common/constant/SyncSimpleDateFormat.java |   32 +
 .../common/constant/TemplateConstant.java     |   11 +
 .../common/constant/WeekTypeEnum.java         |   50 +
 .../com/rootcloud/common/enums/BaseEnums.java |   13 +
 .../common/enums/DeviceOnlineStatus.java      |   73 +
 .../common/enums/HttpRequestMethedEnum.java   |   42 +
 .../rootcloud/common/enums/OrderEnums.java    |   68 +
 .../common/enums/ReportStatisticsEnums.java   |   72 +
 .../common/enums/ServicePlanEnums.java        |  372 +++
 .../common/enums/StatusCodeEnum.java          |   41 +
 .../intercept/DataScopeInterceptor.java       |  264 ++
 .../common/intercept/LanguageIntercept.java   |   30 +
 .../com/rootcloud/common/live/CacheMap.java   |   65 +
 .../com/rootcloud/common/live/CacheMap2.java  |   65 +
 .../com/rootcloud/common/live/DateUtil.java   | 1505 +++++++++++
 .../common/net/DateJsonValueProcessor.java    |   54 +
 .../com/rootcloud/common/net/JsonHelper.java  |  474 ++++
 .../rootcloud/common/net/NetworkHelper.java   |  296 +++
 .../common/net/TimestampToDateMorpher.java    |   31 +
 .../rootcloud/common/util/CommonUtils.java    |  148 ++
 .../rootcloud/common/util/DateConstant.java   |   43 +
 .../com/rootcloud/common/util/DateUtils.java  |  525 ++++
 .../rootcloud/common/util/EncryptUtil.java    |  306 +++
 .../rootcloud/common/util/GaoDeAPIUtils.java  |  108 +
 .../com/rootcloud/common/util/MapBuilder.java |   79 +
 .../common/util/OrderNumberUtils.java         |   24 +
 .../common/util/PlatformDeviceTransUtil.java  |  273 ++
 .../common/util/RestTemplateUtils.java        |  122 +
 .../common/vo/PrinterWorkBoxSize.java         |   53 +
 .../com/rootcloud/common/vo/RepPageVO.java    |   92 +
 .../config/GlobalExceptionHandler.java        |   57 +
 .../rootcloud/config/MybatisPlusConfig.java   |   38 +
 .../com/rootcloud/config/RedisConfig.java     |   22 +
 .../config/RedisObjectSerializer.java         |   42 +
 .../com/rootcloud/config/ScheduleConfig.java  |   21 +
 .../com/rootcloud/config/SwaggerConfig.java   |   71 +
 .../rootcloud/config/WebMvcConfigurer.java    |   54 +
 .../auth/AuthenticationInterceptor.java       |  215 ++
 .../config/auth/AuthorizationInterceptor.java |   46 +
 .../com/rootcloud/config/auth/CorsConfig.java |   31 +
 .../rootcloud/config/auth/LoginUserInfo.java  |   47 +
 .../config/auth/RequiresUserType.java         |   13 +
 .../rootcloud/config/auth/UserContext.java    |   67 +
 .../com/rootcloud/config/auth/UserInfo.java   |   14 +
 .../rootcloud/config/auth/UserTypeEnum.java   |   19 +
 .../config/exception/AbstractException.java   |   14 +
 .../config/exception/BusinessException.java   |   13 +
 .../config/rabbitmq/RabbitMQConfig.java       |  115 +
 .../com/rootcloud/config/rabbitmq/Sender.java |   66 +
 .../com/rootcloud/config/unipush/GtUtils.java |  229 ++
 .../config/unipush/MessageController.java     |  148 ++
 .../config/unipush/SendUniPushUtil.java       |   66 +
 .../config/unipush/UniPushAppsConfig.java     |   25 +
 .../rootcloud/config/unipush/UniPushVO.java   |   14 +
 .../config/unipush/UnipushUtils.java          |  199 ++
 .../controller/AbaBaseController.java         |   77 +
 .../controller/AppBaseController.java         |   74 +
 .../controller/AppDeviceController.java       |  116 +
 .../controller/AppMessageController.java      |  160 ++
 .../AppNxZskFaultCodeController.java          |   45 +
 .../controller/AppOrderController.java        |  119 +
 .../controller/CarouselController.java        |   86 +
 .../controller/CommonController.java          |   33 +
 .../controller/DeviceController.java          |  129 +
 .../DeviceHistorySituationController.java     |  169 ++
 .../controller/FittingController.java         |   75 +
 .../rootcloud/controller/JobController.java   |  117 +
 .../controller/LappLiveController.java        |   60 +
 .../rootcloud/controller/LoginController.java |   58 +
 .../controller/MessageModelController.java    |   34 +
 .../rootcloud/controller/ModelController.java |   68 +
 .../rootcloud/controller/MyController.java    |   44 +
 .../controller/NetworkController.java         |   32 +
 .../controller/NetworkUserController.java     |  177 ++
 .../controller/NxOrderController.java         |   66 +
 .../NxPartFileConfigController.java           |   45 +
 .../controller/NxPartFileController.java      |   49 +
 .../controller/NxTodoLibraryController.java   |   75 +
 .../controller/ReportStatisticController.java |  217 ++
 .../rootcloud/controller/SMSController.java   |   54 +
 .../controller/ServicePlanController.java     |  155 ++
 .../WorkStatusMonitorController.java          |   44 +
 .../domain/ao/ExportHistorySituationAO.java   |   36 +
 .../domain/ao/HistorySituationAO.java         |   36 +
 .../com/rootcloud/domain/ao/NxUserInfoAO.java |   64 +
 .../domain/ao/OrderDispatchForm.java          |   51 +
 .../domain/ao/ReportStatisticAO.java          |   37 +
 .../rootcloud/domain/ao/ServicePlanAO.java    |  113 +
 .../domain/ao/ServicePlanCalendarAO.java      |   22 +
 .../domain/ao/ServicePlanCalendarNewAO.java   |   22 +
 .../domain/ao/ServicePlanParamsAO.java        |   11 +
 .../domain/ao/TriggerConditionAO.java         |   60 +
 .../domain/constant/AppConstant.java          |   16 +
 .../domain/constant/RabbitMQConstant.java     |   23 +
 .../domain/constant/RedisConstant.java        |   10 +
 .../com/rootcloud/domain/dao/ConfigDao.java   |   18 +
 .../com/rootcloud/domain/dao/CustomerDao.java |   21 +
 .../domain/dao/FittingsListMapper.java        |    9 +
 .../com/rootcloud/domain/dao/GbsjbDao.java    |   56 +
 .../domain/dao/JeCoreEnduserDao.java          |   47 +
 .../rootcloud/domain/dao/JeCoreRoleDao.java   |   17 +
 .../domain/dao/JeCoreRoleUserDao.java         |   17 +
 .../rootcloud/domain/dao/JeSysUsermsgDao.java |   17 +
 .../java/com/rootcloud/domain/dao/KhDao.java  |   13 +
 .../rootcloud/domain/dao/ModelColorDao.java   |   16 +
 .../domain/dao/ModelPropertyDao.java          |   15 +
 .../com/rootcloud/domain/dao/NxDeviceDao.java |   34 +
 .../com/rootcloud/domain/dao/NxOrderDao.java  |   17 +
 .../domain/dao/PrinterEfficiencyWorkDao.java  |   44 +
 .../domain/dao/PrinterHeadRecordDao.java      |   11 +
 .../domain/dao/RepPrinterOutputDao.java       |   30 +
 .../domain/dao/RepPrinterReportDAO.java       |   68 +
 .../domain/dao/RepPrinterReportItemDao.java   |   22 +
 .../domain/dao/RepPrinterSandPassrateDao.java |   33 +
 .../domain/dao/RepPrinterSandPercentDAO.java  |  108 +
 .../domain/dao/RepPrinterSandPercentDAO2.java |  122 +
 .../domain/dao/RepPrinterStarEvaluateDAO.java |   53 +
 .../domain/dao/RepPrinterStarPassrateDao.java |   35 +
 .../domain/dao/RepPrinterTargetDicDAO.java    |   65 +
 .../domain/dao/RepPrinterWastereasonDao.java  |   26 +
 .../rootcloud/domain/dao/TargetTypeDAO.java   |   43 +
 .../domain/dao/ds/DeviceListMapper.java       |   16 +
 .../domain/dao/ds/DeviceSyncMapper.java       |    9 +
 .../dao/ds/ModelPropertySyncMapper.java       |   10 +
 .../domain/dao/ds/ModelSyncMapper.java        |    9 +
 .../domain/dao/gkjk/NxJeDeviceDao.java        |   43 +
 .../domain/dao/part/NxPartFileConfigDao.java  |   16 +
 .../domain/dao/part/NxPartFileDao.java        |   34 +
 .../domain/dao/part/NxPartRespDao.java        |   17 +
 .../domain/dao/sp/NxTriggerConditionDao.java  |   10 +
 .../domain/dao/sp/NxUserInfoDao.java          |    9 +
 .../domain/dao/sp/ServicePlanDao.java         |    9 +
 .../domain/dao/sp/ServicePlanHistoryDao.java  |   14 +
 .../com/rootcloud/domain/dto/CameraDTO.java   |   22 +
 .../com/rootcloud/domain/dto/CarouselDTO.java |   31 +
 .../rootcloud/domain/dto/ConditionModel.java  |   37 +
 .../com/rootcloud/domain/dto/DeviceDTO.java   |   39 +
 .../domain/dto/DeviceSpecialDTO.java          |   21 +
 .../com/rootcloud/domain/dto/DeviceVO.java    |   62 +
 .../domain/dto/DeviceWorkTimeDTO.java         |   21 +
 .../rootcloud/domain/dto/EngineerModel.java   |   24 +
 .../domain/dto/EnterpriseInfoDTO.java         |  682 +++++
 .../rootcloud/domain/dto/ImageUrlsDTO.java    |   21 +
 .../com/rootcloud/domain/dto/NxDeviceDTO.java |   21 +
 .../rootcloud/domain/dto/NxSparePartVo.java   |  107 +
 .../com/rootcloud/domain/dto/OrderInfoVO.java |   57 +
 .../com/rootcloud/domain/dto/OrderVO.java     |  282 +++
 .../domain/dto/PendingOrderModel.java         |   49 +
 .../domain/dto/ServiceViewResultModel.java    |   53 +
 .../rootcloud/domain/dto/UserRoleDeptDTO.java |  327 +++
 .../domain/entity/CarouselEntity.java         |   62 +
 .../domain/entity/ContractEntity.java         |   18 +
 .../rootcloud/domain/entity/DemoEntity.java   |   23 +
 .../com/rootcloud/domain/entity/FwryDTO.java  |   34 +
 .../rootcloud/domain/entity/GbsjbEntity.java  |  139 ++
 .../domain/entity/JeCoreEnduserEntity.java    |  545 ++++
 .../domain/entity/JeCoreRoleEntity.java       |  236 ++
 .../domain/entity/JeCoreRoleUserEntity.java   |   32 +
 .../domain/entity/JeSysUsermsgEntity.java     |  120 +
 .../com/rootcloud/domain/entity/KhglDTO.java  |   14 +
 .../domain/entity/MyAdviceEntity.java         |   66 +
 .../domain/entity/MyMessageEntity.java        |   76 +
 .../domain/entity/NetworkEntity.java          |   52 +
 .../domain/entity/NetworkUserEntity.java      |   45 +
 .../domain/entity/NxFittingsListEntity.java   |   12 +
 .../domain/entity/NxJeDeviceEntity.java       |  208 ++
 .../domain/entity/NxOrderEntity.java          |  477 ++++
 .../domain/entity/NxPartFileConfigEntity.java |  106 +
 .../domain/entity/NxPartFileEntity.java       |  147 ++
 .../domain/entity/NxPartRespEntity.java       |   99 +
 .../domain/entity/NxSparePartEntity.java      |   27 +
 .../domain/entity/NxTodoLibrary.java          |  219 ++
 .../domain/entity/NxZskFaultCodeEntity.java   |   29 +
 .../com/rootcloud/domain/entity/Part.java     |  671 +++++
 .../com/rootcloud/domain/entity/SiteDTO.java  |   13 +
 .../domain/entity/base/EntityBase.java        |   20 +
 .../domain/entity/base/ModelColor.java        |   21 +
 .../entity/base/ModelPropertyEntity.java      |   59 +
 .../rootcloud/domain/entity/base/NxResp.java  |   26 +
 .../entity/base/UpdatableEntityBase.java      |   18 +
 .../domain/entity/device/DeviceEntity.java    |   67 +
 .../entity/device/NxDeviceCameraEntity.java   |   39 +
 .../domain/entity/device/NxDeviceEntity.java  |   74 +
 .../entity/device/NxDeviceLocationEntity.java |   23 +
 .../domain/entity/ds/DeviceListEntity.java    |   27 +
 .../domain/entity/ds/DeviceSyncEntity.java    |   64 +
 .../domain/entity/ds/ModelEntity.java         |   21 +
 .../entity/ds/ModelPropertySyncEntity.java    |   29 +
 .../domain/entity/ds/NxDsLogEntity.java       |   14 +
 .../entity/sp/NxTriggerConditionEntity.java   |   67 +
 .../domain/entity/sp/NxUserInfoEntity.java    |   86 +
 .../domain/entity/sp/ServicePlanEntity.java   |  136 +
 .../entity/sp/ServicePlanHistoryEntity.java   |   36 +
 .../domain/mapper/CarouselMapper.java         |   15 +
 .../rootcloud/domain/mapper/CommonMapper.java |   25 +
 .../rootcloud/domain/mapper/DemoMapper.java   |   19 +
 .../rootcloud/domain/mapper/DeviceMapper.java |   56 +
 .../domain/mapper/JeSysUsermsgMapper.java     |    7 +
 .../domain/mapper/MessageModelMapper.java     |   12 +
 .../domain/mapper/ModelPropertyMapper.java    |   48 +
 .../domain/mapper/MyAdviceMapper.java         |    7 +
 .../domain/mapper/MyMessageMapper.java        |    7 +
 .../domain/mapper/NetworkMapper.java          |   14 +
 .../domain/mapper/NetworkUserMapper.java      |   14 +
 .../domain/mapper/NxDeviceCameraMapper.java   |   16 +
 .../domain/mapper/NxDeviceLocationMapper.java |   22 +
 .../domain/mapper/NxDeviceMapper.java         |   26 +
 .../domain/mapper/NxDsLogMapper.java          |    9 +
 .../domain/mapper/NxOrderMapper.java          |  212 ++
 .../rootcloud/domain/mapper/NxPlpzMapper.java |   15 +
 .../domain/mapper/NxTodoLibraryMapper.java    |   27 +
 .../mapper/NxTriggerConditionMapper.java      |   13 +
 .../domain/mapper/NxUserInfoMapper.java       |   28 +
 .../domain/mapper/NxZskFaultCodeMapper.java   |   28 +
 .../domain/mapper/NxgxJcdaFwryMapper.java     |   13 +
 .../domain/mapper/ServicePlanMapper.java      |  167 ++
 .../domain/mapper/SpareFilerMapper.java       |   53 +
 .../domain/mapper/SparePartMapper.java        |   24 +
 .../domain/mapper/TechnicalTaskDAO.java       |   22 +
 .../rootcloud/domain/mapper/UserRoleDao.java  |   12 +
 .../domain/model/LappLiveCondition.java       |   36 +
 .../domain/model/WorkStatusMonitorModel.java  |   34 +
 .../domain/service/app/MyAdviceService.java   |   16 +
 .../domain/service/app/MyMessageService.java  |   21 +
 .../service/app/impl/MyAdviceServiceImpl.java |  123 +
 .../app/impl/MyMessageServiceImpl.java        |  195 ++
 .../service/auth/RootCloudAuthService.java    |   58 +
 .../auth/RootCloudAuthServiceImpl.java        |  464 ++++
 .../domain/service/auth/UserService.java      |   20 +
 .../service/device/DeviceAlarmService.java    |   51 +
 .../domain/service/device/DeviceService.java  |   63 +
 .../service/device/FaultCodeService.java      |   41 +
 .../service/device/LappLiveService.java       |   28 +
 .../service/device/NxDeviceService.java       |   42 +
 .../device/impl/DeviceAlarmServiceImpl.java   | 1059 ++++++++
 .../device/impl/DeviceServiceImpl.java        |  679 +++++
 .../device/impl/FaultCodeServiceImpl.java     |  101 +
 .../device/impl/LappLiveSetviceImpl.java      |  297 +++
 .../device/impl/NxDeviceServiceImpl.java      |  122 +
 .../service/ds/DeviceListSyncService.java     |   22 +
 .../domain/service/ds/DeviceSyncService.java  |   10 +
 .../service/ds/ModelPropertySyncService.java  |   35 +
 .../domain/service/ds/ModelSyncService.java   |   11 +
 .../domain/service/ds/NxDsLogService.java     |    8 +
 .../ds/impl/DeviceListSyncServiceImpl.java    |   95 +
 .../ds/impl/DeviceSyncServiceImpl.java        |  228 ++
 .../ds/impl/ModelPropertySyncServiceImpl.java |  238 ++
 .../service/ds/impl/ModelSyncServiceImpl.java |  174 ++
 .../service/ds/impl/NxDsLogServiceImpl.java   |   15 +
 .../ds/impl/SyncDeviceInfoService.java        |  153 ++
 .../ds/impl/SyncModelProertySyncService.java  |  117 +
 .../service/fittings/FittingsService.java     |    9 +
 .../service/fittings/SpareFileService.java    |  391 +++
 .../service/fittings/SparePartService.java    |   32 +
 .../fittings/impl/FittingsServiceImpl.java    |   31 +
 .../fittings/impl/SparePartServiceImpl.java   |  233 ++
 .../domain/service/gbsj/GbsjbService.java     |   20 +
 .../service/gbsj/JeCoreEnduserService.java    |   45 +
 .../service/gbsj/JeCoreRoleService.java       |   19 +
 .../service/gbsj/JeCoreRoleUserService.java   |   17 +
 .../service/gbsj/ModelColorService.java       |   16 +
 .../service/gbsj/ModelPropertyService.java    |   27 +
 .../service/gbsj/impl/GbsjbServiceImpl.java   |  119 +
 .../gbsj/impl/JeCoreEnduserServiceImpl.java   |   87 +
 .../gbsj/impl/JeCoreRoleServiceImpl.java      |   14 +
 .../gbsj/impl/JeCoreRoleUserServiceImpl.java  |   13 +
 .../gbsj/impl/ModelColorServiceImpl.java      |   31 +
 .../gbsj/impl/ModelPropertyServiceImpl.java   |  144 ++
 .../service/gkjk/NxJeDeviceService.java       |  147 ++
 .../gkjk/impl/NxJeDeviceServiceImpl.java      | 1331 ++++++++++
 .../service/message/MessageModelService.java  |   35 +
 .../service/network/NetworkService.java       |   75 +
 .../service/network/NetworkUserService.java   |  670 +++++
 .../domain/service/order/OrderService.java    |  233 ++
 .../service/order/OrderServiceImpl.java       | 1945 +++++++++++++++
 .../service/part/NxPartFileConfigService.java |   29 +
 .../service/part/NxPartFileService.java       |   33 +
 .../service/part/NxPartRespService.java       |   18 +
 .../domain/service/part/PartTask.java         |   82 +
 .../impl/NxPartFileConfigServiceImpl.java     |   94 +
 .../part/impl/NxPartFileServiceImpl.java      |  294 +++
 .../part/impl/NxPartRespServiceImpl.java      |   16 +
 .../service/sp/NxTriggerConditionService.java |   50 +
 .../domain/service/sp/NxUserInfoService.java  |   86 +
 .../service/sp/ServicePlanHistoryService.java |   13 +
 .../domain/service/sp/ServicePlanService.java |  162 ++
 .../impl/NxTriggerConditionServiceImpl.java   |  270 ++
 .../sp/impl/NxUserInfoServiceImpl.java        |  434 ++++
 .../impl/ServicePlanHistoryServiceImpl.java   |   23 +
 .../sp/impl/ServicePlanServiceImpl.java       | 2146 ++++++++++++++++
 .../service/todo/NxTodoLibraryService.java    |   66 +
 .../todo/impl/NxTodoLibraryServiceImpl.java   |  189 ++
 .../com/rootcloud/domain/vo/CarouselVO.java   |   29 +
 .../com/rootcloud/domain/vo/ConfigVO.java     |   52 +
 .../rootcloud/domain/vo/CustomerSales.java    |   15 +
 .../com/rootcloud/domain/vo/CustomerVO.java   |   89 +
 .../com/rootcloud/domain/vo/DeviceListVO.java |   33 +
 .../domain/vo/DeviceStatusStatistic.java      |   42 +
 .../com/rootcloud/domain/vo/FaultNumber.java  |   20 +
 .../rootcloud/domain/vo/FittingsSales.java    |   16 +
 .../java/com/rootcloud/domain/vo/KhVO.java    |   24 +
 .../com/rootcloud/domain/vo/NxDeviceVO.java   |  497 ++++
 .../rootcloud/domain/vo/OrderStatistic.java   |   16 +
 .../domain/vo/OrderStatusStatistic.java       |   36 +
 .../java/com/rootcloud/domain/vo/Outlets.java |   31 +
 .../rootcloud/domain/vo/PartsFaultNumber.java |   19 +
 .../domain/vo/PersonAllStatistic.java         |   36 +
 .../domain/vo/PersonnelStatistic.java         |   30 +
 .../domain/vo/PrinterEfficiencyWorkVO.java    |  119 +
 .../domain/vo/PrinterHeadRecordVO.java        |  292 +++
 .../com/rootcloud/domain/vo/RepMttDataVO.java |  222 ++
 .../domain/vo/RepPrinterEmailConfigVO.java    |   49 +
 .../domain/vo/RepPrinterOutputVO.java         |  198 ++
 .../domain/vo/RepPrinterReportItemVO.java     |   41 +
 .../domain/vo/RepPrinterReportVO.java         |  942 +++++++
 .../domain/vo/RepPrinterSandPassrateVO.java   |  188 ++
 .../domain/vo/RepPrinterSandPercentVO.java    |  451 ++++
 .../domain/vo/RepPrinterStarPassrateVO.java   |  186 ++
 .../domain/vo/RepPrinterTargetDicVO.java      |  131 +
 .../domain/vo/RepPrinterWasteTypeVO.java      |   27 +
 .../domain/vo/RepPrinterWastereasonVO.java    |  175 ++
 .../domain/vo/RepStarEvaluateVO.java          |  239 ++
 .../java/com/rootcloud/domain/vo/SMSVO.java   |   15 +
 .../com/rootcloud/domain/vo/StatusVO.java     |   16 +
 .../com/rootcloud/domain/vo/TargetTypeVO.java |   84 +
 .../rootcloud/domain/vo/TechnicalTaskVO.java  |  131 +
 .../com/rootcloud/domain/vo/UserRoleVO.java   |  132 +
 .../rootcloud/exception/ExceptionCode.java    |   18 +
 .../OperationNotAllowedException.java         |   14 +
 .../exception/UserUnauthorizedException.java  |   11 +
 .../rootcloud/service/CarouselService.java    |   42 +
 .../com/rootcloud/service/ConfigService.java  |   33 +
 .../com/rootcloud/service/EmailService.java   |   19 +
 .../service/PrinterEfficiencyService.java     |   40 +
 .../rootcloud/service/RepCustomerService.java |   19 +
 .../service/RepPrinterReportService.java      |   62 +
 .../service/RepPrinterSandPercentService.java |  118 +
 .../rootcloud/service/RepPrinterService.java  |   77 +
 .../RepPrinterStarEvaluateService.java        |   23 +
 .../service/RepPrinterTargetDicService.java   |   65 +
 .../AddRepPrinterTargetDicCondition.java      |   98 +
 .../DelRepPrinterTargetDicCondition.java      |   24 +
 .../QueryRepPrinterTargetDicCondition.java    |   95 +
 .../condition/QueryUserReportCondition.java   |  119 +
 .../UpdateRepPrinterTargetDicCondition.java   |  111 +
 .../service/constant/ExceptionStatus.java     |   24 +
 .../service/impl/CarouselServiceImpl.java     |  118 +
 .../service/impl/ConfigServiceImpl.java       |   68 +
 .../service/impl/EmailServiceImpl.java        |  127 +
 .../impl/PrinterEfficiencyServiceImpl.java    | 1448 +++++++++++
 .../service/impl/RepCustomerServiceImpl.java  |   94 +
 .../impl/RepPrinterReportServiceImpl.java     | 2195 +++++++++++++++++
 .../RepPrinterSandPercentServiceImpl.java     |  393 +++
 .../service/impl/RepPrinterServiceImpl.java   |  504 ++++
 .../RepPrinterStarEvaluateServiceImpl.java    | 1364 ++++++++++
 .../impl/RepPrinterTargetDicServiceImpl.java  |   97 +
 .../java/com/rootcloud/timer/MainTimer.java   |  161 ++
 .../com/rootcloud/timer/ServicePlanTimer.java |   60 +
 .../com/rootcloud/timer/SparePartTimer.java   |   53 +
 .../validate/annotation/NotBlank.java         |   21 +
 .../validate/annotation/Validate.java         |   18 +
 .../main/java/com/rootcloud/vo/UserLogin.java |   76 +
 .../java/com/rootcloud/vo/UserLogout.java     |   82 +
 .../com/rootcloud/vo/app/AdviceResultVo.java  |   22 +
 .../com/rootcloud/vo/app/MessageResultVo.java |   22 +
 .../com/rootcloud/vo/device/BaseDeviceVO.java |   45 +
 .../com/rootcloud/vo/device/CameraParam.java  |   33 +
 .../CommonDeviceHistorySituationVO.java       |   29 +
 .../vo/device/DeviceHistorySituationVO.java   |   65 +
 .../com/rootcloud/vo/device/DeviceInfo.java   |   66 +
 .../device/DeviceMonthWorkTimeLineChart.java  |   25 +
 .../device/DeviceMonthWorkTimeStatistics.java |   30 +
 .../vo/device/DeviceStatusStatistics.java     |   27 +
 .../rootcloud/vo/device/DeviceStatusVO.java   |   19 +
 .../com/rootcloud/vo/device/DeviceTypeVO.java |   90 +
 .../com/rootcloud/vo/device/DeviceVO.java     |   24 +
 .../com/rootcloud/vo/device/DeviceView.java   |   22 +
 .../vo/device/DeviceWorkTimeStatistics.java   |   29 +
 .../com/rootcloud/vo/device/NetWorkParam.java |   20 +
 .../rootcloud/vo/device/NxDeviceParam.java    |   17 +
 .../device/ServicePlanCalendarDetailsVO.java  |   41 +
 .../vo/device/ServicePlanCalendarList.java    |   31 +
 .../vo/device/ServicePlanCalendarVO.java      |   20 +
 .../vo/device/ServicePlanDetailVO.java        |  118 +
 .../vo/device/SituationColumnsVO.java         |   53 +
 .../vo/faultcode/FaultCodeDetailVo.java       |   33 +
 .../rootcloud/vo/faultcode/FaultCodeVo.java   |   42 +
 .../vo/network/NetWorkUserWeekVO.java         |   21 +
 .../com/rootcloud/vo/order/DeviceDataVo.java  |   27 +
 .../rootcloud/vo/order/OrderLcinfoParam.java  |   21 +
 .../com/rootcloud/vo/order/OrderParam.java    |   36 +
 .../rootcloud/vo/order/OrderSignInParam.java  |   42 +
 .../rootcloud/vo/resp/AppDeviceAlarmResp.java |   22 +
 .../vo/resp/DeviceCodeAlarmModel.java         |   25 +
 .../vo/resp/DeviceRuleAlarmModel.java         |   21 +
 .../rootcloud/vo/resp/OtherDeviceResp.java    |   20 +
 .../vo/rest/AppDeviceAlarmParam.java          |   36 +
 .../rootcloud/vo/rest/DeviceAlarmParam.java   |   39 +
 .../vo/rest/DevicePropertyValueParam.java     |   12 +
 .../rootcloud/vo/rest/DeviceTrendParam.java   |   31 +
 .../vo/service/MaintenanceListVo.java         |   20 +
 .../rootcloud/vo/service/NxUserInfoVo.java    |   32 +
 .../com/rootcloud/vo/service/OutletsVO.java   |   21 +
 .../vo/service/ServicePlanInfoVO.java         |  114 +
 .../rootcloud/vo/service/ServicePlanVo.java   |   71 +
 .../java/com/rootcloud/vo/todo/TodoVo.java    |  126 +
 .../web/PrinterEfficiencyController.java      |  169 ++
 .../web/PrinterReportController.java          |  401 +++
 .../rootcloud/web/RepCustomerController.java  |   93 +
 .../rootcloud/web/RepPrinterController.java   |  608 +++++
 .../web/dto/ChanNengLiYongLvDto.java          |  106 +
 .../rootcloud/web/dto/GuHuaJiDanHaoDto.java   |   66 +
 .../web/dto/PinJunDaYinGaoDuDto.java          |   65 +
 .../web/dto/PrinterEfficiencyDTO.java         |   96 +
 .../rootcloud/web/dto/PrinterReportDTO.java   |  171 ++
 .../web/dto/RepPrinterOutputDTO.java          |   18 +
 .../web/dto/RepPrinterSandPassrateDTO.java    |   19 +
 .../web/dto/RepPrinterStarPassrateDTO.java    |   18 +
 .../web/dto/RepPrinterTargetTypeDTO.java      |   32 +
 .../web/dto/RepPrinterWastereasonDTO.java     |   20 +
 .../web/dto/UpdateUserReportDTO.java          |  129 +
 .../web/dto/WeiXuFeiYongTongJiDto.java        |   78 +
 nxgx-ifsm-base/src/main/resources/banner.txt  |   10 +
 .../main/resources/config/application-k8s.yml |  145 ++
 .../src/main/resources/config/application.yml |  155 ++
 .../src/main/resources/config/bootstrap.yml   |   30 +
 .../main/resources/i18n/messages.properties   |    7 +
 .../i18n/messages/messages_en_US.properties   |   68 +
 .../i18n/messages/messages_zh_CN.properties   |   67 +
 .../resources/i18n/messages_de.properties     |    2 +
 .../resources/i18n/messages_en.properties     |    6 +
 .../resources/i18n/messages_es.properties     |    1 +
 .../resources/i18n/messages_fr.properties     |    1 +
 .../resources/i18n/messages_zh_cn.properties  |    5 +
 .../resources/i18n/messages_zhhk.properties   |    5 +
 .../src/main/resources/logback-spring.xml     |   63 +
 .../main/resources/logfile-config/base.xml    |   16 +
 .../logfile-config/console-appender.xml       |   21 +
 .../resources/logfile-config/defaults.xml     |   27 +
 .../logfile-config/file-appender.xml          |   23 +
 .../main/resources/mapper/CommonMapper.xml    |   19 +
 .../src/main/resources/mapper/ConfigDao.xml   |   35 +
 .../src/main/resources/mapper/CustomerDAO.xml |   47 +
 .../src/main/resources/mapper/DemoMapper.xml  |   23 +
 .../resources/mapper/DeviceListMapper.xml     |   48 +
 .../main/resources/mapper/DeviceMapper.xml    |  307 +++
 .../src/main/resources/mapper/GbsjbDao.xml    |   40 +
 .../resources/mapper/JeCoreEnduserDao.xml     |  206 ++
 .../main/resources/mapper/JeCoreRoleDao.xml   |   64 +
 .../resources/mapper/JeCoreRoleUserDao.xml    |   13 +
 .../main/resources/mapper/JeSysUsermsgDao.xml |   35 +
 .../src/main/resources/mapper/KhDao.xml       |   11 +
 .../resources/mapper/MessageModelMapper.xml   |   25 +
 .../src/main/resources/mapper/ModelMapper.xml |   10 +
 .../resources/mapper/ModelPropertyMapper.xml  |  221 ++
 .../mapper/ModelPropertySyncMapper.xml        |   10 +
 .../src/main/resources/mapper/NxDeviceDao.xml |  135 +
 .../main/resources/mapper/NxDeviceMapper.xml  |   41 +
 .../main/resources/mapper/NxJeDeviceDao.xml   |  118 +
 .../main/resources/mapper/NxOrderMapper.xml   | 1453 +++++++++++
 .../resources/mapper/NxPartFileConfigDao.xml  |    8 +
 .../main/resources/mapper/NxPartFileDao.xml   |  117 +
 .../main/resources/mapper/NxPartRespDao.xml   |   28 +
 .../main/resources/mapper/NxPlpzMapper.xml    |   10 +
 .../main/resources/mapper/NxSparePartDao.xml  |   27 +
 .../resources/mapper/NxTodoLibraryMapper.xml  |  220 ++
 .../mapper/NxTriggerConditionMapper.xml       |   36 +
 .../resources/mapper/NxUserInfoMapper.xml     |   71 +
 .../resources/mapper/NxZskFaultCodeMapper.xml |   47 +
 .../mapper/PrinterEfficiencyWorkDao.xml       |  108 +
 .../resources/mapper/PrinterHeadRecordDao.xml |   55 +
 .../resources/mapper/RepPrinterOutputDao.xml  |  262 ++
 .../resources/mapper/RepPrinterReportDAO.xml  |  392 +++
 .../mapper/RepPrinterReportItemDao.xml        |   32 +
 .../mapper/RepPrinterSandPassrateDao.xml      |  191 ++
 .../mapper/RepPrinterSandPercentDAO2.xml      |  447 ++++
 .../mapper/RepPrinterSandPercentDao.xml       |  384 +++
 .../mapper/RepPrinterStarPassrateDao.xml      |  187 ++
 .../mapper/RepPrinterTargetDicDao.xml         |  101 +
 .../mapper/RepPrinterWastereasonDao.xml       |  155 ++
 .../resources/mapper/ServicePlanMapper.xml    |  461 ++++
 .../main/resources/mapper/SpareFileMapper.xml |  265 ++
 .../main/resources/mapper/TargetTypeDao.xml   |   40 +
 .../resources/mapper/TechnicalTaskDAO.xml     |   52 +
 .../src/main/resources/mapper/UserRoleDao.xml |   22 +
 .../src/main/resources/templates/error.html   |  163 ++
 .../src/main/resources/templates/st/body.st   |   19 +
 .../src/main/resources/templates/st/head.st   |   34 +
 .../test/java/com/everyone/test/DemoTest.java |  177 ++
 .../com/rootcloud/NxgxApplicationTests.java   |  106 +
 pom.xml                                       |   98 +
 564 files changed, 62392 insertions(+)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/ifsm-base.iml
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 .idea/jarRepositories.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 README.md
 create mode 100644 nxgx-commons/pom.xml
 create mode 100644 nxgx-commons/src/main/java/com/rootcloud/utils/HashMapChain.java
 create mode 100644 nxgx-commons/src/main/java/com/rootcloud/utils/JEUuidUtil.java
 create mode 100644 nxgx-commons/src/main/java/com/rootcloud/utils/LocalDateUtils.java
 create mode 100644 nxgx-commons/src/main/java/com/rootcloud/utils/Person.java
 create mode 100644 nxgx-commons/src/main/java/com/rootcloud/utils/SpringBeanUtils.java
 create mode 100644 nxgx-commons/src/main/java/com/rootcloud/utils/StringUtil.java
 create mode 100644 nxgx-commons/src/main/java/com/rootcloud/utils/StuInvocationHandler.java
 create mode 100644 nxgx-commons/src/main/java/com/rootcloud/utils/Student.java
 create mode 100644 nxgx-commons/src/main/java/com/rootcloud/utils/StudentProxy.java
 create mode 100644 nxgx-commons/target/classes/com/rootcloud/utils/HashMapChain.class
 create mode 100644 nxgx-commons/target/classes/com/rootcloud/utils/JEUuidUtil.class
 create mode 100644 nxgx-commons/target/classes/com/rootcloud/utils/LocalDateUtils.class
 create mode 100644 nxgx-commons/target/classes/com/rootcloud/utils/Person.class
 create mode 100644 nxgx-commons/target/classes/com/rootcloud/utils/SpringBeanUtils.class
 create mode 100644 nxgx-commons/target/classes/com/rootcloud/utils/StringUtil.class
 create mode 100644 nxgx-commons/target/classes/com/rootcloud/utils/StuInvocationHandler.class
 create mode 100644 nxgx-commons/target/classes/com/rootcloud/utils/Student.class
 create mode 100644 nxgx-commons/target/classes/com/rootcloud/utils/StudentProxy.class
 create mode 100644 nxgx-commons/target/maven-archiver/pom.properties
 create mode 100644 nxgx-commons/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
 create mode 100644 nxgx-commons/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
 create mode 100644 nxgx-commons/target/nxgx-commons-Brussels-SR6.jar
 create mode 100644 nxgx-ifsm-base/.gitignore
 create mode 100644 nxgx-ifsm-base/pom.xml
 create mode 100644 nxgx-ifsm-base/src/main/docker/Dockerfile
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/NXGXBaseApp.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/CheckSumBuilder.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/Constants.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/DESUtil.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/DateUtil.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/DeflaterUtils.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/HttpClientUtil.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/HttpUtils.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/I18nUtil.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/IgnoreSecurity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/JEUuidUtil.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/JsonPageResult.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/JsonResult.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/JsonResult2.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/JsonResultStatus.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/LappLiveClient.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/NotBlank.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/OAuth2Properties.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/OAuthResult.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/PageAO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/PageRequest.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/Request.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/ResourceUtil.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/RootCloudOpenAPIUtil.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/SendMessageUtils.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/SprintBeanUtils.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/TokenUtil.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/UserOperationContext.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/Validate.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/WebServiceClient.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/BusinessConstant.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/DeviceConstant.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/JsonResultStatusBpm.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/LappLiveConstant.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/Properties.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/RoleIdConstant.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/RootCloudApi.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/SyncSimpleDateFormat.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/TemplateConstant.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/WeekTypeEnum.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/BaseEnums.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/DeviceOnlineStatus.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/HttpRequestMethedEnum.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/OrderEnums.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/ReportStatisticsEnums.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/ServicePlanEnums.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/StatusCodeEnum.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/intercept/DataScopeInterceptor.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/intercept/LanguageIntercept.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/live/CacheMap.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/live/CacheMap2.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/live/DateUtil.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/net/DateJsonValueProcessor.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/net/JsonHelper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/net/NetworkHelper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/net/TimestampToDateMorpher.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/CommonUtils.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/DateConstant.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/DateUtils.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/EncryptUtil.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/GaoDeAPIUtils.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/MapBuilder.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/OrderNumberUtils.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/PlatformDeviceTransUtil.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/RestTemplateUtils.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/vo/PrinterWorkBoxSize.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/common/vo/RepPageVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/GlobalExceptionHandler.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/MybatisPlusConfig.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/RedisConfig.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/RedisObjectSerializer.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/ScheduleConfig.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/SwaggerConfig.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/WebMvcConfigurer.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/AuthenticationInterceptor.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/AuthorizationInterceptor.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/CorsConfig.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/LoginUserInfo.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/RequiresUserType.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/UserContext.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/UserInfo.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/UserTypeEnum.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/exception/AbstractException.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/exception/BusinessException.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/rabbitmq/RabbitMQConfig.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/rabbitmq/Sender.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/GtUtils.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/MessageController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/SendUniPushUtil.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/UniPushAppsConfig.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/UniPushVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/UnipushUtils.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AbaBaseController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppBaseController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppDeviceController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppMessageController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppNxZskFaultCodeController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppOrderController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/CarouselController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/CommonController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/DeviceController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/DeviceHistorySituationController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/FittingController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/JobController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/LappLiveController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/LoginController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/MessageModelController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/ModelController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/MyController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NetworkController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NetworkUserController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NxOrderController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NxPartFileConfigController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NxPartFileController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NxTodoLibraryController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/ReportStatisticController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/SMSController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/ServicePlanController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/controller/WorkStatusMonitorController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ExportHistorySituationAO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/HistorySituationAO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/NxUserInfoAO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/OrderDispatchForm.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ReportStatisticAO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ServicePlanAO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ServicePlanCalendarAO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ServicePlanCalendarNewAO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ServicePlanParamsAO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/TriggerConditionAO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/constant/AppConstant.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/constant/RabbitMQConstant.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/constant/RedisConstant.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ConfigDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/CustomerDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/FittingsListMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/GbsjbDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/JeCoreEnduserDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/JeCoreRoleDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/JeCoreRoleUserDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/JeSysUsermsgDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/KhDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ModelColorDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ModelPropertyDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/NxDeviceDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/NxOrderDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/PrinterEfficiencyWorkDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/PrinterHeadRecordDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterOutputDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterReportDAO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterReportItemDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterSandPassrateDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterSandPercentDAO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterSandPercentDAO2.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterStarEvaluateDAO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterStarPassrateDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterTargetDicDAO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterWastereasonDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/TargetTypeDAO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ds/DeviceListMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ds/DeviceSyncMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ds/ModelPropertySyncMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ds/ModelSyncMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/gkjk/NxJeDeviceDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/part/NxPartFileConfigDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/part/NxPartFileDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/part/NxPartRespDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/sp/NxTriggerConditionDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/sp/NxUserInfoDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/sp/ServicePlanDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/sp/ServicePlanHistoryDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/CameraDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/CarouselDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/ConditionModel.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/DeviceDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/DeviceSpecialDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/DeviceVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/DeviceWorkTimeDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/EngineerModel.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/EnterpriseInfoDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/ImageUrlsDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/NxDeviceDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/NxSparePartVo.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/OrderInfoVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/OrderVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/PendingOrderModel.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/ServiceViewResultModel.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/UserRoleDeptDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/CarouselEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ContractEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/DemoEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/FwryDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/GbsjbEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/JeCoreEnduserEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/JeCoreRoleEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/JeCoreRoleUserEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/JeSysUsermsgEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/KhglDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/MyAdviceEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/MyMessageEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NetworkEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NetworkUserEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxFittingsListEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxJeDeviceEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxOrderEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxPartFileConfigEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxPartFileEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxPartRespEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxSparePartEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxTodoLibrary.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxZskFaultCodeEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/Part.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/SiteDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/EntityBase.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/ModelColor.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/ModelPropertyEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/NxResp.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/UpdatableEntityBase.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/device/DeviceEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/device/NxDeviceCameraEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/device/NxDeviceEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/device/NxDeviceLocationEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/DeviceListEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/DeviceSyncEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/ModelEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/ModelPropertySyncEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/NxDsLogEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/sp/NxTriggerConditionEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/sp/NxUserInfoEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/sp/ServicePlanEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/sp/ServicePlanHistoryEntity.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/CarouselMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/CommonMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/DemoMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/DeviceMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/JeSysUsermsgMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/MessageModelMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/ModelPropertyMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/MyAdviceMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/MyMessageMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NetworkMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NetworkUserMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxDeviceCameraMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxDeviceLocationMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxDeviceMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxDsLogMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxOrderMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxPlpzMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxTodoLibraryMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxTriggerConditionMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxUserInfoMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxZskFaultCodeMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxgxJcdaFwryMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/ServicePlanMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/SpareFilerMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/SparePartMapper.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/TechnicalTaskDAO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/UserRoleDao.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/model/LappLiveCondition.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/model/WorkStatusMonitorModel.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/app/MyAdviceService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/app/MyMessageService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/app/impl/MyAdviceServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/app/impl/MyMessageServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/auth/RootCloudAuthService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/auth/RootCloudAuthServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/auth/UserService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/DeviceAlarmService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/DeviceService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/FaultCodeService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/LappLiveService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/NxDeviceService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/DeviceAlarmServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/DeviceServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/FaultCodeServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/LappLiveSetviceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/NxDeviceServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/DeviceListSyncService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/DeviceSyncService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/ModelPropertySyncService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/ModelSyncService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/NxDsLogService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/DeviceListSyncServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/DeviceSyncServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/ModelPropertySyncServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/ModelSyncServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/NxDsLogServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/SyncDeviceInfoService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/SyncModelProertySyncService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/FittingsService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/SpareFileService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/SparePartService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/impl/FittingsServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/impl/SparePartServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/GbsjbService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/JeCoreEnduserService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/JeCoreRoleService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/JeCoreRoleUserService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/ModelColorService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/ModelPropertyService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/GbsjbServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/JeCoreEnduserServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/JeCoreRoleServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/JeCoreRoleUserServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/ModelColorServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/ModelPropertyServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gkjk/NxJeDeviceService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gkjk/impl/NxJeDeviceServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/message/MessageModelService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/network/NetworkService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/network/NetworkUserService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/order/OrderService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/order/OrderServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/NxPartFileConfigService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/NxPartFileService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/NxPartRespService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/PartTask.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/impl/NxPartFileConfigServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/impl/NxPartFileServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/impl/NxPartRespServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/NxTriggerConditionService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/NxUserInfoService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/ServicePlanHistoryService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/ServicePlanService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/NxTriggerConditionServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/NxUserInfoServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/ServicePlanHistoryServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/ServicePlanServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/todo/NxTodoLibraryService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/todo/impl/NxTodoLibraryServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/CarouselVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/ConfigVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/CustomerSales.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/CustomerVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/DeviceListVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/DeviceStatusStatistic.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/FaultNumber.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/FittingsSales.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/KhVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/NxDeviceVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/OrderStatistic.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/OrderStatusStatistic.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/Outlets.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PartsFaultNumber.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PersonAllStatistic.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PersonnelStatistic.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PrinterEfficiencyWorkVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PrinterHeadRecordVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepMttDataVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterEmailConfigVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterOutputVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterReportItemVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterReportVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterSandPassrateVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterSandPercentVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterStarPassrateVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterTargetDicVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterWasteTypeVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterWastereasonVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepStarEvaluateVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/SMSVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/StatusVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/TargetTypeVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/TechnicalTaskVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/UserRoleVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/exception/ExceptionCode.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/exception/OperationNotAllowedException.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/exception/UserUnauthorizedException.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/CarouselService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/ConfigService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/EmailService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/PrinterEfficiencyService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepCustomerService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterReportService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterSandPercentService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterStarEvaluateService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterTargetDicService.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/AddRepPrinterTargetDicCondition.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/DelRepPrinterTargetDicCondition.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/QueryRepPrinterTargetDicCondition.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/QueryUserReportCondition.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/UpdateRepPrinterTargetDicCondition.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/constant/ExceptionStatus.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/CarouselServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/ConfigServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/EmailServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/PrinterEfficiencyServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepCustomerServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterReportServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterSandPercentServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterStarEvaluateServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterTargetDicServiceImpl.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/timer/MainTimer.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/timer/ServicePlanTimer.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/timer/SparePartTimer.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/validate/annotation/NotBlank.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/validate/annotation/Validate.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/UserLogin.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/UserLogout.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/app/AdviceResultVo.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/app/MessageResultVo.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/BaseDeviceVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/CameraParam.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/CommonDeviceHistorySituationVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceHistorySituationVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceInfo.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceMonthWorkTimeLineChart.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceMonthWorkTimeStatistics.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceStatusStatistics.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceStatusVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceTypeVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceView.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceWorkTimeStatistics.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/NetWorkParam.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/NxDeviceParam.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/ServicePlanCalendarDetailsVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/ServicePlanCalendarList.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/ServicePlanCalendarVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/ServicePlanDetailVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/SituationColumnsVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/faultcode/FaultCodeDetailVo.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/faultcode/FaultCodeVo.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/network/NetWorkUserWeekVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/order/DeviceDataVo.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/order/OrderLcinfoParam.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/order/OrderParam.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/order/OrderSignInParam.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/resp/AppDeviceAlarmResp.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/resp/DeviceCodeAlarmModel.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/resp/DeviceRuleAlarmModel.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/resp/OtherDeviceResp.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/rest/AppDeviceAlarmParam.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/rest/DeviceAlarmParam.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/rest/DevicePropertyValueParam.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/rest/DeviceTrendParam.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/MaintenanceListVo.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/NxUserInfoVo.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/OutletsVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/ServicePlanInfoVO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/ServicePlanVo.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/vo/todo/TodoVo.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/web/PrinterEfficiencyController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/web/PrinterReportController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/web/RepCustomerController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/web/RepPrinterController.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/ChanNengLiYongLvDto.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/GuHuaJiDanHaoDto.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/PinJunDaYinGaoDuDto.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/PrinterEfficiencyDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/PrinterReportDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterOutputDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterSandPassrateDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterStarPassrateDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterTargetTypeDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterWastereasonDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/UpdateUserReportDTO.java
 create mode 100644 nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/WeiXuFeiYongTongJiDto.java
 create mode 100644 nxgx-ifsm-base/src/main/resources/banner.txt
 create mode 100644 nxgx-ifsm-base/src/main/resources/config/application-k8s.yml
 create mode 100644 nxgx-ifsm-base/src/main/resources/config/application.yml
 create mode 100644 nxgx-ifsm-base/src/main/resources/config/bootstrap.yml
 create mode 100644 nxgx-ifsm-base/src/main/resources/i18n/messages.properties
 create mode 100644 nxgx-ifsm-base/src/main/resources/i18n/messages/messages_en_US.properties
 create mode 100644 nxgx-ifsm-base/src/main/resources/i18n/messages/messages_zh_CN.properties
 create mode 100644 nxgx-ifsm-base/src/main/resources/i18n/messages_de.properties
 create mode 100644 nxgx-ifsm-base/src/main/resources/i18n/messages_en.properties
 create mode 100644 nxgx-ifsm-base/src/main/resources/i18n/messages_es.properties
 create mode 100644 nxgx-ifsm-base/src/main/resources/i18n/messages_fr.properties
 create mode 100644 nxgx-ifsm-base/src/main/resources/i18n/messages_zh_cn.properties
 create mode 100644 nxgx-ifsm-base/src/main/resources/i18n/messages_zhhk.properties
 create mode 100644 nxgx-ifsm-base/src/main/resources/logback-spring.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/logfile-config/base.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/logfile-config/console-appender.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/logfile-config/defaults.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/logfile-config/file-appender.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/CommonMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/ConfigDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/CustomerDAO.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/DemoMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/DeviceListMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/DeviceMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/GbsjbDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/JeCoreEnduserDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/JeCoreRoleDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/JeCoreRoleUserDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/JeSysUsermsgDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/KhDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/MessageModelMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/ModelMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/ModelPropertyMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/ModelPropertySyncMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/NxDeviceDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/NxDeviceMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/NxJeDeviceDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/NxOrderMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/NxPartFileConfigDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/NxPartFileDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/NxPartRespDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/NxPlpzMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/NxSparePartDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/NxTodoLibraryMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/NxTriggerConditionMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/NxUserInfoMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/NxZskFaultCodeMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/PrinterEfficiencyWorkDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/PrinterHeadRecordDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/RepPrinterOutputDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/RepPrinterReportDAO.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/RepPrinterReportItemDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/RepPrinterSandPassrateDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/RepPrinterSandPercentDAO2.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/RepPrinterSandPercentDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/RepPrinterStarPassrateDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/RepPrinterTargetDicDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/RepPrinterWastereasonDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/ServicePlanMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/SpareFileMapper.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/TargetTypeDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/TechnicalTaskDAO.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/mapper/UserRoleDao.xml
 create mode 100644 nxgx-ifsm-base/src/main/resources/templates/error.html
 create mode 100644 nxgx-ifsm-base/src/main/resources/templates/st/body.st
 create mode 100644 nxgx-ifsm-base/src/main/resources/templates/st/head.st
 create mode 100644 nxgx-ifsm-base/src/test/java/com/everyone/test/DemoTest.java
 create mode 100644 nxgx-ifsm-base/src/test/java/com/rootcloud/NxgxApplicationTests.java
 create mode 100644 pom.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..806ea0a
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="nxgx-ifsm-base" />
+        <module name="nxgx-commons" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..7da7373
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/nxgx-commons/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/nxgx-ifsm-base/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/nxgx-ifsm-base/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/ifsm-base.iml b/.idea/ifsm-base.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/ifsm-base.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..58fe702
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="SpringJavaConstructorAutowiringInspection" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="SpringJavaInjectionPointsAutowiringInspection" enabled="false" level="ERROR" enabled_by_default="false" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..e8c2e7e
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="nexus-rootcloud" />
+      <option name="name" value="nexus-rootcloud" />
+      <option name="url" value="http://nexus.irootechapp.com/repository/maven-public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jitpack.io" />
+      <option name="name" value="jitpack.io" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jitpack.io" />
+      <option name="name" value="jitpack.io" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="nexus-aliyun" />
+      <option name="name" value="nexus-aliyun" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jitpack.io" />
+      <option name="name" value="jitpack.io" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..d5cd614
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..b63bac3
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/ifsm-base.iml" filepath="$PROJECT_DIR$/.idea/ifsm-base.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..aed8734
--- /dev/null
+++ b/README.md
@@ -0,0 +1,92 @@
+# gongxiang_service
+
+
+
+## Getting started
+
+To make it easy for you to get started with GitLab, here's a list of recommended next steps.
+
+Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
+
+## Add your files
+
+- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
+- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
+
+```
+cd existing_repo
+git remote add origin http://119.3.165.210:8100/gitlab-instance-cbcb2114/gongxiang_service.git
+git branch -M main
+git push -uf origin main
+```
+
+## Integrate with your tools
+
+- [ ] [Set up project integrations](http://119.3.165.210:8100/gitlab-instance-cbcb2114/gongxiang_service/-/settings/integrations)
+
+## Collaborate with your team
+
+- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
+- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
+- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
+- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
+- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
+
+## Test and Deploy
+
+Use the built-in continuous integration in GitLab.
+
+- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
+- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
+- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
+- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
+- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
+
+***
+
+# Editing this README
+
+When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
+
+## Suggestions for a good README
+Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
+
+## Name
+Choose a self-explaining name for your project.
+
+## Description
+Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
+
+## Badges
+On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
+
+## Visuals
+Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
+
+## Installation
+Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
+
+## Usage
+Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
+
+## Support
+Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
+
+## Roadmap
+If you have ideas for releases in the future, it is a good idea to list them in the README.
+
+## Contributing
+State if you are open to contributions and what your requirements are for accepting them.
+
+For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
+
+You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
+
+## Authors and acknowledgment
+Show your appreciation to those who have contributed to the project.
+
+## License
+For open source projects, say how it is licensed.
+
+## Project status
+If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
diff --git a/nxgx-commons/pom.xml b/nxgx-commons/pom.xml
new file mode 100644
index 0000000..12ef5cf
--- /dev/null
+++ b/nxgx-commons/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>io.spring.platform</groupId>
+        <artifactId>platform-bom</artifactId>
+        <version>Brussels-SR6</version>
+        <relativePath />
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <groupId>com.rootcloud</groupId>
+    <artifactId>nxgx-commons</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/nxgx-commons/src/main/java/com/rootcloud/utils/HashMapChain.java b/nxgx-commons/src/main/java/com/rootcloud/utils/HashMapChain.java
new file mode 100644
index 0000000..b65c208
--- /dev/null
+++ b/nxgx-commons/src/main/java/com/rootcloud/utils/HashMapChain.java
@@ -0,0 +1,10 @@
+package com.rootcloud.utils;
+
+import java.util.HashMap;
+
+public class HashMapChain<K, V> extends HashMap<K, V> {
+    public HashMapChain putChain(K key, V value) {
+        super.put(key, value);
+        return this;
+    }
+}
diff --git a/nxgx-commons/src/main/java/com/rootcloud/utils/JEUuidUtil.java b/nxgx-commons/src/main/java/com/rootcloud/utils/JEUuidUtil.java
new file mode 100644
index 0000000..d0c610d
--- /dev/null
+++ b/nxgx-commons/src/main/java/com/rootcloud/utils/JEUuidUtil.java
@@ -0,0 +1,152 @@
+package com.rootcloud.utils;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public class JEUuidUtil {
+    final static char[] digits = {'0', '1', '2', '3', '4', '5', '6', '7', '8',
+            '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+            'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y',
+            'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
+            'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y',
+            'Z'};
+
+    final static Map<Character, Integer> digitMap = new HashMap<Character, Integer>();
+
+    static {
+        for (int i = 0; i < digits.length; i++) {
+            digitMap.put(digits[i], (int) i);
+        }
+    }
+
+    /**
+     * 支持的最大进制数
+     */
+    public static final int MAX_RADIX = digits.length;
+
+    /**
+     * 支持的最小进制数
+     */
+    public static final int MIN_RADIX = 2;
+
+    /**
+     * 将长整型数值转换为指定的进制数（最大支持62进制，字母数字已经用尽）
+     */
+    public static String toString(long i, int radix) {
+        if (radix < MIN_RADIX || radix > MAX_RADIX)
+            radix = 10;
+        if (radix == 10)
+            return Long.toString(i);
+
+        final int size = 65;
+        int charPos = 64;
+
+        char[] buf = new char[size];
+        boolean negative = (i < 0);
+
+        if (!negative) {
+            i = -i;
+        }
+
+        while (i <= -radix) {
+            buf[charPos--] = digits[(int) (-(i % radix))];
+            i = i / radix;
+        }
+        buf[charPos] = digits[(int) (-i)];
+
+        if (negative) {
+            buf[--charPos] = '-';
+        }
+
+        return new String(buf, charPos, (size - charPos));
+    }
+
+    static NumberFormatException forInputString(String s) {
+        return new NumberFormatException("For input string: \"" + s + "\"");
+    }
+
+    /**
+     * 将字符串转换为长整型数字
+     *
+     * @param s     数字字符串
+     * @param radix 进制数
+     */
+    public static long toNumber(String s, int radix) {
+        if (s == null) {
+            throw new NumberFormatException("null");
+        }
+
+        if (radix < MIN_RADIX) {
+            throw new NumberFormatException("radix " + radix
+                    + " less than Numbers.MIN_RADIX");
+        }
+        if (radix > MAX_RADIX) {
+            throw new NumberFormatException("radix " + radix
+                    + " greater than Numbers.MAX_RADIX");
+        }
+
+        long result = 0;
+        boolean negative = false;
+        int i = 0, len = s.length();
+        long limit = -Long.MAX_VALUE;
+        long multmin;
+        Integer digit;
+
+        if (len > 0) {
+            char firstChar = s.charAt(0);
+            if (firstChar < '0') {
+                if (firstChar == '-') {
+                    negative = true;
+                    limit = Long.MIN_VALUE;
+                } else if (firstChar != '+')
+                    throw forInputString(s);
+
+                if (len == 1) {
+                    throw forInputString(s);
+                }
+                i++;
+            }
+            multmin = limit / radix;
+            while (i < len) {
+                digit = digitMap.get(s.charAt(i++));
+                if (digit == null) {
+                    throw forInputString(s);
+                }
+                if (digit < 0) {
+                    throw forInputString(s);
+                }
+                if (result < multmin) {
+                    throw forInputString(s);
+                }
+                result *= radix;
+                if (result < limit + digit) {
+                    throw forInputString(s);
+                }
+                result -= digit;
+            }
+        } else {
+            throw forInputString(s);
+        }
+        return negative ? result : -result;
+    }
+
+    private static String digits(long val, int digits) {
+        long hi = 1L << (digits * 4);
+        return toString(hi | (val & (hi - 1)), MAX_RADIX).substring(1);
+    }
+
+    /**
+     * 以62进制（字母加数字）生成19位UUID，最短的UUID
+     */
+    public static String uuid() {
+        UUID uuid = UUID.randomUUID();
+        StringBuilder sb = new StringBuilder();
+        sb.append(digits(uuid.getMostSignificantBits() >> 32, 8));
+        sb.append(digits(uuid.getMostSignificantBits() >> 16, 4));
+        sb.append(digits(uuid.getMostSignificantBits(), 4));
+        sb.append(digits(uuid.getLeastSignificantBits() >> 48, 4));
+        sb.append(digits(uuid.getLeastSignificantBits(), 12));
+        return sb.toString();
+    }
+}
diff --git a/nxgx-commons/src/main/java/com/rootcloud/utils/LocalDateUtils.java b/nxgx-commons/src/main/java/com/rootcloud/utils/LocalDateUtils.java
new file mode 100644
index 0000000..06b03d6
--- /dev/null
+++ b/nxgx-commons/src/main/java/com/rootcloud/utils/LocalDateUtils.java
@@ -0,0 +1,74 @@
+package com.rootcloud.utils;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * jdk8 时间API
+ *
+ * @author leilei.zang
+ * @date 2021-09-13 11:27
+ */
+public class LocalDateUtils {
+
+    public static final String YYYY_MM_DD = "yyyy-MM-dd";
+    public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+    public static final String YYYY_MM_DD_HH_MM_SS_SSS = "yyyyMMddhhmmssSSS";
+
+    //格式化date
+    public static String formatDate(Date date) {
+        if (Objects.isNull(date)) {
+            return null;
+        }
+        LocalDateTime localDateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+        return localDateTime.format(DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM_SS));
+    }
+
+    //格式化date
+    public static String formatDate(Date date, String formatter) {
+        if (Objects.isNull(date)) {
+            return null;
+        }
+        return formatDate(date.toInstant(), formatter);
+    }
+
+    //格式化instant
+    public static String formatDate(Instant instant) {
+        if (Objects.isNull(instant)) {
+            return null;
+        }
+        LocalDateTime localDateTime = instant.atZone(ZoneId.systemDefault()).toLocalDateTime();
+        return localDateTime.format(DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM_SS));
+    }
+
+    //格式化instant
+    public static String formatDate(Instant instant, String formatter) {
+        if (Objects.isNull(instant)) {
+            return null;
+        }
+        LocalDateTime localDateTime = instant.atZone(ZoneId.systemDefault()).toLocalDateTime();
+        if (StringUtil.isNotBlank(formatter)) {
+            return localDateTime.format(DateTimeFormatter.ofPattern(formatter));
+        }
+        return localDateTime.format(DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM_SS));
+    }
+
+    //获取当前时间
+    public static String now(String format) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(format);
+        LocalDateTime now = LocalDateTime.now();
+        return now.format(dateTimeFormatter);
+    }
+
+    //获取当前时间
+    public static String now() {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM_SS);
+        LocalDateTime now = LocalDateTime.now();
+        return now.format(dateTimeFormatter);
+    }
+
+}
diff --git a/nxgx-commons/src/main/java/com/rootcloud/utils/Person.java b/nxgx-commons/src/main/java/com/rootcloud/utils/Person.java
new file mode 100644
index 0000000..029522d
--- /dev/null
+++ b/nxgx-commons/src/main/java/com/rootcloud/utils/Person.java
@@ -0,0 +1,6 @@
+package com.rootcloud.utils;
+
+public interface Person {
+
+    void giveMoney();
+}
diff --git a/nxgx-commons/src/main/java/com/rootcloud/utils/SpringBeanUtils.java b/nxgx-commons/src/main/java/com/rootcloud/utils/SpringBeanUtils.java
new file mode 100644
index 0000000..67c99ab
--- /dev/null
+++ b/nxgx-commons/src/main/java/com/rootcloud/utils/SpringBeanUtils.java
@@ -0,0 +1,33 @@
+package com.rootcloud.utils;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * 在非spring管理的类中获取spring注册的bean
+ * @author lujiahao
+ * @date 2019-05-22 14:25
+ */
+@Component
+public class SpringBeanUtils implements ApplicationContextAware {
+
+    private static ApplicationContext applicationContext;
+
+    @Override
+    public void setApplicationContext(ApplicationContext context) throws BeansException {
+        if (applicationContext == null) {
+            applicationContext = context;
+        }
+    }
+
+    public static Object getBean(String name) {
+        return applicationContext.getBean(name);
+    }
+
+    public static <T> T getBean(Class<T> clazz) {
+        return applicationContext.getBean(clazz);
+    }
+
+}
diff --git a/nxgx-commons/src/main/java/com/rootcloud/utils/StringUtil.java b/nxgx-commons/src/main/java/com/rootcloud/utils/StringUtil.java
new file mode 100644
index 0000000..f7698db
--- /dev/null
+++ b/nxgx-commons/src/main/java/com/rootcloud/utils/StringUtil.java
@@ -0,0 +1,86 @@
+package com.rootcloud.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.regex.Pattern;
+
+public class StringUtil extends StringUtils {
+
+    private static final String[] specialWordArr = {"\\", "$", "(", ")", "*", "+", ".", "[", "]", "?", "^", "{", "}", "|"};
+    private static String regexPrefix = "^.*";
+    private static String regexSuffix = ".*$";
+    public static final String comma = ":";
+
+    //fixed by: yangnenghao / date: 2021/4/19 / 导入null
+    //override String.valueOf()
+    public static String valueOf(Object obj) {
+        return (obj == null) ? "" : obj.toString();
+    }
+
+
+    /**
+     * 转义特殊字符
+     *
+     * @param keyword
+     * @return java.lang.String
+     * @date 2021-02-18 16:59
+     */
+    public static String escapeExprSpecialWordStr(String keyword) {
+        if (isNotBlank(keyword)) {
+            for (String key : specialWordArr) {
+                if (keyword.contains(key)) keyword = keyword.replace(key, "\\" + key);
+            }
+        }
+        return keyword;
+    }
+
+    /**
+     * 转义特殊字符,并编译
+     *
+     * @param keyword
+     * @return java.util.regex.Patternl
+     * @date 2021-02-18 16:59
+     */
+    public static Pattern escapeExprSpecialWord(String keyword) {
+        return Pattern.compile(regexPrefix + escapeExprSpecialWordStr(keyword) + regexSuffix, Pattern.CASE_INSENSITIVE);
+    }
+
+    /**
+     * 转义特殊字符,自定义编译
+     *
+     * @param keyword
+     * @param pattern
+     * @return java.util.regex.Pattern
+     * @date 2021-02-19 15:53
+     */
+    public static Pattern escapeExprSpecialWord(String keyword, Integer pattern) {
+        if (null != pattern)
+            return Pattern.compile(regexPrefix + escapeExprSpecialWordStr(keyword) + regexSuffix, pattern);
+        return escapeExprSpecialWord(keyword);
+    }
+
+    /**
+     * 对老代码使用String.valueOf()的null过滤处理
+     * 新代码：建议使用重写的StringUtil.valueOf()
+     *
+     * @param value
+     * @return boolean
+     * @author leilei.zang
+     * @date 2021-08-17 10:37
+     */
+    public static boolean isNotBlank(String value) {
+        return StringUtils.isNotBlank(value) && !"null".equals(value);
+    }
+
+    /**
+     * 配合Optional使用,按需使用
+     *
+     * @param value
+     * @return java.lang.String
+     * @author leilei.zang
+     * @date 2021-10-12 10:49
+     */
+    public static String values(String value) {
+        return StringUtil.isNotBlank(value) ? value : null;
+    }
+}
diff --git a/nxgx-commons/src/main/java/com/rootcloud/utils/StuInvocationHandler.java b/nxgx-commons/src/main/java/com/rootcloud/utils/StuInvocationHandler.java
new file mode 100644
index 0000000..0105e2c
--- /dev/null
+++ b/nxgx-commons/src/main/java/com/rootcloud/utils/StuInvocationHandler.java
@@ -0,0 +1,18 @@
+package com.rootcloud.utils;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+
+public class StuInvocationHandler<T> implements InvocationHandler {
+
+    T taget;
+
+    public StuInvocationHandler(T taget) {
+        this.taget = taget;
+    }
+
+    @Override
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        return method.invoke(taget, args);
+    }
+}
diff --git a/nxgx-commons/src/main/java/com/rootcloud/utils/Student.java b/nxgx-commons/src/main/java/com/rootcloud/utils/Student.java
new file mode 100644
index 0000000..42dcf5d
--- /dev/null
+++ b/nxgx-commons/src/main/java/com/rootcloud/utils/Student.java
@@ -0,0 +1,19 @@
+package com.rootcloud.utils;
+
+public class Student implements Person {
+
+    private String name;
+
+    @Override
+    public void giveMoney() {
+        System.out.println(name + "缴费了");
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/nxgx-commons/src/main/java/com/rootcloud/utils/StudentProxy.java b/nxgx-commons/src/main/java/com/rootcloud/utils/StudentProxy.java
new file mode 100644
index 0000000..150f3e8
--- /dev/null
+++ b/nxgx-commons/src/main/java/com/rootcloud/utils/StudentProxy.java
@@ -0,0 +1,30 @@
+package com.rootcloud.utils;
+
+import java.lang.reflect.Proxy;
+
+public class StudentProxy implements Person {
+
+    private Student student;
+
+    public StudentProxy(Person person) {
+        this.student = (Student) person;
+    }
+
+    @Override
+    public void giveMoney() {
+        this.student.giveMoney();
+    }
+
+
+    public static void main(String [] args){
+        Student student = new Student();
+        student.setName("张三");
+        StudentProxy studentProxy = new StudentProxy(student);
+        studentProxy.giveMoney();
+
+
+        Person person =(Person)Proxy.newProxyInstance(Person.class.getClassLoader(),new Class<?>[]{Person.class},new StuInvocationHandler<Person>(student));
+
+        person.giveMoney();
+    }
+}
diff --git a/nxgx-commons/target/classes/com/rootcloud/utils/HashMapChain.class b/nxgx-commons/target/classes/com/rootcloud/utils/HashMapChain.class
new file mode 100644
index 0000000000000000000000000000000000000000..4c63fd579188764fbd939d50ac6d5190035eb5df
GIT binary patch
literal 870
zcma)4!A{#i6r7EdI7w3|X@Np1O?yh*s=oA4HBlslijWB9K;)h`#v)4{J9TU%{t8Y=
z9Qc5KRK=_fk*icne0clbcy`{t+5PkP?jFDwG;1hgTZcC$c1*k#D0fw$;+}xfYC8hO
z{qW2aSnaF8`;m-?UNn$HpGc!0y3%)Kq;&lV7UPkc3Vi6h;n<GCFn0YgIkS^k`BVE)
zPDjUbvOkh4=m>25D{wV=60sKU?hcMR1E<rYN@bG7siMGPtA8OcrR~e$+&&pzcy8R8
zN7@V3scQW4uJnj=dIF_O=_j1u;2Csu7^|o1Jdkk`5w}{|;g;(2y?gX+zKQc6te4TW
zlTSwGT&SIfN#uG5O5e;{-ssPIggQzn*RhLt0?kENLxFVcd@Bx0p9Q`yY4MzIcn^cG
zOn(K?M3fm#R(o6p*OGM$al^zwg;D<|h$>_KF|XlSTIG@FL<Cl_N?9%UoBIu}RqNxY
zTNHj;*DNy08Yv*jWCJbR%!tTjxdkt<mbR**!K}c>d6sUKv0lztugF>_TENCE+r;Y>
G*?IsE;>&9Q

literal 0
HcmV?d00001

diff --git a/nxgx-commons/target/classes/com/rootcloud/utils/JEUuidUtil.class b/nxgx-commons/target/classes/com/rootcloud/utils/JEUuidUtil.class
new file mode 100644
index 0000000000000000000000000000000000000000..6e40dffba40e51483d9f3a8abf3011067a13ed88
GIT binary patch
literal 3954
zcmaJ^TX0jy8UEHf(vjq2dojphV~h+0j0rXuV{;22o12ZfBp^Vc2|bpN<>TmLq$9#5
z4bVVC(n}HoX-NqIn#4^f>7-!>oRCS{mu9BZna;E?ed$d5(3igTr87yHxZfVhmMCtS
z@ppFr{df1jeE+}Vci(*aIe-rQB8W#}=@<&20*N5%Fsw$lj*%dIct%H3M=FQ_EI-of
zoAF~*eUAm<N7j#=AC8*m{W$K&vuf7~9VfkKc|QLMB{(%XLy(7`RyRBs#CPy~CC=ci
zj&nhT@m;m{f>J*p#07j$!HY_EQH@^G@p2F?u$1ce)xIC-_@RJr&`#J+PN3pQkAUBu
z?KVdRYWhda<7Ru_v6Jl-Y!C?Sw-ag8$!9Hrbq}s?EKHMTI?>)UY-Y{4V`Vp#347Cy
zm7r*oI%jv}@X;qCTYC=+h+Z}C-7`6_>dB;Yj+u52n#sK7VE`&<<3>AeJDUVNElUpy
zXg!%hno!ekr>#Bt)PR*eU=AcHsqN3i&E!EdYpZ!ts5!$n-3#}}GpY7$Cga4Dnf##Z
zSFXKpTQqMEM(HE%@;jORPS#E*1nOG)dY6`&UyxHr*!=4g@Mg_H`vh&t*{6839;eg$
zGQ7t#kRRevX)9qm_HizWCk3kZJ7)YDM$xrNN1H(PP$t`(9?d(GSFUM!_`Y%z3Z8Dy
zWK*WI?L^!fb?i)9S;R|gAKvP^Q`n>2d03%$sdB^3x4_J@^~qE*F++AX=cs)08nQ!A
z<&#dzPBSA}E5|Y2O<J6KlXl8>$azwcvg2lwd>Uq`v^>KrFsr59lc`|J!mTdFqS4;1
z^rj*=AW&asO+mRkZzl&yA9}Sho-DE<xIdH6#;xtP%6&~Km2HZ+2G(MoK-2%vx`EZ`
zFt8avGO%2wMY^PSd0e<zo%4#o{E~dyL<r0-X*^&vgUh6aZI$bA&gIwo@B#y`;x$H<
zgUxtaU2=)hO6QY|oX_P}SgE`&&=^iyxm?&8Hq+t4)w#B^f|(yqWG$1`_Fo#4C1&6<
zu8?je>-sb4gn>8kV*|U;Z=fA3bo|7?RlKR=rv|R!ErA&&{URR>T*nn<?G^)X<A#o#
z25#YJ2HwHDDtHvXhj%A;x;fox=7vdnb@Z5lpX2=p;=6ZX#EO$bp_aaB*`c=_>FMoN
z1@ALQN3Aq@w0s&KKfJd@me6$iJg~84n(8iX^O4jEXV~pG>`y*b+!0!;aU08EW+^sP
zy^h5}*5|FgEdDtyJ>^DC>5#ou?$*hk$_o+}&s|(@W+5ya%1<bYNPfH67+IUS{6K+C
zDuUCv!`li;pDHhbVAf0zW>Tuw*fb`Ka!P?)>S)mJOwLiQ-X5~!?8M#f^T5{2eleTN
z{gye+dfkIIl$wZ#ycbwIjf-Vf{=c0@GheVr`3`89qe_&cIf}9nSgBqItU|piVvg&v
zhF^hBSKbAkV>SWedP>^)75sWz??U{_RoOuFxk4QqIW`Ikcnq633n;Er!p$PW!*t4C
zZuH(nu<>Jf-hodBA8VAs8}K)cL;FZZHpwlWnv8trUGHrQT)qZf8-wQQ^o4wH!q=4F
z+|=k?xcnC8)q6wQd2Qljc$*q89Lrzqi1M4-JT~z+wW7pI7V=$1RlS#rAx$oi-h(fu
zmSrTQ4c>+R5v}n+d9WQbh>y_v#i+p&g!sxgpcV75jKNz@NgKnmf`M2`FFUZ6VLHel
zJ<Z^Z(7OyzIZ2OI1U4}q^b!$t^Q%TZ+)=@^Qry?U8=GNc8%G+?jq~m{csV<W9oWge
zz1$Om->3+FgE}E}^lcIM5fIG{{ISDsQwS&exLxHUd=LKEJp^KR5v;Ae1EZCHwN->W
zsJ@FD<z$8HWFbx6WoZgyH}-HnfW6pPIJe?Gnoz}bwY7eUDs^_P<SAdw_1?n5@~dX>
zhPii8TRU^=sxRicNu6G8R!J=o@pLk&URoOJ^v%NTE<NPCj$gKV?x4QY2pMw4EwuBq
z{06GEPHh$%y7V#BP_pc8_*=)(_(jO4ku~n{yjRreb1$U20wHh6cMI{4F|Re`rI^Q!
zqv;dOufVSnUSC;X`DJlWJtNh8tvCtSDXJ9?3(vh^N5XZwt8l?A$qNE2GB$B-tf(8(
zu0juw!5hwh$S4-5^ag1JW=Uggs~Odqc$~F$fFz0HNyP9i;!zyIFh?nT8(Em7&H&Dm
z3NK=ibg^&=L+tknz7{s0h7r7vBtAeIw@I{5F^WIo82-$ie}RL)BaeUJS^N_x@GqRg
zzj0aw@SLc|^P&M~#XSC;Sb!JYtdF9Sdw0;HCpbEZo7hjw44yke>$=GU=Do-XHB!VC
zwDXT7XE#}N6n}6@s?pxxli(dB?l69fLmc_&&2Mm+dOGhjisvaZAHa<2MT;lUg-RVU
zp$Q>0ib>weV8sMC2B*X>r6;hoT%?1){$Nzj{tA^}qvAd^%^%VDE1vIVfwPRLpO&zz
z1snC@likft%|YwTIg)W43$!~}SgHZ_TON$F4;S5tgqbzf4UZIyRrN<ztUlDz?{2OJ
z@D$6u(EmPUR@MHe#<6HuvF7@hk;ae6@M-BE$6}KFP(dJ1>*e$E$r8EZfyE`#m{euW
zmW*9Mw}4l8>8lLrYwRGGXx{6j(q)$a6$bka*NHkBrIA`sF+r*WKTcYiG}+HI6<fFX
ziW&@~_&{#@%p3E_715X`S4LxAxhfj-$<@)AE<2(zzg!cINuTT_>avUImurauxsDi=
zCb3cu5Dgh8R>?tPwX}#ea)>Bpf;dAC6KkbSoGC|$v*a_xkW3QmWQsUjripW8hFC90
zi4F1?ajwh~8)c3-PddaVnJ3Pd$BAM2EU{UhATE$6i3{Z^;vyL#J|eq`i)9aSiQGzT
zk=uw%<#uAL+(BF>cM>0!y~O3RkJu)65!+=yafRGXTq*YuSIND^)p8%PLq1MiBcC94
z%KgMHd4RZ9Mv3d>LE?IOh`2!>CT^55;$!m3=xuoKp@sc<>21vOY-r%?^!Y6`u}g8(
z(7_JXFpkzwu*`!)=OM->{;D)?!=ql<LQ`oVApyV0qeh%Tt#}DD#dUt);VV^qb;UU>
abW0NM3&Q{3-WTV@*I2-`$GN!zgZ}}Pesiq=

literal 0
HcmV?d00001

diff --git a/nxgx-commons/target/classes/com/rootcloud/utils/LocalDateUtils.class b/nxgx-commons/target/classes/com/rootcloud/utils/LocalDateUtils.class
new file mode 100644
index 0000000000000000000000000000000000000000..4c4ac369121dec5c928fb373776547a1f069dd33
GIT binary patch
literal 2385
zcma)7U02&i5WQ=RWvdFfhJ*kqC6p!@W85YU36PRB5MmmOq&1L+eo$cx5V5TuTW(K&
zMW6F8(ih6fLw`VjQ%_Itt^}4roW>7Y&F;+HJ9lQ~zyE#r7l1FYtD_IMb-vxvF^9W4
z?qOcX0v2`L$CnzGl6auwA->Y_2+KM&tmt@*RcSuaP!!N#^0#A}J1Z*!nbM*4t5v93
zjr~H|YdVenMS)ApZlmQ{4R6b;we2L<1O_@mJH?`mE|&#{B6fLDPU35U#C@mXcuN93
zQ`s$n__ABI1^P=)!(MOKckSkewOiv(rsP(v+LqOHq#bO=y#uEuFj=a&^+MBiy-Lk(
zR|{>=skI6!V8!z6O=*&_zUMaUmM6CuGv(JLeG77HF&kB6ysEs@XPsGoO%jrk8%~`G
zhkX~1Mh99RNvX=7Re5DvzXZJJ&VirDj--?FOYrQbz|A0uLR|A(5nY7l_@``8h~!C#
zz<gAu_hO{sDLdD2e-pS7Bnb~mWDN<w27wQywo;*0)fZLNWQd^er<&8{ML`FrB2(*S
zx81DRtB#zQf$jmAl_PB63WhY4447Eg@XWw-e52u817&Pz*fg+(7aG1Z@Dkes6aPO~
z#CgqM-Zb;o>UgoZP_HkvS{lAL@B@CNJ_hpm$-qa*YS=OGGe{yQlczg(>e=q0UGX@f
zom7-Z8m3vT9vsx`trjl~uab&U9Y3v3YC~^zqNdr;#(R-)TI=mvP2h64H~#TrmK6Fr
zL2{4<Ql1-(g$xQbR&bqZ@p-GwZMR{sRXN|S*DcSkuh@H5yT&?B+Y|C)*L;rQbmVAx
zGK)YyJcNGYlW9K9Qa!nDOcs(tdY>Ng<Keky#2M`>rR$KHCOV>CG;&nN-Ft3%oY98B
zy|A3Y_b{y0MOlb-5~@nN&@Xbh$D)SON0(nXP7mAddXIPkU!7_B3CC?*=cm4p{}DYH
zMnBSEQ)tDIp*;|?le7mz_GQKid3pG}%7_A2!L@h#Pl!KMieWwzYBP-yz8k&+MsbZ+
ziZ@`4J2Lo?fHAJur;ibPgI@7=`UpM8h##T%2#HcIlRQT12>M$(Nv0sbIG<O^VwkB$
z$>W*=x#B0n#~A1N5Oh{JL6}cy^+2Q)?qq=bBEZdb;pUF<K?kUhVPr<23C2!_Kr#V{
zB=f0~rVHdo0J0x|jCDZXqp~akrwKSi)$<|HG2Fxy2@OV9mJL9EC#d8-8v$yvK;sRJ
z8Lmpyne+0FuyepIlDJJ0cL+B}k?*qpc|~U2&mNE=PN2XbPo>~7C3p(4)IS*UE6K4I
zzulVwxqgyMm5y=AoXG{vjj87PnlGUj4~YISgxF6p(qz`l@@Li1rN}g=5K~+~3m{5?
o=xJ5jQ(}~IoGCRxVT{L&US+N)rxGWE%;4&0mV^B{F=M#(A1<UJUjP6A

literal 0
HcmV?d00001

diff --git a/nxgx-commons/target/classes/com/rootcloud/utils/Person.class b/nxgx-commons/target/classes/com/rootcloud/utils/Person.class
new file mode 100644
index 0000000000000000000000000000000000000000..e2eb5653470c3c7ca375b3dd62986e6a546fffdd
GIT binary patch
literal 139
zcmX^0Z`VEs1_l!bPId-%b_Nbc2F~=%vQ*#vywplY24)S-Fh&Nh;QZ2}<W#rJoK!{z
z?ts*y;`}_lti-ZJMh2<m{9OH_{QQ#Socz)h{nC=moML^53PuJ2kQ)7*#JqHU|D>$c
f<PtVU21W)Zpmhukj4VLY8CXCp238=+#J~msP7@&O

literal 0
HcmV?d00001

diff --git a/nxgx-commons/target/classes/com/rootcloud/utils/SpringBeanUtils.class b/nxgx-commons/target/classes/com/rootcloud/utils/SpringBeanUtils.class
new file mode 100644
index 0000000000000000000000000000000000000000..1053b8e756fcd67fc51b885492a7d1a18e0d7e4c
GIT binary patch
literal 1302
zcmb7DTT>G;7(H1EE88N7P~;+B5NwOGIPzo}X0Rhq^)j~do-VNlw#m+JD#)+$^5E!$
zug>_R9KY;VEws+a>}--RIp4|oF8T5E>o)*f*z_=lwQ-E%ZXP9+?ND*C?&6+{`wY`O
zib5H1Bekk&WyFbL*sSZg?I%$zRr__!JK|W!M}CkU`?~`kRfe%`sifIq7%7$a8FDp!
zAQ&d=Qi*5XPD{j1-U?}Fx~>Br?(<k$ySJG$Z)C!-S`T!`kF_>IsJjP#*T^vO8>x)P
zf~!~7rn_bnVFpDoJS<&Qx0UMl;$oO+7#<uw<xx+T_v9oHk<CovVuO%vVXO{@wNm|%
zzvX_&RoibEo2P2IZ|iyMPy~jg<`iYmMm+$haQjJWAy1Ow9HT+VPfr=H^pRw6hT_?D
zzKedRw0Iu8-E3BONYQvhwiP$sm}EWJZa(V6^;GW+=*oP{#K7P+bT<yfp0w4RIaizw
z8z#g2%dRrABlcw?smi-bX_Iys6}d9BMu`!z(1!H;HQkA{63SEy@Q^Ry62@Kl1<c`^
z9Tpi@{-aMArvBzUi;OztVtu`P%x#)V!@OG52#IgoA^FoL3>(9s|9&{QMGtcf)LQg=
zHd1=DxpbYUu|SqjGoyL5@)_&{EgVeHXq|w|^nqY00F#&^iy8&fgtE>r$Z}}Te}wZL
z?)oP<mSQBOxJ)xJLsYYL_gqR<%-}sLa>P~AM1@Yhm`Bh|V3D?|AarE!*&;Wq!J~UB
zUohg}Jz4!q7y6WXn8yO0TZTnKS%$r{47rRU6Pm@ke1>5O*U4*{{w#VAOSnPSP5K>5
QtApF=Y6W*_whXJlFUkHuz5oCK

literal 0
HcmV?d00001

diff --git a/nxgx-commons/target/classes/com/rootcloud/utils/StringUtil.class b/nxgx-commons/target/classes/com/rootcloud/utils/StringUtil.class
new file mode 100644
index 0000000000000000000000000000000000000000..ed3d12bb0e6357821ab8daa1c99b19d8ffa9ac04
GIT binary patch
literal 2412
zcmaJ?S#uOs6#nik>7Gevp@D=g0b<0-gk%(OAz=vwkjSuTLvRS7olYm|q%%GA^gs|1
zQC$84KKNjj#fuLLRe{oySF3#S@A!m%x2KbIVBq1Ld*}AK-`T!%=kI5~KLxN4-)E7-
zSrzB9_z)ju@dk_x)%h$saY4a&7K;3QQLZ0LMVn5Pq|GI1Jt23O6<o=p9appX1fR-d
zQ^HQFu%z{r0$atjiWwENDjXGaD&|$VDi&0fRd^~YDz2&URa8|33Tg_j3$#`%w&j@a
zMbDo);`;*YCyI0Cb+h1_<(YyJ_)d9dSfJUrXY9puzCG<M3g|C4F>2GHN!s!j7EFPb
zQLkJL%yKYpx;2J)L!jw^Q+9$w0?Az8xIk*uo3aJkicZ-+Q(Ks{{qyFe%M-omS*AN~
z`i}e^9j1a=rz)_cNc@8Dd4c76wW&faaNKGX?gj1{vT|K|JUcD0D;JCR?Btwn1;c%@
zqm?X^-sIfc>>_LCVFac%f7+~saj@C~o9wD(R_x=872jAbBEg>X7{NF8IB(x%sMI&u
z00nu0jSXQ12I5()#gy3>!VVSAnL%LtW#&K9z&@7rSUF%z{pCV5gitDVG_s<>O@XXa
zJ>vyONtJoV-N0YpC4qF<2ev(2**o=s<wgw18eYw}>=TaccUwIv*}g$ZK@D$Vj{pZ^
zQNvAqrr{*UH1r{_;TAp@=zN~2M{ABdWwZX`vWDCELc<+=si7acH5|fW4FlM{eC@@A
zHQdEl3cl8G58r4Q#WCrTep2O{>uUHG-wCuo?~~4YDLG0Xg$)$_ltIb_<qG96<tpVC
z<u-+o$*Y63Ob+IGxBJyp7U=c-nSxm{ty#Mu$BGjbj_2MO;aOKPv?jbdby@Dfs~1*a
zL#`nSRm&>}rc)-y)_4;~XHDO*uhs0bWe>|%Hkp-*U7mU+7h~^6)DAg|zFl!mi%mZE
zQU@`Ht#usx5Ye81tV1Pa&0rib`aTw=`C^Y5%evJLMl-+~Ine_ZK1yTElxdqT3$ljQ
z%Wuae?BoNS<LjQn7D-6%vXW-uN|JHij6tpf1@04g6Ds%QGxc7c6u6SwNar6z{1%$*
zqizZh6}-*8RyV*qc$dF2cn|w|A}=53DlfO@|AML~9ze-2A^9s$lKi__Mp+j_X~htR
z`Q-pbK_WA%;2<G66A|Q(%p}c^C-P5_x{r~ENEiE`9!wtU+V&In^mpwUO651Fme6z`
z-Q4^ErSzD-GfT+I<LnZem!O@xmlO~F`zOB|N=Jy=MW@}Y)OLF8#xeASp>?n>ThNOU
z)+r@@<49OJ8DuMx&(N;ms1O7H5+ftWF^aXwdoul=D2j(@VFV1kmCHl4)x$|Y!8#d7
zB36=tSV?*!ZxUG+R2DX%b%JX_^#6?9E8+W>pi2*QyM8rYhRy5y8SoHEF}#wdY<N96
zxjTXP=}@Mb<b%Q7_^w3}oQiVmAnu0yXxBHgwH-e|Nj*R+`Ac|ZwZ$i6`E=lemFlID
z*f1gpd}^h^vUsv+E%gQ~dE$xH!0W_2AH!>j;gK@UBa$*IiYpYp8#WCv+gtxcXDO*?
zj8aP9WR%kSW~0=kZ!t=WzSStH`ZlA~-lTU?D|$Dzs&A*x=sT#h`cCR*y@y)UU!!i(
mdyPj(>#sjTi@xg-+T?hMu#5HbW-!ian?N&9PxD&>XZ{CkG7A6z

literal 0
HcmV?d00001

diff --git a/nxgx-commons/target/classes/com/rootcloud/utils/StuInvocationHandler.class b/nxgx-commons/target/classes/com/rootcloud/utils/StuInvocationHandler.class
new file mode 100644
index 0000000000000000000000000000000000000000..81005efa4e559aba948706f40fdded64365f9d4d
GIT binary patch
literal 1128
zcma)5$!^n76g@9PO<dE4l$5rNr3{H%@P-XE$_9ZzN@0<x8&-~E5*NoWa_rLn6-W#c
z3qF94LYx;TjoTQhi|709bj}@~|NQ;+8^AN{=_q2mgaYpC*ueu04>df}@K~T2*?l(>
zsI-pkW83oWpl`kJ9=T4mFHmZG{lJdm&=tscI<zb`yugc^0@d1LLj6#n@KW{|z1s2u
z_gy^fx?#ue`m|J9(y{$RJM@%3H5Q_QHx@8kjvQK{l#%1hxM#(Y=Z~#+6u%9QnH705
zcw+}W-wj#9`gx$!(G1MGG)jZLG*ve>UR2df9*I7&%63LusYXNhqtDS;2W~Wwz5Nd<
z*K}z0MH7cS3gyWuX@-+Lfvr^31x$|64*ML+S_Zm+{_4bWM`|Kt4K;y-M(0HeY+6Ng
z(Uh{x7_+9Uw`CkU?rTr&Y%^;GPt`*)u#CC^4OcXn2CCQ<s9ko60_BU3O<-qk`fq(4
z$~>ww2<7MGZRKlfi5qj@3?bQ*!1Ii?W{fvudD!M(Qv`R%1Jy8PiMJed9>F;nlvio#
zQsyXi^CyJ4`yIKj)bd#2cZHH3Vl6Y<z$&%%BpPL0qo%wGdgYvN?aZg2F<<AcI>}eO
zJz^JB{+{^_xhFr6|3WR{O{y+W_{=0K#dl-Ujbh%w=CqnE++?n*!61wBm7!|5#Z#c=
PHsg~1@8B+NIo$gP?f4V_

literal 0
HcmV?d00001

diff --git a/nxgx-commons/target/classes/com/rootcloud/utils/Student.class b/nxgx-commons/target/classes/com/rootcloud/utils/Student.class
new file mode 100644
index 0000000000000000000000000000000000000000..47e94b0b41e9272956272479750d282f70efb4f3
GIT binary patch
literal 915
zcmaJ<T~8B16g|_gZI?x$P{2Y}{A`P`N_^AspouS5B&i|saoe5LA-g-x?kov^z~7^$
zmWak5;O`*OUtzqnT`7gehn=}Id(XM&o;yGPoc;jt1Un{XP%GgEZW_2{BC8K3Hgt5m
zh&y_}YvLa68+c%#ZlJ-C3ml&_lv{_+kz;#K(6ier6hZGPL*bbSgxY1u)*A<u`a-&t
zI@b~b-;4bY58pZ+F9FN0;~hAm(C73rr{0T*q1Nh3-wvfzT~EfY9V_8QR3dhHpr}Tv
zCyw}Q8SrBUqsP@=B4?@Im?p@G{v}lESO05`W?RN#m%kKRmz9>;*1cJn!@Pl}g-twU
zSh?Kq^H_K;4=v2%nuRTFleS;q2fqhj&rUyBu(4|3k%h;oGOYclCx-bk^_$Ki?<$7s
zG{8O&BN<HOw~r&meKK6egsO~s6w=<Oi71*2cYHk;r{Cv+%dj=gg)7FSoe{98<Y>4I
zi;2idYMMY_7xDsZ(8HMlSx8?-TS6}^M=^Ow>jIr@+8OQn<_Xv*3Nk3uT1YOlSfp5k
zDFI8U(9W=Y4t_;XQU9xbM&=u`?@o|w4v-(BP&Q~8qBulpOllH2P{KN?8WY#fiC3^n
zbd#!x?jwONs+zq39;>>JY6{+^Y+b0(-28(4<?;*ENjYIy9%ZHFb<f%$ZO2+tas4kb
C$Gj#0

literal 0
HcmV?d00001

diff --git a/nxgx-commons/target/classes/com/rootcloud/utils/StudentProxy.class b/nxgx-commons/target/classes/com/rootcloud/utils/StudentProxy.class
new file mode 100644
index 0000000000000000000000000000000000000000..5f82fb342bd0be8526aa70cc83449200b20b2021
GIT binary patch
literal 1263
zcmaJ=ZBNrs6n<_u=+>1nhJd^yzECz`z5+Ug4<tsCfg~6b;-_xA&XVrdv>nP%@K@+x
zFwudchR^;E{Ts$}yOPz|kS4c1_niB@oYVXB&(|LS?qfqk9&;*;G*Xz?pr9a^xfF`>
zy`W-Iqs)?A3Mxt(`fyvt9Tj&qWN}X;j0YKHWOA87_54<y3!h=KQgfOm*Kz!s?X>Ep
zmT%c!X|IzmGxV-m!t&P{rj6LjUG930D9`URBsZNpXXvk3g737NRqj4Ft2XWAD^AU{
z_f6N5ak!cEUs)c*Y%FTXzw0`0kEMv$0Sm)KY;~xCA>FW!__ibXF+;)#G&N02Fbo?n
zDu?EgS+Y&hAa|}M8Xe81+aMK#F=+-p>{1|uLECd$ZjC>&q^E(X#3hNXV+hj><CpYP
z#~`lgn38q9zrTI>b^1=n3RW3rE;$v@OY~uevADX9e;p6;h}z%vxoMjonKR<fko+xi
zM04>iM?5t}-R7?3D63f0@fbAmTo>tC^^n)-Z&5w&@0d;UKV-x=G~3{Qz*}+5I(HdH
zjrmArBt>)m2c*LhOl73Y?DCg3QJ2CQ<OF{cd~ONPH${z<RHI6w_|cgL`{js`3*7&j
zP>#wCHQ^dvt2`LpA4a#0hDet(LEkhJT1P0_qJ4$leT5USLh&5RXCyw-hJvfKW~m%V
zBMA*U!HiNg+&O?Tj8jBMF@Z^fWAX<HVV8p#NEJRI(MGb1D6c)x4;8rpO{Yq#3(?Y;
zA<-Ra@6kiNz{VMrgA?>riuv9))H9?GiYG{KFSMcMGi~U}@8~;7<THC`$jVgzDRSq?
z>@0r407I90ibz2{NRj_6*%+Z`oQPM+z&crw<_aB3%;I_=YbEHK6lCBARV!4j28LxH
KZ&HndTYmxB4J@Mo

literal 0
HcmV?d00001

diff --git a/nxgx-commons/target/maven-archiver/pom.properties b/nxgx-commons/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..1a286bd
--- /dev/null
+++ b/nxgx-commons/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Apache Maven
+#Mon Apr 14 12:01:34 CST 2025
+version=Brussels-SR6
+groupId=com.rootcloud
+artifactId=nxgx-commons
diff --git a/nxgx-commons/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/nxgx-commons/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..70231cf
--- /dev/null
+++ b/nxgx-commons/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,9 @@
+com\rootcloud\utils\Student.class
+com\rootcloud\utils\StringUtil.class
+com\rootcloud\utils\StuInvocationHandler.class
+com\rootcloud\utils\HashMapChain.class
+com\rootcloud\utils\LocalDateUtils.class
+com\rootcloud\utils\SpringBeanUtils.class
+com\rootcloud\utils\JEUuidUtil.class
+com\rootcloud\utils\Person.class
+com\rootcloud\utils\StudentProxy.class
diff --git a/nxgx-commons/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/nxgx-commons/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..baf6dd2
--- /dev/null
+++ b/nxgx-commons/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,9 @@
+F:\Documents\WeChat Files\wxid_g25i3132av9k22\FileStorage\File\2025-03\gongxiang_service\gongxiang_service\nxgx-commons\src\main\java\com\rootcloud\utils\Student.java
+F:\Documents\WeChat Files\wxid_g25i3132av9k22\FileStorage\File\2025-03\gongxiang_service\gongxiang_service\nxgx-commons\src\main\java\com\rootcloud\utils\StuInvocationHandler.java
+F:\Documents\WeChat Files\wxid_g25i3132av9k22\FileStorage\File\2025-03\gongxiang_service\gongxiang_service\nxgx-commons\src\main\java\com\rootcloud\utils\StringUtil.java
+F:\Documents\WeChat Files\wxid_g25i3132av9k22\FileStorage\File\2025-03\gongxiang_service\gongxiang_service\nxgx-commons\src\main\java\com\rootcloud\utils\HashMapChain.java
+F:\Documents\WeChat Files\wxid_g25i3132av9k22\FileStorage\File\2025-03\gongxiang_service\gongxiang_service\nxgx-commons\src\main\java\com\rootcloud\utils\JEUuidUtil.java
+F:\Documents\WeChat Files\wxid_g25i3132av9k22\FileStorage\File\2025-03\gongxiang_service\gongxiang_service\nxgx-commons\src\main\java\com\rootcloud\utils\SpringBeanUtils.java
+F:\Documents\WeChat Files\wxid_g25i3132av9k22\FileStorage\File\2025-03\gongxiang_service\gongxiang_service\nxgx-commons\src\main\java\com\rootcloud\utils\LocalDateUtils.java
+F:\Documents\WeChat Files\wxid_g25i3132av9k22\FileStorage\File\2025-03\gongxiang_service\gongxiang_service\nxgx-commons\src\main\java\com\rootcloud\utils\StudentProxy.java
+F:\Documents\WeChat Files\wxid_g25i3132av9k22\FileStorage\File\2025-03\gongxiang_service\gongxiang_service\nxgx-commons\src\main\java\com\rootcloud\utils\Person.java
diff --git a/nxgx-commons/target/nxgx-commons-Brussels-SR6.jar b/nxgx-commons/target/nxgx-commons-Brussels-SR6.jar
new file mode 100644
index 0000000000000000000000000000000000000000..da89df7dff29295e9dd6067d9b79ce7bca6218cf
GIT binary patch
literal 11002
zcmb7q1yq$=^EV-f7Lbq>kZu9#?gr_U?l^Qvs7LAU?(R<M?iP*$(nxpr2e0?Oa=rTg
z*EeUK^*m>-J-;)1_UxJ2v*(o*^dkfa2sj7`M%`cyhzA6J_bwx%BtR!2E6VWdZWsmx
z930%ghG9G$CL<s#Au6J%L@y)i7}_e^{sL8aH~I?Y24d@_pkQZ>w<2oPD@3g@Olw@k
zX}lt~v@0F~Oqe{IB=yF)uSNZ7K5Z8;xsL`^CXC5M61w2vnYgrtuQAv^D4)BqZ#-6P
z)1n6sz4y*mAi`>#`zBtN283fC3Ax2yV8=YR5+9W&E(h`!PMu-cQA!7g-H7)*lc<@^
z&+;S|-gz#o?au|(JueqH>Ij`%lt5fyQNeml)w=0+d%|LErBZTi<pFv(%cI8fBBWDg
z0-NAeyf-pTkT>?dN#4b^_eM%||G*29`rMN*hxH`23RXLT7z*xCucTn%v~3oGmhM#G
z00{wcucRNkeDRAeAKi^Gu(tY-8h=0H@n0kCtgRgkEUg_4AB_EVW$smekM?t{ql1~H
z{r^}b@;`8h>)D&i=-CLF>X`xQ4J`HS?SmA0W!qk1@PsfSKF(#Q`2_XSX{im4m{HUK
zY6D6E95U52KBaFaaYpkxtacCjigL-r2vre%ZSgV1YO>p`Omh<-FJvN7j4*ZrlVxWq
zLHlE&N?O_l73@fN0RuRlFDQU^K^e8KqSLXLi2&<(Peb$SA(<d9!4shuTh+oo3#r-D
z4EYAr#lWfAj~jJuTe;wd@lOle0a#B}{D?1AQ^C*tFmhyL@Fo<5Xq3gtW>2&T4QhwL
z$u2Pk<TcMG>c2;%)n^eY#C9eeSRO5-Lysec(X;W`<%PoHu=x9Za;dD{<QVgKs|(EL
ziCNiDxA8kcQNiI?Fd}8L^)mc+g8!}d$-!Hx2&v!|H3T$a#V?)Dgn;pMPv8pEea4b-
zWKFnjA=-E`F8Y_BLPa=HcI9&A3{Z;sdz3m;V{}l7!V*2fP;BS)<7iG09*e~JUdCUp
zuoLwiv(ImFL7p(}a&cOXNdg0vN;D~Q5ZPBqU7b$9_o*zAkaCaCald4UdcVOWLYc}n
zn^E@!?&NjDKJ>kX1@FYE2j5wjG4u}$`~5Z~{lf}NiYPmp87kk|$6xEKs%eP<#<>Z0
zb~0&vw)IgDnYF91ZVE816<7yQOGpT+t7s8~BPi)UiEWJire19J9)K&zAOSZL{sbzr
zLncb;5vh$J##D@GKDDyB&V@pr$C}jKg#s0o|7Frw7S?&zs>-><!<5^^L!GAEl>ObN
z^DRUOnKL7ZL*4Z?dSOUcC`zFc+^?J$P<soZ!L`A{5MHHM;`t_hA#abl@!u1g@iDz+
zH%~rZ@+B0TC^p~>c9UzrMwhhFckzZm;mZTMaJ=7LjC!8fW=3EF1-Ia4zO9_~mi4{;
zS<?q_<W>W2WATz81WRe;2Fm9q!i}@A_a*&1Wl4ejtv4!=&0N!#Cy0>_M{!~UU4;hS
zcvNb{uWHA4B;sXRt>9_hTpf*oxNH$TK}C(mQ-K^RuAP*6nqy_Ilp0w>U-4(%Y{Xow
zrnMnQv%gzudao{NDE0;#kSBdJ=C*jVW(#ShWkz9T67@bO+o|ULWc)^XB*<xODqO}v
zWBs+UNn-d|u+l)_F6(%8{Hj;{xW#zmD>2$AQ|TN9S=!`2r@Ckp+-a~#xs$4=!PJVg
z0#{OH(iR$Jfthsyfzex8SpvO7F#Wtt!s`>p<m58By(c`PIW<`>Avw&`gBjr}A?shn
zYDrH<3zC9yxH{PDSl3NaDR*SEro*q*P0so{S%&A>raTjKHWk-B*9*C@DlQ1PqLi?V
zB9{zeC7tcuBDscXDkrGfX50~_u}PGrrE8Lg*r`(*ythWszt%>SMhu8g_1Q=}FJa}(
z)+Ut_*d;4vZu#O+q`2Zx)AjEmNEhNT$J$}|JrAp{!oW1-gy~CB1olqt(}T%x`_#CH
zy<3KqSP3d7r>O_YNb)RS)g#k(GJ*1MlN_M~MhtaX-dd(=XNmB-RdB8%gUsf_;Xo3%
zoyLHePsExloRPMw(LULDF6h>b`QsBS40%%YOd7qG+{GUXYB3e4tr3;H7gfm7?OX>9
zDV-g&^^{tr5sx$JA|_4(yKMY$YCZcir+pm>s8%L0uR2=D9k5M1+zI$tY%q7%&f-88
zE~>g$_U<oi2x6kDERY&}@Hm0EwO%QBwLz!Kdz3d2yC}O3_Mb)vj>3;N)*zvqTYTg?
zoh?jKFiE^VuxuNY3zdAGo0`l<m^C>$)s#5Mz0ovZRxf|lJ+=ypVlhxU?O`R9__lQP
z>Dv3cH^-k#T8af|fFq5a0Un(p$v3bv+LtRfD<Y^MEJx#>V0j}D(rIrJ!pi(KI%lRY
zK>RJ&9JYEwoTUl*9Onmvx(a>vb-BI(%m~(q*LlJ~1x~HVjLnijfR(Hf{=~*MkgH2}
zX0hoRHo{4Ogw{^!0OMqTa<yKjpG%J$D9fPs>>Wptc~k56eV$aka%%Zta+*FtU63o6
zE^(hSn!Q$Vr#r&S`UA2N4r6p8`kc%#xz?PT9mo!f;y#4*VayFRiI;W=E|3Lhv`SjT
zR#<xGYmu*Wk7k8a59qmT79v1Tsg33VSIQqpc6#=x>$24&7KR)98<o9ciUq)c)Hm@S
z0&`q@%0{ZH%ABk8jRAQpv#Cxhc%Klhl~?N8zaGk<@uC;Ndf#NLM5^_EXez)~-O18_
z6>%KqvnMi9js#m(3_G$rf*Z2g>KaHflzv<x|A7PUfKCU*Dcz|BC`k?ncpLFTm%Z0!
z)uU^#Ob~GOYhBN9rb@O;d{zKgsL#Dd)@EwU$3~wT#f9La^5HVx#el`Ka7lcrj&b%|
ziwnzs1M-)iMynZg&pAps_m51(4wWTnA@Y>@G-qY)z=&ZHu9|{ZKF`_+J$&2NpdU#F
z?6l`Dl{nxp@cI*`E)OxAnd3xdqp}(VBxDzTiRP-Ahu#P>_=LOB)WPoPl($S3lI>!x
z*R@vAb?8lXDzCx0(5oDhT`NJLX|?F9q4#BcAk)>%tn@1zT151kz?|b%{*XQ4%An{-
z=%IC5SjYt)<z#%7U#?m@N~&jg-EON6n{S_(K#CIyANMAv(M6=aADNec^@uZKS$(X=
z(<6m}C4l@fRW{~47><sCn&E<}IVUkJzbQJ!vkzn9V2NsV%O+Ra8FMI(<RGyH0R`zb
z9(J`rJp#{52y4pAeRS&A#6c~zW`S0W8Jv*Q>YDY~({Lxm{!jg2%Lp6s$@T~`^};!m
z*k!02yy?d}+e92H=1%vl^bRLRd{EH3#l#n%`JLcg>{H-(rPLiV*z7qQ?xWy$^4TKY
zw!vTFQHT(0V|BWSD9u;K_6_^3yG#ta^7+>~L(@&Qj@r(2$Z8nx&G2e~1)sgxeIuJI
zUoefR-9acZgjK#qbTc2Wl+oBs(V8GWqkV<t#(prGFsI9K>@aJxJgjIq>$Ts>Y=Tmj
zfU)k2AOn|{cL+-7Z$)JTB>TRWL`ie16o+lT(Z!ItKoHT%m}h)BNH}?hslzv;fi2HR
zr>Bajw9(kDnO~3(J(<T$x<r(1amr|r3HV&Yjcr0WRF4MVy5!V;eXg&3Est4%l66$?
zRp7<m!ZiHtkda6A5(P>Bdp37F*Z1(Q3d6O`BNTmBi6#n)P>SQx!_f#1yPMve)vmoj
zOeXy;hfgpKtx|J_{B!!Sb>fG!*;FxVH!(O{G{xvfpTXiq(9)sQ+uNB@5)s$ZicO9I
zC3f3_?xd<7J3+3?SK>+$h|lFqw6Ogymea+RVr0T{b?AeIv*cLO9qT;TVx;`M>~I)~
zWc0(fNO74&@hR$kJI9_!_W;u)c{=vXW7Mdv79V{TOQb|W`^Y3q8v(ya8b>M{O{HJA
zMWNEu-a*AAQy7V}sI-n+U>MCV^NiSgSzf=2TQreA1l^<uy(5lEI+0A%x59|VHdsrl
zFl^Je%8sW@7DzM{h39u@h*zdvjgGfWuAi|*G!&EIhq#QjC|DO&D-I-K?cMI^w1X{E
z-yx+BtM`>M@~oBKA*YXV^QBqVUX;WkYa%)o*=fB*Wm%To=8--w%$=WJ575ljk6Fx3
z_an&HM|DimFNSp+5=26}RyLdYxEetrlhx*tb0&gCwum9wxfx4TeE24T=G=*XNY`64
z+$JFSc8(XzqytPErfVV}xp9GVpI1pJ$%X^&4moxx|0}Pe{6k(PZEc`uDXiyUbe~$;
z|CL)QZ!1iTV(?f58WlikK@;;!!e{vf5d$N<_rk(ovUj{>m9QW}zD{k!BGT6+&;(M*
zjn2IZI6^sI79&g@{@lA<ND3}TgT@VU+TCe9O>{dgyxP5VzJ)kLfTaf5imhxF`-{vd
zmU$Xs(x@rh66(;X1uTO6ea=KXNeT;Ig(~l3<Bhqe6H%l#Em!DJZkbd-`Ca+l)F<by
zRb@zz7AI6?D1$(b1(T)6@r?zl@uC<BQ0+;n*IKf&{vx2V_sTc^^6oUKb=H&8ZZfG1
zaZ{LZC7MP;x|G(Ffknp0ExFd4u$V#$rIM~jswD|yCs^$#WnWQa2V)A&vw`YPdHO8<
zaoJWXxHuF<1=C%@FD2A?DmRqBMN0)rd}5K93)Iq(fx*O~=bGKuHi_0TTb*MqaKLeX
zZHY@@T1Vy)P_6B%Jo4_)g&`S|FMvRt;(N3%o+Bthf^ae04Wm`we|_iRJ(S?1=#NaV
z{lh-waM#5j`?LftlUexIvcS1(op4r;QkhS7cO3T{x;4fckmAH@&}j_1_I`O`6yZ}3
zV<UB8QTu@r<_$88C6!C|0!NeLUZeN(YRoOuFP(@me5NjbJfOG$N0CIZI~IbMm)#rA
z7|lEtRa|5kKJznpz6w5Eti1qlxlo1Dk_FXJVGZ&SX9O1~8~w;HXjKvZ+hL+<ujmO0
zRSSYdN9!b4O#^2M1nR!_(CV{R$4B|M<lb7&Y)@cNAvqO<UX&LNR;!3k^X$k=HB{7^
zOa#g(5STUqzlgF};BO52Z*x6M0h=de@DXrqRL?wB6Hi87A5=K`mRDw9eYRg(l>A-V
zX@9*jiTSBia8lXh6t403ma%h%X7O67-u^Qfe>ZCJz@1{H=M(Kq)mvhLt`qjlR>5wy
zLvq(dw<H%Yf{8m?h0-tuKb({f2ai45|C$kqesHko5k-R&{K4RMW)Afo2mO+}SYjtT
z`Prlvtn?yoH@0<4<WqOSUDWPPdpghARGo$-E)gBX1;wM3=izb`>2w{kX-&tmAFkTm
zb;ts2v*SraEFSk@vZ3*IzU*eqO&mu3&P<`ufj^^;a_Z%iu+}D1vnLO08cLGLI{3nA
z5;lB~e|gJ3hvhX98+RxPieWyqonN2AqeO$`H%=a{u$*2A;&%A(#k4D+8wr!%OBD!H
z5RAEX>R=Af+Ia;jxr<$kRd{WCgEM?h5BZ$Ib^qfyGq!p$(V>~gfi|jR2ppCAaGf{p
zo|+QzRkh1b+;&3C82vRbUd76}tr6=CgL9)`k=)mW@b#G&gZ-8CB}Y4ZUTzaf`Z93)
zHh_<66{i&Sm&ffPu|segTeakFtZh5`k%EE7R9g&5wbO)m2Y*;N;{n^_^SdLO{GChr
zSuOds5J2<?ck;@}&ffa3BRJQwHJBFw0H6b8od8ZwfXAYMp`(FvrMaty&yu15W8}dX
zqJZN0tFiQDrJ8|6B~if6`_Ji%SKN(-9p%EJfV|}^t?TrwtMKK-t1*o0vG9RJeGgv*
zQ2=Bp?sZ~EgM-IyX5r`MC#<3XQ2;prRo4(Qey9aXpRp85f*ip5pV?pqGZDYPlQrP(
z`{&tE{b4qWHg;w}6G0<A-~;a%r6{F{E`WMN4zK>z(+5tV<LUF*M}zvky|0uyBNG=h
zqz63818sGgE2_BAmQ~N$)m-<?qxkyDP0$NNZ9=D}*5hVNns2h}Pft?_`5?D+r$w+5
z#$($);`>v6&DzrKZxw<K!NzjI28^wWnk$3*e9_xWzm3R)1KP#&cj|plJIaECx!>)5
zEszmb!YQv;kf`VmrH`IMiu=Tiie!(R*U|sBgd`nn_tCPtsc8zV)iVjVXPnI68v}7z
zahrDDgiUs#INY{u;^A~?Gl%U<+Z<0OQ-Kv|2QuNjDLVT%suc)sY2Rj>)xJCW;3K5I
zbBM0viABhji&{<-IMG_FZi#<@GJ{yV;VNTrs4PWNtePaWFkNnlkyl!i{C?a~Okx8v
zWGR3n`|5p4GLu%)duEKGm_q{>m9aK<mzs(E9r+FiMJG(QYhV5lXH7W@<{g<e+>U6|
ztn`<Td<UIPmFigC@rq?2BpU0BzMf>$ezoxUc!eoa#~kt)hAnwZVbV(CYwg#kf<>N8
z6Wm(M2elu}V6~t1*8*ddy^n8W(Y??26GlC?fV}42Gtqf2@=88WI+JCd-r}Kq_pLn9
z4SG93Yg)PHxGl4uGe~-gU-X9ajUmq0yaTq<;YtZT?@7zW#4OlHQV_B2-0HX(w5WZ6
z=4?fO%N<08=6OpGkv@e?bbs~omgn+x@=YtA`7hq1<ZbQXnx%_U$PbXM@#}(SK8L3D
z5Fk|GYV|4J1Un$4bVbf$%Wvp=4T)o`_(+}(GaCYs*3rDDSFwSMDvNl>GsJFez4fBI
zjfOSBmqOmi^LGU>Sh&7XI35Ei2nZ~ghnD+m3GGki5=Do5%l%m{@leuK{j7p<^O#wP
ziC8PpU-cDLRXdS%!O8Q~^wcQ-7~Ia_Tq`(8C}JFDoK6i3tL+trFFw2uMf5rsx{h=X
zRRv8>MNLP$N4+Op#C^WdC~hgtCMV}7HK#YSH*aq)nISIsKYHU2<+2wn7$lDGVGYoJ
zdxM-{BhVTP5V`S?FHRA6mc3DoWQ;L9s-1bQVk07iSZscVk<x1*)h3%;YIKwdCDs|~
zZ-&WCt%X@Z{awk0`n&QOH54WpCRoXnx{vxf3?>X1CcclX+lg*hA651lyb$PkDWhW2
zv0z^P#-TM(5S+5})D$ks%w)lGO}Y*ds%wMT*ogXZ@0ZrA2C@-$jI))VgAB(0g3v`|
z&;=yeIYS64PYWE&?@Af#@F-sF^&H3RxD=bV!%5H89$Jvq8v~WKzPVmK&Uo8?C@wKS
z9k`D~<&CLK>bb(js<O3O^U3a!n@me_RG@El)J-Pj#spj&yZOq3)UmN1Ri8-X9b?0c
zhLg%A8Bv@xbt@FBi^A<K(=g)uWk|pH2g18=2igzGC}cIa)*~E1;aRjH92Evr6)<#c
zGbC1}_rQAyqD=ahaN_KfXv2X$Ur9=7=BIbbKn~KSJWkKxP9oXWxT2Sb-^XV^aaq~=
z3^^@@ks2pJR++R^jBj;#aOO%D9_(DI`W{7Jpj*bhc<GU-g9CBN5>^xHmrAC&QU6UD
z&aLL!!X?(G&$h5S>uX)l2z+eR#86HeYEN8SId>K<VCL3peXJdk^wf+ElPh)hxe4YL
z+(6M$9C3va(HV}T?EIrLn^{5Q#Uqc$i^qVYz;U>^PgDIpO4iBF)8OcGeiKyLr-k80
z!|X8Ug=gvdfXn>!FRG)b2#sXx<=^D@KCF9d$)M#s&5K2Eq8n%)qxu*ZjyM!6<Ig!Q
z%1>%$g)fy9b%MKzy)Zb*hRZpY7nIQp<7=^uygVp7^Vf?6j11}IOWb67x85hXr!Iz!
z!O<8wNwGQ_6j^tZZ7ssGcbB-~YGx7Djb{!lR#9lzq{bBRgDyE6kfYo-;@%R<A!t!q
z86L<Hy$ujL83%X!Ak1cgW1#k)&926G!m@{I@kVO_`)*+-a@`=vnteYDC1>Wpnp94E
znTB$$1*?DbX)E-@N6+O1aiVwnWH`m$hjL*}A+2IPflho}v7Dc)uT8eLfz#75L)H=u
z={LMnb?4BM`|$QAPt$r0tk94HM&xFt{9tddBXqLIa5JhI&A7O#KH^L>1_sA!&;-o-
z%OaJ_nZ@CWEe;`fcq$H$rqAc1^4vZlp-C}lbBsJSlqY}>5Hlr(eqz0N05>S*z$90;
zv*6!#qEwYh(n}r|Le_(pvAOIZe9F*M1V7gZCuBT-ez9UFk#GY6e=3i0&CnkSts_a{
z+`UhX{<xz?I2q~ewG?)uw7CV@j`yW0Bdc9y5ucz0A3x{uraxLrZhj6XVdIuIz!47s
z1CndP-?K@N>&k+pd9&yj70#jK1y=JC>wSqN*_&&5g9twt<O5KnlX<7F$Y^9Zs6X|^
z5{tPDt3u7%k|n^uY>+m;%c<gvf_3F6jVM>6`Bv&MF4sDX!BdZqqXH#()+21VN#6|&
z1K9{OM!#HR4<5Yn%|9__>{4Y71|%o@Q@CHeyLXUd<EdrCcNY?t|1(h`{!?goa5OXm
zI{Y~BcqsG($N4dMB4W^&##pVU!ddy>kW&>wmO(p0KEV^r!%*_eLJw(Es-`IKj=F$$
zM@bF!|8NG;1P$K=W!uddBu<OfRKl@3%M3oeK0RlH2-zFyAbUw&>u&)lPUzX}=%@|`
zM%pS~YLWw&f<g6wcz_0ySIa(!P?h~wB761fBk1}9K{TXi%#q2y{J9?9?iG&0BPL^H
zYx-i3u82<DxZSsp8a!z)gPoT>1y{|=QfK{r(?-{&<{oD$dB}AY6VNP(ynOETCe>8b
zh)DKK3TICdV9+ul@Z6;8Yu^(?;dhW#->>Q>O`VMJPtNVr$kf(jd6270eaWD$5V>l*
zOL?W<;UW&Nq<O(;RhI_vjGY{Au7TGMLk^v>EG@BXtrs9SkP>d|(A&o<j|*lQcNO!J
zMc9}1NI$;Y`!+6an}S7epg%$Gj4{Sb>gDfX*A2ey#CiN?o@vY2O0PI_Hqh6IjDpNN
zDsZxLK5eK0VtORRPeoiuw!~9g4WvIs{MD$>@*vQ?%mZ)&`hcHrC?&xdf>}QK=)Lmi
z9_GT=p*pC7DJ;CtPhrm4OeibGD1+tmaSgjDL*(OFS$d%{E#+TY&D5GU1P5^_f8Mzc
z%=eO3R(&Pcd+9m(QF1#;j&dkihg_Cry_8iTi@+iCX(p^Sd14XYy$wys)|wpO-AP3J
z<4)q&WcN?EPKrNl=#`zd%bOpD<fXVNi!Ok1lTBw?|5}m?%1*4I)C%MZQwhf>9!QE9
zt}71LT)nLpW9dA&gSCR@j^F`<PDg2ewr#&=fjvCHN|jb=9Pu^Ie#kwBnYsDq?Irv?
z@uafhiyVGAqToV*I6M8=01}3qLj)|PK3ad`oYd5G6lcsCMH?Lv1Qew<mq=j+(im(E
zzFgH>^cT{&Ml~vXT5Oclz($2!*y!!2PVEk1Y0eXNg}Om{8qMW)K5k8$7!__vWym#c
zI2XwM3)9CMer^nd;WA-?3(+!e!$-7bK!8E3MZZbxc31OK-EOd#FI%{mUU~w+TX=$V
zQM0%`1SkE|XC-F3DYimFY@hF8>ZLL{l55E;N<xF#s$`fSRWos3-hMy=ID(7ZjBW;=
z9Kg~`YGEX>AnC>HH3SeMf2_^cll**qbAGdby6%SDucjA!uJiQK#fx?|lUv+pOYl|A
zMuzRI9!xpTEwc{6Yg$nKj>!qKo!^t^DXG;a_Ane4*RjR|#)uhU7iaf$rwhYwiLW=j
zv-7z_8@w%4YP(<Ln*>RPw<+yE5$_=u5Y><mX)dSIGEEkkTCiSm7~h8;r-}#<pM|`g
zw`(x1T&iYCi?srK;vE$-=^nksZe-;Yc8!#eACDVh7c7wR7h9W);eza68Adz*uttF(
zY?IW55d{t3kt#?ME3bj<gZIMQmVb!+g@lc?Rw(&axEA#OjEOLwZxyO?T|FVf*b^DV
z&3IGzfzUP7C1_XQr)qpchPRJ+M0v-j-`jbgy}fzlS9A{eEL{#scLMEkIVx>;ibNH*
z!6$No-@ENqf~{*RFNa2z3u}9j@*I!kC<uKY0Y{AlQBamXvx62Wsor01As8C0sYH-w
zE`p2Y(Lh(Wd-b2|x9?OM$T4^M<nEoz{PRhO{?G1G0_b#CD{?Ti28!ze4K0oA{wfwJ
z%2<!{qk1H;v)IbuX(&t`sB5%1A~xB8MC*u9#i{W1kK207YI?D{@i;ceZfHW!LfQAA
z&*Xj8xjdskDLmecOY%50{vLF-c^Z-ek*p6EM8<Qx^ErCxn&i)7T}&6zgk)emim{_P
z#aeCWI|as0XODwja!;@~UXRK_MP((XZCql+S@;R(vI>pY#g=-s=r)9+r9I_(zF=LU
z7n1XKB%qF-sGW!xP9beKA~g-5KQQkk$Z@1VrHtKAd%#4tSO!-9ny?&O9vRxZN#v)W
ztbj<f>L)AquD2mhUE`&crrc6!Mtw5+qjP@zZ{cM_!U}J(6?>*v&51G^Pswm2*VXW{
z4wfVPkPf-MkNY_!B8j#mDErB_kS6;hLPL&d4bUIAzwLkb77d(i=Fj9<R6H;i+WbUg
zw2Emz+4MQy;g@Q?MSpm(C^{F?P~idd%Ny$uJ$vsP@yK_S??U@RI=>eLYcFmX#WQi!
zsBc>Kw*#(OSVnf%_)(;*Wwl|j2t+x*7?vnxid73v+BJWy<I<5om#(44TC3-e*7mhX
zF1Ml`v&!Pn09o+wU~WmR&PL~0PgWi{9>jBqf`fdgM`B-}B2tGmr(Kw7)U1691KT5h
zj&o%@aGlcZoXT9}1S%Bov?e!T^30?gyjo^m@TcFI2LgAmA@BX?I>|K7`JMkX{mZC+
z-+^&gnEcs+VWsC}1pLnx|L+GA{Cn_Sj{yD89)X|T3BMkOsQ)ikpo@tM-5r{hHSl4V
zLAz9#`W@?kiSh33za1k#<o%}z|G=@ilg`D;GDxWvnD_#<QLK-TXy;1;a6*)ZA<Q*b
ziAp{ryU5jXkaqJC_v9Daquou2Y}#*DF$r@Gt8u5;sLronlfe?@j9QN4RZF73KtQzW
zv%1*c?A~H+>@O+tBy$I>MDVi#6LuPF@P;hjK(uE@nWG@(Er+BKo@rJifVFhU_Sabw
zhSnv()pQo%#>GK%$M$#JGkjh&=5c0A4KERbk7TX2behD-Jowh%!HN$ta;hTfP9CbU
z=bVqos7dI$-{jO#!sA`$^{_CRP-V7Rl3hQ}!{VMac978C%{+h%YS^Lx>=eGp2x(m<
z%(Z<?9mC`ChQdYIMEHYE0&h#k(WPg%?fGa!dKXmwZbmH|#TgoFof1PilJ<d#L`h7?
zl3GX;#$+IBV}2=Bw9~4JjH;8mF4%OY&D>JLlz4vrd$G4Ox~GaN|A3wl!hvS1+|wbN
z#>^*I@GEL+)D_}AmJ^RQX+@iicP~HRNW_on#6N*idm(c69!r$s3XH_l$7yM-HAdCb
zd}@JnB|b=P)^}V-wnR~{!#-Ym#1+m`Db5gs#3C-}+9kBgkYWx%-am$KzHvO5yEovX
z2#vDxI|I)7hgba7u-N~<4Z_CG+Q!Jv!OX}Wxwq``hZm?2BaITb3r~!Ziq`nsQXhAL
zM6N&@vZNp`J1h8`#@BN+JK~h|ix9hnS}Lo}a7ojlmDHTs(oop|gM_}9-MGMOL`x$%
z4J%4Lee;rV!4{6l>%+nc%EZa;5m)WUZTQy%W+QzPiM&JI+?642ac+7D8b5ZZowsbA
z+nxBJyYDM0NGJ^G-*3CSB>FExh1eFjfBo+c_`&wGUE^V^(0vQf-;@cWxO@FC+k+me
zhkyKQa&@Qpzv%vtrSI0_Zm-?>ho7SU%5mRf^n>m>fPZm3bPzvze_hF+^4{~t|BKi0
zuLh)hgr75h*t&9`4E{}-pn*Ri{JSCPS1mrgwjuo+@a~xjD!xlb?{)BVMn9zbwFTx^
z#D|sJ`|F;+DH8-h{ypOFE`J`P-fRA01(oP;$h&7INEz+-s1IwvzoI>?YTZ{||E5e3
z$&=rs{k8`C5cYnFAD#vOsmyP8EB-rW{#qb=h<HEkhbIH#zooo;W`b^T{)G78MENV+
z!|dyy79@!OKj9u6E`G&)7<}*Zw!bM8L`V2X%s*stKd^uA8t%jQ54ztoAMUjA-#z|!
zF#q$0yAS6-nM?l7{LjexzvQ?N??0h7{x7J11nGymyASsd{r-Kp|C=&FOwa!{zkiDO
z58S_k|3mnDdwl41?}NwRlnD~LGtXbt_kY0u3?;9mU;y_>=y#u%yRtAT+5NBo2lQ)v
ACjbBd

literal 0
HcmV?d00001

diff --git a/nxgx-ifsm-base/.gitignore b/nxgx-ifsm-base/.gitignore
new file mode 100644
index 0000000..561aff0
--- /dev/null
+++ b/nxgx-ifsm-base/.gitignore
@@ -0,0 +1,149 @@
+######################
+# Project Specific
+######################
+/target/www/**
+/src/test/javascript/coverage/
+/src/test/javascript/PhantomJS*/
+
+######################
+# Node
+######################
+/node/
+node_tmp/
+node_modules/
+npm-debug.log.*
+/.awcache/*
+
+######################
+# SASS
+######################
+.sass-cache/
+/*.jh
+/*.png
+
+######################
+# Eclipse
+######################
+*.pydevproject
+.project
+.metadata
+tmp/
+tmp/**/*
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+.factorypath
+/src/main/resources/rebel.xml
+
+# External tool builders
+.externalToolBuilders/**
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+######################
+# Intellij
+######################
+.idea/
+*.iml
+*.iws
+*.ipr
+*.ids
+*.orig
+classes/
+
+######################
+# Visual Studio Code
+######################
+.vscode/
+
+######################
+# Maven
+######################
+/log/
+/target/
+
+######################
+# Gradle
+######################
+.gradle/
+/build/
+
+######################
+# Package Files
+######################
+*.jar
+*.war
+*.ear
+*.db
+
+######################
+# Windows
+######################
+# Windows image file caches
+Thumbs.db
+
+# Folder config file
+Desktop.ini
+
+######################
+# Mac OSX
+######################
+.DS_Store
+.svn
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+######################
+# Directories
+######################
+/bin/
+/deploy/
+
+######################
+# Logs
+######################
+*.log*
+
+######################
+# Others
+######################
+*.class
+*.*~
+*~
+.merge_file*
+
+######################
+# Gradle Wrapper
+######################
+!gradle/wrapper/gradle-wrapper.jar
+
+######################
+# Maven Wrapper
+######################
+!.mvn/wrapper/maven-wrapper.jar
+
+######################
+# ESLint
+######################
+.eslintcache
+
+yarn.lock
+
+/.apt_generated/
diff --git a/nxgx-ifsm-base/pom.xml b/nxgx-ifsm-base/pom.xml
new file mode 100644
index 0000000..e52e8d0
--- /dev/null
+++ b/nxgx-ifsm-base/pom.xml
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>nxgx-base</artifactId>
+        <groupId>com.rootcloud</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>nxgx-ifsm-base</artifactId>
+    <properties>
+        <resilience4jVersion>1.3.0</resilience4jVersion>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.gexin.platform</groupId>
+            <artifactId>gexin-rp-sdk-http</artifactId>
+            <version>4.1.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.2.9</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jsqlparser</groupId>
+            <artifactId>jsqlparser</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <!-- json -->
+        <dependency>
+            <groupId>net.sf.json-lib</groupId>
+            <artifactId>json-lib</artifactId>
+            <version>2.4</version>
+            <classifier>jdk15</classifier>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.messaging.saaj</groupId>
+            <artifactId>saaj-impl</artifactId>
+            <version>1.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.cookingfox</groupId>
+            <artifactId>guava-preconditions</artifactId>
+            <version>0.1.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <!-- 复制 父项目中依赖，不复制 下载不下来 jar  -->
+        <!--<dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>${mybatis-spring-boot-starter.version}</version>
+        </dependency>-->
+
+        <dependency>
+            <groupId>com.ejlchina</groupId>
+            <artifactId>httputils</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>${mybatis-plus.version}</version>
+        </dependency>
+        <!--
+                <dependency>
+                    <groupId>com.baomidou</groupId>
+                    <artifactId>mybatis-plus-generator</artifactId>
+                    <version>${mybatis-plus.version}</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.mybatis</groupId>
+                            <artifactId>mybatis-spring</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+        -->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>${pagehelper.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis-spring</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>com.taobao.arthas</groupId>-->
+        <!--            <artifactId>arthas-spring-boot-starter</artifactId>-->
+        <!--            <version>${arthas-spring-boot-starter.version}</version>-->
+        <!--        </dependency>-->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+            <version>${swagger2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>1.4.1.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+            <version>1.4.1.Final</version>
+        </dependency>
+        <!-- AOP -->
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+        </dependency>
+        <!-- redis -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+        <!-- nacos -->
+        <!--        <dependency>-->
+        <!--            <groupId>org.apache.dubbo</groupId>-->
+        <!--            <artifactId>dubbo-registry-nacos</artifactId>-->
+        <!--            <version>2.7.8</version>-->
+        <!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>com.alibaba.cloud</groupId>-->
+        <!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
+        <!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.4.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <version>3.6.28</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- Groovy-->
+        <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-all -->
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <version>3.0.7</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>com.rootcloud</groupId>
+            <artifactId>apiconnector-engine</artifactId>
+            <version>0.0.2-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>eu.bitwalker</groupId>
+            <artifactId>UserAgentUtils</artifactId>
+            <version>1.21</version>
+        </dependency>
+
+        <!--RabbitMq-->
+        <dependency>
+            <groupId>org.springframework.amqp</groupId>
+            <artifactId>spring-rabbit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-poi</artifactId>
+            <version>4.6.6</version>
+        </dependency>
+        <!-- Excel POI插件 -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper</artifactId>
+            <version>5.0.1</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-client</artifactId>
+            <version>1.19.1</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.getui.push/restful-sdk -->
+        <dependency>
+            <groupId>com.getui.push</groupId>
+            <artifactId>restful-sdk</artifactId>
+            <version>1.0.0.14</version>
+        </dependency>
+    </dependencies>
+    <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+</project>
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/docker/Dockerfile b/nxgx-ifsm-base/src/main/docker/Dockerfile
new file mode 100644
index 0000000..dfc99f5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/docker/Dockerfile
@@ -0,0 +1,6 @@
+FROM private-registry.rootcloud.com/devops/jdk-11-dd:latest
+VOLUME /tmp
+ADD *.jar /data/app.jar
+WORKDIR /data
+ENV JAVA_OPTS="-Djava.awt.headless=true -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai"
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -jar /data/app.jar" ]
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/NXGXBaseApp.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/NXGXBaseApp.java
new file mode 100644
index 0000000..0e420ab
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/NXGXBaseApp.java
@@ -0,0 +1,56 @@
+package com.rootcloud;
+
+import com.rootcloud.common.constant.TemplateConstant;
+import com.rootcloud.domain.dao.ConfigDao;
+import com.rootcloud.domain.vo.ConfigVO;
+import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
+import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import springfox.documentation.oas.annotations.EnableOpenApi;
+
+import java.util.List;
+
+@EnableScheduling  //扫描定时器
+@EnableOpenApi
+@MapperScan({"com.rootcloud.domain.*.*","com.rootcloud.domain.*"})
+@SpringBootApplication(exclude = {MongoAutoConfiguration.class, MongoDataAutoConfiguration.class})
+public class NXGXBaseApp implements CommandLineRunner {
+
+    private static final Logger log = LoggerFactory.getLogger(NXGXBaseApp.class);
+
+    public static void main(String[] args) {
+        SpringApplication app = new SpringApplication(NXGXBaseApp.class);
+        app.run(args);
+    }
+    @Override
+    public void run(String... args) throws Exception {
+        initData();
+    }
+
+    @Autowired
+    private ConfigDao configDao;
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+
+    private void  initData(){
+        List<ConfigVO> zhidTableList= configDao.listTable_zhid();
+        for (ConfigVO ztable:zhidTableList) {
+            redisTemplate.opsForValue().set(TemplateConstant.NXGX_ZH_SPLIT_TABLES+ztable.getName(),ztable.getValue());
+        }
+        List<ConfigVO> szhidTableList= configDao.listTable_syzhid();
+        for (ConfigVO ztable:szhidTableList) {
+            redisTemplate.opsForValue().set(TemplateConstant.NXGX_ZH_SPLIT_TABLES+ztable.getName(),ztable.getValue());
+        }
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/CheckSumBuilder.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/CheckSumBuilder.java
new file mode 100644
index 0000000..d0e9acd
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/CheckSumBuilder.java
@@ -0,0 +1,42 @@
+package com.rootcloud.common;
+
+
+import java.security.MessageDigest;
+
+public class CheckSumBuilder {
+    // 计算并获取CheckSum
+    public static String getCheckSum(String appSecret, String nonce, String curTime) {
+        return encode("sha1", appSecret + nonce + curTime);
+    }
+
+    // 计算并获取md5值
+    public static String getMD5(String requestBody) {
+        return encode("md5", requestBody);
+    }
+
+    private static String encode(String algorithm, String value) {
+        if (value == null) {
+            return null;
+        }
+        try {
+            MessageDigest messageDigest
+                    = MessageDigest.getInstance(algorithm);
+            messageDigest.update(value.getBytes());
+            return getFormattedText(messageDigest.digest());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+    private static String getFormattedText(byte[] bytes) {
+        int len = bytes.length;
+        StringBuilder buf = new StringBuilder(len * 2);
+        for (int j = 0; j < len; j++) {
+            buf.append(HEX_DIGITS[(bytes[j] >> 4) & 0x0f]);
+            buf.append(HEX_DIGITS[bytes[j] & 0x0f]);
+        }
+        return buf.toString();
+    }
+    private static final char[] HEX_DIGITS = { '0', '1', '2', '3', '4', '5',
+            '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/Constants.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/Constants.java
new file mode 100644
index 0000000..4f790b0
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/Constants.java
@@ -0,0 +1,84 @@
+package com.rootcloud.common;
+
+import com.rootcloud.common.vo.PrinterWorkBoxSize;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Constants {
+
+    /**
+     * 租户编号
+     */
+    public static final String CONFIG_CODE_TENANT_ID = "printer_tenant_id";
+
+    /**以下尺寸为计算打印效率、布图率的尺寸
+     */
+    public static final Map<String, PrinterWorkBoxSize> PRINTER_WORK_BOX_SIZE_MAP = new HashMap<String, PrinterWorkBoxSize>(16) {
+        {
+//            put("2215", new PrinterWorkBoxSize().length(22F).width(15F).height(7F));
+//            put("2218", new PrinterWorkBoxSize().length(22F).width(18F).height(7F));
+//            put("2515", new PrinterWorkBoxSize().length(25F).width(15F).height(7F));
+//            put("2518", new PrinterWorkBoxSize().length(25F).width(18F).height(7F));
+//            put("1800", new PrinterWorkBoxSize().length(18F).width(11F).height(7F));//12F
+//            put("Max", new PrinterWorkBoxSize().length(18F).width(10F).height(7F));
+//            put("SDream", new PrinterWorkBoxSize().length(22F).width(12F).height(7.2F));
+//            put("800", new PrinterWorkBoxSize().length(8F).width(5F).height(4F));
+//            put("1000", new PrinterWorkBoxSize().length(10F).width(6F).height(5F));
+//            put("2600", new PrinterWorkBoxSize().length(26F).width(20F).height(10F));
+//
+//            put("2600B", new PrinterWorkBoxSize().length(25F).width(23.5F).height(10F));//24F
+//            put("2500", new PrinterWorkBoxSize().length(25.24F).width(15.60F).height(10F)); //25F 15F 改为25.24F 15.60F
+//            put("300", new PrinterWorkBoxSize().length(3F).width(2F).height(10F));
+//            put("1800E", new PrinterWorkBoxSize().length(18F).width(10F).height(7F));
+//            put("1200", new PrinterWorkBoxSize().length(12F).width(12F).height(3.5F));
+            //1200机型参数
+
+            //2022-03-02 修改1800、Max的长、宽参数
+            put("2215", new PrinterWorkBoxSize().length(22F).width(15F).height(7F));
+            put("2218", new PrinterWorkBoxSize().length(22F).width(18F).height(7F));
+            put("2515", new PrinterWorkBoxSize().length(25F).width(15F).height(7F));
+            put("2518", new PrinterWorkBoxSize().length(25F).width(18F).height(7F));
+            put("1800", new PrinterWorkBoxSize().length(17.3F).width(10.5F).height(7F));//18f 改为 17.3F  11F改为10.5F
+            put("Max", new PrinterWorkBoxSize().length(17.3F).width(10F).height(7F)); //18f 改为 17.3F
+            put("SDream", new PrinterWorkBoxSize().length(22F).width(12F).height(7.2F));
+            put("800", new PrinterWorkBoxSize().length(8F).width(5F).height(4F));
+            put("1000", new PrinterWorkBoxSize().length(10F).width(6F).height(5F));
+            put("2600", new PrinterWorkBoxSize().length(26F).width(20F).height(10F));
+
+            put("2600B", new PrinterWorkBoxSize().length(25F).width(23.5F).height(10F));//24F
+            put("2500", new PrinterWorkBoxSize().length(25.24F).width(15.60F).height(10F)); //25F 15F 改为25.24F 15.60F
+            put("300", new PrinterWorkBoxSize().length(3F).width(2F).height(10F));
+            put("1800E", new PrinterWorkBoxSize().length(18F).width(10F).height(7F));
+            put("1200", new PrinterWorkBoxSize().length(12F).width(12F).height(3.5F));
+
+        }
+    };
+
+    /**
+     * 以下尺寸为运维报告中计算砂利用率的尺寸
+     */
+    public static final Map<String, PrinterWorkBoxSize> PRINTER_WORK_BOX_SIZE_MAP_slyl = new HashMap<String, PrinterWorkBoxSize>(16) {
+        {
+            put("2215", new PrinterWorkBoxSize().length(22.6F).width(15.6F).height(7F));
+            put("2218", new PrinterWorkBoxSize().length(22.6F).width(18.6F).height(7F));
+            put("2515", new PrinterWorkBoxSize().length(25.6F).width(15.6F).height(7F));
+            put("2518", new PrinterWorkBoxSize().length(25.6F).width(18.6F).height(7F));
+            put("1800", new PrinterWorkBoxSize().length(18.6F).width(12F).height(7F));//12.6
+            put("Max", new PrinterWorkBoxSize().length(18.6F).width(10.6F).height(7F));
+            put("SDream", new PrinterWorkBoxSize().length(22.6F).width(12.6F).height(7.2F));
+            put("800", new PrinterWorkBoxSize().length(8.4F).width(5.4F).height(4F));
+            put("1000", new PrinterWorkBoxSize().length(10.4F).width(6.4F).height(5F));
+            put("2600", new PrinterWorkBoxSize().length(27.1F).width(20.6F).height(10F));
+
+            put("300", new PrinterWorkBoxSize().length(3.2F).width(2.2F).height(10F));
+            put("2500", new PrinterWorkBoxSize().length(25.24F).width(15.6F).height(10F));
+            put("2600B", new PrinterWorkBoxSize().length(25.6F).width(24.1F).height(10F));
+            put("1800E", new PrinterWorkBoxSize().length(18.6F).width(10.6F).height(10F));
+            put("1200", new PrinterWorkBoxSize().length(12F).width(12F).height(3.5F));
+            //1200机型参数
+        }
+    };
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/DESUtil.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/DESUtil.java
new file mode 100644
index 0000000..ca37396
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/DESUtil.java
@@ -0,0 +1,77 @@
+package com.rootcloud.common;
+
+import org.apache.commons.codec.binary.Base64;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.DESedeKeySpec;
+
+/**
+ * @author LiPingAn 2022/1/4 14:53
+ * @version 1.0
+ **/
+public class DESUtil {
+    private static final String KEY = "cf410f8f9a4a42cc7a7f48fc4134e8f9";
+    private static final String KEY_ALGORITHM = "DESede";
+    private static final String DEFAULT_CIPHER_ALGORITHM = "DESede/ECB/PKCS5Padding";// 默认的加密算法
+
+    /**
+     * DESede 加密操作
+     * @param content 待加密内容
+     * @return 返回Base64转码后的加密数据
+     */
+    public static String encrypt(String content) {
+        try {
+            Cipher cipher = Cipher.getInstance(DEFAULT_CIPHER_ALGORITHM);
+            // 创建密码器
+            byte[] byteContent = content.getBytes("utf-8");
+            cipher.init(Cipher.ENCRYPT_MODE, getSecretKey());
+            // 初始化为加密模式的密码器
+            byte[] result = cipher.doFinal(byteContent);// 加密
+            return Base64.encodeBase64String(result);// 通过Base64转码返回
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * } } DESede 解密操作
+     *
+     * @param content
+     * @return
+     */
+    public static String decrypt(String content) {
+        try {
+            // 实例化
+            Cipher cipher = Cipher.getInstance(DEFAULT_CIPHER_ALGORITHM); // 使用密钥初始化，设置为解密模式
+            cipher.init(Cipher.DECRYPT_MODE, getSecretKey()); // 执行操作
+            byte[] result = cipher.doFinal(Base64.decodeBase64(content));
+            return new String(result, "utf-8");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * }
+     * 生成秘钥
+     * @return
+     */
+    private static SecretKey getSecretKey() {
+        //返回生成指定算法密钥生成器的KeyGenerator 对象
+        try {
+            // --解密的key
+            final DESedeKeySpec dks = new DESedeKeySpec(KEY.getBytes("UTF-8"));
+            final SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(KEY_ALGORITHM);
+            final SecretKey securekey = keyFactory.generateSecret(dks);
+            return securekey;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return null;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/DateUtil.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/DateUtil.java
new file mode 100644
index 0000000..b7ce31b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/DateUtil.java
@@ -0,0 +1,992 @@
+package com.rootcloud.common;
+
+import jline.internal.Log;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+/**
+ * @ClassName DateUtil
+ * @Description TODO
+ * @Author w-liuyi01
+ * @Date 2022/4/22 10:49
+ * @Version 1.0
+ */
+public class DateUtil {
+
+    // Grace style
+    public static final String PATTERN_GRACE = "yyyy/MM/dd HH:mm:ss";
+    public static final String PATTERN_GRACE_NORMAL = "yyyy/MM/dd HH:mm";
+    public static final String PATTERN_GRACE_SIMPLE = "yyyy/MM/dd";// Classical style
+    public static final String PATTERN_CLASSICAL = "yyyy-MM-dd HH:mm:ss";
+    public static final String PATTERN_CLASSICAL_ISO = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+    public static final String PATTERN_CLASSICAL_ISO_SIMPLE = "yyyy-MM-dd'T'HH:mm:ss'Z'";
+    public static final String PATTERN_CLASSICAL_NORMAL = "yyyy-MM-dd HH:mm";
+    public static final String PATTERN_CLASSICAL_SIMPLE = "yyyy-MM-dd";
+    //CH style
+    public static final String PATTERN_CH = "yyyy年MM月dd日 HH时mm分ss秒";
+    public static final String PATTERN_CH_NORMAL = "yyyy年MM月dd日 HH时mm分";
+    public static final String PATTERN_CH_SIMPLE = "yyyy年MM月dd日";
+    public static final String PATTERN_MMDD_SIMPLE = "MM-dd";
+
+
+    //把标准世界时转换为北京时间
+    public static String UTCtoBeijing(String Timestamp_Local)
+    {
+        //先去掉格式
+        Timestamp_Local = DateUtil.reverseHandlerTime(Timestamp_Local);
+        //转换为北京时间
+        LocalDateTime date = LocalDateTime.parse(Timestamp_Local, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).plusHours(8);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String formatedDateStr = date.format(formatter);
+        return  formatedDateStr;
+    }
+
+    public static String UTCtoBeijing_1(String Timestamp_Local)
+    {
+        //先去掉格式
+        Timestamp_Local = DateUtil.reverseHandlerTime_1(Timestamp_Local);
+        //转换为北京时间
+        LocalDateTime date = LocalDateTime.parse(Timestamp_Local, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).plusHours(8);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String formatedDateStr = date.format(formatter);
+        return  formatedDateStr;
+    }
+
+
+    // 获取当前时间
+    public static String getCurrentTime(){
+        Calendar calendar= Calendar.getInstance();
+        SimpleDateFormat dateFormat= new SimpleDateFormat(PATTERN_CLASSICAL);
+        return dateFormat.format(calendar.getTime());
+    }
+
+/**
+     * @Author w-liuyi01
+     * @Description //带时区的时间格式处理
+     * @Date 2022/4/22 10:55
+     * @Param [time]
+     * @return java.lang.String
+     **/
+    public static String handlerTime(String time) {
+        Date date = null;
+        try {
+            date = new SimpleDateFormat(PATTERN_CLASSICAL).parse(time);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        //国际时间格式转换东八区-8小时
+//        calendar.set(Calendar.HOUR,calendar.get(Calendar.HOUR)-8);
+        SimpleDateFormat sdf = new SimpleDateFormat(PATTERN_CLASSICAL_ISO);
+        //format将Date型转换为String型，parse将String型转换为Date型
+        String UTCDate = sdf.format(calendar.getTime());
+        return UTCDate;
+    }
+
+    public static String handlerTimeNoUTC(String time,int timeZone) {
+        Date date = null;
+        try {
+            date = new SimpleDateFormat(PATTERN_CLASSICAL_ISO).parse(time);
+        } catch (ParseException e) {
+            try {
+                date = new SimpleDateFormat(PATTERN_CLASSICAL_ISO_SIMPLE).parse(time);
+            }catch  (ParseException ex) {
+                e.printStackTrace();
+            }
+        }
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        //国际时间格式转换东八区-8小时
+        calendar.set(Calendar.HOUR,calendar.get(Calendar.HOUR) + timeZone);
+        SimpleDateFormat sdf = new SimpleDateFormat(PATTERN_CLASSICAL);
+        //format将Date型转换为String型，parse将String型转换为Date型
+        String UTCDate = sdf.format(calendar.getTime());
+        return UTCDate;
+    }
+
+
+    /**
+     * @Author w-lxf
+     * @Description 根据string日期获取时间戳
+     * @return
+     */
+    public static Long getTimesByString(String time){
+        Long result = 0l;
+        SimpleDateFormat sdf = new SimpleDateFormat(PATTERN_CLASSICAL);
+//        SimpleDateFormat sdf = new SimpleDateFormat(PATTERN_CLASSICAL_ISO);//yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
+        // 设置时区为CST，中国标准时区
+//        sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+        try {
+            Date date = sdf.parse(time);
+            result = date.getTime();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    /**
+     * 根据string日期格式yyyy-MM-dd'T'HH:mm:ss.SSS'Z'转化为long型时间戳
+     * @param time 日期格式yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
+     * @return
+     */
+    public static Long timeStringToLong(String time){
+        Long result = 0l;
+        SimpleDateFormat sdf = new SimpleDateFormat(PATTERN_CLASSICAL_ISO);
+        sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+        try {
+            Date date = sdf.parse(time);
+            result = date.getTime();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    public static Long getTimesByStringType(String time){
+        Long result = 0l;
+        SimpleDateFormat sdf = new SimpleDateFormat(PATTERN_CLASSICAL);
+        if (time.contains("Z")){
+            sdf = new SimpleDateFormat(PATTERN_CLASSICAL_ISO);
+        }
+        try {
+            Date date = sdf.parse(time);
+            result = date.getTime();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+
+    /**
+     * 计算两个字符串时间相差天数
+     * @param date1
+     * @param date2
+     * @return
+     */
+    public static float dayDiff(String date1,String date2) throws ParseException{
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Calendar calendar = Calendar.getInstance();
+
+        Date old = sdf.parse(date1);
+        calendar.setTime(old);
+        Long oTime = calendar.getTimeInMillis();
+
+        Date now = sdf.parse(date2);
+        calendar.setTime(now);
+        Long nTime = calendar.getTimeInMillis();
+        return (nTime - oTime)/(3600F * 1000 * 24);
+    }
+
+
+    /**
+     * UCT时间转换成北京时间
+     * @param time
+     * @return
+     */
+    public static String getDateByUct(String time){
+        String result = null;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+        Date uctDate = null;
+        try {
+            //处理平台的utc时间格式统一为yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
+            String subTime = time.substring(time.indexOf(".")+1,time.length());
+            String fillTime = "";
+            if(subTime.length()<4){
+                time = time.substring(0,time.indexOf(".")+1);
+                for(int i=0;i<4-subTime.length();i++){
+                    fillTime+="0";
+                }
+                time = time+fillTime+subTime;
+            }
+            uctDate = sdf.parse(time);
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(uctDate);
+            //20220830时间不对去掉+8小时的逻辑
+//            calendar.set(Calendar.HOUR,calendar.get(Calendar.HOUR)+8);
+//            calendar.set(Calendar.HOUR,calendar.get(Calendar.HOUR));
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            result = simpleDateFormat.format(calendar.getTime());
+        } catch (ParseException e) {
+            Log.error("时间转换异常："+e.getMessage());
+            //e.printStackTrace();
+        }
+        return result;
+    }
+
+
+    public static String reverseHandlerTimeByType(String time) {
+        Date date = null;
+        try {
+            if (time.contains("Z")){
+                time = time.replace("Z", " UTC");
+                date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS Z").parse(time);
+            }else{
+                date = new SimpleDateFormat(PATTERN_CLASSICAL).parse(time);
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat(PATTERN_CLASSICAL);
+        //format将Date型转换为String型，parse将String型转换为Date型
+        String UTCDate = sdf.format(date);
+        return UTCDate;
+    }
+
+
+    public static String reverseHandlerTime(String time) {
+        Date date = null;
+        try {
+            date = new SimpleDateFormat(PATTERN_CLASSICAL_ISO).parse(time);
+        } catch (ParseException e) {
+            try {
+                date = new SimpleDateFormat(PATTERN_CLASSICAL_ISO_SIMPLE).parse(time);
+            } catch (ParseException ex) {
+                ex.printStackTrace();
+            }
+        }
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        //国际时间格式转换东八区+8小时
+        calendar.set(Calendar.HOUR,calendar.get(Calendar.HOUR)+8);
+        SimpleDateFormat sdf = new SimpleDateFormat(PATTERN_CLASSICAL);
+        //format将Date型转换为String型，parse将String型转换为Date型
+        String UTCDate = sdf.format(calendar.getTime());
+        return UTCDate;
+    }
+
+    public static String reverseHandlerTime_1(String time) {
+        Date date = null;
+        try {
+            if(time.length()<= 20)
+            {
+                time = time.replace('Z','.')+"000Z"; //2022-05-17T13:15:48Z  2022-05-14T15:00:15Z
+                date = new SimpleDateFormat(PATTERN_CLASSICAL_ISO).parse(time);
+            }
+            else
+                date = new SimpleDateFormat(PATTERN_CLASSICAL_ISO).parse(time);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat(PATTERN_CLASSICAL);
+        //format将Date型转换为String型，parse将String型转换为Date型
+        String UTCDate = sdf.format(date);
+        return UTCDate;
+    }
+
+    /**
+     * 根据默认格式将指定字符串解析成日期
+     *
+     * @param str
+     * 指定字符串
+     * @return 返回解析后的日期
+     */
+    public static Date parse(String str) {
+        return parse(str, PATTERN_CLASSICAL);
+    }/**
+     * 根据指定格式将指定字符串解析成日期
+     *
+     * @param str
+     * 指定日期
+     * @param pattern
+     * 指定格式
+     * @return 返回解析后的日期
+     */
+    public static Date parse(String str, String pattern) {
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        try {
+            return sdf.parse(str);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }/**
+     * 根据默认格式将日期转格式化成字符串
+     *
+     * @param date
+     * 指定日期
+     * @return 返回格式化后的字符串
+     */
+    public static String format(Date date) {
+        return format(date, PATTERN_CLASSICAL);
+    }
+    /**
+     * 根据默认格式将日期转格式化成字符串
+     *
+     * @param date
+     * 指定日期
+     * @return 返回格式化后的字符串
+     */
+    public static String formatForDate(Date date) {
+        return format(date, PATTERN_CLASSICAL_SIMPLE);
+    }
+
+    /**
+     * 根据指定格式将指定日期格式化成字符串
+     *
+     * @param date
+     * 指定日期
+     * @param pattern
+     * 指定格式
+     * @return 返回格式化后的字符串
+     */
+    public static String format(Date date, String pattern) {
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        return sdf.format(date);
+    }/**
+     * 获取时间date1与date2相差的秒数
+     *
+     * @param date1
+     * 起始时间
+     * @param date2
+     * 结束时间
+     * @return 返回相差的秒数
+     */
+    public static int getOffsetSeconds(Date date1, Date date2) {
+        int seconds = (int) ((date2.getTime() - date1.getTime()) / 1000);
+        return seconds;
+    }/**
+     * 获取时间date1与date2相差的分钟数
+     *
+     * @param date1
+     * 起始时间
+     * @param date2
+     * 结束时间
+     * @return 返回相差的分钟数
+     */
+    public static int getOffsetMinutes(Date date1, Date date2) {
+        return getOffsetSeconds(date1, date2) / 60;
+    }/**
+     * 获取时间date1与date2相差的小时数
+     *
+     * @param date1
+     * 起始时间
+     * @param date2
+     * 结束时间
+     * @return 返回相差的小时数
+     */
+    public static int getOffsetHours(Date date1, Date date2) {
+        return getOffsetMinutes(date1, date2) / 60;
+    }/**
+     * 获取时间date1与date2相差的天数数
+     *
+     * @param date1
+     * 起始时间
+     * @param date2
+     * 结束时间
+     * @return 返回相差的天数
+     */
+    public static int getOffsetDays(Date date1, Date date2) {
+        return getOffsetHours(date1, date2) / 24;
+    }/**
+     * 获取时间date1与date2相差的周数
+     *
+     * @param date1
+     * 起始时间
+     * @param date2
+     * 结束时间
+     * @return 返回相差的周数
+     */
+    public static int getOffsetWeeks(Date date1, Date date2) {
+        return getOffsetDays(date1, date2) / 7;
+    }/**
+     * 获取重置指定日期的时分秒后的时间
+     *
+     * @param date
+     * 指定日期
+     * @param hour
+     * 指定小时
+     * @param minute
+     * 指定分钟
+     * @param second
+     * 指定秒
+     * @return 返回重置时分秒后的时间
+     */
+    public static Date getResetTime(Date date, int hour, int minute, int second) {
+        Calendar cal = Calendar.getInstance();
+        if (date != null) {
+            cal.setTime(date);
+        }
+        cal.set(Calendar.HOUR_OF_DAY, hour);
+        cal.set(Calendar.SECOND, minute);
+        cal.set(Calendar.MINUTE, second);
+        return cal.getTime();
+    }/**
+     * 返回指定日期的起始时间
+     *
+     * @param date
+     * 指定日期(例如2014-08-01)
+     * @return 返回起始时间(例如2014-08-01 00:00:00)
+     */
+    public static Date getIntegralStartTime(Date date) {
+        return getResetTime(date, 0, 0, 0);
+    }/**
+     * 返回指定日期的结束时间
+     *
+     * @param date
+     * 指定日期(例如2014-08-01)
+     * @return 返回结束时间(例如2014-08-01 23:59:59)
+     */
+    public static Date getIntegralEndTime(Date date) {
+        return getResetTime(date, 23, 59, 59);
+    }/**
+     * 获取指定日期累加年月日后的时间
+     *
+     * @param date
+     * 指定日期
+     * @param year
+     * 指定年数
+     * @param month
+     * 指定月数
+     * @param day
+     * 指定天数
+     * @return 返回累加年月日后的时间
+     */
+    public static Date rollDate(Date date, int year, int month, int day) {
+        Calendar cal = Calendar.getInstance();
+        if (date != null) {
+            cal.setTime(date);
+        }
+        cal.add(Calendar.YEAR, year);
+        cal.add(Calendar.MONTH, month);
+        cal.add(Calendar.DAY_OF_MONTH, day);
+        return cal.getTime();
+    }/**
+     * 获取指定日期累加指定月数后的时间
+     *
+     * @param date
+     * 指定日期
+     * @param month
+     * 指定月数
+     * @return 返回累加月数后的时间
+     */
+    public static Date rollMonth(Date date, int month) {
+        return rollDate(date, 0, month, 0);
+    }/**
+     * 获取指定日期累加指定天数后的时间
+     *
+     * @param date
+     * 指定日期
+     * @param day
+     * 指定天数
+     * @return 返回累加天数后的时间
+     */
+    public static Date rollDay(Date date, int day) {
+        return rollDate(date, 0, 0, day);
+    }/**
+     * 计算指定日期所在月份的天数
+     *
+     * @param date
+     * 指定日期
+     * @return 返回所在月份的天数
+     */
+    public static int getDayOfMonth(Date date) {
+        Calendar cal = Calendar.getInstance();
+        if (date != null) {
+            cal.setTime(date);
+        }
+        int dayOfMonth = cal.getActualMaximum(Calendar.DATE);
+        return dayOfMonth;
+    }/**
+     * 获取当月第一天的起始时间,例如2014-08-01 00:00:00
+     *
+     * @return 返回当月第一天的起始时间
+     */
+    public static Date getMonthStartTime() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_MONTH, 1);
+        return getIntegralStartTime(cal.getTime());
+    }/**
+     * 获取当月最后一天的结束时间,例如2014-08-31 23:59:59
+     *
+     * @return 返回当月最后一天的结束时间
+     */
+    public static Date getMonthEndTime() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_MONTH, getDayOfMonth(cal.getTime()));
+        return getIntegralEndTime(cal.getTime());
+    }/**
+     * 获取上个月第一天的起始时间,例如2014-07-01 00:00:00
+     *
+     * @return 返回上个月第一天的起始时间
+     */
+    public static Date getLastMonthStartTime() {
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.MONTH, -1);
+        cal.set(Calendar.DAY_OF_MONTH, 1);
+        return getIntegralStartTime(cal.getTime());
+    }/**
+     * 获取上个月最后一天的结束时间,例如2014-07-31 23:59:59
+     *
+     * @return 返回上个月最后一天的结束时间
+     */
+    public static Date getLastMonthEndTime() {
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.MONTH, -1);
+        cal.set(Calendar.DAY_OF_MONTH, getDayOfMonth(cal.getTime()));
+        return getIntegralEndTime(cal.getTime());
+    }/**
+     * 获取下个月第一天的起始时间,例如2014-09-01 00:00:00
+     *
+     * @return 返回下个月第一天的起始时间
+     */
+    public static Date getNextMonthStartTime() {
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.MONTH, 1);
+        cal.set(Calendar.DAY_OF_MONTH, 1);
+        return getIntegralStartTime(cal.getTime());
+    }/**
+     * 获取下个月最后一天的结束时间,例如2014-09-30 23:59:59
+     *
+     * @return 返回下个月最后一天的结束时间
+     */
+    public static Date getNextMonthEndTime() {
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.MONTH, 1);
+        cal.set(Calendar.DAY_OF_MONTH, getDayOfMonth(cal.getTime()));
+        return getIntegralEndTime(cal.getTime());
+    }/**
+     * 获取当前季度第一天的起始时间
+     *
+     * @return 返回当前季度第一天的起始时间
+     */
+    public static Date getQuarterStartTime() {
+        Calendar cal = Calendar.getInstance();
+        int month = cal.get(Calendar.MONTH);
+        if (month < 3) {
+            cal.set(Calendar.MONTH, 0);
+        } else if (month < 6) {
+            cal.set(Calendar.MONTH, 3);
+        } else if (month < 9) {
+            cal.set(Calendar.MONTH, 6);
+        } else {
+            cal.set(Calendar.MONTH, 9);
+        }
+        cal.set(Calendar.DAY_OF_MONTH, 1);
+        return getIntegralStartTime(cal.getTime());
+    }/**
+     * 获取当前季度最后一天的结束时间
+     *
+     * @return 返回当前季度最后一天的结束时间
+     */
+    public static Date getQuarterEndTime() {
+        Calendar cal = Calendar.getInstance();
+        int month = cal.get(Calendar.MONTH);
+        if (month < 3) {
+            cal.set(Calendar.MONTH, 2);
+        } else if (month < 6) {
+            cal.set(Calendar.MONTH, 5);
+        } else if (month < 9) {
+            cal.set(Calendar.MONTH, 8);
+        } else {
+            cal.set(Calendar.MONTH, 11);
+        }
+        cal.set(Calendar.DAY_OF_MONTH, getDayOfMonth(cal.getTime()));
+        return getIntegralEndTime(cal.getTime());
+    }/**
+     * 获取前一个工作日
+     *
+     * @return 返回前一个工作日
+     */
+    public static Date getPrevWorkday() {
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.DAY_OF_MONTH, -1);
+        if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) {
+            cal.add(Calendar.DAY_OF_MONTH, -2);
+        }
+        if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY) {
+            cal.add(Calendar.DAY_OF_MONTH, -1);
+        }
+        return getIntegralStartTime(cal.getTime());
+    }/**
+     * 获取下一个工作日
+     *
+     * @return 返回下个工作日
+     */
+    public static Date getNextWorkday() {
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.DAY_OF_MONTH, 1);
+        if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY) {
+            cal.add(Calendar.DAY_OF_MONTH, 2);
+        }
+        if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) {
+            cal.add(Calendar.DAY_OF_MONTH, 1);
+        }
+        return getIntegralStartTime(cal.getTime());
+    }/**
+     * 获取当周的第一个工作日
+     *
+     * @return 返回第一个工作日
+     */
+    public static Date getFirstWorkday() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+        return getIntegralStartTime(cal.getTime());
+    }/**
+     * 获取当周的最后一个工作日
+     *
+     * @return 返回最后一个工作日
+     */
+    public static Date getLastWorkday() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_WEEK, Calendar.FRIDAY);
+        return getIntegralStartTime(cal.getTime());
+    }/**
+     * 判断指定日期是否是工作日
+     *
+     * @param date
+     * 指定日期
+     * @return 如果是工作日返回true,否则返回false
+     */
+    public static boolean isWorkday(Date date) {
+        Calendar cal = Calendar.getInstance();
+        if (date != null) {
+            cal.setTime(date);
+        }
+        int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK);
+        return !(dayOfWeek == Calendar.SATURDAY || dayOfWeek == Calendar.SUNDAY);
+    }/**
+     * 获取指定日期是星期几
+     *
+     * @param date
+     * 指定日期
+     * @return 返回星期几的描述
+     */
+    public static String getWeekdayDesc(Date date) {
+        final String[] weeks = new String[]{"星期日", "星期一", "星期二", "星期三", "星期四",
+                "星期五", "星期六"};
+        Calendar cal = Calendar.getInstance();
+        if (date != null) {
+            cal.setTime(date);
+        }
+        return weeks[cal.get(Calendar.DAY_OF_WEEK) - 1];
+    }/**
+     * 获取指定日期距离当前时间的时间差描述(如3小时前、1天前)
+     *
+     * @param date
+     * 指定日期
+     * @return 返回时间差的描述
+     */
+    public static String getTimeOffsetDesc(Date date) {
+        int seconds = getOffsetSeconds(date, new Date());
+        if (Math.abs(seconds) < 60) {
+            return Math.abs(seconds) + "秒" + (seconds > 0 ? "前" : "后");
+        }
+        int minutes = seconds / 60;
+        if (Math.abs(minutes) < 60) {
+            return Math.abs(minutes) + "分钟" + (minutes > 0 ? "前" : "后");
+        }
+        int hours = minutes / 60;
+        if (Math.abs(hours) < 60) {
+            return Math.abs(hours) + "小时" + (hours > 0 ? "前" : "后");
+        }
+        int days = hours / 24;
+        if (Math.abs(days) < 7) {
+            return Math.abs(days) + "天" + (days > 0 ? "前" : "后");
+        }
+        int weeks = days / 7;
+        if (Math.abs(weeks) < 5) {
+            return Math.abs(weeks) + "周" + (weeks > 0 ? "前" : "后");
+        }
+        int monthes = days / 30;
+        if (Math.abs(monthes) < 12) {
+            return Math.abs(monthes) + "个月" + (monthes > 0 ? "前" : "后");
+        }
+        int years = monthes / 12;
+        return Math.abs(years) + "年" + (years > 0 ? "前" : "后");
+    }
+
+    /**
+     * 根据时间区间获取时间段的所有日期
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    public static List<Date> getDates(Date startTime, Date endTime) {
+        startTime = getDateStart(startTime);
+        endTime = getDateStart(endTime);
+        List lDate = new ArrayList();
+        lDate.add(startTime);
+        Calendar calBegin = Calendar.getInstance();
+        // 使用给定的 Date 设置此 Calendar 的时间
+        calBegin.setTime(startTime);
+        Calendar calEnd = Calendar.getInstance();
+        // 使用给定的 Date 设置此 Calendar 的时间
+        calEnd.setTime(endTime);
+        // 测试此日期是否在指定日期之后
+        while (endTime.after(calBegin.getTime())){
+            // 根据日历的规则，为给定的日历字段添加或减去指定的时间量
+            calBegin.add(Calendar.DAY_OF_MONTH, 1);
+            lDate.add(calBegin.getTime());
+        }
+        return lDate;
+    }
+
+    /**
+     * 获取指定日期的开始时间
+     * @param date
+     * @return
+     */
+    public static Date getDateStart(Date date){
+        if(date == null){
+            return null;
+        }
+        Calendar calendar =  Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        return calendar.getTime();
+    }
+
+    /**
+     * 获取指定日期的结束时间
+     * @return str
+     */
+    public static Date getDateEnd(Date date){
+        if(date == null){
+            return null;
+        }
+        Calendar calendar =  Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        calendar.set(Calendar.MILLISECOND, 0);
+        return calendar.getTime();
+    }
+
+    /**
+     * 根据格式把date时间转为字符串
+     * @param date
+     * @param format
+     * @return
+     */
+    public static String dateToString(Date date, String format){
+        SimpleDateFormat dateFormat = new SimpleDateFormat(format);
+        return dateFormat.format(date);
+    }
+
+    public static Date stringToDate(String dateStr, String format) {
+        Date d = null;
+        SimpleDateFormat dateFormat = new SimpleDateFormat(format);
+        try {
+            dateFormat.setLenient(false);
+            d = dateFormat.parse(dateStr);
+        } catch (Exception e) {
+            d = null;
+        }
+        return d;
+    }
+
+    /**
+     * 时间戳转为date
+     * @param times
+     * @param format
+     * @return
+     */
+    public static Date timestampToDate(Long times, String format){
+        Date date = null;
+        try {
+            SimpleDateFormat dateFormat =  new SimpleDateFormat(format);
+            String d = dateFormat.format(times);
+            date = dateFormat.parse(d);
+        }catch (Exception e){
+            date = null;
+        }
+        return date;
+    }
+
+    /**
+     * 时间戳转为date
+     * @param times
+     * @return
+     */
+    public static Date timestampToDate(Long times){
+        Date date = null;
+        try {
+            SimpleDateFormat dateFormat =  new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String d = dateFormat.format(times);
+            date = dateFormat.parse(d);
+        }catch (Exception e){
+            date = null;
+        }
+        return date;
+    }
+
+    /**
+     * 获取指定小时
+     * @param date 时间
+     * @param hours 小时数
+     * @param minutes 分钟数
+     * @return Date
+     */
+    public static Date getBeforeHour(Date date, int hours, int minutes){
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.HOUR_OF_DAY, hours);
+        calendar.add(Calendar.MINUTE, minutes);
+        return calendar.getTime();
+    }
+
+
+    /**
+     * 时间戳转时间
+     */
+    public static String timeStamp2Time(Long timeStamp) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = new Date(timeStamp);
+        return sdf.format(date);
+    }
+
+
+    /**
+     * 得到几天前的时间
+     * @param date
+     * @param day
+     * @return
+     */
+    public static Date getDateBefore(Date date,int day){
+        Calendar now =Calendar.getInstance();
+        now.setTime(date);
+        now.set(Calendar.DATE,now.get(Calendar.DATE)-day);
+        return now.getTime();
+    }
+
+    /**
+     * 得到几天后的时间
+     * @param date
+     * @param day
+     * @return
+     */
+    public static Date getDateAfter(Date date,int day){
+        Calendar now = Calendar.getInstance();
+        now.setTime(date);
+        now.set(Calendar.DATE,now.get(Calendar.DATE)+day);
+        return now.getTime();
+    }
+
+
+    /**
+     * 得到几天后的时间
+     * @param date
+     * @param day
+     * @return
+     */
+    public static String getDateStringAfter(Date date,int day){
+        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar now = Calendar.getInstance();
+        now.setTime(date);
+        now.set(Calendar.DATE,now.get(Calendar.DATE)+day);
+        return sf.format(now.getTime());
+    }
+
+    public static Boolean isSameYear(String date){
+        Calendar cal1 = Calendar.getInstance();
+        cal1.setTime(stringToDate(date, PATTERN_CLASSICAL));
+        int a =  cal1.get(Calendar.YEAR);
+        Calendar cal2 = Calendar.getInstance();
+        int b =  cal2.get(Calendar.YEAR);
+        return a == b;
+    }
+
+
+    public static String getSysdateStr() {
+        SimpleDateFormat formatter= new SimpleDateFormat(PATTERN_CLASSICAL);
+        Date date = new Date(System.currentTimeMillis());
+        return formatter.format(date);
+    }
+
+
+    public static String specialDate(String spcialString){
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
+        Date  date = null;
+        try {
+            date = df.parse(spcialString);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        SimpleDateFormat df1 = new SimpleDateFormat ("EEE MMM dd HH:mm:ss Z yyyy", Locale.UK);
+        Date date1 = null;
+        try {
+            date1 = df1.parse(date.toString());
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        SimpleDateFormat df2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return df2.format(date1);
+    }
+
+    /**
+     * 获取两个日期之间的所有日期
+     * @param startTime 开始日期
+     * @param endTime 结束日期
+     * @return
+     */
+    public static List<String> getDays(String startTime, String endTime) {
+        // 返回的日期集合
+        List<String> days = new ArrayList<String>();
+        DateFormat dateFormat = new SimpleDateFormat(DateUtil.PATTERN_CLASSICAL_SIMPLE);
+        try {
+            Date start = dateFormat.parse(startTime);
+            Date end = dateFormat.parse(endTime);
+            Calendar tempStart = Calendar.getInstance();
+            tempStart.setTime(start);
+            Calendar tempEnd = Calendar.getInstance();
+            tempEnd.setTime(end);
+            tempEnd.add(Calendar.DATE, +1);// 日期加1(包含结束)
+            while (tempStart.before(tempEnd)) {
+                days.add(dateFormat.format(tempStart.getTime()));
+                tempStart.add(Calendar.DAY_OF_YEAR, 1);
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return days;
+    }
+
+
+
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+        String dateString = "2022-09-14T02:12:13Z";
+        String startDate = "2023-08-08";
+        String endDate = "2023-08-07";
+        System.out.println("固定时间段:" + DateUtil.getDays(startDate, endDate));
+        //System.out.println(DateUtil.handlerTimeNoUTC(dateString,8));
+//        System.out.println(DateUtil.handlerTime(dateString));
+
+//        Date date = new Date();
+//        Date date1 = rollDay(date, -2);
+//        Date date2 = rollMonth(date, -3);
+//        System.out.println(format(date));
+//        System.out.println(format(date1));
+//        System.out.println(format(date2));
+//        System.out.println(getTimeOffsetDesc(date1));
+//        System.out.println(getTimeOffsetDesc(date2));
+//        System.out.println("获取下个月第一天的起始时间:"+format(getNextMonthStartTime(),PATTERN_CH));
+//        System.out.println("获取下个月最后一天的结束时间:"+format(getNextMonthEndTime()));
+//        System.out.println("获取前一个工作日:"+format(getPrevWorkday(),PATTERN_CLASSICAL_SIMPLE));
+        System.out.println("获取后一个工作日:"+format(getNextWorkday(),PATTERN_CLASSICAL_SIMPLE));
+//        System.out.println("获取当前季度第一天的起始时间:"+format(getQuarterStartTime()));
+//        System.out.println("获取当前季度最后一天的结束时间:"+format(getQuarterEndTime()));
+//        System.out.println("获取当周的第一个工作日:"+format(getFirstWorkday(),PATTERN_CLASSICAL_SIMPLE));
+//        System.out.println("获取当周的最后一个工作日:"+format(getLastWorkday(),PATTERN_CLASSICAL_SIMPLE));
+//        System.out.println(getWeekdayDesc(null));
+//        System.out.println(getSysdateStr());
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/DeflaterUtils.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/DeflaterUtils.java
new file mode 100644
index 0000000..7872c5c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/DeflaterUtils.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed Materials - Property of ROOTCLOUD
+ * THIS MODULE IS "RESTRICTED MATERIALS OF ROOTCLOUD"
+ * (c) Copyright ROOTCLOUD Inc. 2018 All Rights Reserved
+ *
+ * The source code for this program is not published or
+ * otherwise divested of its trade secrets
+ */
+
+package com.rootcloud.common;
+
+import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.Base64;
+import java.util.zip.DataFormatException;
+import java.util.zip.Inflater;
+
+/**
+ * 解压缩字符串工具.
+ */
+public class DeflaterUtils {
+
+/*
+  */
+/**
+   * 压缩.
+   * @param unzipString  {@code String}
+   * @return
+   *//*
+
+  public static String zipString(String unzipString) throws UnsupportedEncodingException {
+    */
+/*
+     *     0 ~ 9 压缩等级 低到高
+     *     public static final int BEST_COMPRESSION = 9;            最佳压缩的压缩级别。
+     *     public static final int BEST_SPEED = 1;                  压缩级别最快的压缩。
+     *     public static final int DEFAULT_COMPRESSION = -1;        默认压缩级别。
+     *     public static final int DEFAULT_STRATEGY = 0;            默认压缩策略。
+     *     public static final int DEFLATED = 8;                    压缩算法的压缩方法(目前唯一支持的压缩方法)。
+     *     public static final int FILTERED = 1;                    压缩策略最适用于大部分数值较小且数据分布随机分布的数据。
+     *     public static final int FULL_FLUSH = 3;                  压缩刷新模式，用于清除所有待处理的输出并重置拆卸器。
+     *     public static final int HUFFMAN_ONLY = 2;                仅用于霍夫曼编码的压缩策略。
+     *     public static final int NO_COMPRESSION = 0;              不压缩的压缩级别。
+     *     public static final int NO_FLUSH = 0;                    用于实现最佳压缩结果的压缩刷新模式。
+     *     public static final int SYNC_FLUSH = 2;                  用于清除所有未决输出的压缩刷新模式;
+     *                                                              可能会降低某些压缩算法的压缩率。
+     *//*
+
+    //使用指定的压缩级别创建一个新的压缩器。
+    Deflater deflater = new Deflater(Deflater.BEST_COMPRESSION);
+    //设置压缩输入数据。
+    deflater.setInput(unzipString.getBytes("UTF-8"));
+    //当被调用时，表示压缩应该以输入缓冲区的当前内容结束。
+    deflater.finish();
+
+    final byte[] bytes = new byte[256];
+    ByteArrayOutputStream outputStream = new ByteArrayOutputStream(256);
+
+    while (!deflater.finished()) {
+      //压缩输入数据并用压缩数据填充指定的缓冲区。
+      int length = deflater.deflate(bytes);
+      outputStream.write(bytes, 0, length);
+    }
+    //关闭压缩器并丢弃任何未处理的输入。
+    deflater.end();
+    return Base64.encodeToString(outputStream.toByteArray());
+  }
+*/
+
+  /**
+   * 解压.
+   * @param zipString {@code String}
+   * @return
+   */
+  public static String unzipString(String zipString) throws UnsupportedEncodingException {
+    byte[] decode = Base64.getDecoder().decode(zipString.getBytes("UTF-8"));
+    //创建一个新的解压缩器
+    Inflater inflater = new Inflater();
+    //设置解压缩的输入数据。
+    inflater.setInput(decode);
+
+    final byte[] bytes = new byte[256];
+    ByteArrayOutputStream outputStream = new ByteArrayOutputStream(256);
+    try {
+      //finished() 如果已到达压缩数据流的末尾，则返回true。
+      while (!inflater.finished()) {
+        //将字节解压缩到指定的缓冲区中。
+        int length = inflater.inflate(bytes);
+        outputStream.write(bytes, 0, length);
+      }
+    } catch (DataFormatException e) {
+      e.printStackTrace();
+      return null;
+    } finally {
+      //关闭解压缩器并丢弃任何未处理的输入。
+      inflater.end();
+    }
+    return new String(outputStream.toByteArray(),"UTF-8");
+  }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/HttpClientUtil.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/HttpClientUtil.java
new file mode 100644
index 0000000..e70e6be
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/HttpClientUtil.java
@@ -0,0 +1,302 @@
+/**
+ * Copyright (C), 2016-2019, 树根互联有限公司
+ * FileName: HttpClientUtil
+ * Author:   yaqiang.zhao
+ * Date:     2019-9-25 17:22
+ * Description: 工具类
+ * History:
+ * <author>          <time>          <version>          <desc>
+ * 作者姓名           修改时间           版本号              描述
+ */
+package com.rootcloud.common;
+
+import com.alibaba.fastjson.JSON;
+import com.rootcloud.common.enums.HttpRequestMethedEnum;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpEntityEnclosingRequest;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 〈工具类〉
+ *
+ * @author yaqiang.zhao
+ * @create 2019-9-25
+ * @since 1.0.0
+ */
+public class HttpClientUtil {
+
+    private final static Logger log = LoggerFactory.getLogger(HttpClientUtil.class);
+
+
+    /**
+     * httpclient使用步骤
+     * 1、创建一个HttpClient对象;
+     * 2、创建一个Http请求对象并设置请求的URL，比如GET请求就创建一个HttpGet对象，POST请求就创建一个HttpPost对象;
+     * 3、如果需要可以设置请求对象的请求头参数，也可以往请求对象中添加请求参数;
+     * 4、调用HttpClient对象的execute方法执行请求;
+     * 5、获取请求响应对象和响应Entity;
+     * 6、从响应对象中获取响应状态，从响应Entity中获取响应内容;
+     * 7、关闭响应对象;
+     * 8、关闭HttpClient.
+     */
+    private static RequestConfig requestConfig = RequestConfig.custom()
+            //从连接池中获取连接的超时时间
+            // 要用连接时尝试从连接池中获取，若是在等待了一定的时间后还没有获取到可用连接（比如连接池中没有空闲连接了）则会抛出获取连接超时异常。
+            .setConnectionRequestTimeout(15000)
+            //与服务器连接超时时间：httpclient会创建一个异步线程用以创建socket连接，此处设置该socket的连接超时时间
+            //连接目标url的连接超时时间，即客服端发送请求到与目标url建立起连接的最大时间。超时时间3000ms过后，系统报出异常
+            .setConnectTimeout(15000)
+            //socket读数据超时时间：从服务器获取响应数据的超时时间
+            //连接上一个url后，获取response的返回等待时间 ，即在与目标url建立连接后，等待放回response的最大时间，在规定时间内没有返回响应的话就抛出SocketTimeout。
+            .setSocketTimeout(30000)
+            .setContentCompressionEnabled(false)
+            .build();
+
+
+    /**
+     * 发送http请求
+     *
+     * @param requestMethod 请求方式（HttpGet、HttpPost、HttpPut、HttpDelete）
+     * @param url           请求路径
+     * @param params        post请求参数
+     * @param header        请求头
+     * @return 响应文本
+     */
+    public static String sendHttp(HttpRequestMethedEnum requestMethod, String url, Map<String, Object> params, Map<String, String> header) {
+        //1、创建一个HttpClient对象;
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        CloseableHttpResponse httpResponse = null;
+        String responseContent = null;
+        //2、创建一个Http请求对象并设置请求的URL，比如GET请求就创建一个HttpGet对象，POST请求就创建一个HttpPost对象;
+        HttpRequestBase request = requestMethod.createRequest(url);
+        request.setConfig(requestConfig);
+        //3、如果需要可以设置请求对象的请求头参数，也可以往请求对象中添加请求参数;
+        if (header != null) {
+            for (Map.Entry<String, String> entry : header.entrySet()) {
+                request.setHeader(entry.getKey(), entry.getValue());
+            }
+        }
+        // 往对象中添加相关参数
+        try {
+            if (params != null) {
+                ((HttpEntityEnclosingRequest) request).setEntity(
+                        new StringEntity(JSON.toJSONString(params),
+                                ContentType.create("application/json", "UTF-8")));
+            }
+            //4、调用HttpClient对象的execute方法执行请求;
+            httpResponse = httpClient.execute(request);
+            //5、获取请求响应对象和响应Entity;
+            HttpEntity httpEntity = httpResponse.getEntity();
+            //6、从响应对象中获取响应状态，从响应Entity中获取响应内容;
+            if (httpEntity != null) {
+                responseContent = EntityUtils.toString(httpEntity, "UTF-8");
+            }
+        } catch (IOException e) {
+            log.error(e.getMessage(), e);
+            e.printStackTrace();
+        } finally {
+            try {
+                //7、关闭响应对象;
+                if (httpResponse != null) {
+                    httpResponse.close();
+                }
+                //8、关闭HttpClient.
+                if (httpClient != null) {
+                    httpClient.close();
+                }
+            } catch (IOException e) {
+                log.error(e.getMessage(), e);
+                e.printStackTrace();
+            }
+        }
+        return responseContent;
+    }
+
+    /**
+     * 向指定URL发送GET方法的请求
+     *
+     * @param url   发送请求的URL
+     * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
+     * @return URL 所代表远程资源的响应结果
+     */
+    public static String sendGetUTF8(String url, String param) {
+        String result = "";
+        BufferedReader in = null;
+        try {
+            String urlNameString = url + "?" + param;
+            URL realUrl = new URL(urlNameString);
+            // 打开和URL之间的连接
+            URLConnection connection = realUrl.openConnection();
+            // 设置通用的请求属性
+            connection.setRequestProperty("accept", "*/*");
+            connection.setRequestProperty("connection", "Keep-Alive");
+            connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+            // 建立实际的连接
+            connection.connect();
+            // 获取所有响应头字段
+            Map<String, List<String>> map = connection.getHeaderFields();
+            // 遍历所有的响应头字段
+            for (String key : map.keySet()) {
+                log.info(key + "--->" + map.get(key));
+            }
+            // 定义 BufferedReader输入流来读取URL的响应
+            in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+            String line;
+            while ((line = in.readLine()) != null) {
+                result += line;
+            }
+        } catch (Exception e) {
+            log.error("sendGetUTF8:" + e.getMessage(), e);
+        }
+        // 使用finally块来关闭输入流
+        finally {
+            try {
+                if (in != null) {
+                    in.close();
+                }
+            } catch (Exception e2) {
+                log.error("sendGetUTF8:" + e2.getMessage(), e2);
+            }
+        }
+        return result;
+    }
+
+
+
+    /**
+     * raw 请求
+     * @param url
+     * @param param
+     * @return
+     */
+    public static String getPostRaw(String url,String param){
+        String result = null;
+        try {
+            HttpClient httpClient = new DefaultHttpClient();
+            HttpPost post = new HttpPost(url);
+            StringEntity postingString = new StringEntity(param);// json传递
+            post.setEntity(postingString);
+            post.setHeader("Content-type", "application/x-www-form-urlencoded;charset=UTF-8");
+            HttpResponse response = httpClient.execute(post);
+            result = EntityUtils.toString(response.getEntity());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return result;
+    }
+
+
+    public static String postForm(String url,Map<String, String> param,Map<String, String> header) {
+        // 创建默认的httpClient实例.
+        CloseableHttpClient httpclient = HttpClients.createDefault();
+        // 创建httppost
+        HttpPost httppost = new HttpPost(url);
+        // 创建参数队列
+        List<NameValuePair> formparams = new ArrayList<NameValuePair>();
+        for (Map.Entry<String, String> entry : param.entrySet()) {
+            formparams.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
+        }
+        UrlEncodedFormEntity uefEntity;
+        String result = null;
+        try {
+            uefEntity = new UrlEncodedFormEntity(formparams, "UTF-8");
+            httppost.setEntity(uefEntity);
+            if (header != null) {
+                for (Map.Entry<String, String> entry : header.entrySet()) {
+                    httppost.setHeader(entry.getKey(), entry.getValue());
+                }
+            }
+            httppost.setHeader("Content-type", "application/x-www-form-urlencoded;charset=UTF-8");
+            CloseableHttpResponse response = httpclient.execute(httppost);
+            try {
+                HttpEntity entity = response.getEntity();
+                if (entity != null) {
+                    result = EntityUtils.toString(entity, "UTF-8");
+                }
+            } finally {
+                response.close();
+            }
+        } catch (ClientProtocolException e) {
+            e.printStackTrace();
+        } catch (UnsupportedEncodingException e1) {
+            e1.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            // 关闭连接,释放资源
+            try {
+                httpclient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+    }
+
+
+    public static String sendFormPost(String url,String param,Map<String, String> header){
+        String result = null;
+        try {
+            HttpClient httpClient = new DefaultHttpClient();
+            HttpPost post = new HttpPost(url);
+            StringEntity postingString = new StringEntity(param);// json传递
+            post.setEntity(postingString);
+
+            if (header != null) {
+                for (Map.Entry<String, String> entry : header.entrySet()) {
+                    post.setHeader(entry.getKey(), entry.getValue());
+                }
+            }
+            post.setHeader("Content-type", "application/x-www-form-urlencoded;charset=UTF-8");
+            HttpResponse response = httpClient.execute(post);
+            result = EntityUtils.toString(response.getEntity());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return result;
+    }
+
+
+
+  /*  public static void main(String[] args) {
+        String url = "https://ifsm.rootcloud.com/saas-gba-device-ledger/api/openapi/device/get-device";
+        Map<String, Object> map = new HashMap<>();
+        map.put("tId", "5UYBI01");
+        map.put("cId", "db34744a-4716-4b2e-9079-21cb307f6313");
+        map.put("key", MD5Utils.getSecret());
+        map.put("page",1);
+        map.put("size",100);
+
+        String res = HttpClientUtil.sendHttp(HttpRequestMethedEnum.HttpPost, url, map, new HashMap<>());
+
+        System.out.println(res);
+    }*/
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/HttpUtils.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/HttpUtils.java
new file mode 100644
index 0000000..432b93a
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/HttpUtils.java
@@ -0,0 +1,453 @@
+package com.rootcloud.common;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.*;
+import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.scheme.Scheme;
+import org.apache.http.conn.scheme.SchemeRegistry;
+import org.apache.http.conn.ssl.SSLSocketFactory;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class HttpUtils {
+    private static final int REQUEST_TIMEOUT = 3 * 1000; // 设置请求超时10秒钟
+
+    private static final int CONNECT_TIMEOUT = 5 * 1000; // 连接超时时间
+
+    private static final int SO_TIMEOUT = 10 * 1000; // 数据传输超时
+
+    private static final String ENCODING = "UTF-8";
+
+    // 务必单例
+    private static CloseableHttpClient client;
+
+    static {
+        RequestConfig requestConfig = RequestConfig.custom()
+                                                   .setConnectTimeout(CONNECT_TIMEOUT)
+                                                   .setConnectionRequestTimeout(REQUEST_TIMEOUT)
+                                                   .setSocketTimeout(SO_TIMEOUT)
+                                                   .build();
+        client = HttpClients.custom().setDefaultRequestConfig(requestConfig).setMaxConnTotal(50).build();
+    }
+
+    public static String get(String url, Map<String, String> paramsMap) {
+        return send(RequestBuilder.get(url), paramsMap);
+    }
+
+
+    public static String post(String url, Map<String, String> paramsMap) {
+        return send(RequestBuilder.post(url), paramsMap);
+    }
+
+
+    public static String send(RequestBuilder requestBuilder, Map<String, String> paramsMap){
+        requestBuilder.setCharset(Charset.forName(ENCODING));
+        String responseText = "";
+
+        if (paramsMap != null) {
+            for (Map.Entry<String, String> param : paramsMap.entrySet()) {
+                requestBuilder.addParameter(param.getKey(), param.getValue());
+            }
+
+            CloseableHttpResponse response = null;
+            try {
+                response = client.execute(requestBuilder.build());
+                if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                    HttpEntity entity = response.getEntity();
+                    if (entity != null) {
+                        responseText = EntityUtils.toString(entity, ENCODING);
+                    }
+                }
+            } catch (Exception e) {
+                //throw new PlatformException("HTTP请求工具类发送请求异常", PlatformExceptionEnum.JE_CORE_UTIL_HTTP_SEND_ERROR,new Object[]{requestBuilder.getUri().getPath(),paramsMap},e);
+            }finally {
+                try {
+                    response.close();
+                } catch (Exception e) {
+                    //throw new PlatformException("HTTP请求工具类关闭请求链接异常", PlatformExceptionEnum.JE_CORE_UTIL_HTTP_SEND_ERROR,new Object[]{requestBuilder.getUri().getPath(),paramsMap},e);
+                }
+            }
+
+        }
+        return responseText;
+
+    }
+    /**
+     * get
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doGet(String host, String path, String method,
+                                     Map<String, String> headers,
+                                     Map<String, String> querys)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpGet request = new HttpGet(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        return httpClient.execute(request);
+    }
+
+    /**
+     * post form
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param bodys
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPost(String host, String path, String method,
+                                      Map<String, String> headers,
+                                      Map<String, String> querys,
+                                      Map<String, String> bodys)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpPost request = new HttpPost(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (bodys != null) {
+            List<NameValuePair> nameValuePairList = new ArrayList<NameValuePair>();
+
+            for (String key : bodys.keySet()) {
+                nameValuePairList.add(new BasicNameValuePair(key, bodys.get(key)));
+            }
+            UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(nameValuePairList, "utf-8");
+            formEntity.setContentType("application/x-www-form-urlencoded; charset=UTF-8");
+            request.setEntity(formEntity);
+        }
+
+        return httpClient.execute(request);
+    }
+
+    /**
+     * Post String
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param body
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPost(String host, String path, String method,
+                                      Map<String, String> headers,
+                                      Map<String, String> querys,
+                                      String body)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpPost request = new HttpPost(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (StringUtils.isNotBlank(body)) {
+            StringEntity entity = new StringEntity(body, "utf-8");
+            entity.setContentType("application/json; charset=utf-8");
+            request.setEntity(entity);
+        }
+
+        return httpClient.execute(request);
+    }
+
+    /**
+     * Post stream
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param body
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPost(String host, String path, String method,
+                                      Map<String, String> headers,
+                                      Map<String, String> querys,
+                                      byte[] body)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpPost request = new HttpPost(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (body != null) {
+            request.setEntity(new ByteArrayEntity(body));
+        }
+
+        return httpClient.execute(request);
+    }
+
+    /**
+     * Put String
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param body
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPut(String host, String path, String method,
+                                     Map<String, String> headers,
+                                     Map<String, String> querys,
+                                     String body)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpPut request = new HttpPut(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+//        if (StringUtils.isNotBlank(body)) {
+//            request.setEntity(new StringEntity(body, "utf-8"));
+//        }
+
+        return httpClient.execute(request);
+    }
+
+    /**
+     * Put stream
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param body
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPut(String host, String path, String method,
+                                     Map<String, String> headers,
+                                     Map<String, String> querys,
+                                     byte[] body)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpPut request = new HttpPut(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (body != null) {
+            request.setEntity(new ByteArrayEntity(body));
+        }
+
+        return httpClient.execute(request);
+    }
+
+    /**
+     * Delete
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doDelete(String host, String path, String method,
+                                        Map<String, String> headers,
+                                        Map<String, String> querys)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpDelete request = new HttpDelete(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        return httpClient.execute(request);
+    }
+
+    private static String buildUrl(String host, String path, Map<String, String> querys) throws UnsupportedEncodingException {
+        StringBuilder sbUrl = new StringBuilder();
+        sbUrl.append(host);
+//        if (!StringUtils.isBlank(path)) {
+//            sbUrl.append(path);
+//        }
+        if (null != querys) {
+            StringBuilder sbQuery = new StringBuilder();
+            for (Map.Entry<String, String> query : querys.entrySet()) {
+                if (0 < sbQuery.length()) {
+                    sbQuery.append("&");
+                }
+//                if (StringUtils.isBlank(query.getKey()) && !StringUtils.isBlank(query.getValue())) {
+//                    sbQuery.append(query.getValue());
+//                }
+//                if (!StringUtils.isBlank(query.getKey())) {
+//                    sbQuery.append(query.getKey());
+//                    if (!StringUtils.isBlank(query.getValue())) {
+//                        sbQuery.append("=");
+//                        sbQuery.append(URLEncoder.encode(query.getValue(), "utf-8"));
+//                    }
+//                }
+            }
+            if (0 < sbQuery.length()) {
+                sbUrl.append("?").append(sbQuery);
+            }
+        }
+
+        return sbUrl.toString();
+    }
+
+    private static HttpClient wrapClient(String host) {
+        HttpClient httpClient = new DefaultHttpClient();
+        if (host.startsWith("https://")) {
+            sslClient(httpClient);
+        }
+
+        return httpClient;
+    }
+
+    private static void sslClient(HttpClient httpClient) {
+        try {
+            SSLContext ctx = SSLContext.getInstance("TLS");
+            X509TrustManager tm = new X509TrustManager() {
+                @Override
+                public X509Certificate[] getAcceptedIssuers() {
+                    return null;
+                }
+                @Override
+                public void checkClientTrusted(X509Certificate[] xcs, String str) {
+
+                }
+                @Override
+                public void checkServerTrusted(X509Certificate[] xcs, String str) {
+
+                }
+            };
+            ctx.init(null, new TrustManager[] { tm }, null);
+            SSLSocketFactory ssf = new SSLSocketFactory(ctx);
+            ssf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+            ClientConnectionManager ccm = httpClient.getConnectionManager();
+            SchemeRegistry registry = ccm.getSchemeRegistry();
+            registry.register(new Scheme("https", 443, ssf));
+        } catch (KeyManagementException ex) {
+            //throw new PlatformException("HTTP请求工具类SLL请求异常", PlatformExceptionEnum.JE_CORE_UTIL_HTTP_SSLCLIENT_ERROR,ex);
+        } catch (NoSuchAlgorithmException ex) {
+            //throw new PlatformException("HTTP请求工具类SLL请求异常", PlatformExceptionEnum.JE_CORE_UTIL_HTTP_SSLCLIENT_ERROR,ex);
+        }
+    }
+
+    public static String responseText(HttpResponse response) {
+        String responseText = "";
+        try {
+            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                HttpEntity entity = response.getEntity();
+                if (entity != null) {
+                    responseText = EntityUtils.toString(entity, "UTF-8");
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return responseText;
+    }
+
+    /**
+     * RAW请求
+     * @param url
+     * @param stringJson
+     * @param headers
+     * @param encode
+     * @return
+     */
+    public static String httpPostRaw(String url, String stringJson, Map<String,String> headers, String encode){
+        String str="";
+        if(encode == null){
+            encode = "utf-8";
+        }
+        //HttpClients.createDefault()等价于 HttpClientBuilder.create().build();
+        CloseableHttpClient closeableHttpClient = HttpClients.createDefault();
+        HttpPost httpost = new HttpPost(url);
+
+        //设置header
+        httpost.setHeader("Content-type", "application/json");
+        if (headers != null && headers.size() > 0) {
+            for (Map.Entry<String, String> entry : headers.entrySet()) {
+                httpost.setHeader(entry.getKey(),entry.getValue());
+            }
+        }
+        //组织请求参数
+        StringEntity stringEntity = new StringEntity(stringJson, encode);
+        httpost.setEntity(stringEntity);
+        String content = null;
+        CloseableHttpResponse httpResponse = null;
+        try {
+            //响应信息
+            httpResponse = closeableHttpClient.execute(httpost);
+            HttpEntity entity = httpResponse.getEntity();
+            content = EntityUtils.toString(entity, encode);
+            str=content;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }finally{
+            try {
+                httpResponse.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        try {  //关闭连接、释放资源
+            closeableHttpClient.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return str;
+    }
+
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/I18nUtil.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/I18nUtil.java
new file mode 100644
index 0000000..2b7c60d
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/I18nUtil.java
@@ -0,0 +1,21 @@
+package com.rootcloud.common;
+
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.context.support.ReloadableResourceBundleMessageSource;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
+
+public final class I18nUtil {
+    public static  Locale localeEn = new Locale("en","US");
+    public static  Locale localeCn = new Locale("zh","CN");
+
+    public static  ReloadableResourceBundleMessageSource messageSource;
+
+    static {
+        messageSource = new ReloadableResourceBundleMessageSource();
+        messageSource.setCacheSeconds(-1);
+        messageSource.setDefaultEncoding(StandardCharsets.UTF_8.name());
+        messageSource.setBasenames("i18n/messages/messages");
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/IgnoreSecurity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/IgnoreSecurity.java
new file mode 100644
index 0000000..7fed05e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/IgnoreSecurity.java
@@ -0,0 +1,18 @@
+package com.rootcloud.common;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/7 19:33
+ */
+@Target({ElementType.METHOD,ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface IgnoreSecurity {
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/JEUuidUtil.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/JEUuidUtil.java
new file mode 100644
index 0000000..1e0665e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/JEUuidUtil.java
@@ -0,0 +1,152 @@
+package com.rootcloud.common;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public class JEUuidUtil {
+    final static char[] digits = {'0', '1', '2', '3', '4', '5', '6', '7', '8',
+            '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+            'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y',
+            'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
+            'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y',
+            'Z'};
+
+    final static Map<Character, Integer> digitMap = new HashMap<Character, Integer>();
+
+    static {
+        for (int i = 0; i < digits.length; i++) {
+            digitMap.put(digits[i], (int) i);
+        }
+    }
+
+    /**
+     * 支持的最大进制数
+     */
+    public static final int MAX_RADIX = digits.length;
+
+    /**
+     * 支持的最小进制数
+     */
+    public static final int MIN_RADIX = 2;
+
+    /**
+     * 将长整型数值转换为指定的进制数（最大支持62进制，字母数字已经用尽）
+     */
+    public static String toString(long i, int radix) {
+        if (radix < MIN_RADIX || radix > MAX_RADIX)
+            radix = 10;
+        if (radix == 10)
+            return Long.toString(i);
+
+        final int size = 65;
+        int charPos = 64;
+
+        char[] buf = new char[size];
+        boolean negative = (i < 0);
+
+        if (!negative) {
+            i = -i;
+        }
+
+        while (i <= -radix) {
+            buf[charPos--] = digits[(int) (-(i % radix))];
+            i = i / radix;
+        }
+        buf[charPos] = digits[(int) (-i)];
+
+        if (negative) {
+            buf[--charPos] = '-';
+        }
+
+        return new String(buf, charPos, (size - charPos));
+    }
+
+    static NumberFormatException forInputString(String s) {
+        return new NumberFormatException("For input string: \"" + s + "\"");
+    }
+
+    /**
+     * 将字符串转换为长整型数字
+     *
+     * @param s     数字字符串
+     * @param radix 进制数
+     */
+    public static long toNumber(String s, int radix) {
+        if (s == null) {
+            throw new NumberFormatException("null");
+        }
+
+        if (radix < MIN_RADIX) {
+            throw new NumberFormatException("radix " + radix
+                    + " less than Numbers.MIN_RADIX");
+        }
+        if (radix > MAX_RADIX) {
+            throw new NumberFormatException("radix " + radix
+                    + " greater than Numbers.MAX_RADIX");
+        }
+
+        long result = 0;
+        boolean negative = false;
+        int i = 0, len = s.length();
+        long limit = -Long.MAX_VALUE;
+        long multmin;
+        Integer digit;
+
+        if (len > 0) {
+            char firstChar = s.charAt(0);
+            if (firstChar < '0') {
+                if (firstChar == '-') {
+                    negative = true;
+                    limit = Long.MIN_VALUE;
+                } else if (firstChar != '+')
+                    throw forInputString(s);
+
+                if (len == 1) {
+                    throw forInputString(s);
+                }
+                i++;
+            }
+            multmin = limit / radix;
+            while (i < len) {
+                digit = digitMap.get(s.charAt(i++));
+                if (digit == null) {
+                    throw forInputString(s);
+                }
+                if (digit < 0) {
+                    throw forInputString(s);
+                }
+                if (result < multmin) {
+                    throw forInputString(s);
+                }
+                result *= radix;
+                if (result < limit + digit) {
+                    throw forInputString(s);
+                }
+                result -= digit;
+            }
+        } else {
+            throw forInputString(s);
+        }
+        return negative ? result : -result;
+    }
+
+    private static String digits(long val, int digits) {
+        long hi = 1L << (digits * 4);
+        return toString(hi | (val & (hi - 1)), MAX_RADIX).substring(1);
+    }
+
+    /**
+     * 以62进制（字母加数字）生成19位UUID，最短的UUID
+     */
+    public static String uuid() {
+        UUID uuid = UUID.randomUUID();
+        StringBuilder sb = new StringBuilder();
+        sb.append(digits(uuid.getMostSignificantBits() >> 32, 8));
+        sb.append(digits(uuid.getMostSignificantBits() >> 16, 4));
+        sb.append(digits(uuid.getMostSignificantBits(), 4));
+        sb.append(digits(uuid.getLeastSignificantBits() >> 48, 4));
+        sb.append(digits(uuid.getLeastSignificantBits(), 12));
+        return sb.toString();
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/JsonPageResult.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/JsonPageResult.java
new file mode 100644
index 0000000..579259a
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/JsonPageResult.java
@@ -0,0 +1,45 @@
+package com.rootcloud.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * 通用返回对象
+ */
+@Getter
+@Setter
+@ToString
+@ApiModel("接口调用结果")
+public class JsonPageResult<T> extends JsonResult<T> {
+    /**
+     * 提示信息
+     */
+    @ApiModelProperty(notes = "记录总数")
+    private long total;
+
+    public JsonPageResult(String code) {
+        super(code);
+    }
+
+    public JsonPageResult(String code, T data) {
+        super(code, data);
+    }
+
+    public JsonPageResult(String code, T data, String message) {
+        super(code, data, message);
+    }
+
+    /**
+     * 成功返回结果
+     *
+     * @param data 获取的数据
+     */
+    public static <T> JsonPageResult<T> success(T data, long total) {
+        JsonPageResult<T> result = new JsonPageResult<>(CODE_SUCCESS, data);
+        result.setTotal(total);
+        return result;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/JsonResult.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/JsonResult.java
new file mode 100644
index 0000000..b29cd31
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/JsonResult.java
@@ -0,0 +1,78 @@
+package com.rootcloud.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * 通用返回对象
+ */
+@Getter
+@Setter
+@ToString
+@ApiModel("接口调用结果")
+public class JsonResult<T> {
+    protected static final String CODE_SUCCESS = "200";
+    private static final String CODE_CLIENT_ERROR = "450";
+    /**
+     * 状态码
+     */
+    @ApiModelProperty(notes = "返回码")
+    private String code;
+    /**
+     * 数据封装
+     */
+    @ApiModelProperty(notes = "数据")
+    private T data;
+    /**
+     * 提示信息
+     */
+    @ApiModelProperty(notes = "提示信息")
+    private String message;
+
+    public JsonResult(String code) {
+        this(code, null);
+    }
+
+    public JsonResult(String code, T data) {
+        this(code, data, null);
+    }
+
+    public JsonResult(String code, T data, String message) {
+        this.code = code;
+        this.message = message;
+        this.data = data;
+    }
+
+
+    public static <T> JsonResult<T> success() {
+        return new JsonResult<T>(CODE_SUCCESS, null, null);
+    }
+
+    public static <T> JsonResult<T> success(T data) {
+        return new JsonResult<T>(CODE_SUCCESS, data, null);
+    }
+
+    public static <T> JsonResult<T> successOK(T data,String message) {
+        return new JsonResult<T>("OK", data, message);
+    }
+
+    public static <T> JsonResult<T> clientFailed(String message) {
+        return new JsonResult<T>(CODE_CLIENT_ERROR, null, message);
+    }
+
+    public static <T> JsonResult<T> failed(String code, String message) {
+        return new JsonResult<T>(code, null, message);
+    }
+
+    /**
+     * 失败返回结果
+     *
+     * @param message 提示信息
+     */
+    public static <T> JsonResult<T> failed(String code, String message, T data) {
+        return new JsonResult(code, data, message);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/JsonResult2.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/JsonResult2.java
new file mode 100644
index 0000000..1ede533
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/JsonResult2.java
@@ -0,0 +1,105 @@
+package com.rootcloud.common;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+
+
+/**
+ * 2.0系统JSON输出类
+ * */
+public class JsonResult2 extends HashMap<String, Object> {
+    private static final long serialVersionUID = 1648637553048061990L;
+
+    public JsonResult2(){
+        this.put("ret", JsonResultStatus.SUCCESS.getRet());
+        this.put("msg", JsonResultStatus.SUCCESS.getMsg());
+        this.put("data", new ArrayList<String>());
+    }
+
+    public JsonResult2(Object data){
+        this.put("ret", JsonResultStatus.SUCCESS.getRet());
+        this.put("msg", JsonResultStatus.SUCCESS.getMsg());
+        this.put("data", data);
+    }
+//    public JsonResult2(Page page) {
+//        this.put("ret", JsonResultStatus.SUCCESS.getRet());
+//        this.put("msg", JsonResultStatus.SUCCESS.getMsg());
+//        this.put("data", new ArrayList<String>());
+//        this.put("pageNo", page.getPageNo());
+//        this.put("count", page.getPageNo());
+//        this.put("pageSize", page.getPageSize());
+//    }
+
+    public JsonResult2(String ret,String msg){
+        this.put("ret", ret);
+        this.put("msg", msg);
+        this.put("data", new ArrayList<String>());
+    }
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    @Override
+    public Object put(String key, Object value) {
+        if(null != key){
+            if("ret".equals(key.toLowerCase()) || "msg".equals(key.toLowerCase())){
+                if(!(value instanceof String)){
+                    return this.get(key);
+                }
+            }
+            if("data".equals(key.toLowerCase())){
+                if(null == value){
+                    super.put("data", new ArrayList());
+                    return null;
+                }else if(!(value instanceof Collection || value instanceof Array
+                        || value.getClass().isArray())){
+                    ArrayList list = new ArrayList();
+                    list.add(value);
+                    super.put("data", list);
+                    return list;
+                }
+            }
+        }
+        return super.put(key, value);
+    }
+
+    public String getRet() {
+        return (String)this.get("ret");
+    }
+
+
+    public void setRet(String ret) {
+        this.put("ret", ret);
+    }
+
+
+    public String getMsg() {
+        return (String)this.get("msg");
+    }
+
+
+    public void setMsg(String msg) {
+        this.put("msg", msg);
+    }
+
+    public void putRetMsg(String ret,String msg){
+        this.put("msg", msg);
+        this.put("ret", ret);
+    }
+
+    public <T> T getData() {
+        return (T) this.get("data");
+    }
+
+    public boolean isSucceed() {
+        return getRet().startsWith("2");
+    }
+
+    public boolean isFailed() {
+        return !isSucceed();
+    }
+
+    public void setData(Object data) {
+        this.put("data", data);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/JsonResultStatus.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/JsonResultStatus.java
new file mode 100644
index 0000000..749ada3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/JsonResultStatus.java
@@ -0,0 +1,67 @@
+package com.rootcloud.common;
+
+
+public enum JsonResultStatus {
+    SUCCESS("200", "执行成功"),
+    REQ_REDIRECT("301", "请求已被永久移动到新位置"),
+    REQ_GRAMMAR_ERROR("400", "服务器不理解请求的语法"),
+    REQ_UN_AUTHORIZED( "401", "API访问资源未授权"),
+    REQ_REFUSE("403", "访问被服务器拒绝"),
+    REQ_NOT_FOUND("404", "请求地址不存在"),
+    REQ_EMPTY_PARAMS( "406", "请求参数错误或为空"),
+    REQ_NOT_OVERTIME("408", "服务器等候请求时超时"),
+    SYS_EXCEPTION("500", "系统服务存在异常"),
+    SYS_UNENFORCED( "501", "服务器不具备完成请求的功能"),
+    SYS_GATEWAY_ERROR("502", "服务器作为网关或代理，从后续服务收到了无效的响应"),
+    SYS_UNAVAILABLE_ERROR("503","目前无法使用服务（由于超载或进行停机维护）"),
+    SYS_GATEWAY_TIMEOUT("504", "服务器作为网关或代理，未及时从后续服务接收请求"),
+    SYS_VERSION_ERROR("505","HTTP版本不被支持"),
+    NO_LOGIN("600", "用户未登录或登录已失效"),
+    NO_RECORDS("691", "记录不存在"),
+    HTTP_REQ_ERROR("900", "服务请求失败"),
+    USER_TENANT_MATCHING_ERROR( "902", "用户请求与所属租户不匹配"),
+    HTTP_URL_ERROR("903", "请求地址非法或为空"),
+    USER_TENANT_LOST_ERROR("904", "用户所属租户序号丢失"),
+
+    /*业务状态码*/
+    DEVICE_UN_AUTHORIZED("50060001", "用户无权限操作"),
+    DEVICE_FAIL("50060002", "执行失败"),
+    DEVICE_ENQUIRE("50060003", "询问状态"),
+    PARAM_REP_TYPE_NULL("50060004", "报表类型不能为空"),
+    PARAM_REP_YEAR_NULL("50060005", "报表年份不能为空"),
+    PARAM_DATE_NULL("50060008", "日期参数不能为空"),
+    REST_GET_DEVICES_BY_OFFICE_NULL("50060006", "调用Base服务根据机构编号获取设备清单返回为空，请联系管理员"),
+    REST_REQUEST_FAILED("50060007", "内部服务请求失败，请联系管理员"),
+
+    PRINTER_HEALTH_CHECK_CONFIG_NOT_EXISTS("50060009", "健康度检查配置项不存在"),
+    WORK_DATA_QUERY_CONFIG_NOT_EXISTS("50060010", "工况查询配置信息不存在，请联系管理员"),
+    WORK_DATA_READ_PROPERTY_VALUE_FAILED("50060011", "读取工况结果属性值失败，请联系管理员")
+    ;
+
+    private String ret;
+
+    private String msg;
+
+    private JsonResultStatus(String ret, String msg) {
+        this.ret = ret;
+        this.msg = msg;
+    }
+
+    public String getRet() {
+        return ret;
+    }
+
+    public void setRet(String ret) {
+        this.ret = ret;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+}
+
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/LappLiveClient.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/LappLiveClient.java
new file mode 100644
index 0000000..65d6320
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/LappLiveClient.java
@@ -0,0 +1,462 @@
+package com.rootcloud.common;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.JsonObject;
+import com.rootcloud.common.constant.LappLiveConstant;
+import com.rootcloud.common.net.JsonHelper;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.ParseException;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 用于调取萤石api，实现视频直播操作。
+ * @author fandi
+ *
+ */
+
+@Component
+public class LappLiveClient {
+
+    private static Logger log = LoggerFactory.getLogger(LappLiveClient.class);
+
+    private static CloseableHttpClient httpClient   = HttpClients.createDefault();
+
+    /**
+     * 获取
+     * @param //url 萤石接口
+     * @param //appKey
+     * @param //appSecret
+     * @return String
+     */
+    public String getAccessToken() throws Exception{
+        if(StringUtils.isBlank(LappLiveConstant.GET_TOKEN_URL) || StringUtils.isBlank(LappLiveConstant.APP_KEY) || StringUtils.isBlank(LappLiveConstant.APP_SECRET)) {
+            log.info("getAccessToken param can not be null| getAccessTokenUrl:{}|appKey:{}|appSecret:{}", LappLiveConstant.GET_TOKEN_URL, LappLiveConstant.APP_KEY, LappLiveConstant.APP_SECRET);
+            return null;
+        }
+
+        log.info("getAccessTokenparam is | getAccessTokenUrl:{} | appKey:{} | appSecret:{} ", LappLiveConstant.GET_TOKEN_URL, LappLiveConstant.APP_KEY, LappLiveConstant.APP_SECRET);
+        String getTokenUri = LappLiveConstant.GET_TOKEN_URL + "?appKey=" + LappLiveConstant.APP_KEY + "&appSecret=" + LappLiveConstant.APP_SECRET;
+        HttpPost post = new HttpPost(getTokenUri);
+
+        String message = "";
+        post.setHeader("Content-type", "application/x-www-form-urlencoded");
+        CloseableHttpResponse response = httpClient.execute(post);
+        message = EntityUtils.toString(response.getEntity(), "utf-8");
+
+        // 首先获取data数据，然后获取data中的accessToken中的数据
+        String data = "";
+        if(JsonHelper.getJsonObject(message).get("code").toString().equals("200")) {
+            data = JsonHelper.getJsonObject(message).get("data").toString();
+        }else {
+            return null;
+        }
+
+        if(StringUtils.isBlank(data)) {
+            return null;
+        }
+
+        // 获取accessToken的有效地址
+        String accessToken = JsonHelper.getJsonObject(data).get("accessToken").toString();
+
+        return accessToken;
+    }
+
+    /**
+     * 获取
+     * @param //url 乐橙接口
+     * @param //appKey
+     * @param //appSecret
+     * @return String
+     */
+    public String getAccessTokenLeCheng() throws Exception{
+        if(StringUtils.isBlank(LappLiveConstant.GET_TOKEN_LECHENG_URL) || StringUtils.isBlank(LappLiveConstant.APP_KEY_LECHENG) || StringUtils.isBlank(LappLiveConstant.APP_SECRET_LECHENG)) {
+            log.error("getAccessToken param can not be null| getAccessTokenUrl:{}|appKey:{}|appSecret:{}", LappLiveConstant.GET_TOKEN_LECHENG_URL, LappLiveConstant.APP_KEY_LECHENG, LappLiveConstant.APP_SECRET_LECHENG);
+            return null;
+        }
+        Map<String, Object> map = paramsInit();
+        log.error("getAccessTokenparam is | getAccessTokenUrl:{} | appKey:{} | appSecret:{} ", LappLiveConstant.GET_TOKEN_LECHENG_URL, LappLiveConstant.APP_KEY_LECHENG, LappLiveConstant.APP_SECRET_LECHENG);
+        //String getTokenUri = LappLiveConstant.GET_TOKEN_LECHENG_URL + "?appKey=" + LappLiveConstant.APP_KEY_LECHENG + "&appSecret=" + LappLiveConstant.APP_SECRET_LECHENG;
+        String getTokenUri = LappLiveConstant.GET_TOKEN_LECHENG_URL;
+        HttpClient client = HttpClients.createDefault();
+        HttpPost post = new HttpPost(getTokenUri);
+        post.setHeader("Content-Type", "application/json");
+        post.setHeader("Accept", "application/json");
+
+        long time = System.currentTimeMillis() / 1000;
+        String nonce = UUID.randomUUID().toString();
+        String id = UUID.randomUUID().toString();
+
+        StringBuilder paramString = new StringBuilder();
+        paramString.append("time:").append(time).append(",");
+        paramString.append("nonce:").append(nonce).append(",");
+        paramString.append("appSecret:").append(LappLiveConstant.APP_SECRET_LECHENG); //SECRET
+        String sign = "";
+        // 计算MD5得值
+        try {
+            //System.out.println("传入参数：" + paramString.toString().trim());
+            sign = DigestUtils.md5Hex(paramString.toString().trim().getBytes("UTF-8"));
+        } catch (Exception e) {
+            log.error("md5 exception:"+e.toString());
+            e.printStackTrace();
+        }
+        log.error("sign:"+sign);
+        Map<String, Object> systemMap = new HashMap<String, Object>();
+        systemMap.put("ver", "1.0");
+        systemMap.put("sign", sign);
+        systemMap.put("appId", LappLiveConstant.APP_KEY_LECHENG); //AppID
+        systemMap.put("nonce", nonce);
+        systemMap.put("time", time);
+
+        // 构建JSON对象
+        JsonObject systemObject = new JsonObject();
+        systemObject.addProperty("ver", "1.0");
+        systemObject.addProperty("appId", LappLiveConstant.APP_KEY_LECHENG);
+        systemObject.addProperty("sign", sign);
+        systemObject.addProperty("time", time);
+        systemObject.addProperty("nonce", nonce);
+
+        JsonObject jsonObject = new JsonObject();
+        jsonObject.add("system", systemObject);
+        jsonObject.addProperty("id", id);
+        jsonObject.add("params", new JsonObject());
+
+        String json = jsonObject.toString();
+        StringEntity entity = new StringEntity(json);
+        post.setEntity(entity);
+        // 发送请求并获取响应
+        HttpResponse response = client.execute(post);
+        // 获取响应状态码
+        int statusCode = response.getStatusLine().getStatusCode();
+        String result = "";
+        // 获取accessToken的有效地址
+        String accessToken = "";
+        try{
+            if (statusCode == 200) {
+                // 获取响应内容
+                result = EntityUtils.toString(response.getEntity());
+                //System.out.println("响应内容: " + result);
+            } else {
+                //System.err.println("HTTP请求失败，状态码: " + statusCode);
+            }
+            if(JsonHelper.getJsonObject(JsonHelper.getJsonObject(result).get("result")).get("code").toString().equals("0")){
+                String data = JsonHelper.getJsonObject(JsonHelper.getJsonObject(result).get("result")).get("data").toString();
+                //accessToken = JsonHelper.getJsonObject(JsonHelper.getJsonObject(JsonHelper.getJsonObject(result).get("result")).get("data")).get("accessToken");
+                accessToken = JsonHelper.getJsonObject(data).get("accessToken").toString();
+            }else {
+                return null;
+            }
+            log.error("accessToken="+accessToken);
+        }catch (Exception ex){
+            log.error("accessToken exception:"+ex.toString());
+        }
+        return accessToken;
+    }
+
+    protected static Map<String, Object> paramsInit() {
+        long time = System.currentTimeMillis() / 1000;
+        String nonce = UUID.randomUUID().toString();
+        String id = UUID.randomUUID().toString();
+
+        StringBuilder paramString = new StringBuilder();
+        paramString.append("time:").append(time).append(",");
+        paramString.append("nonce:").append(nonce).append(",");
+        paramString.append("appSecret:").append(LappLiveConstant.APP_SECRET_LECHENG); //SECRET
+
+        String sign = "";
+        // 计算MD5得值
+        try {
+            System.out.println("传入参数：" + paramString.toString().trim());
+            sign = DigestUtils.md5Hex(paramString.toString().trim().getBytes("UTF-8"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        Map<String, Object> systemMap = new HashMap<String, Object>();
+        systemMap.put("ver", "1.0");
+        systemMap.put("sign", sign);
+        systemMap.put("appId", LappLiveConstant.APP_KEY_LECHENG); //AppID
+        systemMap.put("nonce", nonce);
+        systemMap.put("time", time);
+
+        Map<String, Object> paramsMap = new HashMap<>();
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("system", systemMap);
+        map.put("params", paramsMap);
+        map.put("id", id);
+        return map;
+    }
+
+
+    /**
+     * 开通直播功能
+     * @param accessToken 令牌号
+     * @param //String url 萤石接口url
+     * @param //String deviceSerial 设备序列号
+     * @param //String channelNo 通道号
+     * @return boolean (true表示成功，false表示失败)
+     * @throws IOException
+     * @throws ParseException
+     */
+    public String openLive(String url, String accessToken, String deviceSerial, String channelNo) throws ParseException, IOException {
+        if(StringUtils.isBlank(url) || StringUtils.isBlank(deviceSerial) || StringUtils.isBlank(accessToken) || StringUtils.isBlank(channelNo)) {
+            log.info("openLive parame can not be null| accessToken:{}|deviceSerial:{}|channelNo:{}|url:{}", accessToken, deviceSerial, channelNo, url);
+            return null;
+        }
+
+        log.info("openLive parame is |accessToken:{}|deviceSerial:{}|channelNo:{}|url:{}", accessToken, deviceSerial, channelNo, url);
+
+        // 获取直播源，格式为：[设备序列号]:[通道号]
+        String source = deviceSerial + ":" + channelNo;
+        String openLiveUri = url + "?accessToken=" + accessToken + "&source=" + source;
+        HttpPost post = new HttpPost(openLiveUri);
+
+        String message = "";
+        post.setHeader("Content-type", "application/x-www-form-urlencoded");
+        CloseableHttpResponse response = httpClient.execute(post);
+        message = EntityUtils.toString(response.getEntity(), "utf-8");
+        return message;
+    }
+
+    /**
+     * 获取直播地址
+     * @return
+     * @throws IOException
+     * @throws ClientProtocolException
+     */
+    public String getLiveAddress(String url, String accessToken, String deviceSerial, String channelNo) throws ClientProtocolException, IOException{
+        if(StringUtils.isBlank(url) || StringUtils.isBlank(deviceSerial) || StringUtils.isBlank(accessToken) || StringUtils.isBlank(channelNo)) {
+            log.info("getLiveAddress parame can not be null| accessToken:{}|deviceSerial:{}|channelNo:{}|url:{}", accessToken, deviceSerial, channelNo, url);
+            return null;
+        }
+        log.info("getLiveAddress parame is |accessToken:{}|deviceSerial:{}|channelNo:{}|url:{}", accessToken, deviceSerial, channelNo, url);
+
+        // 获取直播源，格式为：[设备序列号]:[通道号]
+        String source = deviceSerial + ":" + channelNo;
+        String getLiveAddressUri = url + "?accessToken="+ accessToken + "&source=" + source;
+        HttpPost post = new HttpPost(getLiveAddressUri);
+
+        String message = "";
+        post.setHeader("Content-type", "application/x-www-form-urlencoded");
+        CloseableHttpResponse response = httpClient.execute(post);
+        message = EntityUtils.toString(response.getEntity(), "utf-8");
+
+        return message;
+    }
+
+    public String getLiveAddressLeCheng0(String url, String accessToken, String deviceSerial, String channelNo) throws ClientProtocolException, IOException{
+        if(StringUtils.isBlank(url) || StringUtils.isBlank(deviceSerial) || StringUtils.isBlank(accessToken) || StringUtils.isBlank(channelNo)) {
+            log.info("getLiveAddress parame can not be null| accessToken:{}|deviceSerial:{}|channelNo:{}|url:{}", accessToken, deviceSerial, channelNo, url);
+            return null;
+        }
+        log.info("getLiveAddress parame is |accessToken:{}|deviceSerial:{}|channelNo:{}|url:{}", accessToken, deviceSerial, channelNo, url);
+        //查询设备通道下创建的直播信息
+        String getLiveAddressUri = "https://openapi.lechange.cn/openapi/getLiveStreamInfo";
+        HttpClient client = HttpClients.createDefault();
+        HttpPost post = new HttpPost(getLiveAddressUri);
+        post.setHeader("Content-Type", "application/json");
+        post.setHeader("Accept", "application/json");
+        long time = System.currentTimeMillis() / 1000;
+        String nonce = UUID.randomUUID().toString();
+        String id = UUID.randomUUID().toString();
+
+        StringBuilder paramString = new StringBuilder();
+        paramString.append("time:").append(time).append(",");
+        paramString.append("nonce:").append(nonce).append(",");
+        paramString.append("appSecret:").append(LappLiveConstant.APP_SECRET_LECHENG); //SECRET
+        String sign = "";
+        // 计算MD5得值
+        try {
+            //System.out.println("传入参数：" + paramString.toString().trim());
+            sign = DigestUtils.md5Hex(paramString.toString().trim().getBytes("UTF-8"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        Map<String, Object> systemMap = new HashMap<String, Object>();
+        systemMap.put("ver", "1.0");
+        systemMap.put("sign", sign);
+        systemMap.put("appId", LappLiveConstant.APP_KEY_LECHENG); //AppID
+        systemMap.put("nonce", nonce);
+        systemMap.put("time", time);
+
+        // 构建JSON对象
+        JsonObject systemObject = new JsonObject();
+        systemObject.addProperty("ver", "1.0");
+        systemObject.addProperty("appId", LappLiveConstant.APP_KEY_LECHENG);
+        systemObject.addProperty("sign", sign);
+        systemObject.addProperty("time", time);
+        systemObject.addProperty("nonce", nonce);
+
+        JsonObject jsonObject = new JsonObject();
+        jsonObject.add("system", systemObject);
+        jsonObject.addProperty("id", id);
+        JsonObject paramsObject = new JsonObject();
+        paramsObject.addProperty("deviceId", deviceSerial);
+        paramsObject.addProperty("channelId", channelNo);
+        paramsObject.addProperty("token", accessToken);
+        jsonObject.add("params", paramsObject);
+
+        String json = jsonObject.toString();
+        StringEntity entity = new StringEntity(json);
+        post.setEntity(entity);
+        HttpResponse response = client.execute(post);
+        int statusCode = response.getStatusLine().getStatusCode();
+        String result = "";
+        String message = "";
+        if (statusCode == 200) {
+            result = EntityUtils.toString(response.getEntity());
+            System.out.println("响应内容: " + result);
+            log.info("响应内容: " + result);
+        } else {
+            System.err.println("HTTP请求失败，状态码: " + statusCode);
+            log.info("HTTP请求失败，状态码: " + statusCode);
+        }
+        return result;
+    }
+
+
+    public String getLiveAddressLeCheng1(String url, String accessToken, String deviceSerial, String channelNo) throws ClientProtocolException, IOException{
+        if(StringUtils.isBlank(url) || StringUtils.isBlank(deviceSerial) || StringUtils.isBlank(accessToken) || StringUtils.isBlank(channelNo)) {
+            log.info("getLiveAddress parame can not be null| accessToken:{}|deviceSerial:{}|channelNo:{}|url:{}", accessToken, deviceSerial, channelNo, url);
+            return null;
+        }
+        log.info("getLiveAddress parame is |accessToken:{}|deviceSerial:{}|channelNo:{}|url:{}", accessToken, deviceSerial, channelNo, url);
+
+        // 获取直播源，格式为：[设备序列号]:[通道号]
+        String getLiveAddressUri = url;
+        HttpPost post = new HttpPost(getLiveAddressUri);
+
+        Map<String, Object> map1 = paramsLiveInit1(deviceSerial,channelNo,accessToken);
+        StringEntity entity = new StringEntity(map1.toString(), ContentType.APPLICATION_JSON);
+        post.setEntity(entity);
+
+        String message = "";
+        post.setHeader("Content-type", "application/x-www-form-urlencoded");
+        CloseableHttpResponse response = httpClient.execute(post);
+        message = EntityUtils.toString(response.getEntity(), "utf-8");
+        return message;
+    }
+
+    protected static Map<String, Object> paramsLiveInit1(String deviceSerial,String channelNo,String accessToken) {
+        long time = System.currentTimeMillis() / 1000;
+        String nonce = UUID.randomUUID().toString();
+        String id = UUID.randomUUID().toString();
+
+        StringBuilder paramString = new StringBuilder();
+        paramString.append("time:").append(time).append(",");
+        paramString.append("nonce:").append(nonce).append(",");
+        paramString.append("appSecret:").append(LappLiveConstant.APP_SECRET_LECHENG); //SECRET
+
+        String sign = "";
+        // 计算MD5得值
+        try {
+            System.out.println("传入参数：" + paramString.toString().trim());
+            sign = DigestUtils.md5Hex(paramString.toString().trim().getBytes("UTF-8"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        Map<String, Object> systemMap = new HashMap<String, Object>();
+        systemMap.put("ver", "1.0");
+        systemMap.put("sign", sign);
+        systemMap.put("appId", LappLiveConstant.APP_KEY_LECHENG); //AppID
+        systemMap.put("nonce", nonce);
+        systemMap.put("time", time);
+
+        Map<String, Object> paramsMap = new HashMap<>();
+        paramsMap.put("streamId", "0"); //0:高清主码流 1:标清辅码流
+        paramsMap.put("deviceId", deviceSerial); //设备序列号
+        paramsMap.put("channelId", channelNo); //通道号
+        paramsMap.put("token", accessToken);//管理员accessToken
+
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("system", systemMap);
+        map.put("params", paramsMap);
+        map.put("id", id);
+        return map;
+    }
+
+    protected static Map<String, Object> paramsLiveInit2(String deviceSerial,String channelNo,String accessToken) {
+        long time = System.currentTimeMillis() / 1000;
+        String nonce = UUID.randomUUID().toString();
+        String id = UUID.randomUUID().toString();
+
+        StringBuilder paramString = new StringBuilder();
+        paramString.append("time:").append(time).append(",");
+        paramString.append("nonce:").append(nonce).append(",");
+        paramString.append("appSecret:").append(LappLiveConstant.APP_SECRET_LECHENG); //SECRET
+
+        String sign = "";
+        // 计算MD5得值
+        try {
+            System.out.println("传入参数：" + paramString.toString().trim());
+            sign = DigestUtils.md5Hex(paramString.toString().trim().getBytes("UTF-8"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        Map<String, Object> systemMap = new HashMap<String, Object>();
+        systemMap.put("ver", "1.0");
+        systemMap.put("sign", sign);
+        systemMap.put("appId", LappLiveConstant.APP_KEY_LECHENG); //AppID
+        systemMap.put("nonce", nonce);
+        systemMap.put("time", time);
+
+        Map<String, Object> paramsMap = new HashMap<>();
+        paramsMap.put("streamId", "1"); //0:高清主码流 1:标清辅码流
+        paramsMap.put("deviceId", deviceSerial); //设备序列号
+        paramsMap.put("channelId", channelNo); //通道号
+        paramsMap.put("token", accessToken);//管理员accessToken
+
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("system", systemMap);
+        map.put("params", paramsMap);
+        map.put("id", id);
+        return map;
+    }
+
+
+    public String getLiveAddressLeCheng2(String url, String accessToken, String deviceSerial, String channelNo) throws ClientProtocolException, IOException{
+        if(StringUtils.isBlank(url) || StringUtils.isBlank(deviceSerial) || StringUtils.isBlank(accessToken) || StringUtils.isBlank(channelNo)) {
+            log.info("getLiveAddress parame can not be null| accessToken:{}|deviceSerial:{}|channelNo:{}|url:{}", accessToken, deviceSerial, channelNo, url);
+            return null;
+        }
+        log.info("getLiveAddress parame is |accessToken:{}|deviceSerial:{}|channelNo:{}|url:{}", accessToken, deviceSerial, channelNo, url);
+
+        // 获取直播源，格式为：[设备序列号]:[通道号]
+        String getLiveAddressUri = url;
+        HttpPost post = new HttpPost(getLiveAddressUri);
+
+        Map<String, Object> map2 = paramsLiveInit2(deviceSerial,channelNo,accessToken);
+        StringEntity entity = new StringEntity(map2.toString(), ContentType.APPLICATION_JSON);
+        post.setEntity(entity);
+
+        String message = "";
+        post.setHeader("Content-type", "application/x-www-form-urlencoded");
+        CloseableHttpResponse response = httpClient.execute(post);
+        message = EntityUtils.toString(response.getEntity(), "utf-8");
+        return message;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/NotBlank.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/NotBlank.java
new file mode 100644
index 0000000..128da1d
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/NotBlank.java
@@ -0,0 +1,21 @@
+package com.rootcloud.common;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 效验属性不可以为空
+ * @author yang yin bo
+ *
+ *2017年4月17日 下午2:47:02
+ */
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface NotBlank {
+
+	String message() default "参数不可以为空";
+	
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/OAuth2Properties.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/OAuth2Properties.java
new file mode 100644
index 0000000..4095eaa
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/OAuth2Properties.java
@@ -0,0 +1,148 @@
+package com.rootcloud.common;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * OAuth2 properties define properties for OAuth2-based microservices.
+ */
+@Component
+@ConfigurationProperties(prefix = "oauth2", ignoreUnknownFields = false)
+public class OAuth2Properties {
+    private WebClientConfiguration webClientConfiguration = new WebClientConfiguration();
+
+    private SignatureVerification signatureVerification = new SignatureVerification();
+
+    public WebClientConfiguration getWebClientConfiguration() {
+        return webClientConfiguration;
+    }
+
+    public SignatureVerification getSignatureVerification() {
+        return signatureVerification;
+    }
+
+    public static class WebClientConfiguration {
+        private String clientId = "web_app";
+        private String secret = "changeit";
+
+        private String phoenixClientId;
+        private String phoenixSecret;
+
+        /**
+         * Holds the session timeout in seconds for non-remember-me sessions.
+         * After so many seconds of inactivity, the session will be terminated.
+         * Only checked during token refresh, so long access token validity may
+         * delay the session timeout accordingly.
+         */
+        private int sessionTimeoutInSeconds = 1800;
+        /**
+         * Defines the cookie domain. If specified, cookies will be set on this domain.
+         * If not configured, then cookies will be set on the top-level domain of the
+         * request you sent, i.e. if you send a request to <code>app1.your-domain.com</code>,
+         * then cookies will be set <code>on .your-domain.com</code>, such that they
+         * are also valid for <code>app2.your-domain.com</code>.
+         */
+        private String cookieDomain;
+
+        private String serverApiPrefix = "";
+
+        public String getClientId() {
+            return clientId;
+        }
+
+        public void setClientId(String clientId) {
+            this.clientId = clientId;
+        }
+
+        public String getSecret() {
+            return secret;
+        }
+
+        public void setSecret(String secret) {
+            this.secret = secret;
+        }
+
+        public int getSessionTimeoutInSeconds() {
+            return sessionTimeoutInSeconds;
+        }
+
+        public void setSessionTimeoutInSeconds(int sessionTimeoutInSeconds) {
+            this.sessionTimeoutInSeconds = sessionTimeoutInSeconds;
+        }
+
+        public String getCookieDomain() {
+            return cookieDomain;
+        }
+
+        public void setCookieDomain(String cookieDomain) {
+            this.cookieDomain = cookieDomain;
+        }
+
+        public String getServerApiPrefix() {
+            return serverApiPrefix;
+        }
+
+        public void setServerApiPrefix(String serverApiPrefix) {
+            this.serverApiPrefix = serverApiPrefix;
+        }
+
+        public String getPhoenixClientId() {
+            return phoenixClientId;
+        }
+
+        public void setPhoenixClientId(String phoenixClientId) {
+            this.phoenixClientId = phoenixClientId;
+        }
+
+        public String getPhoenixSecret() {
+            return phoenixSecret;
+        }
+
+        public void setPhoenixSecret(String phoenixSecret) {
+            this.phoenixSecret = phoenixSecret;
+        }
+    }
+
+    public static class SignatureVerification {
+        /**
+         * Maximum refresh rate for public keys in ms.
+         * We won't fetch new public keys any faster than that to avoid spamming UAA in case
+         * we receive a lot of "illegal" tokens.
+         */
+        private long publicKeyRefreshRateLimit = 10 * 1000L;
+        /**
+         * Maximum TTL for the public key in ms.
+         * The public key will be fetched again from UAA if it gets older than that.
+         * That way, we make sure that we get the newest keys always in case they are updated there.
+         */
+        private long ttl = 24 * 60 * 60 * 1000L;
+        /**
+         * Endpoint where to retrieve the public key used to verify token signatures.
+         */
+        private String publicKeyEndpointUri = "http://uaa/oauth/token_key";
+
+        public long getPublicKeyRefreshRateLimit() {
+            return publicKeyRefreshRateLimit;
+        }
+
+        public void setPublicKeyRefreshRateLimit(long publicKeyRefreshRateLimit) {
+            this.publicKeyRefreshRateLimit = publicKeyRefreshRateLimit;
+        }
+
+        public long getTtl() {
+            return ttl;
+        }
+
+        public void setTtl(long ttl) {
+            this.ttl = ttl;
+        }
+
+        public String getPublicKeyEndpointUri() {
+            return publicKeyEndpointUri;
+        }
+
+        public void setPublicKeyEndpointUri(String publicKeyEndpointUri) {
+            this.publicKeyEndpointUri = publicKeyEndpointUri;
+        }
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/OAuthResult.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/OAuthResult.java
new file mode 100644
index 0000000..15816ed
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/OAuthResult.java
@@ -0,0 +1,156 @@
+package com.rootcloud.common;
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.io.Serializable;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.HashMap;
+
+public class OAuthResult implements Serializable {
+
+    private String access_token;
+
+    private Integer expires_in;
+
+    private String refresh_token;
+
+    private String code;
+
+    private String value;
+
+    private String message;
+
+    private HashMap additionalInformation;
+
+    //契合云杉登录的相关属性（赋默认值）
+    private Boolean isSystemAdmin;
+    private String scope;
+    private String tenantId;
+    private String token_type;
+
+    public OAuthResult() {
+
+    }
+
+
+    public OAuthResult(JSONObject res) {
+        this.access_token = res.getString("access_token");
+        this.refresh_token = res.getString("refresh_token");
+        this.expires_in = res.getIntValue("expires_in");
+        this.isSystemAdmin = false;
+        this.scope = "read";
+        this.tenantId = "";
+        this.token_type = "bearer";
+    }
+
+    public OAuthResult(String auth) {
+        this.access_token = auth;
+        this.refresh_token = "";
+        this.expires_in = 3000;
+        this.isSystemAdmin = false;
+        this.scope = "read";
+        this.tenantId = "";
+        this.token_type = "bearer";
+    }
+
+    public OAuthResult(String accessToken, Integer expiresIn, String refreshToken) {
+        this.access_token = accessToken;
+        this.expires_in = expiresIn;
+        this.refresh_token = refreshToken;
+    }
+
+    public String getExpiresAt() {
+        Instant instant = Instant.now();
+        Instant plus = instant.plus(expires_in, ChronoUnit.SECONDS);
+        return String.valueOf(plus.getEpochSecond());
+    }
+
+    public String getAccess_token() {
+        return access_token;
+    }
+
+    public void setAccess_token(String access_token) {
+        this.access_token = access_token;
+    }
+
+    public Integer getExpires_in() {
+        return expires_in;
+    }
+
+    public void setExpires_in(Integer expires_in) {
+        this.expires_in = expires_in;
+    }
+
+    public String getRefresh_token() {
+        return refresh_token;
+    }
+
+    public void setRefresh_token(String refresh_token) {
+        this.refresh_token = refresh_token;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public HashMap getAdditionalInformation() {
+        return additionalInformation;
+    }
+
+    public void setAdditionalInformation(HashMap additionalInformation) {
+        this.additionalInformation = additionalInformation;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public Boolean getSystemAdmin() {
+        return isSystemAdmin;
+    }
+
+    public void setSystemAdmin(Boolean systemAdmin) {
+        isSystemAdmin = systemAdmin;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public void setScope(String scope) {
+        this.scope = scope;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getToken_type() {
+        return token_type;
+    }
+
+    public void setToken_type(String token_type) {
+        this.token_type = token_type;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/PageAO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/PageAO.java
new file mode 100644
index 0000000..fbed7af
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/PageAO.java
@@ -0,0 +1,47 @@
+package com.rootcloud.common;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
+
+public class PageAO {
+
+    @ApiModelProperty("当前页数")
+    @NotNull(message = "当前页数不能为空")
+    private Integer pageNum;
+
+    @ApiModelProperty("分页大小")
+    @NotNull(message = "分页大小不能为空")
+    private Integer pageSize;
+
+    /**
+     * 默认页
+     */
+    private static final int DEFAULT_PAGE = 1;
+
+    /**
+     * 每页大小
+     */
+    private static final int DEFAULT_SIZE = 12;
+
+    public Integer getPageNum() {
+        if (this.pageNum == null){
+            return DEFAULT_PAGE;
+        }
+        return Math.max(DEFAULT_PAGE, pageNum);
+    }
+
+    public Integer getPageSize() {
+
+        if (this.pageSize == null){
+            return DEFAULT_SIZE;
+        }
+        // 检验pageSize小于等于0时，给默认大小
+        if (pageSize <= 0){
+            return Math.max(pageSize, DEFAULT_SIZE);
+        }
+        // 校验页面大小不能大于DEFAULT_SIZE
+        return Math.min(pageSize, DEFAULT_SIZE);
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/PageRequest.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/PageRequest.java
new file mode 100644
index 0000000..d23fc62
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/PageRequest.java
@@ -0,0 +1,41 @@
+package com.rootcloud.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/5/28
+ */
+@Data
+@ApiModel("查询分页参数")
+public class PageRequest {
+    @ApiModelProperty(value = "一页大小")
+    private Integer size;
+    @ApiModelProperty(value = "页数")
+    private Integer page;
+    private static PageRequest defaultPaging = new PageRequest(0, 20);
+    private static int MAX_PAGESIZE = 2000;
+
+    public static PageRequest normalize(PageRequest paging) {
+        if (paging == null) {
+            paging = defaultPaging;
+        }
+        if (paging.page < 0) {
+            paging.setPage(0);
+        }
+        if (paging.size > MAX_PAGESIZE) {
+            paging.setSize(MAX_PAGESIZE);
+        }
+        return paging;
+    }
+
+    public PageRequest() {
+    }
+
+    public PageRequest(Integer size, Integer page) {
+        this.size = size;
+        this.page = page;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/Request.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/Request.java
new file mode 100644
index 0000000..1ec7900
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/Request.java
@@ -0,0 +1,181 @@
+package com.rootcloud.common;
+
+import com.alibaba.fastjson.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@Component
+public class Request {
+
+    private final Logger log = LoggerFactory.getLogger(Request.class);
+
+    /**
+     * 4.0 需要修改密码返回的token
+     */
+    public static final String X_ROOTCLOUD_SETPW_TOKEN = "x-rootcloud-setpw-token";
+
+    private static RestTemplate restTemplate = new RestTemplate();
+
+    public ResponseEntity<String> requestForJP(String uri, HttpEntity<String> httpMethod) {
+        return restTemplate.postForEntity(uri, httpMethod, String.class);
+    }
+
+    public JSONObject request(String uri, HttpMethod httpMethod, MultiValueMap<String, String> headers, Object t) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        if (headers != null) {
+            headers.forEach((k, v) -> {
+                httpHeaders.add(k, v.get(0));
+            });
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("请求地址：{}，请求 参数：{} , 请求headers:{}", uri,
+                    JSONObject.toJSONString(t), JSONObject.toJSONString(httpHeaders));
+        }
+        HttpEntity request = new HttpEntity<>(t, httpHeaders);
+        ResponseEntity<JSONObject> responseEntity = restTemplate
+                .exchange(uri, httpMethod, request, JSONObject.class);
+        if (!responseEntity.getStatusCode().is2xxSuccessful()) {
+            log.error("request error  result Code :{} , result: {}", responseEntity.getStatusCodeValue()
+                    , JSONObject.toJSONString(responseEntity.getBody()));
+            return null;
+        }
+        JSONObject jsonResult = responseEntity.getBody();
+        if (log.isDebugEnabled()) {
+            log.debug("请求返回: {}", JSONObject.toJSONString(jsonResult));
+        }
+        return jsonResult;
+    }
+
+
+    public JSONObject requestPost(String url, Map<String, String> map) {
+        if (log.isDebugEnabled()) {
+            log.debug("请求地址：{}，请求 参数：{} ", url, JSONObject.toJSONString(map));
+        }
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+        headers.setAccept(Stream.of(MediaType.APPLICATION_JSON_UTF8).collect(Collectors.toList()));
+        HttpEntity<String> request = new HttpEntity<>(JSONObject.toJSONString(map), headers);
+        try {
+            ResponseEntity<JSONObject> responseEntity = restTemplate.postForEntity(url, request, JSONObject.class);
+            if (!responseEntity.getStatusCode().is2xxSuccessful()) {
+                log.error("request error  result Code :{} , result: {}", responseEntity.getStatusCodeValue()
+                        , JSONObject.toJSONString(responseEntity.getBody()));
+                return null;
+            }
+
+            JSONObject jsonResult = responseEntity.getBody();
+            if (log.isDebugEnabled()) {
+                log.debug("请求返回: {}", JSONObject.toJSONString(jsonResult));
+            }
+            return jsonResult;
+        } catch (HttpClientErrorException e) {
+            log.error("请求发生异常", e);
+            log.error("请求地址：{}，请求 参数：{} ", url, JSONObject.toJSONString(map));
+            String bodyString = e.getResponseBodyAsString();
+            if ("".equals(bodyString)) {
+                return null;
+            }
+            log.error("异常返回结果:{}", bodyString);
+            //IAM-1003	password need to be changed
+            try {
+                JSONObject object = JSONObject.parseObject(bodyString);
+                String code = object.getString("code");
+                //IAM-1003
+                if ("IAM-1003".equals(code)) {
+                    //4.0 出现这个错误码 说明密码需要重置。 返回xtoken 作为给前端 重置密码
+                    HttpHeaders httpHeaders = e.getResponseHeaders();
+                    String setpwToken = httpHeaders.getFirst(X_ROOTCLOUD_SETPW_TOKEN);
+                    object.put(X_ROOTCLOUD_SETPW_TOKEN, setpwToken);
+                    return object;
+                }
+            } catch (Exception e1) {
+                log.error("异常结果转化异常", e1);
+            }
+        }
+        return null;
+    }
+
+
+    /**
+     * sany cas 是get 请求
+     *
+     * @param url
+     * @param map
+     * @return
+     */
+    public JSONObject requestCasGet(String url, Map<String, String> map) {
+        if (log.isDebugEnabled()) {
+            log.debug("请求地址：{}，请求 参数：{} ", url, JSONObject.toJSONString(map));
+        }
+        StringBuilder sb = new StringBuilder(url);
+        if (map != null) {
+            sb.append("?");
+            for (Map.Entry<String, String> entry : map.entrySet()) {
+                sb.append(entry.getKey()).append("=").append(entry.getValue()).append("&");
+            }
+            sb.deleteCharAt(sb.length() - 1);
+        }
+        ResponseEntity<JSONObject> responseEntity = restTemplate.getForEntity(sb.toString(), JSONObject.class);
+        if (!responseEntity.getStatusCode().is2xxSuccessful()) {
+            log.error("request error  result Code :{} , result: {}", responseEntity.getStatusCodeValue()
+                    , JSONObject.toJSONString(responseEntity.getBody()));
+            return new JSONObject();
+        }
+        JSONObject jsonResult = responseEntity.getBody();
+        if (log.isDebugEnabled()) {
+            log.debug("请求返回: {}", JSONObject.toJSONString(jsonResult));
+        }
+        return jsonResult;
+    }
+
+    /**
+     * 发送 application from 请求
+     *
+     * @param url
+     * @param head
+     * @param map
+     * @return
+     */
+    public JSONObject requestCasPost(String url, Map<String, String> head, Map<String, String> map) {
+        MultiValueMap<String, String> multiValueMap = new LinkedMultiValueMap<>();
+        if (log.isDebugEnabled()) {
+            log.debug("请求地址：{}，请求 参数：{} ,请求头部信息{}", url, JSONObject.toJSONString(map), head);
+        }
+        if (map != null) {
+            for (Map.Entry<String, String> entry : map.entrySet()) {
+                multiValueMap.add(entry.getKey(), entry.getValue());
+            }
+        }
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        if (head != null) {
+            head.forEach((k, v) -> headers.add(k, v));
+        }
+        HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(multiValueMap, headers);
+        ResponseEntity<JSONObject> responseEntity = restTemplate.postForEntity(url, request, JSONObject.class);
+        if (!responseEntity.getStatusCode().is2xxSuccessful()) {
+            log.error("request error  result Code :{} , result: {}", responseEntity.getStatusCodeValue()
+                    , JSONObject.toJSONString(responseEntity.getBody()));
+            return null;
+        }
+        JSONObject jsonResult = responseEntity.getBody();
+        if (log.isDebugEnabled()) {
+            log.debug("请求返回: {}", JSONObject.toJSONString(jsonResult));
+        }
+        return jsonResult;
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/ResourceUtil.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/ResourceUtil.java
new file mode 100644
index 0000000..a91adc1
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/ResourceUtil.java
@@ -0,0 +1,27 @@
+package com.rootcloud.common;
+
+import com.rootcloud.config.auth.LoginUserInfo;
+import com.rootcloud.config.auth.UserContext;
+import org.springframework.context.support.ReloadableResourceBundleMessageSource;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
+
+public class ResourceUtil {
+    public static String getI18nMessage(String code) {
+        Locale locale ;
+        LoginUserInfo current = UserContext.current();
+        if("en".equals(current.getLanguage())){
+            locale = I18nUtil.localeEn;
+        }else {
+            locale = I18nUtil.localeCn;
+        }
+//        ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource();
+//        messageSource.setCacheSeconds(-1);
+//        messageSource.setDefaultEncoding(StandardCharsets.UTF_8.name());
+//        messageSource.setBasenames("i18n/messages/messages");
+        String message = I18nUtil.messageSource.getMessage(code, null, locale);
+        //I18nUtil.clear();
+        return message;
+    }
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/RootCloudOpenAPIUtil.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/RootCloudOpenAPIUtil.java
new file mode 100644
index 0000000..117e7e4
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/RootCloudOpenAPIUtil.java
@@ -0,0 +1,78 @@
+package com.rootcloud.common;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ejlchina.http.HTTP;
+import com.rootcloud.common.constant.DeviceConstant;
+import com.rootcloud.common.constant.RootCloudApi;
+import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/23 16:26
+ */
+@Component
+@Slf4j
+public class RootCloudOpenAPIUtil {
+
+    @Value("${os.iam.domain}")
+    private String reqUrl;
+
+    @Value("${os.iam.superToken}")
+    private String superToken;
+
+    @Autowired
+    private TokenUtil tokenUtil;
+
+    @Value("${os.iam.uri:http://iothub-historian.rootcloud-platform-pre.rootcloudapp.com}")
+    private String openAPIUri;
+
+    protected Map<String, String> defaultHeader() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Authorization", "Bearer " + tokenUtil.getToken());
+        return headers;
+    }
+
+    protected HTTP httpClient(String baseUrl) {
+        return HTTP.builder().config((OkHttpClient.Builder builder) -> {
+            // 连接超时时间（默认10秒）
+            builder.connectTimeout(5, TimeUnit.SECONDS);
+            // 写入超时时间（默认10秒）
+            builder.writeTimeout(5, TimeUnit.SECONDS);
+            // 读取超时时间（默认10秒）
+            builder.readTimeout(5, TimeUnit.SECONDS);
+        }).baseUrl(baseUrl).build();
+    }
+
+    public Integer getDeviceCurrentStatus(String thingId) {
+        JSONObject device = this.httpClient(reqUrl).sync(RootCloudApi.DEVICE_CURRENT_STATUS_URI).addHeader(this.defaultHeader()).addUrlParam("thingId", thingId).get().getBody().toJsonObject();
+        log.info("平台设备信息:[{}]", device);
+        Object online = device.get("online");
+        if (online != null) {
+            if (online instanceof Boolean) {
+                return (Boolean) online ? DeviceConstant.ONLINE_STATUS_CODE : DeviceConstant.OFFLINE_STATUS_CODE;
+            }
+        }
+        return DeviceConstant.OFFLINE_STATUS_CODE;
+    }
+
+    public Integer getCountUnclosedDevice() {
+        JSONObject device = this.httpClient(openAPIUri).sync(RootCloudApi.DEVICE_UNCLOSE_COUNT_URI).addHeader(this.defaultHeader()).get().getBody().toJsonObject();
+        log.info("平台设备信息:[{}]", device);
+        Object count = device.get("count");
+        if (count != null) {
+            return Integer.parseInt((String) count);
+        }
+        return 0;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/SendMessageUtils.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/SendMessageUtils.java
new file mode 100644
index 0000000..adb806f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/SendMessageUtils.java
@@ -0,0 +1,95 @@
+package com.rootcloud.common;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.fastjson.JSONArray;
+//import jline.internal.Log;
+import jline.internal.Log;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class SendMessageUtils {
+
+    @Value(value = "${sms.server-url}")
+    private String  SERVER_URL;
+
+    @Value(value = "${sms.app-key}")
+    private String  APP_KEY;
+
+    @Value(value = "${sms.app-secret}")
+    private String  APP_SECRET;
+
+    @Value(value = "${sms.nonce}")
+    private String  NONCE;
+
+    @Value(value = "${sms.templateid}")
+    private String  TEMPLATEID;
+
+    public  void send(List<String> mobiles,List<String> params) {
+        this.send(mobiles,params,null);
+    }
+
+    public  void send(List<String> mobiles,List<String> params,String templateId) {
+        DefaultHttpClient httpClient = new DefaultHttpClient();
+        HttpPost httpPost = new HttpPost(SERVER_URL);
+        String curTime = String.valueOf((new Date()).getTime() / 1000L);
+        /*
+         * 参考计算CheckSum的java代码，在上述文档的参数列表中，有CheckSum的计算文档示例
+         */
+        String checkSum = CheckSumBuilder.getCheckSum(APP_SECRET, NONCE, curTime);
+
+        // 设置请求的header
+        httpPost.addHeader("AppKey", APP_KEY);
+        httpPost.addHeader("Nonce", NONCE);
+        httpPost.addHeader("CurTime", curTime);
+        httpPost.addHeader("CheckSum", checkSum);
+        httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
+
+        // 设置请求的的参数，requestBody参数
+        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+        /*
+         * 1.如果是模板短信，请注意参数mobile是有s的，详细参数配置请参考“发送模板短信文档”
+         * 2.参数格式是jsonArray的格式，例如 "['13888888888','13666666666']"
+         * 3.params是根据你模板里面有几个参数，那里面的参数也是jsonArray格式
+         */
+        if (StringUtils.isNotEmpty(templateId)){
+            nvps.add(new BasicNameValuePair("templateid", templateId));
+        }else {
+            nvps.add(new BasicNameValuePair("templateid", TEMPLATEID));
+        }
+        nvps.add(new BasicNameValuePair("mobiles",  JSONArray.toJSONString(mobiles)));
+        nvps.add(new BasicNameValuePair("params",  JSONArray.toJSONString(params)));
+        try{
+            httpPost.setEntity(new UrlEncodedFormEntity(nvps, "utf-8"));
+            // 执行请求
+            HttpResponse response = httpClient.execute(httpPost);
+            /*
+             * 1.打印执行结果，打印结果一般会200、315、403、404、413、414、500
+             * 2.具体的code有问题的可以参考官网的Code状态表
+             */
+            //System.out.println(EntityUtils.toString(response.getEntity(), "utf-8"));
+            log.info("调用网易云信接口参数：{}，返回值:{}",httpPost.getEntity(),EntityUtils.toString(response.getEntity(), "utf-8"));
+           // Log.info(EntityUtils.toString(response.getEntity(), "utf-8"));
+        }catch (IOException e){
+            e.printStackTrace();
+            log.error("发送短信失败！");
+        }
+
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/SprintBeanUtils.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/SprintBeanUtils.java
new file mode 100644
index 0000000..77bd1de
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/SprintBeanUtils.java
@@ -0,0 +1,28 @@
+package com.rootcloud.common;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * 获取sprintBean
+ */
+@Component
+public class SprintBeanUtils implements ApplicationContextAware {
+
+    private static ApplicationContext context;
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        context = applicationContext;
+    }
+
+    public static <T> T getBean(String beanName) {
+        if (context.containsBean(beanName)) {
+            return (T) context.getBean(beanName);
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/TokenUtil.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/TokenUtil.java
new file mode 100644
index 0000000..87eeade
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/TokenUtil.java
@@ -0,0 +1,211 @@
+package com.rootcloud.common;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONObject;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.domain.mapper.CommonMapper;
+import jline.internal.Log;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+@Component
+public class TokenUtil {
+    @Resource
+    private RedisTemplate redisTemplate;
+    @Value(value = "${os.iam.clientid}")
+    private String clientId;
+    @Value(value = "${os.iam.clientsecret}")
+    private String clientSecret;
+    @Value(value = "${os.iam.domain}")
+    private String domain;
+    @Value(value = "${os.iam.loginuri}")
+    private String loginUri;
+
+
+//    public String superToken(){
+//        return "aHViLXN1cGVyLXVzZXI";
+//    }
+
+    @Autowired
+    private CommonMapper commonMapper;
+
+    public String getToken(String clientId, String clientSecret) {
+        String result = "";
+        JSONObject json = new JSONObject();
+        json.set("grant_type", "client_credentials");
+        json.set("client_id", clientId);
+        json.set("client_secret", clientSecret);
+        HttpRequest request = HttpUtil.createPost(domain + loginUri);
+        request.body(json.toString(), "application/json");
+        HttpResponse response = request.execute();
+        result = response.body();
+        JSONObject json2 = new JSONObject(result);
+        result = json2.get("access_token").toString();
+        return result;
+    }
+
+    public String getToken(String tenantId) {
+        String rediskey = "common_accessToken";
+        if (StringUtils.isNotBlank(tenantId)) {
+            rediskey = tenantId + "_accessToken";
+        }
+        Object token = null;
+        try {
+            token = redisTemplate.opsForValue().get(rediskey);
+        } catch (Exception e) {
+            redisTemplate.delete(rediskey);
+        }
+        if (token != null) {
+            return token.toString();
+        } else {
+            String result = "";
+            Map<String, String> rootClient = commonMapper.getRootClient(tenantId);
+            if (rootClient != null) {
+                clientId = rootClient.get("CLIENT_ID");
+                clientSecret = rootClient.get("CLIENT_SECRET");
+                JSONObject json = new JSONObject();
+                json.set("grant_type", "client_credentials");
+                json.set("client_id", clientId);
+                json.set("client_secret", clientSecret);
+                HttpRequest request = HttpUtil.createPost(domain + loginUri);
+                request.body(json.toString(), "application/json");
+                HttpResponse response = request.execute();
+                result = response.body();
+                JSONObject json2 = new JSONObject(result);
+                result = json2.get("access_token").toString();
+                redisTemplate.opsForValue().set(rediskey, result, 3500, TimeUnit.SECONDS);
+            } else {
+                Log.error("查询clientId为null,租户id：" + tenantId);
+            }
+            return result;
+        }
+    }
+
+
+    /*public String getToken() {
+        String tenantId = UserContext.getTenantId();  //获取当前租户
+        String rediskey = "common_accessToken";
+        if (StringUtils.isNotBlank(tenantId)) {
+            rediskey = tenantId + "_accessToken";
+        }
+        Object token = null;
+        try {
+            token = redisTemplate.opsForValue().get(rediskey);
+        } catch (Exception e) {
+            redisTemplate.delete(rediskey);
+        }
+        if (token != null) {
+            return token.toString();
+        } else {
+            String result = "";
+            Map<String, String> rootClient = commonMapper.getRootClient(tenantId);
+//            rootClient = new HashMap<>();  测试使用
+//            rootClient.put("CLIENT_ID","2022041578413b61ae181695");
+//            rootClient.put("CLIENT_SECRET","a7ed2906927805a0f6d4fa0019ea017f");
+
+            if (rootClient != null) {
+                clientId = rootClient.get("CLIENT_ID");
+                clientSecret = rootClient.get("CLIENT_SECRET");
+                JSONObject json = new JSONObject();
+                json.set("grant_type", "client_credentials");
+                json.set("client_id", clientId);
+                json.set("client_secret", clientSecret);
+                Log.info("获取参数：" + json.toString());
+                HttpRequest request = HttpUtil.createPost(domain + loginUri);
+                Log.info("获取路径：" + domain + loginUri);
+                request.body(json.toString(), "application/json");
+                try {
+                    HttpResponse response = request.execute();
+                    result = response.body();
+                    JSONObject json2 = new JSONObject(result);
+                    result = json2.get("access_token").toString();
+                    redisTemplate.opsForValue().set(rediskey, result, 3500, TimeUnit.SECONDS);
+                } catch (Exception e) {
+                    Log.error("获取access_token失败，失败原因：" + e.getMessage());
+                }
+            } else {
+                Log.error("查询clientId为null,租户id：" + tenantId);
+            }
+            return result;
+        }
+    }*/
+
+    public String getToken() {
+        String tenantId = UserContext.getTenantId();  //获取当前租户
+        String rediskey = "common_accessToken";
+        if(StringUtils.isNotBlank(tenantId)){
+            rediskey= tenantId+"_accessToken";
+        }
+        Object token = null;
+        try{
+            token = redisTemplate.opsForValue().get(rediskey);
+        }catch (Exception e){
+            redisTemplate.delete(rediskey);
+        }
+        if (token != null) {
+            return token.toString();
+        } else {
+            String result = "";
+            Map<String,String> rootClient = commonMapper.getRootClient(tenantId);
+            /*Map<String,String> rootClient  = new HashMap<>();  //测试使用
+            rootClient.put("CLIENT_ID","20221206c509e669fe968c13");
+            rootClient.put("CLIENT_SECRET","b9ad3dddce304e311439ee8ad7202a36");*/
+            if(rootClient!=null) {
+                clientId = rootClient.get("CLIENT_ID");
+                clientSecret = rootClient.get("CLIENT_SECRET");
+                JSONObject json = new JSONObject();
+                json.set("grant_type", "client_credentials");
+                json.set("client_id", clientId);
+                json.set("client_secret", clientSecret);
+                HttpRequest request = HttpUtil.createPost(domain + loginUri);
+                Log.info("访问路径："+domain + loginUri+"，访问参数："+json);
+                request.body(json.toString(), "application/json");
+                HttpResponse response = request.execute();
+                result = response.body();
+                JSONObject json2 = new JSONObject(result);
+                result = json2.get("access_token").toString();
+                redisTemplate.opsForValue().set(rediskey, result, 3500, TimeUnit.SECONDS);
+            }else{
+                Log.error("查询clientId为null,租户id："+tenantId);
+            }
+            return result;
+        }
+    }
+
+
+    public static void main(String[] args) {
+        Map<String, String> rootClient = new HashMap<>();  //测试使用
+        rootClient.put("CLIENT_ID", "20221029150bbb6e7936972d");
+        rootClient.put("CLIENT_SECRET", "a76b4a99495e8b94154b499e88f13d00");
+        if (rootClient != null) {
+          String   clientId = rootClient.get("CLIENT_ID");
+            String clientSecret = rootClient.get("CLIENT_SECRET");
+            JSONObject json = new JSONObject();
+            json.set("grant_type", "client_credentials");
+            json.set("client_id", clientId);
+            json.set("client_secret", clientSecret);
+            Log.info("获取参数：" + json.toString());
+            HttpRequest request = HttpUtil.createPost("https://openapi.zengcaicloud.com/account-manage/v1/auth/login");
+            request.body(json.toString(), "application/json");
+            try {
+                HttpResponse response = request.execute();
+                String result = response.body();
+                JSONObject json2 = new JSONObject(result);
+                result = json2.get("access_token").toString();
+                System.out.println(result);
+            } catch (Exception e) {
+                Log.error("获取access_token失败，失败原因：" + e.getMessage());
+            }
+        }
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/UserOperationContext.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/UserOperationContext.java
new file mode 100644
index 0000000..7d77432
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/UserOperationContext.java
@@ -0,0 +1,26 @@
+package com.rootcloud.common;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/5/25
+ */
+@Getter
+@Setter
+@ToString
+public class UserOperationContext {
+    private String userId;
+    private String userName;
+    private String tenantId;
+    /**
+     * 浏览器
+     */
+    private String browser;
+    /**
+     * ip
+     */
+    private String ip;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/Validate.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/Validate.java
new file mode 100644
index 0000000..7212b5c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/Validate.java
@@ -0,0 +1,18 @@
+package com.rootcloud.common;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 标记该类是否需要效验参数
+ * @author yang yin bo
+ *
+ *2017年4月17日 下午3:14:12
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Validate {
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/WebServiceClient.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/WebServiceClient.java
new file mode 100644
index 0000000..13082ad
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/WebServiceClient.java
@@ -0,0 +1,505 @@
+package com.rootcloud.common;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.rootcloud.domain.entity.NxPartFileEntity;
+import com.rootcloud.domain.entity.NxPartRespEntity;
+import com.rootcloud.domain.entity.Part;
+import jline.internal.Log;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPMessage;
+import java.io.*;
+import java.math.BigDecimal;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class WebServiceClient {
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private String wsdlLocation;// webservice地址
+    private String action;// 命名空间
+    private String methodName;// 调用方法
+    private Map<String, String> params;// 参数键值对
+
+    /**
+     * 初始化调用webservice参数
+     *
+     * @param wsdlLocation webservice地址
+     * @param namespace    命名空间
+     * @param methodName   调用方法
+     * @param params       参数键值对
+     */
+    public WebServiceClient(String wsdlLocation, String action, String methodName, Map<String, String> params) {
+        this.wsdlLocation = wsdlLocation;
+        this.action = action;
+        this.methodName = methodName;
+        this.params = params;
+    }
+
+    /**
+     * 获取SOAP的请求头，并替换其中的标志符号为用户输入的参数及数据
+     *
+     * @param params 用户输入的参数键值对
+     * @return 客户将要发送给服务器的SOAP请求
+     */
+    private String getSoapRequestSap() {
+        StringBuilder soapRequestData = new StringBuilder();
+        soapRequestData = new StringBuilder();
+        soapRequestData.append("<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:urn=\"urn:sap-com:document:sap:rfc:functions\">");
+        soapRequestData.append("<soapenv:Header/>");
+        soapRequestData.append("<soapenv:Body>");
+        soapRequestData.append("<urn:" + methodName + ">");
+        Set<String> nameSet = params.keySet();
+        for (String name : nameSet) {
+            soapRequestData.append("<" + name + ">" + params.get(name) + "</" + name + ">");
+        }
+        soapRequestData.append("</urn:" + methodName + ">");
+        soapRequestData.append("</soapenv:Body>");
+        soapRequestData.append("</soapenv:Envelope>");
+        return soapRequestData.toString();
+    }
+
+    /**
+     * 用户把SOAP请求发送给服务器端，并返回服务器点返回的输入流
+     *
+     * @return 服务器端返回的输入流，供客户端读取
+     * @throws Exception
+     */
+    public InputStream getSoapInputStreamBySap() throws Exception {
+        try {
+            String soap = getSoapRequestSap();
+            if (logger.isDebugEnabled()) {
+                logger.debug("调用SAP请求报文内容: {}", soap);
+            }
+            URL url = new URL(wsdlLocation);
+            URLConnection conn = url.openConnection();
+            conn.setUseCaches(false);
+            conn.setDoInput(true);
+            conn.setDoOutput(true);
+            conn.setRequestProperty("Content-Length", Integer.toString(soap.length()));
+            conn.setRequestProperty("Content-Type", "text/xml;charset=UTF-8");
+            conn.setConnectTimeout(100000000);
+            conn.setReadTimeout(100000000);
+            conn.setRequestProperty("SOAPAction", action);
+            //认证   用户名:密码 base64
+            conn.setRequestProperty("Authorization", "Basic cHJkX3Bpc3VwZXI6aGFuZGhhbmQw");
+            OutputStream os = conn.getOutputStream();
+            OutputStreamWriter osw = new OutputStreamWriter(os, StandardCharsets.UTF_8);
+            osw.write(soap);
+            osw.flush();
+            osw.close();
+            InputStream is = conn.getInputStream();
+            return is;
+        } catch (Exception e) {
+            logger.info("服务端返回异常", e);
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 对服务器端返回的XML进行解析
+     */
+    public List<NxPartFileEntity> getPartData() {
+        List<NxPartFileEntity> partList = new ArrayList<NxPartFileEntity>();
+        try {
+//            InputStream is = getSoapInputStreamBySap();
+            //出入流直接传承xml字符串
+//            String result = convertStreamToString(is);
+//            logger.info("获取xml数据{}",result);
+            //String ji = "<SOAP:Envelope xmlns:SOAP='http://schemas.xmlsoap.org/soap/envelope/'><SOAP:Header/><SOAP:Body><ns0:ZDM_INVENTORYINFResponse xmlns:ns0='urn:sap-com:document:sap:rfc:functions'><ZTDM_INVENTORYINF><item><MATNR>000000000001165762</MATNR><MAKTX>三元乙丙橡胶发泡（硬度20）\\415*87*25</MAKTX><MTART>Z01</MTART><GROES>415*87*25</GROES><MATKL>D01004</MATKL><MEINS>EA</MEINS><NTGEW>0</NTGEW><GEWEI>KG</GEWEI><ZEINR/><BISMT/><CHARG/><WERKS>1430</WERKS><LGORT>1004</LGORT><LABST>50.000</LABST><LVORM/><ADD1>                                           973.45</ADD1><ADD2/><ADD3/><ADD4>000000</ADD4><ADD5/><ADD6/><ADD7/><ADD8>                                            19.47</ADD8><ADD9/><ADD10/></item><item><MATNR>000000000001096794</MATNR><MAKTX>气1缸\\MGPM25-125Z-XC22</MAKTX><MTART>Z01</MTART><GROES>MGPM25-125Z-XC22</GROES><MATKL>D04000</MATKL><MEINS>EA</MEINS><NTGEW>0</NTGEW><GEWEI>KG</GEWEI><ZEINR/><BISMT/><CHARG/><WERKS>1430</WERKS><LGORT>1004</LGORT><LABST>3.000</LABST><LVORM/><ADD1>                                          4348.67</ADD1><ADD2/><ADD3/><ADD4>000000</ADD4><ADD5/><ADD6/><ADD7/><ADD8>                                           724.78</ADD8><ADD9/><ADD10/></item><item><MATNR>000000000001102941</MATNR><MAKTX>压力传感器\\ZSE30AF-01-D-MGA2K-X580</MAKTX><MTART>Z01</MTART><GROES>ZSE30AF-01-D-MGA2K-X580</GROES><MATKL>D01004</MATKL><MEINS>EA</MEINS><NTGEW>0</NTGEW><GEWEI>KG</GEWEI><ZEINR/><BISMT/><CHARG/><WERKS>1430</WERKS><LGORT>1004</LGORT><LABST>4.000</LABST><LVORM/><ADD1>                                         68134.48</ADD1><ADD2/><ADD3/><ADD4>000000</ADD4><ADD5/><ADD6/><ADD7/><ADD8>                                          2129.20</ADD8><ADD9/><ADD10/></item></ZTDM_INVENTORYINF></ns0:ZDM_INVENTORYINFResponse></SOAP:Body></SOAP:Envelope>";
+            //logger.info("获取xml数据{}",result);
+            //SOAPMessage msg = formatSoapString(new ByteArrayInputStream(ji.getBytes(StandardCharsets.UTF_8)));
+            SOAPMessage msg = formatSoapString(getSoapInputStreamBySap());
+            if (msg == null) {
+                return new ArrayList<>();
+            }
+            SOAPBody body = msg.getSOAPBody();
+            if (logger.isTraceEnabled()) {
+                logger.trace("调用SAP获取配件结果: {}", body);
+            }
+            NodeList nodes = body.getFirstChild().getFirstChild().getChildNodes();
+            if (logger.isDebugEnabled()) {
+                logger.debug("调用SAP获取配件结果: {}", nodes);
+            }
+            for (int count = 0; count < nodes.getLength(); count++) {
+                Node node = nodes.item(count);
+                NodeList childNodes = node.getChildNodes();
+                NxPartFileEntity part = new NxPartFileEntity();
+                for (int i = 0; i < childNodes.getLength(); i++) {
+                    Node childNode = childNodes.item(i);
+                    String NodeName = childNode.getNodeName();
+                    if (null == childNode.getFirstChild()) {
+                        continue;
+                    }
+//                    logger.info("配件数据=======，{}", childNode.getFirstChild().getTextContent());
+                    part.setNxPartFileId(JEUuidUtil.uuid());
+                    part.setSyCreatetime(DateUtil.getCurrentTime());
+                    part.setSyCreateuser("system");
+                    part.setFileSfsgjpj("0");
+                    if ("MATNR".equals(NodeName)) {  //物料编号
+                        String code = childNode.getFirstChild().getTextContent();
+                        code = code.replaceFirst("^0*", "");
+                        part.setFilePjbm(code);
+                    } else if ("MEINS".equals(NodeName)) {//基本计量单位 ==> 单位
+                        part.setFileDw(childNode.getFirstChild().getTextContent());
+                    } else if ("LABST".equals(NodeName)) {//库存数量
+                        String strSl = childNode.getFirstChild().getTextContent();
+                        if (strSl == null) break;
+                        String replace = strSl.replace(" ", "");
+                        BigDecimal kcsl = new BigDecimal(replace);
+                        part.setFileKcsl(kcsl);
+                    } else if ("ADD8".equals(NodeName)) {//实际价格==> 单位
+                        String strPrice = childNode.getFirstChild().getTextContent();
+                        if (strPrice == null) break;
+                        String replace = strPrice.replace(" ", "");
+                        BigDecimal price = new BigDecimal(replace);
+                        part.setFileDj(price);
+                    } else if ("MAKTX".equals(NodeName)) {//规格型号和配件名称
+                        String content = childNode.getFirstChild().getTextContent();
+                        String[] split = content.split("\\\\");
+                        part.setFilePjmc(split[0]);
+                        part.setFileGgxh(content);
+                    } else if ("WERKS".equals(NodeName)) {//仓库名称和编码
+                        String content = childNode.getFirstChild().getTextContent();
+                        part.setFileCkbm(content);
+                        part.setFileCkmc(content);
+                    } else if ("LGORT".equals(NodeName)) {//库位编码
+                        String content = childNode.getFirstChild().getTextContent();
+                        part.setFileKwbm(content);
+                    }
+                }
+
+//                if (!"1004".equals(part.getFileCkbm())) {
+//                    continue;
+//                }
+                logger.info("规格型号配件名称=======，{}", JSONObject.toJSON(part));
+                if (StringUtils.isNotBlank(part.getFilePjbm())) {
+                    partList.add(part);
+                }
+            }
+        } catch (Exception e) {
+            logger.info("解析异常", e);
+            e.printStackTrace();
+        }
+        if (logger.isDebugEnabled()) {
+            logger.debug("处理结果: {}", JSONObject.toJSONString(partList));
+        }
+        logger.info("获取数据大小为{}", partList.size());
+        return partList;
+    }
+
+
+    public List<Part> getPartData2() {
+        List<Part> partList = new ArrayList<Part>();
+        try {
+            InputStream is = getSoapInputStreamBySap();
+            //出入流直接传承xml字符串
+            //String result = convertStreamToString(is);
+            //logger.info("获取xml数据{}",result);
+            SOAPMessage msg = formatSoapString(is);
+            SOAPBody body = msg.getSOAPBody();
+
+            logger.info("调用SAP获取配件xml:" + body);
+            if (logger.isTraceEnabled()) {
+                logger.trace("调用SAP获取配件结果: {}", body);
+            }
+
+            NodeList nodes = body.getFirstChild().getFirstChild().getChildNodes();
+            if (logger.isDebugEnabled()) {
+                logger.debug("调用SAP获取配件结果: {}", nodes);
+            }
+
+            for (int count = 0; count < nodes.getLength(); count++) {
+                Node node = nodes.item(count);
+                NodeList childNodes = node.getChildNodes();
+                Part part = new Part();
+
+                String MATNR_code = "";
+                String MEINS = "";
+                String ZENDME = "";
+                double a = 0.0;
+                BigDecimal ZSJJG_price = new BigDecimal(a);
+                String LWEDT = "";
+                String WERKS = "";
+                String LGORT = "";
+
+
+                for (int i = 0; i < childNodes.getLength(); i++) {
+                    Node childNode = childNodes.item(i);
+                    String NodeName = childNode.getNodeName();
+                    if (null == childNode.getFirstChild()) {
+                        continue;
+                    }
+
+                    if ("MATNR".equals(NodeName)) {  //物料编号
+                        String code = childNode.getFirstChild().getTextContent();
+                        MATNR_code = code.replaceFirst("^0*", "");
+                    } else if ("MEINS".equals(NodeName)) {//基本计量单位 ==> 单位
+                        MEINS = childNode.getFirstChild().getTextContent();
+                    } else if ("ZENDME".equals(NodeName)) {//库存数量 => 单位说明
+                        ZENDME = childNode.getFirstChild().getTextContent();
+                    } else if ("ZSJJG".equals(NodeName)) {//实际价格==> 单位
+                        String strPrice = childNode.getFirstChild().getTextContent();
+                        ZSJJG_price = new BigDecimal(strPrice);
+                    } else if ("LWEDT".equals(NodeName)) {//入库日期 ==> 重量单位说明
+                        LWEDT = childNode.getFirstChild().getTextContent();
+                    } else if ("WERKS".equals(NodeName)) {
+                        WERKS = childNode.getFirstChild().getTextContent();
+                        //logger.info("工厂编号:"+WERKS);
+                    } else if ("LGORT".equals(NodeName)) {
+                        LGORT = childNode.getFirstChild().getTextContent();
+                        //logger.info("库房编号:"+LGORT);
+                    }
+                }
+                //判断当前item集合中是否出现1430库下面的1004
+                if (WERKS.equals("1430")) {
+                    if (LGORT.equals("1004")) {
+                        part.setPartCode(MATNR_code);
+                        part.setCode(MATNR_code + ".0");
+                        part.setUnit(MEINS); //单位
+                        part.setUnitDesc("");//单位说明
+                        try {
+                            float countValue = Float.parseFloat(ZENDME);//库存数量
+                            part.setPartInventoryCount((int) countValue);
+                        } catch (Exception ex) {
+                            logger.info("库存转换异常..." + ex.toString());
+                        }
+                        part.setPrice(ZSJJG_price);
+                        part.setWeightUnitDesc(LWEDT);
+                        logger.info("1430工厂编号1004 库房编号找到了...");
+                    }
+                } else {
+                    part.setPartCode(MATNR_code);
+                    part.setCode(MATNR_code + ".0");
+                    part.setUnit(MEINS); //单位
+                    part.setUnitDesc("");//单位说明
+                    try {
+                        float countValue = Float.parseFloat(ZENDME);//库存数量
+                        part.setPartInventoryCount((int) countValue);
+                    } catch (Exception ex) {
+                        logger.info("库存转换异常..." + ex.toString());
+                    }
+                    part.setPrice(ZSJJG_price);
+                    part.setWeightUnitDesc(LWEDT);
+//					logger.info("工厂编号:"+WERKS);
+//					logger.info("库房编号:"+LGORT);
+                }
+                if (StringUtils.isNotBlank(part.getPartCode())) {
+                    partList.add(part);
+                }
+            }
+        } catch (Exception e) {
+            logger.info("解析异常", e);
+            e.printStackTrace();
+        }
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("处理结果: {}", JSONObject.toJSONString(partList));
+        }
+
+        logger.info("获取数据大小为{}", partList.size());
+        return partList;
+    }
+
+    //专门刷新1430/1004库存数据
+    public List<Part> getPartData3() {
+        List<Part> partList = new ArrayList<Part>();
+        try {
+            InputStream is = getSoapInputStreamBySap();
+            //出入流直接传承xml字符串
+            //String result = convertStreamToString(is);
+            //logger.info("获取xml数据{}",result);
+            SOAPMessage msg = formatSoapString(is);
+            SOAPBody body = msg.getSOAPBody();
+
+            logger.info("调用SAP获取配件xml:" + body);
+            if (logger.isTraceEnabled()) {
+                logger.trace("调用SAP获取配件结果: {}", body);
+            }
+
+            NodeList nodes = body.getFirstChild().getFirstChild().getChildNodes();
+            if (logger.isDebugEnabled()) {
+                logger.debug("调用SAP获取配件结果: {}", nodes);
+            }
+
+            for (int count = 0; count < nodes.getLength(); count++) {
+                Node node = nodes.item(count);
+                NodeList childNodes = node.getChildNodes();
+                Part part = new Part();
+
+                String MATNR_code = "";
+                String MEINS = "";
+                String ZENDME = "";
+                double a = 0.0;
+                BigDecimal ZSJJG_price = new BigDecimal(a);
+                String LWEDT = "";
+                String WERKS = "";
+                String LGORT = "";
+
+
+                for (int i = 0; i < childNodes.getLength(); i++) {
+                    Node childNode = childNodes.item(i);
+                    String NodeName = childNode.getNodeName();
+                    if (null == childNode.getFirstChild()) {
+                        continue;
+                    }
+
+                    if ("MATNR".equals(NodeName)) {  //物料编号
+                        String code = childNode.getFirstChild().getTextContent();
+                        MATNR_code = code.replaceFirst("^0*", "");
+                    } else if ("MEINS".equals(NodeName)) {//基本计量单位 ==> 单位
+                        MEINS = childNode.getFirstChild().getTextContent();
+                    } else if ("ZENDME".equals(NodeName)) {//库存数量 => 单位说明
+                        ZENDME = childNode.getFirstChild().getTextContent();
+                    } else if ("ZSJJG".equals(NodeName)) {//实际价格==> 单位
+                        String strPrice = childNode.getFirstChild().getTextContent();
+                        ZSJJG_price = new BigDecimal(strPrice);
+                    } else if ("LWEDT".equals(NodeName)) {//入库日期 ==> 重量单位说明
+                        LWEDT = childNode.getFirstChild().getTextContent();
+                    } else if ("WERKS".equals(NodeName)) {
+                        WERKS = childNode.getFirstChild().getTextContent();
+                        //logger.info("工厂编号:"+WERKS);
+                    } else if ("LGORT".equals(NodeName)) {
+                        LGORT = childNode.getFirstChild().getTextContent();
+                        //logger.info("库房编号:"+LGORT);
+                    }
+                }
+                //判断当前item集合中是否出现1430库下面的1004
+                if (WERKS.equals("1430")) {
+                    if (LGORT.equals("1004")) {
+                        part.setPartCode(MATNR_code);
+                        part.setCode(MATNR_code + ".0");
+                        part.setUnit(MEINS); //单位
+                        part.setUnitDesc("");//单位说明
+                        try {
+                            float countValue = Float.parseFloat(ZENDME);//库存数量
+                            part.setPartInventoryCount((int) countValue);
+                        } catch (Exception ex) {
+                            logger.info("库存转换异常..." + ex.toString());
+                        }
+                        part.setPrice(ZSJJG_price);
+                        part.setWeightUnitDesc(LWEDT);
+                        logger.info("1430工厂编号1004 库房编号找到了...");
+                    }
+                }
+//				else
+//				{
+//					part.setPartCode(MATNR_code);
+//					part.setCode(MATNR_code+".0");
+//					part.setUnit(MEINS); //单位
+//					part.setUnitDesc("");//单位说明
+//					try
+//					{
+//						float countValue = Float.parseFloat(ZENDME);//库存数量
+//						part.setPartInventoryCount((int) countValue);
+//					}catch (Exception ex)
+//					{
+//						logger.info("库存转换异常..."+ex.toString());
+//					}
+//					part.setPrice(ZSJJG_price);
+//					part.setWeightUnitDesc(LWEDT);
+////					logger.info("工厂编号:"+WERKS);
+////					logger.info("库房编号:"+LGORT);
+//				}
+                if (StringUtils.isNotBlank(part.getPartCode())) {
+                    partList.add(part);
+                }
+            }
+        } catch (Exception e) {
+            logger.info("解析异常", e);
+            e.printStackTrace();
+        }
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("处理结果: {}", JSONObject.toJSONString(partList));
+        }
+
+        logger.info("获取数据大小为{}", partList.size());
+        return partList;
+    }
+
+    @SuppressWarnings("unused")
+    private String convertStreamToString(InputStream is) {
+        BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+        StringBuilder sb = new StringBuilder();
+        String line = null;
+        try {
+            while ((line = reader.readLine()) != null) {
+                sb.append(line);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+
+        } finally {
+            try {
+                reader.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return sb.toString();
+    }
+
+    private static SOAPMessage formatSoapString(InputStream is) {
+        MessageFactory msgFactory;
+        try {
+            msgFactory = MessageFactory.newInstance();
+            SOAPMessage reqMsg = msgFactory.createMessage(new MimeHeaders(), is);
+            reqMsg.saveChanges();
+            return reqMsg;
+        } catch (Exception e) {
+            Log.error("获取数据失败，失败原因：" + e.getMessage());
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 判断是否为数字
+     *
+     * @param str
+     * @return
+     */
+    public boolean isNumeric(String str) {
+        Pattern pattern = Pattern.compile("[0-9]*");
+        Matcher isNum = pattern.matcher(str);
+        if (!isNum.matches()) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 测试
+     *
+     * @param args
+     * @throws Exception
+     */
+    public static void main(String[] args) throws Exception {
+
+//		String action = "http://sap.com/xi/WebService/soap1.1";
+//		String methodName = "ZMM_RP002";
+//		String wsdlLocation = "http://61.133.215.5:50000/XISOAPAdapter/MessageServlet?senderParty=&senderService=BS_LIMS_PRD&receiverParty=&receiverService=&interface=SI_ZMM_RP002&interfaceNamespace=http://www.kocel.com/lims/zmm_rp002";
+//		Map<String, String> params = new ConcurrentHashMap<String, String>();
+//		WebServiceClient client = new WebServiceClient(wsdlLocation, action, methodName, params);
+//		List<Part> partList = client.getPartData();
+//		System.out.println(partList.size());
+
+
+    }
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/BusinessConstant.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/BusinessConstant.java
new file mode 100644
index 0000000..227ab2b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/BusinessConstant.java
@@ -0,0 +1,22 @@
+package com.rootcloud.common.constant;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/27 21:35
+ */
+public interface BusinessConstant {
+    String NETWORK_USER_STATUS_FREE = "0";
+    String NETWORK_USER_STATUS_BUSY = "1";
+    String NETWORK_USER_STATUS_UNKNOWN = "2";
+
+
+    //管理角色
+    String CUSTOMER_ROLE_MANGE = "1";
+    //网点角色
+    String CUSTOMER_ROLE_OUTLETS = "2";
+    //客户角色
+    String CUSTOMER_ROLE_CUSTOMER = "3";
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/DeviceConstant.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/DeviceConstant.java
new file mode 100644
index 0000000..3f1fef4
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/DeviceConstant.java
@@ -0,0 +1,19 @@
+package com.rootcloud.common.constant;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/19 10:21
+ */
+public interface DeviceConstant {
+    Integer OFFLINE_STATUS_CODE  = 0;
+    Integer ONLINE_STATUS_CODE  = 1;
+    Integer ALARM_STATUS_CODE  = 2;
+    Integer RUN_STATUS_CODE  = 3;
+    Integer READY_STATUS_CODE  = 4;
+
+
+    String DEVICE_SOURCE_PLATFORM = "1";
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/JsonResultStatusBpm.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/JsonResultStatusBpm.java
new file mode 100644
index 0000000..6e71f37
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/JsonResultStatusBpm.java
@@ -0,0 +1,30 @@
+package com.rootcloud.common.constant;
+
+/***
+ * JSON数据返回状态码
+ * @author Adams.huang
+ *
+ */
+public class JsonResultStatusBpm {
+
+    /***
+     * 系统异常
+     */
+    public final static String RET_EXCEPTION = "50230000";
+
+    public final static String RET_EXCEPTION_CN = "系统异常";
+
+    /**
+     * 您没有发起此流程权限
+     */
+    public final static String RET_UN_AUTH_START_PROC = "50230001";
+
+    public final static String RET_UN_AUTH_START_PROC_CN = "您没有发起此流程权限，请联系管理员！";
+
+
+    public final static String RET_SUCCESS = "200";
+    public final static String MSG_SUCCESS = "维修流程执行成功";
+    public final static String MSG_SUCCESS2 = "保养流程执行成功";
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/LappLiveConstant.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/LappLiveConstant.java
new file mode 100644
index 0000000..bf2bd48
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/LappLiveConstant.java
@@ -0,0 +1,56 @@
+package com.rootcloud.common.constant;
+
+public class LappLiveConstant {
+
+    /**
+     * 获取token的appkey
+     */
+    public static final String APP_KEY = "b35eae0c68324019abf3907b478f27b3";
+
+    /**
+     * 获取token的appsecret
+     */
+    public static final String APP_SECRET = "121b4ca1fe8a2f9e55e6ccdcf831e91c";
+
+    /**
+     * 获取token的url
+     */
+    public static final String GET_TOKEN_URL = "https://open.ys7.com/api/lapp/token/get";
+
+    /**
+     *打开视频直播url
+     */
+    public static final String OPEN_LIVE_URL = "https://open.ys7.com/api/lapp/live/video/open";
+
+    /**
+     * 获取视频直播的url
+     */
+    public static final String GET_LIVE_URL = "https://open.ys7.com/api/lapp/live/address/get";
+
+    //------------------乐橙---------------------------
+    /**
+     * 获取token的url
+     */
+    public static final String GET_TOKEN_LECHENG_URL = "https://openapi.lechange.cn/openapi/accessToken";
+    /**
+     * 获取token的appkey
+     */
+    public static final String APP_KEY_LECHENG = "lcb32eb75e1bde4003"; //AppId
+    /**
+     * 获取token的appsecret
+     */
+    public static final String APP_SECRET_LECHENG = "c30348803e59403eb86e15bdcd00a5"; //AppSecret
+    /**
+     *打开视频直播url
+     */
+    public static final String OPEN_LIVE_LECHENG_URL = "https://open.ys7.com/api/lapp/live/video/open";
+    /**
+     * 获取视频直播的url
+     */
+    public static final String GET_LIVE_LECHENG_URL = "https://open.ys7.com/api/lapp/live/address/get";
+
+    public static final String LIVE_LECHENG_URL ="https://openapi.lechange.cn/openapi/bindDeviceLive";
+
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/Properties.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/Properties.java
new file mode 100644
index 0000000..5338087
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/Properties.java
@@ -0,0 +1,22 @@
+package com.rootcloud.common.constant;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@Data
+@ConfigurationProperties(prefix = "application.jeboot")
+public class Properties {
+
+    /**
+     * JP地址
+     */
+    private String wfHost;
+
+    /**
+     * JP推送站内信接口
+     */
+    public static final String dwr_sender_uri = "/je/dwr/sender";
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/RoleIdConstant.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/RoleIdConstant.java
new file mode 100644
index 0000000..3d00eef
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/RoleIdConstant.java
@@ -0,0 +1,17 @@
+package com.rootcloud.common.constant;
+
+/**
+ * @author LiPingAn 2022/6/13 20:13
+ * @version 1.0
+ **/
+public class RoleIdConstant {
+
+    public final static String GLY = "10125632";
+    public final static String SHLD = "lEsw0MgJDhyW0S8iC3q";
+    public final static String FWJL = "wq3AoijXFmkUWUrKgUl";
+    public final static String GCS = "10125563";
+    public final static String KHLD = "TWybnV3LWjHEWk7DugF";
+    public final static String KH = "10125624";
+
+    public final static String XTGLY = "I51DPB2JBOjvtwCXZ2a";
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/RootCloudApi.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/RootCloudApi.java
new file mode 100644
index 0000000..9ad883e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/RootCloudApi.java
@@ -0,0 +1,16 @@
+package com.rootcloud.common.constant;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/23 16:23
+ */
+public interface RootCloudApi {
+
+    String DEVICE_CURRENT_STATUS_URI = "/thing-instance/v1/device/device-instances/status";
+
+    String DEVICE_UNCLOSE_COUNT_URI = "/alarms/alarm/count-unclosed-device";
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/SyncSimpleDateFormat.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/SyncSimpleDateFormat.java
new file mode 100644
index 0000000..1202e4b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/SyncSimpleDateFormat.java
@@ -0,0 +1,32 @@
+package com.rootcloud.common.constant;
+
+import java.text.FieldPosition;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * <p>线程安全的DateFormat</p>
+ * @author Adams.huang
+ *
+ */
+public class SyncSimpleDateFormat extends SimpleDateFormat {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = -446222332706658395L;
+
+	public SyncSimpleDateFormat(String pattern) {
+        super(pattern);
+    }
+
+    @Override
+    public synchronized Date parse(String source) throws ParseException {
+        return super.parse(source);
+    }
+
+    @Override
+    public synchronized StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition pos) {
+        return super.format(date, toAppendTo, pos);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/TemplateConstant.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/TemplateConstant.java
new file mode 100644
index 0000000..07fee1c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/TemplateConstant.java
@@ -0,0 +1,11 @@
+package com.rootcloud.common.constant;
+
+public class TemplateConstant {
+
+    public final static String TEMPLATE_ORDRE = "SY_DD1086EE";
+    public final static String TEMPLATE_AFTER_ORDRE = "SY_SH1086EE";
+    public final static String TEMPLATE_SPARE = "SY_BJ1086EE";
+    public final static String TEMPLATE_JSHT = "SY_JS1086EE";
+    public final static String TEMPLATE_FWHT = "SY_FW1086EE";
+    public final static String NXGX_ZH_SPLIT_TABLES = "NXGX_ZH_SPLIT_TABLES:";//宁夏共享租户数据权限隔离key
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/WeekTypeEnum.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/WeekTypeEnum.java
new file mode 100644
index 0000000..c03a5ef
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/constant/WeekTypeEnum.java
@@ -0,0 +1,50 @@
+package com.rootcloud.common.constant;
+
+/**
+ * 星期几转换
+ * @author Adams.huang
+ *
+ */
+public enum WeekTypeEnum {
+
+	SUN(1, "日"),
+	MON(2, "一"), 
+	TUES(3, "二"), 
+	WEDNES(4, "三"), 
+	THURS(5, "四"), 
+	FRI(6, "五"), 
+	SAT(7, "六");
+
+	private WeekTypeEnum(int key, String display) {
+		this.key = key;
+		this.display = display;
+	}
+
+	private int key;
+	private String display;
+
+	public int getKey() {
+		return key;
+	}
+
+	public void setKey(int key) {
+		this.key = key;
+	}
+
+	public String getDisplay() {
+		return display;
+	}
+
+	public void setDisplay(String display) {
+		this.display = display;
+	}
+
+	public static String getDisplay(int key) {
+		for (WeekTypeEnum item : WeekTypeEnum.values()) {
+			if (item.getKey() == key) {
+				return item.getDisplay();
+			}
+		}
+		return null;
+	}
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/BaseEnums.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/BaseEnums.java
new file mode 100644
index 0000000..2f46944
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/BaseEnums.java
@@ -0,0 +1,13 @@
+package com.rootcloud.common.enums;
+
+/**
+ * @Author lujin
+ * @Description 社区基础枚举接口
+ * @Date on 2019/1/17.
+ */
+public interface BaseEnums<K,V> {
+
+    K getCode();
+
+    V getDesc();
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/DeviceOnlineStatus.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/DeviceOnlineStatus.java
new file mode 100644
index 0000000..97cddb8
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/DeviceOnlineStatus.java
@@ -0,0 +1,73 @@
+package com.rootcloud.common.enums;
+
+import com.rootcloud.common.ResourceUtil;
+import lombok.Getter;
+
+/**
+ * <p>
+ *     设备打印状态
+ * </p>
+ * @author HeJia
+ * @since 2022/5/12
+ */
+public enum DeviceOnlineStatus implements BaseEnums<Integer, String> {
+    /**
+     * 离线，待机，打印中
+     */
+    OFFLINE(1,"离线", ""),
+    ONLINE(2,"待机", "__online__.connected"),
+    READY(3,"待机", "SB_ZT_Ready"),
+    RUNNING(4,"打印中", "SB_ZT_Running");
+
+
+    private final Integer code;
+    private final String desc;
+
+    @Getter
+    private final String propertyId;
+
+    DeviceOnlineStatus(Integer code, String desc, String propertyId) {
+        this.code = code;
+        this.desc = desc;
+        this.propertyId = propertyId;
+    }
+
+    @Override
+    public Integer getCode() {
+        return code;
+    }
+
+    @Override
+    public String getDesc() {
+        switch (code){
+            case 1:
+                return ResourceUtil.getI18nMessage("60018");
+            case 2:
+                return ResourceUtil.getI18nMessage("60019");
+            case 3:
+                return ResourceUtil.getI18nMessage("60019");
+            case 4:
+                return ResourceUtil.getI18nMessage("60020");
+            default:
+                return "";
+        }
+    }
+
+    public static DeviceOnlineStatus getByPropertyId(String propertyId) {
+        for (DeviceOnlineStatus instance : values()) {
+            if (instance.propertyId.equals(propertyId)) {
+                return instance;
+            }
+        }
+        return null;
+    }
+
+    public static DeviceOnlineStatus getByCode(Integer code) {
+        for (DeviceOnlineStatus instance : values()) {
+            if (instance.code.equals(code)) {
+                return instance;
+            }
+        }
+        return null;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/HttpRequestMethedEnum.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/HttpRequestMethedEnum.java
new file mode 100644
index 0000000..75af902
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/HttpRequestMethedEnum.java
@@ -0,0 +1,42 @@
+package com.rootcloud.common.enums;
+
+import org.apache.http.client.methods.*;
+
+/**
+ * @Author: M
+ * @Date: 2019-6-27 13:19
+ * @Version 1.0
+ */
+public enum HttpRequestMethedEnum {
+    // HttpGet请求
+    HttpGet {
+        @Override
+        public HttpRequestBase createRequest(String url) {
+            return new HttpGet(url);
+        }
+    },
+    // HttpPost 请求
+    HttpPost {
+        @Override
+        public HttpRequestBase createRequest(String url) {
+            return new HttpPost(url);
+        }
+    },
+    // HttpPut 请求
+    HttpPut {
+        @Override
+        public HttpRequestBase createRequest(String url) {
+            return new HttpPut(url);
+        }
+    },
+    // HttpDelete 请求
+    HttpDelete {
+        @Override
+        public HttpRequestBase createRequest(String url) {
+            return new HttpDelete(url);
+        }
+    };
+
+    public HttpRequestBase createRequest(String url) { return null; }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/OrderEnums.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/OrderEnums.java
new file mode 100644
index 0000000..2d29c02
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/OrderEnums.java
@@ -0,0 +1,68 @@
+package com.rootcloud.common.enums;
+
+
+/**
+ * @Author yangyijun
+ * @Description 订单枚举
+ * @Date on 2022/5/18
+ */
+public interface OrderEnums {
+
+    enum OrderStatus implements BaseEnums<String, String>{
+
+        WORKERS_TO_BE_DISPATCHED("1", "待派工"),
+        PENDING_ORDERS("2", "待接单"),
+        PENDING_CHECK_IN("3", "待签到"),
+        PENDING_REPORTING("4", "待报工"),
+        PENDING_REVIEW("5", "待审核"),
+        TO_BE_RETURNED("6", "待回访"),
+        DONE("7", "已完成"),
+        REJECTED("8", "已拒绝"),
+        TRANSFERRED("9", "已转派"),
+        DEPRECATED("10", "已废弃"),
+        DELETED("11", "已删除");
+
+        private String code;
+        private String desc;
+
+        OrderStatus(String code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        @Override
+        public String getCode() {
+            return this.code;
+        }
+
+        @Override
+        public String getDesc() {
+            return this.desc;
+        }
+    }
+
+    enum TodoStatus implements BaseEnums<String, String>{
+
+        UNRESOLVED("0", "未解决"),
+        RESOLVED("1", "已经解决");
+
+        private String code;
+        private String desc;
+
+        TodoStatus(String code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        @Override
+        public String getCode() {
+            return this.code;
+        }
+
+        @Override
+        public String getDesc() {
+            return this.desc;
+        }
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/ReportStatisticsEnums.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/ReportStatisticsEnums.java
new file mode 100644
index 0000000..bbd2b88
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/ReportStatisticsEnums.java
@@ -0,0 +1,72 @@
+package com.rootcloud.common.enums;
+
+
+/**
+ * @Author yangyijun
+ * @Description 订单枚举
+ * @Date on 2022/5/18
+ */
+public interface ReportStatisticsEnums {
+
+    enum DataStatus implements BaseEnums<String, String>{
+
+        NEARLY_SEVEN_DAYS("1", "近七天"),
+        NEARLY_A_MONTH("2", "近30天"),
+        MONTH("3", "当月"),
+        THAT_YEAR("4", "当年");
+
+        private String code;
+        private String desc;
+
+        DataStatus(String code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        @Override
+        public String getCode() {
+            return this.code;
+        }
+
+        @Override
+        public String getDesc() {
+            return this.desc;
+        }
+    }
+
+
+
+    enum DeviceStatus implements BaseEnums<String, String>{
+
+        HIRE("1", "出租"),
+        SOLD("2", "变卖"),
+        IDLE("3", "闲置"),
+        SEALED("4", "封存"),
+        ENABLE("5", "启用"),
+        SCRAP("6", "报废"),
+        IN_USE("7", "在用");
+
+        private String code;
+        private String desc;
+
+        DeviceStatus(String code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        @Override
+        public String getCode() {
+            return this.code;
+        }
+
+        @Override
+        public String getDesc() {
+            return this.desc;
+        }
+    }
+
+
+
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/ServicePlanEnums.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/ServicePlanEnums.java
new file mode 100644
index 0000000..7afbabc
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/ServicePlanEnums.java
@@ -0,0 +1,372 @@
+package com.rootcloud.common.enums;
+
+
+/**
+ * @Author lujin
+ * @Description 社区枚举
+ * @Date on 2019/1/17.
+ */
+public interface ServicePlanEnums {
+
+    /**
+     * 计划周期【1：日2：周3：月4：年】
+     */
+    enum PlanCycle implements BaseEnums<Integer, String> {
+
+        DAY(1, "日"),
+        WEEK(2, "周"),
+        MONTH(3, "月"),
+        YEAR(4, "年");
+
+        private Integer code;
+        private String desc;
+
+        PlanCycle(Integer code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        @Override
+        public Integer getCode() {
+            return this.code;
+        }
+
+        @Override
+        public String getDesc() {
+            return this.desc;
+        }
+    }
+
+
+//    计划类型 1维修、2保养、3交机、4技改
+enum PlanType implements BaseEnums<Integer, String> {
+
+    REPAIR(1, "维修"),
+    MAINTAIN(2, "保养"),
+    HANDOVER(3, "交机"),
+    TECHNICAL_TRANSFORMATION(4, "技改");
+
+    private Integer code;
+    private String desc;
+
+    PlanType(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    @Override
+    public Integer getCode() {
+        return this.code;
+    }
+
+    @Override
+    public String getDesc() {
+        return this.desc;
+    }
+}
+
+    //计划状态【0：待启动1：进行中2：已完成3：已暂停】
+    enum PlanStatus implements BaseEnums<Integer, String> {
+
+        TO_BE_STARTED(0, "待启动"),
+        IN_PROGRESS(1, "进行中"),
+        FINISHED(2, "已完成"),
+        PAUSED(3, "已暂停");
+
+        private Integer code;
+        private String desc;
+
+        PlanStatus(Integer code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        @Override
+        public Integer getCode() {
+            return this.code;
+        }
+
+        @Override
+        public String getDesc() {
+            return this.desc;
+        }
+    }
+
+//        是否超时【0：未超时 1：已超时】
+
+    enum IsTimeout implements BaseEnums<Integer, String> {
+
+        NO_TIMEOUT(0, "未超时"),
+        TIMED_OUT(1, "已超时");
+
+        private Integer code;
+        private String desc;
+
+        IsTimeout(Integer code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        @Override
+        public Integer getCode() {
+            return this.code;
+        }
+
+        @Override
+        public String getDesc() {
+            return this.desc;
+        }
+    }
+
+    //        提醒方式【0：邮件1：短信 2：站内信】
+    enum RemindWay implements BaseEnums<Integer, String> {
+
+        EMAIL(0, "邮件"),
+        MSG(1, "短信"),
+        STATION_MSG(2, "站内信");
+
+        private Integer code;
+        private String desc;
+
+        RemindWay(Integer code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        @Override
+        public Integer getCode() {
+            return this.code;
+        }
+
+        @Override
+        public String getDesc() {
+            return this.desc;
+        }
+    }
+
+    /**
+     *  触发条件 1.系统时间 2.工况，3.报警
+     */
+    enum TriggerType implements BaseEnums<String, String> {
+
+        YSY_TIME("1", "系统时间"),
+        WORK_CONDITION("2", "工况"),
+        ALARM("3", "报警");
+
+        private final String code;
+        private final String desc;
+
+    TriggerType(String code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        @Override
+        public String getCode() {
+            return this.code;
+        }
+
+        @Override
+        public String getDesc() {
+            return this.desc;
+        }
+    }
+
+    /**
+     *  触发条件
+     */
+    enum Condition implements BaseEnums<String, String> {
+
+        EQ("1", "等于"),
+        GT("2", "大于"),
+        GEQ("3", "大于等于"),
+        LT("4", "小于"),
+        LEQ("5", "小于等于");
+        private final String code;
+        private final String desc;
+
+        Condition(String code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        @Override
+        public String getCode() {
+            return this.code;
+        }
+
+        @Override
+        public String getDesc() {
+            return this.desc;
+        }
+    }
+
+
+    enum CheckType implements BaseEnums<String, String>{
+
+        CHECK_FALSE("0", "否"),
+        CHECK_TURE("1", "是");
+
+        private String code;
+        private String desc;
+
+        CheckType(String code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        @Override
+        public String getCode() {
+            return this.code;
+        }
+
+        @Override
+        public String getDesc() {
+            return this.desc;
+        }
+    }
+
+    enum DetailStatus implements BaseEnums<Integer, String> {
+
+        DEFAULT(0, "默认的"),
+        DETAIL(1, "需要处理的");
+
+        private final Integer code;
+        private final String desc;
+
+        DetailStatus(Integer code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        @Override
+        public Integer getCode() {
+            return this.code;
+        }
+
+        @Override
+        public String getDesc() {
+            return this.desc;
+        }
+    }
+
+
+    enum PrintStatus implements BaseEnums<String, String>{
+
+        PRINTING("1", "打印中"),
+        STANDBY("2", "待机"),
+        OFFLINE("3", "离线");
+
+        private String code;
+        private String desc;
+
+        PrintStatus(String code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        @Override
+        public String getCode() {
+            return this.code;
+        }
+
+        @Override
+        public String getDesc() {
+            return this.desc;
+        }
+    }
+
+
+    enum MessageType implements BaseEnums<String, String>{
+
+        FAULT_ALARM("1", "故障报警"),
+        PARAMETER_ALARM("2", "参数报警"),
+        MAINTENANCE_REMINDERS("3", "保养提醒"),
+        DEVICE_STATUS_REMINDER("4", "设备状态提醒"),
+        SPARE_PARTS_LIFE_WARNING_REMINDER("5", "备件寿命预警提醒"),
+        CONTRACT_SETTLEMENT("6", "合同及结算消息通知"),
+        REPAIR("001", "维修"),
+        MAINTENANCE("002", "保养"),
+        HANDOVER("003", "交机"),
+        TRANSFORMATION("004", "技改"),
+        INSPECTION("005", "巡检");
+
+        private String code;
+        private String desc;
+
+        MessageType(String code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        @Override
+        public String getCode() {
+            return this.code;
+        }
+
+        @Override
+        public String getDesc() {
+            return this.desc;
+        }
+    }
+
+
+    enum MessageCodeType implements BaseEnums<String, String>{
+
+        ORDER_MESSAGE("1", "订单消息通知"),
+        MAINTENANCE_MESSAGE("2", "保养计划通知"),
+        CONDITION_ALARM("3", "工况报警通知"),
+        CONTRACTS_SETTLEMENTS("4", "合同以及结算消息通知"),
+        SPARE_PARTS_LIFE("5", "备件寿命预警消息通知"),
+        REPAIR_ORDER_MESSAGE("6", "维修单消息通知");
+
+        private String code;
+        private String desc;
+
+        MessageCodeType(String code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        @Override
+        public String getCode() {
+            return this.code;
+        }
+
+        @Override
+        public String getDesc() {
+            return this.desc;
+        }
+    }
+
+
+
+    enum MaintenanceType implements BaseEnums<String, String>{
+        STATUS_NO_LAUNCH("1", "未发起状态灰色"),
+        STATUS_LAUNCH("2", "已发起状态蓝色"),
+        STATUS_FINISH("3", "正常完成绿色"),
+        STATUS_EXTENDED_NO_FINISH("4", "延期未完成-浅绿色"),
+        STATUS_EXTENDED_FINISH("5", "拖期完成橙色"),
+        STATUS_NO_FINISH("6", "未完成红色");
+
+        private String code;
+        private String desc;
+
+        MaintenanceType(String code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        @Override
+        public String getCode() {
+            return this.code;
+        }
+
+        @Override
+        public String getDesc() {
+            return this.desc;
+        }
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/StatusCodeEnum.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/StatusCodeEnum.java
new file mode 100644
index 0000000..2758fad
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/enums/StatusCodeEnum.java
@@ -0,0 +1,41 @@
+package com.rootcloud.common.enums;
+
+import com.rootcloud.common.ResourceUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum StatusCodeEnum {
+    SUCCESS("200", ResourceUtil.getI18nMessage("200")),
+    IMPORT_ERROR("409", ResourceUtil.getI18nMessage("409")),
+    EXCEPTION("13500", ResourceUtil.getI18nMessage("13500")),
+    INBOUND_SUCCESS("13501", ResourceUtil.getI18nMessage("13501")),
+    OUTBOUND_SUCCESS("13512", ResourceUtil.getI18nMessage("13512")),
+    OUTBOUND_FAIL("13503", ResourceUtil.getI18nMessage("13503")),
+    OUTBOUND_NOT_ENOUGH("13514", ResourceUtil.getI18nMessage("13514")),
+    USER_NOT_EXIST("13505", ResourceUtil.getI18nMessage("13505")),
+    OUTBOUND_SOLD_SUCCESS("13502", ResourceUtil.getI18nMessage("13502")),
+    PART_NOT_EXIST("13504", ResourceUtil.getI18nMessage("13504")),
+    DEVICE_NOT_EXIST("13506", ResourceUtil.getI18nMessage("13506")),
+    DEVICE_WORK_STATUS_NOT_EXIST("13508", ResourceUtil.getI18nMessage("13508")),
+    HISTORY_DEVICE_NOT_EXIST("14001", ResourceUtil.getI18nMessage("14001")),
+    ORDER_NOT_EXIST("15001", ResourceUtil.getI18nMessage("15001")),
+    SING_IN_ONLY_STATUS("15002", ResourceUtil.getI18nMessage("15002")),
+    SERVICE_PLAN_NOT_EXIST("16001", ResourceUtil.getI18nMessage("16001")),
+    SERVICE_PLAN_NOT_DELETE("16002", ResourceUtil.getI18nMessage("16002")),
+    SERVICE_PLAN_NOT_STOP("16003", ResourceUtil.getI18nMessage("16003")),
+    SERVICE_PLAN_NOT_FINISH("16004", ResourceUtil.getI18nMessage("16004")),
+    SERVICE_PLAN_NOT_STAR("16005", ResourceUtil.getI18nMessage("16005")),
+    SERVICE_PLAN_NOT_CALENDAR("16006", ResourceUtil.getI18nMessage("16006")),
+    SING_IN_NOT_PASS("17001", ResourceUtil.getI18nMessage("17001")),
+    TODO_NOT_EXIST("18001", ResourceUtil.getI18nMessage("18001")),
+    TODO_NOT_STATUS("18002", ResourceUtil.getI18nMessage("18002")),
+    FAIL_CALL_INTERFACE("40000", ResourceUtil.getI18nMessage("40000")),
+    ALARM_TYPE_REQUIRED("13507",ResourceUtil.getI18nMessage("13507")),
+    ABNORMAL_CHECK_IN("60021",ResourceUtil.getI18nMessage("60021")),
+    GET_CURRENT_LOCATION_EXCEPTION("60022",ResourceUtil.getI18nMessage("60022"))
+    ;
+    private String ret;
+    private String message;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/intercept/DataScopeInterceptor.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/intercept/DataScopeInterceptor.java
new file mode 100644
index 0000000..70873ad
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/intercept/DataScopeInterceptor.java
@@ -0,0 +1,264 @@
+package com.rootcloud.common.intercept;
+
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor;
+import com.alibaba.druid.util.JdbcConstants;
+import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.handlers.AbstractSqlParserHandler;
+import com.rootcloud.common.constant.TemplateConstant;
+import com.rootcloud.config.auth.UserContext;
+import jline.internal.Log;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.CCJSqlParserManager;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import net.sf.jsqlparser.schema.Column;
+import net.sf.jsqlparser.statement.select.*;
+import org.apache.ibatis.executor.statement.StatementHandler;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.SqlCommandType;
+import org.apache.ibatis.plugin.*;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.reflection.SystemMetaObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+import javax.sql.DataSource;
+import java.io.StringReader;
+import java.sql.Connection;
+import java.util.*;
+
+@Slf4j
+@AllArgsConstructor
+@Intercepts({@Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})})
+@Component
+public class DataScopeInterceptor  extends AbstractSqlParserHandler implements Interceptor {
+
+
+    private DataSource dataSource;
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    private static final List NO_STATEMENT_SQL = new ArrayList();
+    static {
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxOrderMapper.orderStatisticByDay");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxOrderMapper.orderStatisticByDayMonth");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.dao.ConfigDao.listTable_zhid");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.dao.ConfigDao.listTable_syzhid");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.dao.JeCoreEnduserDao.getTenantInfoNOSQL");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.dao.gkjk.NxJeDeviceDao.devicePage");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxOrderMapper.checkPersonStatistic");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxTodoLibraryMapper.getPage");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.ServicePlanMapper.getCustomerAndRoles");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.ServicePlanMapper.selectOutletsIdByCustomerId");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.ServicePlanMapper.selectListXMBY");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.ServicePlanMapper.selectByParams");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.ServicePlanMapper.selectSysTimeList");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.ServicePlanMapper.selectOne");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.dao.gkjk.NxJeDeviceDao.selectOne");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxOrderMapper.getSpartPartList");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxOrderMapper.countSpartPartList");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxUserInfoMapper.selectBySeviceCode");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.SpareFilerMapper.getSparePartByAzwh");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.SpareFilerMapper.getxtmkBypjbm2");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.SpareFilerMapper.getSparePartBySbbmAndPjbm");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.SpareFilerMapper.getSparePartByAzwh");
+        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.SpareFilerMapper.getSparePartBySbbm");
+
+
+
+
+
+
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.dao.JeCoreEnduserDao.getUser");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.dao.JeCoreEnduserDao.getSiteByUserId");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.dao.JeCoreEnduserDao.getCustomsByUserId");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.dao.JeCoreEnduserDao.getCustomsBySiteAreaName");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.dao.JeCoreEnduserDao.selectList");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxJeDeviceDao.selectByUserId");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxJeDeviceDao.countByUserId");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.ServicePlanMapper.selectByUserId");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.ServicePlanMapper.countByUserId");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxOrderMapper.selectByUserId");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxOrderMapper.countByUserId");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxOrderMapper.getSpartPartList");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxOrderMapper.countSpartPartList");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxOrderMapper.getNxgxJcdaFwryByUserId");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxOrderMapper.getCoreEnduserByUsrId");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxOrderMapper.getfwwd");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.mapper.NxOrderMapper.getKhBykhdzs");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.dao.ds.selectBykhmc");
+//        NO_STATEMENT_SQL.add("com.rootcloud.domain.dao.ds.selectByUserId");
+    }
+    //不拦截sql
+
+
+    @Override
+    public Object intercept(Invocation invocation) throws Throwable {
+        StatementHandler statementHandler = PluginUtils.realTarget(invocation.getTarget());
+        MetaObject metaObject = SystemMetaObject.forObject(statementHandler);
+        this.sqlParser(metaObject);
+        // 先判断是不是SELECT操作 不是直接过滤
+        MappedStatement mappedStatement = (MappedStatement) metaObject.getValue("delegate.mappedStatement");
+        if (!SqlCommandType.SELECT.equals(mappedStatement.getSqlCommandType())) {
+            return invocation.proceed();
+        }
+
+        BoundSql boundSql = (BoundSql) metaObject.getValue("delegate.boundSql");
+        String sql = boundSql.getSql();
+       // Log.info("原sql:" + sql);
+        if(NO_STATEMENT_SQL.contains(mappedStatement.getId())){   //不拦截sql
+            return invocation.proceed();
+        }
+
+        //判断是否在表名列表
+        String zhid = UserContext.getUserTenantId();  //需要进行租户ID过滤
+        //zhid = "aaa";  //TODO
+        if(StringUtils.isBlank(zhid)){
+            return invocation.proceed();
+        }
+       // Log.info("需要进行租户ID过滤"+zhid);
+        CCJSqlParserManager parserManager = new CCJSqlParserManager();
+        Select select = (Select) parserManager.parse(new StringReader(sql));
+        PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
+        addWhere(plainSelect,null, zhid);
+
+        if (plainSelect.getJoins() != null) {    // 是否存关联连接, 主表已经加了过滤条件了,除非特殊情况才进行处理.
+            List<Join> joins = plainSelect.getJoins();
+            for (Join join : joins){
+                addWhere(plainSelect,join,zhid);
+            }
+        }
+
+        //获取select列项,判断是否有子查询
+        if (plainSelect.getSelectItems() != null) {
+            List<SelectItem> subSelectItem = plainSelect.getSelectItems();
+            for (SelectItem subSelect :
+                    subSelectItem) {
+                if (subSelect instanceof SelectExpressionItem) {
+                    SelectExpressionItem selectExpressionItem = (SelectExpressionItem) subSelect;
+                    if (!(selectExpressionItem.getExpression() instanceof Column)) {
+                        //如果子列，是一个子查询
+                        Expression expression_col = selectExpressionItem.getExpression();
+                        if (expression_col instanceof SubSelect) {
+                            SubSelect subselect = (SubSelect) expression_col;
+                            PlainSelect subPlainSelect  =  (PlainSelect)subselect.getSelectBody();
+                            addWhere(subPlainSelect,null,zhid);
+                        }
+                    }
+                }
+            }
+        }
+        //Log.info("改造sql:" + select.toString());
+        metaObject.setValue("delegate.boundSql.sql", select.toString());
+
+        return invocation.proceed();
+    }
+
+
+
+    /**
+     * 增加 where条件
+     * @param plainSelect
+     */
+    private void addWhere(PlainSelect plainSelect,Join join,String zhid) throws JSQLParserException {
+
+        String tableName = "";
+        String alias = "";
+        if (join == null) {
+            tableName = plainSelect.getFromItem().toString().toLowerCase();
+            alias = plainSelect.getFromItem().getAlias()!=null?plainSelect.getFromItem().getAlias().getName():"";
+        } else {
+            tableName = join.getRightItem().toString().toLowerCase();
+            alias = join.getRightItem().getAlias()!=null?join.getRightItem().getAlias().getName():"";
+        }
+
+        if (tableName.indexOf(" ") != -1) {
+            tableName = tableName.substring(0, tableName.indexOf(" "));
+        }
+        // 判断表明是否存在ZHID或者SY_ZHID字段   从redis获取,如果为null,直接return
+        Object obj = redisTemplate.opsForValue().get(TemplateConstant.NXGX_ZH_SPLIT_TABLES + tableName);
+       // obj = "aa";//TODO
+        //System.out.println(tableName + "表获取resids换缓存:" + obj);
+        if (obj != null && StringUtils.isNotBlank(obj.toString())) {
+            StringBuffer whereSql = new StringBuffer();
+            if (StringUtils.isNotBlank(alias)) {
+                //存在别名
+                whereSql.append(alias + "." + obj.toString() + " = '" + zhid + "'");
+            } else {
+                whereSql.append(obj.toString() + " = '" + zhid + "'");    //需要进行租户ID过滤
+            }
+
+            Expression where = plainSelect.getWhere();
+            if (where == null) {
+                if (whereSql.length() > 0) {
+                    Expression expression = CCJSqlParserUtil
+                            .parseCondExpression(whereSql.toString());
+                    Expression whereExpression = (Expression) expression;
+                    plainSelect.setWhere(whereExpression);
+                }
+            } else {
+                if (whereSql.length() > 0) {
+                    //where条件之前存在，需要重新进行拼接
+                    whereSql.append(" and " + where.toString());
+                } else {
+                    //新增片段不存在，使用之前的sql
+                    whereSql.append(where.toString());
+                }
+                Expression expression = CCJSqlParserUtil
+                        .parseCondExpression(whereSql.toString());
+                plainSelect.setWhere(expression);
+            }
+        }
+    }
+
+
+
+    /**
+     * 获取sql中所有的表名
+     * @param boundSql
+     * @return
+     */
+    private List<String> getTableName(BoundSql boundSql) {
+        List<SQLStatement> stmtList = SQLUtils.parseStatements(boundSql.getSql(), JdbcConstants.MYSQL);
+
+        List<String> tableNameList = new ArrayList<>();
+        for (SQLStatement stmt : stmtList) {
+            MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor();
+            stmt.accept(visitor);
+            visitor.getTables().keySet().forEach(s -> tableNameList.add(s.getName()));
+        }
+
+        return tableNameList;
+    }
+
+    /**
+     * 生成拦截对象的代理
+     *
+     * @param target 目标对象
+     * @return 代理对象
+     */
+    @Override
+    public Object plugin(Object target) {
+        if (target instanceof StatementHandler) {
+            return Plugin.wrap(target, this);
+        }
+        return target;
+    }
+
+    /**
+     * mybatis配置的属性
+     *
+     * @param properties mybatis配置的属性
+     */
+    @Override
+    public void setProperties(Properties properties) {
+
+    }
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/intercept/LanguageIntercept.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/intercept/LanguageIntercept.java
new file mode 100644
index 0000000..4f027ae
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/intercept/LanguageIntercept.java
@@ -0,0 +1,30 @@
+package com.rootcloud.common.intercept;
+
+import com.rootcloud.common.I18nUtil;
+import com.rootcloud.config.auth.LoginUserInfo;
+import com.rootcloud.config.auth.UserContext;
+import groovy.util.logging.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 语言全局拦截器
+ */
+@Slf4j
+public class LanguageIntercept extends HandlerInterceptorAdapter {
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler){
+//        Object language = redisTemplate.opsForValue().get("user_id~language");
+//        LoginUserInfo current = UserContext.current();
+//        if("en".equals(current.getLanguage())){
+//            I18nUtil.setLocale("en","US");
+//        }else{
+//            I18nUtil.setLocale("zh","CN");
+//        }
+        return true;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/live/CacheMap.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/live/CacheMap.java
new file mode 100644
index 0000000..d53bef5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/live/CacheMap.java
@@ -0,0 +1,65 @@
+package com.rootcloud.common.live;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 使用ConcurrentHashMap做一个简易的缓存，目前只是添加，如需其他的方法可自行添加
+ * @author fandi
+ *
+ */
+
+public class CacheMap {
+
+    // 设置过期时间为5天
+    public static int EXPIRE_DAY = 5;
+
+    /**
+     * 数据缓存map
+     */
+    public static Map<String, String> dataMap = new ConcurrentHashMap<String, String>();
+
+    /**
+     * 数据缓存过期map
+     */
+    public static Map<String, Date> dataExpireMap = new ConcurrentHashMap<String, Date>();
+
+    /**
+     * 将一个key、value值放入内存缓存,并设置过期天数
+     *
+     * @param key
+     * @param val
+     * @param EXPIRE_DAY
+     */
+    public static void put(String key, String val) {
+        dataMap.put(key, val);
+        dataExpireMap.put(key, DateUtil.getAfterDate(new Date(), EXPIRE_DAY));
+    }
+
+    /**
+     * 从缓存中获取一个key的数据(若过期返回null)
+     *
+     * @param key
+     * @return
+     */
+    public static String get(String cacheKey) {
+    	String obj = "";
+        Date expireDate = CacheMap.dataExpireMap.get(cacheKey);
+
+        //如果过期时间不为空，或者当前时间与过期时间的差小于0，则说明当前的缓存有效。
+        if (expireDate != null && DateUtil.getDateSpace(expireDate, new Date()) < 0) {
+            obj = CacheMap.dataMap.get(cacheKey);
+        }
+        return obj;
+    }
+    
+	/**
+	 * 判断是否存在一个key
+	 * @param key
+	 * @return
+	 */
+	public static boolean hasCache(String key) { 
+	      return CacheMap.dataMap.containsKey(key); 
+	   } 
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/live/CacheMap2.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/live/CacheMap2.java
new file mode 100644
index 0000000..62480c8
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/live/CacheMap2.java
@@ -0,0 +1,65 @@
+package com.rootcloud.common.live;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 使用ConcurrentHashMap做一个简易的缓存，目前只是添加，如需其他的方法可自行添加
+ * @author fandi
+ *
+ */
+
+public class CacheMap2 {
+
+    // 设置过期时间为3天
+    public static int EXPIRE_DAY = 3;
+
+    /**
+     * 数据缓存map
+     */
+    public static Map<String, String> dataMap = new ConcurrentHashMap<String, String>();
+
+    /**
+     * 数据缓存过期map
+     */
+    public static Map<String, Date> dataExpireMap = new ConcurrentHashMap<String, Date>();
+
+    /**
+     * 将一个key、value值放入内存缓存,并设置过期天数
+     *
+     * @param key
+     * @param val
+     * @param EXPIRE_DAY
+     */
+    public static void put(String key, String val) {
+        dataMap.put(key, val);
+        dataExpireMap.put(key, DateUtil.getAfterDate(new Date(), EXPIRE_DAY));
+    }
+
+    /**
+     * 从缓存中获取一个key的数据(若过期返回null)
+     *
+     * @param key
+     * @return
+     */
+    public static String get(String cacheKey) {
+    	String obj = "";
+        Date expireDate = CacheMap2.dataExpireMap.get(cacheKey);
+
+        //如果过期时间不为空，或者当前时间与过期时间的差小于0，则说明当前的缓存有效。
+        if (expireDate != null && DateUtil.getDateSpace(expireDate, new Date()) < 0) {
+            obj = CacheMap2.dataMap.get(cacheKey);
+        }
+        return obj;
+    }
+    
+	/**
+	 * 判断是否存在一个key
+	 * @param key
+	 * @return
+	 */
+	public static boolean hasCache(String key) { 
+	      return CacheMap2.dataMap.containsKey(key);
+	   } 
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/live/DateUtil.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/live/DateUtil.java
new file mode 100644
index 0000000..28cb92e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/live/DateUtil.java
@@ -0,0 +1,1505 @@
+package com.rootcloud.common.live;
+
+import com.rootcloud.common.constant.SyncSimpleDateFormat;
+import com.rootcloud.common.constant.WeekTypeEnum;
+import lombok.SneakyThrows;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
+
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.MessageFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 日期组件
+ * @author Adams.huang
+ *
+ */
+public class DateUtil {
+
+	public static final String YYYY_MM_DD = "yyyy-MM-dd";
+	public static final String HH_MM_SS = "HH:mm:ss";
+	public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+	public static final String YYYY_MM_DD_HH_MM = "yyyy-MM-dd HH:mm";
+	public static final String YYYY_MMDD = "yyyyMMdd";
+	public static final String yyyy_MM = "yyyy/MM";
+	public static final String yyyy_MM_dd = "yyyy/MM/dd";
+	public static final String yyyyMM = "yyyyMM";
+	public static final String MM_DD_HH_SS_TEMPLATE = "{0}-{1}({2}){3}:{4}";
+	public static final String HH_SS_TEMPLATE = "{0}:{1}";
+	public static final String yyyyMMddhhmmss = "yyyyMMddhhmmss";
+	private static final Calendar calendar = Calendar.getInstance();
+	private final static SimpleDateFormat dateformater1 = new SimpleDateFormat("yyyy-MM-dd");
+	public static boolean defaultTimeFlag = true; // 查询条件默认时间显示标志
+
+	/* 开始时间点 */
+	public final static String startTimePoint = " 00:00:00";
+	/* 结束时间点 */
+	public final static String endTimePoint = " 23:59:59";
+
+	/**
+	 * Number of milliseconds in a standard second.
+	 * 
+	 * @since 2.1
+	 */
+	public static final long MILLISECOND_PER_SECOND = 1000;
+	/**
+	 * Number of milliseconds in a standard minute.
+	 * 
+	 * @since 2.1
+	 */
+	public static final long MILLISECOND_PER_MINUTE = 60 * MILLISECOND_PER_SECOND;
+	/**
+	 * Number of milliseconds in a standard hour.
+	 * 
+	 * @since 2.1
+	 */
+	public static final long MILLISECOND_PER_HOUR = 60 * MILLISECOND_PER_MINUTE;
+	/**
+	 * Number of milliseconds in a standard day.
+	 * 
+	 * @since 2.1
+	 */
+	public static final long MILLISECOND_PER_DAY = 24 * MILLISECOND_PER_HOUR;
+
+	private static SimpleDateFormat dateformater, timeformater, dateTimeformater, dateIDformater;
+
+	private DateUtil() {
+	}
+
+	/**
+	 * 得到本月的第一天
+	 * 
+	 * @return
+	 */
+	public static String getMonthFirstDay() {
+		Calendar calendar = Calendar.getInstance();
+		calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH));
+
+		return dateformater1.format(calendar.getTime());
+	}
+
+	public static String getDisplayTime(String time) {
+		Date dateTime = parseDateTime(time);
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(dateTime);
+		//判断是否是今天
+		Calendar todayCalendar = Calendar.getInstance();
+		Date now = new Date();
+		todayCalendar.setTime(now);
+		todayCalendar.set(Calendar.HOUR_OF_DAY, 0);
+		todayCalendar.set(Calendar.MINUTE, 0);
+		int todayYear = todayCalendar.get(Calendar.YEAR);
+		
+		int month = calendar.get(Calendar.MONTH) + 1;
+		int day = calendar.get(Calendar.DAY_OF_MONTH);
+		int hour = calendar.get(Calendar.HOUR_OF_DAY);
+		int minute = calendar.get(Calendar.MINUTE);
+		int week = calendar.get(Calendar.DAY_OF_WEEK);
+		int year = calendar.get(Calendar.YEAR);
+		String weekStr = WeekTypeEnum.getDisplay(week);
+		String minuteStr = minute > 9 ? Integer.toString(minute) : "0" + Integer.toString(minute);
+		if (calendar.after(todayCalendar)){
+			return MessageFormat.format(HH_SS_TEMPLATE,hour,minuteStr);
+		}
+		if(todayYear > year){//显示年
+			return formatDate(dateTime);
+		}
+		return MessageFormat.format(MM_DD_HH_SS_TEMPLATE, month, day, weekStr,
+				hour, minuteStr);
+	}
+
+	/**
+	 * 得到本月的最后一天
+	 * 
+	 * @return
+	 */
+	public static String getMonthLastDay() {
+		Calendar calendar = Calendar.getInstance();
+		calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+		return dateformater1.format(calendar.getTime());
+	}
+
+	/**
+	 * 获取日期格式的DateFormater
+	 * 
+	 * @return DateFormat
+	 */
+	private static DateFormat getDateFormater() {
+		if (dateformater == null)
+			dateformater = new SyncSimpleDateFormat(YYYY_MM_DD);
+		return dateformater;
+	}
+
+	/**
+	 * 获取日期格式的DateFormater  2017/12/12
+	 * 
+	 * @return DateFormat
+	 */
+	private static DateFormat getDateEnFormater() {
+		if (dateformater == null)
+			dateformater = new SyncSimpleDateFormat(yyyy_MM_dd);
+		return dateformater;
+	}
+	
+	/**
+	 * 获取时间格式的DateFormater
+	 * 
+	 * @return DateFormat
+	 */
+	private static DateFormat getTimeFormater() {
+		if (timeformater == null)
+			timeformater = new SyncSimpleDateFormat(HH_MM_SS);
+		return timeformater;
+	}
+
+	/**
+	 * 获取日期时间格式的DateFormater
+	 * 
+	 * @return DateFormat
+	 */
+	private static DateFormat getDateTimeFormater() {
+		if (dateTimeformater == null)
+			dateTimeformater = new SyncSimpleDateFormat(YYYY_MM_DD_HH_MM_SS);
+		return dateTimeformater;
+	}
+
+	/**
+	 * 获得没有秒的时间字符串
+	 * 
+	 * @return yyyy-MM-dd HH:mm
+	 */
+	public static String formatDateTimeFormaterExceptSeconds(Date date) {
+		dateTimeformater = new SyncSimpleDateFormat(YYYY_MM_DD_HH_MM);
+		return dateTimeformater.format(date);
+	}
+
+	/**
+	 * 获取日期时间格式的DateFormater
+	 *
+	 * @return DateFormat
+	 */
+	private static DateFormat getDateIDFormater() {
+		if (dateIDformater == null)
+			dateIDformater = new SyncSimpleDateFormat(YYYY_MMDD);
+		return dateIDformater;
+	}
+
+	/**
+	 * 获取现在的时间(yyyy-MM-dd HH:mm:ss)
+	 *
+	 * @return String
+	 */
+	public static String getNow() {
+		return getDateTimeFormater().format(new Date());
+	}
+
+	/**
+	 * 获取现在的日期(yyyy-MM-dd)
+	 *
+	 * @return String
+	 */
+	public static String getDate() {
+		return getDateFormater().format(new Date());
+	}
+
+	/**
+	 * 获取现在的时间(HH:mm:ss)
+	 *
+	 * @return String
+	 */
+	public static String getTime() {
+		return getTimeFormater().format(new Date());
+	}
+
+	/**
+	 * 获取日期(yyyy-MM-dd)
+	 *
+	 * @param checkTime
+	 *            Timestamp
+	 *
+	 * @return String
+	 */
+	public static Date getDate(Date checkTime) {
+		return parseDate(getDate());
+	}
+
+	/**
+	 * 获取年
+	 *
+	 * @param checkTime
+	 * @return
+	 * @author Adams Fum
+	 * @date 2015年8月7日 上午11:12:19
+	 */
+	public static int getYear(Date checkTime) {
+		GregorianCalendar ca = new GregorianCalendar();
+		ca.setTime(checkTime);
+
+		return ca.get(GregorianCalendar.YEAR);
+	}
+
+	/**
+	 * 获取月
+	 *
+	 * @param checkTime
+	 * @return
+	 * @author Adams Fum
+	 * @date 2015年8月7日 上午11:12:23
+	 */
+	public static int getMonth(Date checkTime) {
+		GregorianCalendar ca = new GregorianCalendar();
+		ca.setTime(checkTime);
+
+		return ca.get(GregorianCalendar.MONTH) + 1;
+	}
+
+	/**
+	 * 获取天
+	 *
+	 * @param checkTime
+	 * @return
+	 * @author Adams Fum
+	 * @date 2015年8月7日 上午11:12:26
+	 */
+	public static int getDay(Date checkTime) {
+		GregorianCalendar ca = new GregorianCalendar();
+		ca.setTime(checkTime);
+
+		return ca.get(GregorianCalendar.DAY_OF_MONTH);
+	}
+
+	/**
+	 * 获取小时
+	 *
+	 * @param checkTime
+	 * @return
+	 * @author ShiChunyun
+	 * @date 2015年11月10日 下午8:23:27
+	 */
+	public static int getHour(Date checkTime) {
+		GregorianCalendar ca = new GregorianCalendar();
+		ca.setTime(checkTime);
+
+		return ca.get(GregorianCalendar.HOUR_OF_DAY);
+	}
+
+	/**
+	 * 获取日期(yyyy-MM-dd)
+	 *
+	 * @param year
+	 * @param month
+	 * @param day
+	 * @return
+	 * @author Adams Fum
+	 * @date 2015年8月7日 上午10:57:51
+	 */
+	public static Date getDate(int year, int month, int day) {
+		if (year == 0)
+			year = 1900;
+		if (month == 0)
+			month = 1;
+		if (day == 0)
+			day = 1;
+		GregorianCalendar gCal = new GregorianCalendar(year, month - 1, day);
+		return gCal.getTime();
+	}
+
+	/**
+	 * 获取日期(yyyy-MM-dd)
+	 *
+	 * @param checkTime
+	 *            Timestamp
+	 *
+	 * @return String
+	 */
+	public static String getDate(Timestamp checkTime) {
+		return formatDate(checkTime);
+	}
+
+	/**
+	 * 获取时间(HH:mm:ss)
+	 *
+	 * @param checkTime
+	 *            Timestamp
+	 *
+	 * @return String
+	 */
+	public static String getTime(Timestamp checkTime) {
+		return getTimeFormater().format(checkTime);
+	}
+
+	/**
+	 * 获取多少天之后的日期
+	 *
+	 * @param startDate
+	 *            Date : 起始时间
+	 * @param days
+	 *            int : 指定天数
+	 *
+	 * @return Date java.util.Date
+	 */
+	public static Date getDate(Date startDate, int days) {
+		Date returnDay = dateDayAdd(startDate, days);
+		return returnDay;
+	}
+
+	/**
+	 * 获取多少天之前的日期
+	 *
+	 * @param startDate
+	 * @param days
+	 * @return
+	 * @author WuXiaoJun
+	 * @date 2014年12月29日
+	 */
+
+	public static Date getBeforeDate(Date startDate, int days) {
+		Date returnDay = dateDayDel(startDate, days);
+		return returnDay;
+	}
+
+	/**
+	 * 获取多少天之后的日期
+	 *
+	 * @param getAfterDate
+	 *            String : 起始日期
+	 * @param days
+	 *            int : 指定天数
+	 *
+	 * @return Date java.util.Date
+	 */
+	public static Date getAfterDate(Date startDate, int days) {
+		Date date = dateDayAdd(startDate, days);
+		return date;
+	}
+
+	/**
+	 * 获取多少月之后的日期
+	 *
+	 * @param startDate
+	 *            Date : 起始日期
+	 * @param months
+	 *            int : 指定月数
+	 *
+	 * @return Date java.util.Date
+	 */
+	public static Date getMonthDate(Date startDate, int months) {
+		Date returnDay = dateMonthAdd(startDate, months);
+		return returnDay;
+	}
+
+	/**
+	 * 获取多少月之后的日期
+	 *
+	 * @param startDate
+	 *            String : 起始日期
+	 * @param months
+	 *            int : 指定月数
+	 *
+	 * @return Date java.util.Date
+	 */
+	public static Date getMonthDate(String startDate, int months) {
+		Date start = parseDate(startDate);
+		Date date = dateMonthAdd(start, months);
+		return date;
+	}
+
+	/**
+	 * 获取多少分钟之后的日期时间
+	 *
+	 * @param strDateTime
+	 *            : 起始日期时间
+	 * @param minutes
+	 *            : 指定分钟数
+	 */
+	public static Date getMinuteTime(String strDateTime, int minutes) {
+		Date start = parseDateTime(strDateTime);
+		return dateDateTimeAdd(start, minutes);
+	}
+
+	/**
+	 * 获取多少分钟之后的日期时间
+	 *
+	 * @param startTimestamp
+	 *            : 起始日期时间
+	 * @param minutes
+	 *            : 指定分钟数
+	 */
+	public static Timestamp getMinuteTimestamp(String startTimestamp, int minutes) {
+		Timestamp start = parseTimestamp(startTimestamp);
+		return dateDateTimeAdd(start, minutes);
+	}
+
+	/**
+	 *
+	 * 获取当前月份 字符串
+	 *
+	 * @return yyyy-mm
+	 * @author Adams Fum
+	 * @date 2014年9月21日
+	 */
+	public static String getCurMonth() {
+		return new SimpleDateFormat("yyyy-MM").format(new Date());
+	}
+
+	/**
+	 *
+	 * 获取当前月份 字符串
+	 *
+	 * @return yyyy/MM
+	 * @author Adams Fum
+	 * @date 2014年9月21日
+	 */
+	public static String getCurMonthPath() {
+		SimpleDateFormat format = new SyncSimpleDateFormat(yyyy_MM);
+		Date date = new Date();
+		return format.format(date);
+	}
+
+	/**
+	 *
+	 * 获取当前月份 字符串
+	 *
+	 * @return yyyyMM
+	 * @author Adams Fum
+	 * @date 2014年9月21日
+	 */
+	public static String getCurMonthStr() {
+		SimpleDateFormat format = new SyncSimpleDateFormat(yyyyMM);
+		Date date = new Date();
+		return format.format(date);
+	}
+
+	/**
+	 * 根据日期获得当前月的开始日期
+	 *
+	 * @param month
+	 *            日期
+	 *
+	 * @return 所属月份的开始日期(java.util.Date)
+	 */
+	public static Date getMonthBegin(Date month) {
+		GregorianCalendar ca = new GregorianCalendar();
+		ca.setTime(month);
+		int year = ca.get(GregorianCalendar.YEAR);
+		int mon = ca.get(GregorianCalendar.MONTH);
+		GregorianCalendar gCal = new GregorianCalendar(year, mon, 1);
+		return gCal.getTime();
+	}
+
+	/**
+	 * 根据年份和月份获得当前月的开始日期
+	 *
+	 * @param year
+	 *            年份
+	 * @param month
+	 *            月份
+	 *
+	 * @return 所属月份的开始日期(java.util.Date)
+	 */
+	public static Date getMonthBegin(int year, int month) {
+		if (month <= 0 || month > 12)
+			throw new IllegalArgumentException("month must from 1 to 12");
+		GregorianCalendar gCal = new GregorianCalendar(year, month - 1, 1);
+		return gCal.getTime();
+	}
+
+	/**
+	 * 根据日期获得当前月的结束日期
+	 *
+	 * @param month
+	 *            日期
+	 *
+	 * @return 所属月份的结束日期(java.util.Date)
+	 */
+	public static Date getMonthEnd(Date month) {
+		GregorianCalendar ca = new GregorianCalendar();
+		ca.setTime(month);
+		int year = ca.get(GregorianCalendar.YEAR);
+		int mon = ca.get(GregorianCalendar.MONTH);
+		int lastDay = ca.getActualMaximum(GregorianCalendar.DAY_OF_MONTH);
+		GregorianCalendar gCal = new GregorianCalendar(year, mon, lastDay);
+		return gCal.getTime();
+	}
+
+	/**
+	 * 根据年份和月份获得当前月的结束日期
+	 *
+	 * @param year
+	 *            年份
+	 * @param month
+	 *            月份
+	 *
+	 * @return 所属月份的结束日期(java.util.Date)
+	 */
+	public static Date getMonthEnd(int year, int month) {
+		Date start = getMonthBegin(year, month);
+		return getMonthEnd(start);
+	}
+
+	/**
+	 * 根据日期参数获取当前周的起始日期(周日)
+	 *
+	 * @param date
+	 *            日期
+	 *
+	 * @return 所属星期的起始日期(java.util.Date)
+	 */
+	public static Date getWeekBegin(Date date) {
+		GregorianCalendar gCal = new GregorianCalendar();
+		gCal.setTime(date);
+		int startDay = gCal.getActualMinimum(GregorianCalendar.DAY_OF_WEEK);
+		gCal.set(GregorianCalendar.DAY_OF_WEEK, startDay);
+		return gCal.getTime();
+	}
+
+	/**
+	 * 根据日期参数获取当前周的结束日期(周六)
+	 *
+	 * @param date
+	 *            日期
+	 *
+	 * @return 所属星期的结束日期(java.util.Date)
+	 */
+	public static Date getWeekEnd(Date date) {
+		GregorianCalendar gCal = new GregorianCalendar();
+		gCal.setTime(date);
+		int lastDay = gCal.getActualMaximum(GregorianCalendar.DAY_OF_WEEK);
+		gCal.set(GregorianCalendar.DAY_OF_WEEK, lastDay);
+		return gCal.getTime();
+	}
+
+	/**
+	 * 获取指定时间段内的天数
+	 *
+	 * @param beginTime
+	 *            Timestamp
+	 * @param endTime
+	 *            Timestamp
+	 *
+	 * @return int
+	 */
+	public static int getDays(Timestamp beginTime, Timestamp endTime) {
+		int days = (int) ((endTime.getTime() - beginTime.getTime()) / MILLISECOND_PER_DAY);
+		return days;
+	}
+
+	/**
+	 * 获取指定时间段内的天数
+	 *
+	 * @param beginTime
+	 *            Date
+	 * @param endTime
+	 *            Date
+	 *
+	 * @return int
+	 */
+	public static int getDays(Date beginTime, Date endTime) {
+		int days = (int) ((endTime.getTime() - beginTime.getTime()) / MILLISECOND_PER_DAY);
+		return days;
+	}
+
+	/**
+	 * 生成日期ID(yyyyMMdd) ex: 传入参数:2004-5-1 返回:20040501
+	 *
+	 * @param date
+	 *            Date
+	 *
+	 * @return String
+	 */
+	public static String getDateID(Date date) {
+		return getDateIDFormater().format(date);
+	}
+
+	/**
+	 * 生成日期ID(yyyyMMdd) ex: 传入参数:2004-5-1 12:32:33 返回:20040501
+	 *
+	 * @param timestamp
+	 *            Timestamp
+	 *
+	 * @return String
+	 */
+	public static String getDateID(Timestamp timestamp) {
+		return getDateIDFormater().format(timestamp);
+	}
+
+	/**
+	 * 根据传入的日期以及年数计算并返回N年后的日期
+	 *
+	 * @param date
+	 *            Date
+	 * @param years
+	 *            int
+	 * @return Date
+	 */
+	public static Date getAfterYear(Date date, int years) {
+
+		calendar.setTime(date);
+		calendar.add(Calendar.YEAR, years);
+
+		return calendar.getTime();
+	}
+
+	/**
+	 * 将java.util.Date格式转换成日期字符串(yyyy-MM-dd)
+	 *
+	 * @return String
+	 */
+	public static String formatDate(Date date) {
+		return getDateFormater().format(date);
+	}
+
+	/**
+	 * 将java.util.Date格式转换成时间字符串(HH:mm:ss)
+	 *
+	 * @return String
+	 */
+	public static String formatTime(Date date) {
+		return getTimeFormater().format(date);
+	}
+
+	/**
+	 * 将java.util.Date格式转换成日期时间字符串(yyyy-MM-dd HH:mm:ss)
+	 *
+	 * @return String
+	 */
+	public static String formatDateTime(Date date) {
+		return getDateTimeFormater().format(date);
+	}
+
+	/**
+	 * 将Timestamp格式转换成日期时间字符串(yyyy-MM-dd HH:mm:ss)
+	 *
+	 * @return String
+	 */
+	public static String formatDateTime(Timestamp timestamp) {
+		return getDateTimeFormater().format(timestamp);
+	}
+
+	/**
+	 * 根据字符串转换成日期格式()
+	 *
+	 * @param strDate
+	 *            日期格式字符串(yyyy-MM-dd)
+	 *
+	 * @return java.util.Date
+	 */
+	public static Date parseDate(String strDate) {
+		Date date = null;
+		try {
+			date = getDateFormater().parse(strDate);
+		} catch (Exception ex) {
+			// System.err.println(ex.getMessage());
+		}
+		return date;
+	}
+
+	/**
+	 * 根据字符串转换成日期格式()
+	 *
+	 * @param strDate
+	 *            日期格式字符串(yyyy/MM/dd)
+	 *
+	 * @return java.util.Date
+	 */
+	public static Date parseDateEn(String strDate) {
+		Date date = null;
+		try {
+			date = getDateEnFormater().parse(strDate);
+		} catch (Exception ex) {
+			// System.err.println(ex.getMessage());
+		}
+		return date;
+	}
+
+	/**
+	 * 根据字符串转换成日期格式
+	 *
+	 * @param strDate
+	 *            日期格式字符串
+	 *
+	 * @return java.sql.Date
+	 */
+	public static java.sql.Date parseSqlDate(String strDate) {
+		return java.sql.Date.valueOf(strDate);
+	}
+
+	/**
+	 * 将Timestamp转换成java.sql.Date格式
+	 *
+	 * @param checkTime
+	 *            Timestamp
+	 *
+	 * @return java.sql.Date
+	 */
+	public static java.sql.Date parseSqlDate(Timestamp checkTime) {
+		String sDate = formatDate(checkTime);
+		return java.sql.Date.valueOf(sDate);
+	}
+
+	/**
+	 * 根据字符串转换成日期格式
+	 *
+	 * @param strDateTime
+	 *            日期时间格式字符串(yyyy-MM-dd HH:mm:ss)
+	 *
+	 * @return java.util.Date
+	 */
+	public static Date parseDateTime(String strDateTime) {
+		Date date = null;
+		if (strDateTime.length() < 19) {
+			strDateTime += ":00";
+		}
+		try {
+			date = getDateTimeFormater().parse(strDateTime);
+		} catch (Exception ex) {
+			System.err.println(ex.getMessage());
+		}
+		return date;
+	}
+
+	/**
+	 * 获取当前时间的前一个月时间
+	 *
+	 * @param strDateTime
+	 *            日期时间格式字符串
+	 *
+	 * @return java.util.Date
+	 */
+	public static Date parseLastMonthDate() {
+		GregorianCalendar gCal = new GregorianCalendar();
+		gCal.setTime(new Date());
+		gCal.add(GregorianCalendar.MONTH, -1);
+		return gCal.getTime();
+	}
+
+	/**
+	 * 获取当前时间的前一个月时间
+	 *
+	 * @param strDateTime
+	 *            日期时间格式字符串
+	 *
+	 * @return java.sql.Timestamp
+	 */
+	public static Timestamp parseLastMonthTimestamp() {
+		GregorianCalendar gCal = new GregorianCalendar();
+		gCal.setTime(new Date());
+		gCal.add(GregorianCalendar.MONTH, -1);
+		return new Timestamp(gCal.getTime().getTime());
+	}
+
+	/**
+	 * 获取当前时间的后几天时间
+	 *
+	 * @param strDateTime
+	 *            日期时间格式字符串
+	 *
+	 * @return java.sql.Timestamp
+	 */
+	public static Timestamp getNextTimestamp(Timestamp e, int i) {
+		if (e == null)
+			return new Timestamp(new Date().getTime());
+		GregorianCalendar gCal = new GregorianCalendar();
+		gCal.setTime(new Date(e.getTime() + i * 1000L * 60 * 60 * 24));
+		return new Timestamp(gCal.getTime().getTime());
+	}
+
+	/**
+	 * 获取当前时间的后几天时间的字符串((yyyy-MM-dd HH:mm:ss))
+	 *
+	 * @param e
+	 * @param i
+	 * @return
+	 */
+	public static String getNextTimeStr(Timestamp e, int i) {
+		if (e == null) {
+			e = new Timestamp(new Date().getTime());
+		}
+		GregorianCalendar gCal = new GregorianCalendar();
+		gCal.setTime(new Date(e.getTime() + i * 1000L * 60 * 60 * 24));
+		return formatDateTime(gCal.getTime());
+	}
+
+	/**
+	 * 将字符串转换成Timestamp格式
+	 *
+	 * @return Timestamp
+	 */
+	public static Timestamp parseTimestamp(String strTimestamp) {
+		if (strTimestamp == null)
+			return new Timestamp(new Date().getTime());
+		String datetime = getDateTimeStr(strTimestamp);
+		return new Timestamp(parseDateTime(datetime).getTime());
+	}
+
+	/**
+	 * 获取日期
+	 *
+	 * @param date
+	 *            指定日期
+	 * @param days
+	 *            经过的天数
+	 *
+	 * @return Date
+	 */
+	private static Date dateDayAdd(Date date, int days) {
+		long now = date.getTime() + days * MILLISECOND_PER_DAY;
+		return (new Date(now));
+	}
+
+	/**
+	 * 获得日期
+	 *
+	 * @param date
+	 *            指定日期
+	 * @param days
+	 *            经过的天数
+	 * @return
+	 * @author WuXiaoJun
+	 * @date 2014年12月29日
+	 */
+
+	private static Date dateDayDel(Date date, int days) {
+		long now = date.getTime() - days * MILLISECOND_PER_DAY;
+		return (new Date(now));
+	}
+
+	/**
+	 * 获取时间
+	 *
+	 * @param timestamp
+	 *            指定日期时间
+	 * @param minutes
+	 *            经过的分钟数
+	 *
+	 * @return Timestamp
+	 */
+	private static Date dateDateTimeAdd(Date time, int minutes) {
+		long now = time.getTime() + minutes * 1000 * 60;
+		return (new Date(now));
+	}
+
+	/**
+	 * 获取时间
+	 *
+	 * @param timestamp
+	 *            指定日期时间
+	 * @param minutes
+	 *            经过的分钟数
+	 *
+	 * @return Timestamp
+	 */
+	private static Timestamp dateDateTimeAdd(Timestamp timestamp, int minutes) {
+		long now = timestamp.getTime() + minutes * 1000 * 60;
+		return (new Timestamp(now));
+	}
+
+	/**
+	 * 根据当前时间以及传入的时间计算相差的分钟数。
+	 *
+	 * @param startDate
+	 *            开始时间
+	 * @param endDate
+	 *            结束时间
+	 *
+	 * @return long
+	 */
+	public static long getDiffMinu(Date startDate, Date endDate) {
+		long startTime = startDate.getTime();
+		long endTime = endDate.getTime();
+
+		long minu = (endTime - startTime) / (1000 * 60);
+		return minu;
+	}
+
+	/**
+	 * 根据当前时间以及传入的时间计算相差的分钟数。
+	 *
+	 * @param startDate
+	 *            开始时间
+	 * @param endDate
+	 *            结束时间
+	 *
+	 * @return long
+	 */
+	public static long getDiffMinu(Timestamp startDate, Timestamp endDate) {
+		long startTime = startDate.getTime();
+		long endTime = endDate.getTime();
+
+		long minu = (endTime - startTime) / (1000 * 60);
+		return minu;
+	}
+
+	/**
+	 * 获取日期
+	 *
+	 * @param date
+	 *            指定日期
+	 * @param months
+	 *            经过的月数
+	 *
+	 * @return Date
+	 */
+	private static Date dateMonthAdd(Date date, int months) {
+		GregorianCalendar cal = new GregorianCalendar();
+		cal.setTime(date);
+		int m = cal.get(GregorianCalendar.MONTH) + months;
+		if (m < 0)
+			m += -12;
+		cal.roll(GregorianCalendar.YEAR, m / 12);
+		cal.roll(GregorianCalendar.MONTH, months);
+		return cal.getTime();
+	}
+
+	/**
+	 * 根据字符串生成日期时间格式的字符串
+	 * 
+	 * @param str
+	 *            日期型字符串,不含时间
+	 * 
+	 * @return String
+	 */
+	private static String getDateTimeStr(String str) {
+		if (str.indexOf(" ") == -1)
+			str += "  00:00:00";
+		else if (str.lastIndexOf(":") == 13)
+			str += ":00";
+		return str;
+	}
+
+	/**
+	 * 本月有多少天
+	 * 
+	 * @return 天
+	 * 
+	 * @author
+	 */
+	public static int GetDaysOfMonth(int iYear, int Month) {
+		int days = 0;
+		switch (Month) {
+		case 1:
+			days = 31;
+			break;
+		case 2:
+			if (IsRuYear(iYear)) {
+				// 闰年多 1 天 即：2 月为 29 天
+				days = 29;
+			} else {
+				// --非闰年少1天 即：2 月为 28 天
+				days = 28;
+			}
+
+			break;
+		case 3:
+			days = 31;
+			break;
+		case 4:
+			days = 30;
+			break;
+		case 5:
+			days = 31;
+			break;
+		case 6:
+			days = 30;
+			break;
+		case 7:
+			days = 31;
+			break;
+		case 8:
+			days = 31;
+			break;
+		case 9:
+			days = 30;
+			break;
+		case 10:
+			days = 31;
+			break;
+		case 11:
+			days = 30;
+			break;
+		case 12:
+			days = 31;
+			break;
+		}
+
+		return days;
+
+	}
+
+	/**
+	 * 判断当前日期所属的年份是否是闰年，私有函数 是闰年：True ，不是闰年：False
+	 * 
+	 */
+	private static boolean IsRuYear(int year) {
+
+		if ((year % 400 == 0) || (year % 4 == 0 && year % 100 != 0)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * 得到星期
+	 * 
+	 */
+	public static String getWeekOfDate(Date dt) {
+		String[] weekDays = { "日", "一", "二", "三", "四", "五", "六" };
+		Calendar cal = Calendar.getInstance();
+
+		cal.setTime(dt);
+		int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
+		if (w < 0)
+			w = 0;
+		return weekDays[w];
+
+	}
+
+	/**
+	 * 按格式转换时间
+	 * 
+	 * @param format
+	 *            ，常用格式："yyMMdd","yyyyMMddhhmmss", "yyyy-MM-dd HH:mm:ss",
+	 *            "yyyy-MM-dd HH:mm:ss.SS"
+	 * 
+	 */
+	public static String convertDateFormat(Date date, String format) throws Exception {
+		String time = null;
+		try {
+			time = (new SimpleDateFormat(format)).format(date);
+		} catch (RuntimeException e) {
+			throw e;
+		}
+
+		return time;
+	}
+
+	/**
+	 * 
+	 * 根据输入的日期字符串返回相应的秒数
+	 * 
+	 * @param dateStr
+	 *            (yyyy-MM-dd)
+	 * @return
+	 * @author Adams Fum
+	 * @date 2014年9月21日
+	 */
+	public static long getSecondsOfDate(String dateStr) {
+		try {
+			Date date = getDateFormater().parse(dateStr);
+			Calendar ca = Calendar.getInstance();
+			ca.setTime(date);
+			return ca.getTimeInMillis() / 1000;
+		} catch (ParseException e) {
+			throw new IllegalArgumentException("输入的日期字符串：'" + dateStr + "'不合法！");
+		}
+	}
+
+	/**
+	 * 
+	 * 根据传入的日期时间字符串，返回相应的秒数
+	 * 
+	 * @param dateStr
+	 *            (yyyy-MM-dd HH:mm:ss)
+	 * @return
+	 * @author Adams Fum
+	 * @date 2014年9月21日
+	 */
+	public static long getSecondsOfDateTime(String dateStr) {
+		try {
+			Date date = getDateTimeFormater().parse(dateStr);
+			Calendar ca = Calendar.getInstance();
+			ca.setTime(date);
+			return ca.getTimeInMillis() / 1000;
+		} catch (ParseException e) {
+			throw new IllegalArgumentException("输入的日期时间字符串：'" + dateStr + "'不合法！");
+		}
+	}
+
+	/**
+	 * 
+	 * 根据传入的日期时，返回相应的秒数
+	 * 
+	 * @param dateTime
+	 * @return
+	 * @author Adams Fum
+	 * @date 2014年9月21日
+	 */
+	public static long getSecondsOfDateTime(Date dateTime) {
+		Calendar ca = Calendar.getInstance();
+		ca.setTime(dateTime);
+		return ca.getTimeInMillis() / 1000;
+	}
+
+	/**
+	 * 根据传入的秒数返回日期时间
+	 */
+	public static Date getDateFromSeconds(long seconds) {
+		Calendar ca = Calendar.getInstance();
+		ca.setTimeInMillis(seconds * 1000);
+		return ca.getTime();
+	}
+
+	/**
+	 * 根据传入的持续时间返回持续时间秒数
+	 * 
+	 * @param duration
+	 *            00:20:00
+	 * 
+	 * @return long 秒数
+	 */
+	public static long getSecondsFromDurTime(String duration) {
+		long seconds = 0;
+		String[] dur = duration.split(":");
+		seconds = new Long(dur[0]).longValue() * 3600 + new Long(dur[1]).longValue() * 60 + new Long(dur[2]).longValue();
+		return seconds;
+	}
+
+	/**
+	 * 格式化持续时间秒数为持续时间(hh:mm:ss或xx小时xx分xx秒)
+	 * 
+	 * @param durLong
+	 *            持续时间秒数
+	 * @param formatStr
+	 *            时间格式(hh:mm:ss)
+	 * @return xx小时xx分xx秒
+	 * @author Adams Fum
+	 * @date 2014年9月21日
+	 */
+	public static String formatDurTime(long durLong, String formatStr) {
+		String durTime = "";
+		if (formatStr == null || "".equals(formatStr))
+			formatStr = "hh:mm:ss";
+		String[] fmtArray = formatStr.split(":");
+		for (int i = 0; i < fmtArray.length; i++) {
+			if (fmtArray[i].equals("hh") || fmtArray[i].endsWith("小时")) {
+				long hl = durLong / 3600;
+				if (hl == 0)
+					continue;
+				durLong = durLong % 3600;
+				if (fmtArray[i].endsWith("小时"))
+					durTime += hl + fmtArray[i];
+				else
+					durTime += hl + ":";
+			} else if (fmtArray[i].equals("mm") || fmtArray[i].startsWith("分")) {
+				long ml = durLong / 60;
+				durLong = durLong % 60;
+				if (fmtArray[i].startsWith("分"))
+					durTime += ml + fmtArray[i];
+				else
+					durTime += ml + ":";
+			} else if (fmtArray[i].equals("ss") || fmtArray[i].equals("秒")) {
+				long sl = durLong;
+				if (fmtArray[i].equals("秒"))
+					durTime += sl + "秒";
+				else
+					durTime += sl;
+			}
+		}
+
+		return durTime;
+	}
+
+	/**
+	 * 得到指定日期的一天的的最后时刻23:59:59
+	 * 
+	 * @param date
+	 *            Date对象
+	 * @return java.util.Date 返回指定日期的最后时间 比如：2010-8-11 23:59:59
+	 */
+	public static Date getFinallyDate(Date date) {
+		SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
+
+		String fm = format.format(date);
+		fm += " 23:59:59";
+		try {
+			return DateUtils.parseDate(fm, new String[] { "yyyyMMdd HH:mm:ss" });
+		} catch (ParseException e1) {
+			return null;
+		}
+	}
+
+	/**
+	 * 得到指定日期的一天的开始时刻00:00:00
+	 * 
+	 * @param date
+	 *            Date对象
+	 * @return java.util.Date 返回指定日期的最开始时间 比如：2010-8-11 00:00:00
+	 */
+	public static Date getStartDate(Date date) {
+		SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
+
+		String fm = format.format(date);
+		fm += " 00:00:00";
+		try {
+			return DateUtils.parseDate(fm, new String[] { "yyyyMMdd HH:mm:ss" });
+		} catch (ParseException e1) {
+			return null;
+		}
+	}
+
+	/**
+	 * 将String型格式化,比如想要将2011-11-11格式化成2011年11月11日,就StringPattern("2011-11-11",
+	 * "yyyy-MM-dd","yyyy年MM月dd日").
+	 * 
+	 * @param date
+	 *            String 想要格式化的日期
+	 * @param oldPattern
+	 *            String 想要格式化的日期的现有格式
+	 * @param newPattern
+	 *            String 想要格式化成什么格式
+	 * @return String
+	 */
+	public static String StringPattern(String date, String oldPattern, String newPattern, Locale locale) {
+		if (date == null || oldPattern == null || newPattern == null) {
+			return null;
+		}
+		SimpleDateFormat oldSdf = new SimpleDateFormat(oldPattern); // 实例化模板对象
+		SimpleDateFormat newSdf = new SimpleDateFormat(newPattern, locale); // 实例化模板对象
+		Date d = null;
+		try {
+			d = oldSdf.parse(date); // 将给定的字符串中的日期提取出来
+		} catch (Exception e) { // 如果提供的字符串格式有错误，则进行异常处理
+			e.printStackTrace(); // 打印异常信息
+		}
+		return newSdf.format(d);
+	}
+
+	/**
+	 * 
+	 * 计算时间段
+	 * 
+	 * @param start
+	 * @return
+	 * @author Adams Fum
+	 * @date 2015年1月28日
+	 */
+	public static Long getStartTimeForSearch(int start) {
+		if (start == -1) {
+			return null;
+		}
+		long startTime = 0L;
+		switch (start) {
+		case 1:
+			Calendar todayCalendar = Calendar.getInstance();
+			Date now = new Date();
+			todayCalendar.setTime(now);
+			todayCalendar.set(Calendar.HOUR_OF_DAY, 0);
+			todayCalendar.set(Calendar.MINUTE, 0);
+			startTime = todayCalendar.getTime().getTime()/1000;
+			break;
+		case 2:
+			Calendar calendar = Calendar.getInstance();
+			calendar.add(Calendar.DATE, -3);
+			startTime = calendar.getTime().getTime()/1000;
+			break;
+		case 3:
+			Calendar weekCalendar = Calendar.getInstance();
+			weekCalendar.add(Calendar.DATE, -7);
+			startTime = weekCalendar.getTime().getTime()/1000;
+			break;
+		case 4:
+			Calendar week2Calendar = Calendar.getInstance();
+			week2Calendar.add(Calendar.DATE, -14);
+			startTime = week2Calendar.getTime().getTime()/1000;
+			break;
+		case 5:
+			Calendar monthCalendar = Calendar.getInstance();
+			monthCalendar.add(Calendar.MONTH, -1);
+			startTime = monthCalendar.getTime().getTime()/1000;
+			break;
+		case 6:
+			Calendar month3Calendar = Calendar.getInstance();
+			month3Calendar.add(Calendar.MONTH, -3);
+			startTime = month3Calendar.getTime().getTime()/1000;
+			break;
+		case 7:
+			Calendar month6Calendar = Calendar.getInstance();
+			month6Calendar.add(Calendar.MONTH, -6);
+			startTime = month6Calendar.getTime().getTime()/1000;
+			break;
+		case 8:
+			Calendar yearCalendar = Calendar.getInstance();
+			yearCalendar.add(Calendar.YEAR, -1);
+			startTime = yearCalendar.getTime().getTime()/1000;
+			break;
+		default:
+			startTime = 0L;
+			break;
+		}
+		return startTime;
+	}
+
+	/**
+	 * 得到本年的第一天
+	 * 
+	 * @return
+	 */
+	public static Date getYearFirstDayTime() {
+		Calendar calendar = Calendar.getInstance();
+		calendar.set(Calendar.DAY_OF_YEAR, calendar.getActualMinimum(Calendar.DAY_OF_YEAR));
+		
+		return parseDateTime(dateformater1.format(calendar.getTime())+ " 00:00:00");
+	}
+	
+	/**
+	 * 得到本年的最后一天
+	 * 
+	 * @return
+	 */
+	public static Date getYearLastDayTime() {
+		Calendar calendar = Calendar.getInstance();
+		calendar.set(Calendar.DAY_OF_YEAR, calendar.getMaximum(Calendar.DAY_OF_YEAR));
+		
+		return parseDateTime(dateformater1.format(calendar.getTime())+ " 23:59:59");
+	}
+	
+	/**
+	 * 获取两个时间相差天数
+	 * 
+	 * @param begin
+	 * @param end
+	 * @return
+	 * @throws ParseException     
+	 * @author ShiChunyun
+	 * @date 2016年7月13日 下午1:22:36
+	 */
+	public static int getDateSpace(Date begin, Date end){
+
+		Calendar calst = Calendar.getInstance();;
+		Calendar caled = Calendar.getInstance();
+
+		calst.setTime(begin);
+		caled.setTime(end);
+
+        //设置时间为0时   
+        calst.set(Calendar.HOUR_OF_DAY, 0);   
+        calst.set(Calendar.MINUTE, 0);   
+        calst.set(Calendar.SECOND, 0);   
+        caled.set(Calendar.HOUR_OF_DAY, 0);   
+        caled.set(Calendar.MINUTE, 0);   
+        caled.set(Calendar.SECOND, 0);   
+       
+        //得到两个日期相差的天数   
+        int days = ((int)(caled.getTime().getTime()/1000)-(int)(calst.getTime().getTime()/1000))/3600/24;   
+        
+        return days;   
+	}
+	
+	/**
+	 * 获取两个时间相差年数
+	 * 
+	 * @param begin
+	 * @param end
+	 * @return
+	 * @throws ParseException     
+	 * @author ShiChunyun
+	 * @date 2016年7月13日 下午1:22:36
+	 */
+	public static int getYearSpace(Date begin, Date end){
+
+		Calendar calst = Calendar.getInstance();
+		Calendar caled = Calendar.getInstance();
+
+		calst.setTime(begin);
+		caled.setTime(end);
+       
+		int calstYear = calst.get(Calendar.YEAR);
+		int caledYear = caled.get(Calendar.YEAR);
+		
+		return caledYear - calstYear;   
+	}
+
+	/**
+	 * 根据开始时间，结束时间获取中间的时间列表
+	 * @param dBegin	开始时间
+	 * @param dEnd		结束时间
+	 * @param dateType		时间类型：1,年	2，月	3，日
+	 * @param dateFormat	格式化时间类型：yyyy-MM-dd
+	 * @return
+	 */
+	public static List<String> findDates(Date dBegin, Date dEnd, String dateType, String dateFormat) {
+		List<String> lDate = new ArrayList<String>();
+		SimpleDateFormat sd = new SimpleDateFormat(dateFormat);
+		lDate.add(sd.format(dBegin));
+		// 使用给定的 Date 设置此 Calendar 的时间
+		Calendar calBegin = Calendar.getInstance();
+		calBegin.setTime(dBegin);
+		// 使用给定的 Date 设置此 Calendar 的时间
+		Calendar calEnd = Calendar.getInstance();
+		calEnd.setTime(dEnd);
+		// 测试此日期是否在指定日期之后
+		while (dEnd.after(calBegin.getTime())) {
+			// 根据日历的规则，为给定的日历字段添加或减去指定的时间量
+			if("1".equals(dateType)){
+				calBegin.add(Calendar.MONTH, 1);
+			}else{
+				calBegin.add(Calendar.DAY_OF_MONTH, 1);
+			}
+			lDate.add(sd.format(calBegin.getTime()));
+		}
+		return lDate;
+	}
+
+
+	/**
+	 * 根据开始时间，结束时间获取中间的时间列表 并且只要周期类的list
+	 * @param dBegin 开始时间
+	 * @param dEnd 结束时间
+	 * @param dateType 时间类型：1,日	2，周	3，月，4.年
+	 * @param planInterval 相隔多久
+	 * @param firstDay 周期开始时间
+	 * @param lastDay 周期结束时间
+	 * @return
+	 */
+	@SneakyThrows
+	public static List<String> findDates(String dBegin, String dEnd, String dateType, Integer planInterval, String firstDay, String lastDay) {
+		List<String> lDate = new ArrayList<String>();
+		SimpleDateFormat sd = new SimpleDateFormat(YYYY_MM_DD);
+		if(StringUtils.isBlank(dEnd)){
+			dEnd = lastDay;
+		}
+		lDate.add(dBegin.substring(0,10));
+		// 使用给定的 Date 设置此 Calendar 的时间
+		Calendar calBegin = Calendar.getInstance();
+		calBegin.setTime(sd.parse(dBegin));
+		// 使用给定的 Date 设置此 Calendar 的时间
+		Calendar calEnd = Calendar.getInstance();
+		calEnd.setTime(sd.parse(dEnd));
+		// 测试此日期是否在指定日期之后
+		if(StringUtils.isNotBlank(dateType)){
+			while (sd.parse(dEnd).after(calBegin.getTime())) {
+				// 根据日历的规则，为给定的日历字段添加或减去指定的时间量
+				if("1".equals(dateType)){
+					calBegin.add(Calendar.DAY_OF_MONTH, planInterval);
+				}else if("2".equals(dateType)){
+					calBegin.add(Calendar.DAY_OF_MONTH, planInterval*7);
+				}else if("3".equals(dateType)){
+					calBegin.add(Calendar.MONTH, planInterval);
+				}else if("4".equals(dateType)){
+					calBegin.add(Calendar.YEAR, planInterval);
+				}
+				if(sd.format(calBegin.getTime()).compareTo(dEnd)<=0 ){
+					lDate.add(sd.format(calBegin.getTime()));
+				}
+			}
+		}
+		lDate = lDate.stream().filter(itm -> itm.compareTo(firstDay)>=0 && itm.compareTo(lastDay)<=0).collect(Collectors.toList());
+		return lDate;
+	}
+
+
+
+
+
+
+	public static void main(String[] args) {
+
+	}
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/net/DateJsonValueProcessor.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/net/DateJsonValueProcessor.java
new file mode 100644
index 0000000..4d499af
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/net/DateJsonValueProcessor.java
@@ -0,0 +1,54 @@
+package com.rootcloud.common.net;
+
+import net.sf.json.JsonConfig;
+import net.sf.json.processors.JsonValueProcessor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.text.SimpleDateFormat;
+
+/**
+ * json日期转化工具类
+ * 
+ * @version 1.0
+ * @author WuXiaoJun
+ * @date 2015年9月22日 下午10:01:08
+ */
+public class DateJsonValueProcessor implements JsonValueProcessor {
+
+	private String format;
+	
+	public DateJsonValueProcessor() {
+	}
+	public DateJsonValueProcessor(String format) {
+		this.format = format;
+	}
+
+	public Object processArrayValue(Object value, JsonConfig jsonConfig) {
+		
+		return null;
+	}
+
+	public Object processObjectValue(String key, Object value,
+			JsonConfig jsonConfig) {
+		if (value == null) {
+			return "";
+		}
+		if (value instanceof java.sql.Timestamp) {
+			String str = new SimpleDateFormat(format)
+					.format((java.sql.Timestamp) value);
+			return str;
+		}
+		if (value instanceof java.util.Date) {
+			if(StringUtils.isNotBlank(format)){
+				String str = new SimpleDateFormat(format)
+				.format((java.sql.Timestamp) value);
+				return str;
+			}else{
+				Long time = ((java.util.Date) value).getTime();
+				return time;
+			}
+		}
+
+		return value.toString();
+	}
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/net/JsonHelper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/net/JsonHelper.java
new file mode 100644
index 0000000..47c368a
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/net/JsonHelper.java
@@ -0,0 +1,474 @@
+package com.rootcloud.common.net;
+
+import net.sf.ezmorph.object.DateMorpher;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import net.sf.json.JsonConfig;
+import net.sf.json.util.JSONUtils;
+import net.sf.json.util.PropertyFilter;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.*;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * JSON数据转换工具
+ * @version 1.0
+ * @author Adams Fum 
+ * @date 2015年7月31日 下午10:05:17
+ */
+public class JsonHelper {
+
+	private static final String ENCODING = "UTF-8";
+	
+	// 输出配置
+	static JsonConfig toJsonConfig = new JsonConfig();
+	// 输入配置
+	static JsonConfig getJsonConfig = new JsonConfig();
+	
+	static PropertyFilter filter = new PropertyFilter(){
+	    @SuppressWarnings("rawtypes")
+		public boolean apply(Object source, String name, Object value) {
+	        if ( JSONUtils.isNull( value )) {
+	            return true;   // 返回 true, 表示这个属性将被过滤掉
+	        }else if(JSONUtils.isString(value) && StringUtils.isBlank((String)value)){
+	        	return true;
+	        }else if(value instanceof String[] && ((String[])value).length == 0){
+	        	return true;
+	        }else if(value instanceof Collection && ((Collection)value).size() == 0){
+	        	return true;
+	        }
+	        return false;
+	    }
+	};
+	static{
+		getJsonConfig.setJsonPropertyFilter(filter);
+		toJsonConfig.setJsonPropertyFilter(filter);
+		toJsonConfig.registerJsonValueProcessor(Date.class, new DateJsonValueProcessor());  
+		JSONUtils.getMorpherRegistry().registerMorpher(new TimestampToDateMorpher());
+		String[] InputFormats = new String[] {"yyyy-MM-dd HH:mm:ss","yyyyMMddHHmmss","yyyy-MM-dd"};
+		JSONUtils.getMorpherRegistry().registerMorpher(new DateMorpher(InputFormats));
+	}
+
+    /**
+    *
+    * 从普通的Bean转换为字符串
+    * @param o
+    * @return
+    * @author Administrator
+    * @date  2014-1-9
+    */
+   public static String getJson(Object o){
+       JSONObject jo=JSONObject.fromObject(o,toJsonConfig);
+       return jo.toString();
+   }
+/**
+    *
+    * 从普通的Bean转换为Json对象
+    * @param o
+    * @return
+    * @author Administrator
+    * @date  2014-1-9
+    */
+   public static JSONObject getJsonObject(Object o){
+       JSONObject jo=JSONObject.fromObject(o,toJsonConfig);
+       return jo;
+   }
+   /**
+    * 从Java的列表转换为字符串
+    * 
+    * @param list
+    * @return
+    * @author Administrator
+    * @date  2014-1-9
+    */
+   public static <T> String getJson(List<T> list){
+       JSONArray ja=JSONArray.fromObject(list,toJsonConfig);
+       return ja.toString();
+   }
+   /**
+    * 从Java的列表转换为Json数组
+    * 
+    * @param list
+    * @return
+    * @author Administrator
+    * @date  2014-1-9
+    */
+   public static <T> JSONArray getJsonArray(List<T> list){
+       JSONArray ja=JSONArray.fromObject(list,toJsonConfig);
+       return ja;
+   }
+   /**
+    * 从Java对象数组转换为字符串
+    * @param arry
+    * @return
+    * @author Administrator
+    * @date  2014-1-9
+    */
+   public static String getJson(Object[] arry){
+       JSONArray ja=JSONArray.fromObject(arry,toJsonConfig);
+       return ja.toString();
+   }
+   /**
+    * 从Java对象数组转换为Json数组
+    * @param arry
+    * @return
+    * @author Administrator
+    * @date  2014-1-9
+    */
+   public static JSONArray getJsonArray(Object[] arry){
+       JSONArray ja=JSONArray.fromObject(arry,toJsonConfig);
+       return ja;
+   }
+   /**
+    * 从Json对象转换为Java对象
+    * @param jsonObject
+    * @return
+    * @author Administrator
+    * @date  2014-1-9
+    */
+   public static Object toBean(JSONObject jsonObject){
+       return JSONObject.toBean(jsonObject);
+   }
+   /**
+    * 从Json对象转换为Java对象
+    * 
+    * @param jsonObject
+    * @param beanClass
+    * @return
+    * @author Administrator
+    * @date  2014-1-9
+    */
+   public static <T> Object toBean(JSONObject jsonObject,Class<T> beanClass){
+       return JSONObject.toBean(jsonObject, beanClass);
+   }
+
+   /**
+   * 从json格式的字符串转换为Map对象
+   * @param s
+   * @return
+   * @author Administrator
+   * @date  2014-1-9
+   */
+  public static Object toBean(String s){
+      return JSONObject.fromObject(s, getJsonConfig);
+  }
+  
+   /**
+    * 从json格式的字符串转换为某个Bean
+    * 
+    * @param s
+    * @param cls
+    * @return
+    * @author Administrator
+    * @date  2014-1-9
+    */
+   public static <T> Object toBean(String s,Class<T> cls){
+       JSONObject jo=JSONObject.fromObject(s, getJsonConfig);
+       return JSONObject.toBean(jo, cls);
+   }
+   
+   /**
+    * 从json字符串格式转换为Collection
+    * 
+    * @param jsonArray
+    * @return
+    * @author Administrator
+    * @date  2014-1-9
+    */
+   @SuppressWarnings("unchecked")
+   public static <T> Collection<T> toCollection(String s){
+       return JSONArray.toCollection(JSONArray.fromObject(s,getJsonConfig));
+   }
+
+   /**
+    * 从json字符串格式转换为Collection
+    * 
+    * @param jsonArray
+    * @param cls
+    * @return
+    * @author Administrator
+    * @date  2014-1-9
+    */
+   @SuppressWarnings("unchecked")
+   public static <T> Collection<T> toCollection(String s,Class<T> cls){
+       return JSONArray.toCollection(JSONArray.fromObject(s,getJsonConfig),cls);
+   }
+
+   /**
+    * 从json数组格式转换为Collection
+    * 
+    * @param jsonArray
+    * @param cls
+    * @return
+    * @author Administrator
+    * @date  2014-1-9
+    */
+   @SuppressWarnings("unchecked")
+   public static <T> Collection<T> toCollection(JSONArray jsonArray,Class<T> cls){
+	   
+       return JSONArray.toCollection(jsonArray, cls);
+   }
+
+   /**
+    * 从json数组格式转换为Collection
+    * 
+    * @param jsonArray
+    * @return
+    * @author Administrator
+    * @date  2014-1-9
+    */
+   @SuppressWarnings("unchecked")
+   public static <T>Collection<T> toCollection(JSONArray jsonArray){
+       return JSONArray.toCollection(jsonArray);
+   }
+   /**
+    * 从json格式的字符串转换为JSONArray数组
+    * 
+    * @param s
+    * @return
+    * @author Administrator
+    * @date  2014-1-9
+    */
+   public static JSONArray getJsonArray(String s){
+       return JSONArray.fromObject(s,toJsonConfig);
+   }
+   
+   /**
+    * 从json格式的字符串转换为某类对象的数组
+    * 
+    * @param s
+    * @param cls
+    * @return
+    * @author Administrator
+    * @date  2014-1-9
+    */
+   @SuppressWarnings("rawtypes")
+   public static Object getArray(String s,Class cls){
+       JSONArray ja=JSONArray.fromObject(s,toJsonConfig);
+       return JSONArray.toArray(ja, cls);
+   }
+   
+   /**
+    * 读取json文件 
+    * 
+    * @param filePath 文件路+文件名称，如：d:\\json\myfile.json
+    * @return     
+    * @author Adams Fum
+    * @date  2014年12月16日
+    */
+	public static JSONObject readJsonObject(String filePath) {
+		BufferedReader reader = null;
+		// 返回值,使用StringBuffer
+		StringBuffer data = new StringBuffer();
+		try {
+			// 指定读取文件的编码格式，要和写入的格式一致，以免出现中文乱码
+			reader = new BufferedReader(new InputStreamReader(new FileInputStream(filePath),
+					ENCODING));
+			String str = null;
+			while ((str = reader.readLine()) != null) {
+				data.append(str);
+			}
+			
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			// 关闭文件流
+			if (reader != null) {
+				try {
+					reader.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+
+		return getJsonObject(data.toString());
+	}
+	
+	/**
+	 * 读取json文件  
+	 * 
+	 * @param filePath 文件路+文件名称，如：d:\\json\myfile.json
+	 * @param beanClass
+	 * @return     
+	 * @author Adams Fum
+	 * @date  2014年12月16日
+	 */
+	public static <T> Object readJsonToBean(String filePath,Class<T> beanClass) {
+		return toBean(readJsonObject(filePath), beanClass);
+	}
+
+	/**
+	 * 读取json文件  
+	 * 
+	 * @param filePath 文件路+文件名称，如：d:\\json\myfile.json
+	 * @return     
+	 * @author Adams Fum
+	 * @date  2014年12月16日
+	 */
+	public static Object readJsonToBean(String filePath) {
+		return toBean(readJsonObject(filePath));
+	}
+	
+   /**
+    * 读取json文件 
+    * 
+    * @param filePath 文件路+文件名称，如：d:\\json\myfile.json
+    * @return     
+    * @author Adams Fum
+    * @date  2014年12月16日
+    */
+	public static JSONArray readJsonArray(String filePath) {
+		BufferedReader reader = null;
+		// 返回值,使用StringBuffer
+		StringBuffer data = new StringBuffer();
+		try {
+			// 指定读取文件的编码格式，要和写入的格式一致，以免出现中文乱码
+			reader = new BufferedReader(new InputStreamReader(new FileInputStream(filePath),
+					ENCODING));
+			String str = null;
+			while ((str = reader.readLine()) != null) {
+				data.append(str);
+			}
+
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			// 关闭文件流
+			if (reader != null) {
+				try {
+					reader.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+
+		return getJsonArray(data.toString());
+	}
+	
+	/**
+	 * 读取json文件  
+	 * 
+	 * @param filePath 文件路+文件名称，如：d:\\json\myfile.json
+	 * @param beanClass
+	 * @return     
+	 * @author Adams Fum
+	 * @date  2014年12月16日
+	 */
+	public static <T> Collection<T> readJsonToCollection(String filePath,Class<T> beanClass) {
+		return toCollection(readJsonArray(filePath),beanClass);
+	}
+	
+	/**
+	 * 读取json文件  
+	 * 
+	 * @param filePath 文件路+文件名称，如：d:\\json\myfile.json
+	 * @return     
+	 * @author Adams Fum
+	 * @date  2014年12月16日
+	 */
+	public static <T> Collection<T> readJsonToCollection(String filePath) {
+		return toCollection(readJsonArray(filePath));
+	}
+	
+	/**
+	 * 给定路径与Json文件，存储到硬盘
+	 * 
+	 * @param path 文件路徑，不包括文件名
+	 * @param json
+	 * @param fileName 如：myfile.json  
+	 * @author Adams Fum
+	 * @date  2014年12月16日
+	 */
+	public static void writeJson(String path, Object json, String fileName) {
+		writeJson(path+fileName,json);
+	}
+
+	/**
+	 * 给定路径与Json文件，存储到硬盘
+	 *  
+	 * @param filePath 文件路+文件名称，如：d:\\json\myfile.json
+	 * @param json     
+	 * @author Adams Fum
+	 * @date  2014年12月16日
+	 */
+	public static void writeJson(String filePath, Object json) {
+		BufferedWriter writer = null;
+		File file = new File(filePath);
+		// 如果文件不存在，则新建一个
+		if (!file.exists()) {
+			try {
+				file.createNewFile();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		// 写入
+		try {
+			writer = new BufferedWriter(new FileWriter(file));
+			writer.write(json.toString());
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				if (writer != null) {
+					writer.close();
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+	
+	 /**
+	    * 读取json文件 
+	    * 
+	    * @param filePath 文件路+文件名称，如：d:\\json\myfile.json
+	    * @return     
+	    * @author Adams Fum
+	    * @date  2014年12月16日
+	    */
+		public static JSONObject readJsonToObject(InputStream is) {
+			BufferedReader reader = null;
+			// 返回值,使用StringBuffer
+			StringBuffer data = new StringBuffer();
+			try {
+				// 指定读取文件的编码格式，要和写入的格式一致，以免出现中文乱码
+				reader = new BufferedReader(new InputStreamReader(is,
+						ENCODING));
+				String str = null;
+				while ((str = reader.readLine()) != null) {
+					data.append(str);
+				}
+				
+			} catch (FileNotFoundException e) {
+				e.printStackTrace();
+			} catch (IOException e) {
+				e.printStackTrace();
+			} finally {
+				// 关闭文件流
+				if (reader != null) {
+					try {
+						reader.close();
+					} catch (IOException e) {
+						e.printStackTrace();
+					}
+				}
+			}
+
+			return getJsonObject(data.toString());
+		}
+		
+	public static void main(String [] args){
+		System.out.println(JsonHelper.readJsonObject("D://json/domain/loginPage_zh_TW.json"));
+		
+	}
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/net/NetworkHelper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/net/NetworkHelper.java
new file mode 100644
index 0000000..a0071b7
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/net/NetworkHelper.java
@@ -0,0 +1,296 @@
+package com.rootcloud.common.net;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.*;
+import java.util.Enumeration;
+
+/**
+ * 测试网络连通性 
+ *  
+ */  
+public class NetworkHelper {  
+    private static Logger log = LoggerFactory.getLogger(NetworkHelper.class);
+    private static NetworkHelper instance = null;  
+    public static synchronized NetworkHelper getInstance(){  
+        if(instance == null){  
+            instance = new NetworkHelper();  
+        }  
+        return instance;  
+          
+    }  
+  
+    /** 
+     * 测试本地能否ping ip 
+     *  
+     * @param ip 
+     * @return 
+     */  
+    public boolean isReachIp(String ip) {  
+        boolean isReach = false;  
+        try {  
+            InetAddress address = InetAddress.getByName(ip);// ping this IP  
+  
+            if (address instanceof java.net.Inet4Address) {  
+                log.info(ip + " is ipv4 address");  
+            } else if (address instanceof java.net.Inet6Address) {  
+                log.info(ip + " is ipv6 address");  
+            } else {  
+                log.info(ip + " is unrecongized");  
+            }  
+            if (address.isReachable(5000)) {  
+                isReach = true;  
+                log.info("SUCCESS - ping " + ip  
+                        + " with no interface specified");  
+            } else {  
+                isReach = false;  
+                log.info("FAILURE - ping " + ip  
+                        + " with no interface specified");  
+            }  
+        } catch (Exception e) {  
+            log.error("error occurs:" + e.getMessage());  
+        }  
+        return isReach;  
+    }  
+  
+    /** 
+     * 测试本地所有的网卡地址都能ping通 ip 
+     *  
+     * @param ip 
+     * @return 
+     */  
+    public  boolean isReachNetworkInterfaces(String ip) {  
+        boolean isReach = false;  
+        try {  
+            InetAddress address = InetAddress.getByName(ip);// ping this IP  
+  
+            if (address instanceof java.net.Inet4Address) {  
+                log.info(ip + " is ipv4 address");  
+            } else if (address instanceof java.net.Inet6Address) {  
+                log.info(ip + " is ipv6 address");  
+            } else {  
+                log.info(ip + " is unrecongized");  
+            }  
+            if (address.isReachable(5000)) {  
+                isReach = true;  
+                log.info("SUCCESS - ping " + ip  
+                        + " with no interface specified");  
+            } else {  
+                isReach = false;  
+                log.info("FAILURE - ping " + ip  
+                        + " with no interface specified");  
+            }  
+            if (isReach) {  
+                log.info("-------Trying different interfaces--------");  
+                Enumeration<NetworkInterface> netInterfaces = NetworkInterface  
+                        .getNetworkInterfaces();  
+                while (netInterfaces.hasMoreElements()) {  
+                    NetworkInterface ni = netInterfaces.nextElement();  
+                    log.info("Checking interface, DisplayName:"  
+                            + ni.getDisplayName() + ", Name:" + ni.getName());  
+                    if (address.isReachable(ni, 0, 5000)) {  
+                        isReach = true;  
+                        log.info("SUCCESS - ping " + ip);  
+                    } else {  
+                        isReach = false;  
+                        log.info("FAILURE - ping " + ip);  
+                    }  
+                    Enumeration<InetAddress> ips = ni.getInetAddresses();  
+                    while (ips.hasMoreElements()) {  
+                        log.info("IP: " + ips.nextElement().getHostAddress());  
+                    }  
+                    log.info("-----------------check now NetworkInterface is done--------------------------");  
+                }  
+            }  
+        } catch (Exception e) {  
+            log.error("error occurs:" + e.getMessage());  
+        }  
+        return isReach;  
+    }  
+  
+    /** 
+     * 获取能与远程主机指定端口建立连接的本机ip地址 
+     * @param remoteAddr 
+     * @param port 
+     * @return 
+     */  
+    public  String getReachableIP(InetAddress remoteAddr, int port) {  
+        String retIP = null;  
+        Enumeration<NetworkInterface> netInterfaces;  
+        try {  
+            netInterfaces = NetworkInterface.getNetworkInterfaces();  
+            while (netInterfaces.hasMoreElements()) {  
+                NetworkInterface ni = netInterfaces.nextElement();  
+                Enumeration<InetAddress> localAddrs = ni.getInetAddresses();  
+                while (localAddrs.hasMoreElements()) {  
+                    InetAddress localAddr = localAddrs.nextElement();  
+                    if (isReachable(localAddr, remoteAddr, port, 5000)) {  
+                        retIP = localAddr.getHostAddress();  
+                        break;  
+                    }  
+                }  
+            }  
+        } catch (SocketException e) {  
+            log.error("Error occurred while listing all the local network addresses:"  
+                    + e.getMessage());  
+        }  
+        if (retIP == null) {  
+            log.info("NULL reachable local IP is found!");  
+        } else {  
+            log.info("Reachable local IP is found, it is " + retIP);  
+        }  
+        return retIP;  
+    }  
+    /** 
+     * 获取能与远程主机指定端口建立连接的本机ip地址 
+     * @param remoteIp 
+     * @param port 
+     * @return 
+     */  
+    public  String getReachableIP(String remoteIp, int port) {  
+  
+        String retIP = null;  
+        InetAddress remoteAddr = null;  
+        Enumeration<NetworkInterface> netInterfaces;  
+        try {  
+            remoteAddr = InetAddress.getByName(remoteIp);  
+            netInterfaces = NetworkInterface.getNetworkInterfaces();  
+            while (netInterfaces.hasMoreElements()) {  
+                NetworkInterface ni = netInterfaces.nextElement();  
+                Enumeration<InetAddress> localAddrs = ni.getInetAddresses();  
+                while (localAddrs.hasMoreElements()) {  
+                    InetAddress localAddr = localAddrs.nextElement();  
+                    if (isReachable(localAddr, remoteAddr, port, 5000)) {  
+                        retIP = localAddr.getHostAddress();  
+                        break;  
+                    }  
+                }  
+            }  
+        } catch (UnknownHostException e) {  
+            log.error("Error occurred while listing all the local network addresses:"+ e.getMessage());  
+        }catch (SocketException e) {  
+            log.error("Error occurred while listing all the local network addresses:"+ e.getMessage());  
+        }  
+        if (retIP == null) {  
+            log.info("NULL reachable local IP is found!");  
+        } else {  
+            log.info("Reachable local IP is found, it is " + retIP);  
+        }  
+        return retIP;  
+    }  
+    /** 
+     * 测试localInetAddr能否与远程的主机指定端口建立连接相连 
+     *  
+     * @param localInetAddr 
+     * @param remoteInetAddr 
+     * @param port 
+     * @param timeout 
+     * @return 
+     */  
+    public  boolean isReachable(InetAddress localInetAddr,  
+            InetAddress remoteInetAddr, int port, int timeout) {  
+        boolean isReachable = false;  
+        Socket socket = null;  
+        try {  
+            socket = new Socket();  
+            // 端口号设置为 0 表示在本地挑选一个可用端口进行连接  
+            SocketAddress localSocketAddr = new InetSocketAddress(  
+                    localInetAddr, 0);  
+            socket.bind(localSocketAddr);  
+            InetSocketAddress endpointSocketAddr = new InetSocketAddress(  
+                    remoteInetAddr, port);  
+            socket.connect(endpointSocketAddr, timeout);  
+            log.info("SUCCESS - connection established! Local: "  
+                    + localInetAddr.getHostAddress() + " remote: "  
+                    + remoteInetAddr.getHostAddress() + " port" + port);  
+            isReachable = true;  
+        } catch (IOException e) {  
+            log.error("FAILRE - CAN not connect! Local: "  
+                    + localInetAddr.getHostAddress() + " remote: "  
+                    + remoteInetAddr.getHostAddress() + " port" + port);  
+        } finally {  
+            if (socket != null) {  
+                try {  
+                    socket.close();  
+                } catch (IOException e) {  
+                    log.error("Error occurred while closing socket:"  
+                            + e.getMessage());  
+                }  
+            }  
+        }  
+        return isReachable;  
+    }  
+  
+    /** 
+     * 测试localIp能否与远程的主机指定端口建立连接相连 
+     *  
+     * @param localIp 
+     * @param remoteIp 
+     * @param port 
+     * @param timeout 
+     * @return 
+     */  
+    public  boolean isReachable(String localIp, String remoteIp,  
+            int port, int timeout) {  
+        boolean isReachable = false;  
+        Socket socket = null;  
+        InetAddress localInetAddr = null;  
+        InetAddress remoteInetAddr = null;  
+        try {  
+            localInetAddr = InetAddress.getByName(localIp);  
+            remoteInetAddr = InetAddress.getByName(remoteIp);  
+            socket = new Socket();  
+            // 端口号设置为 0 表示在本地挑选一个可用端口进行连接  
+            SocketAddress localSocketAddr = new InetSocketAddress(  
+                    localInetAddr, 0);  
+            socket.bind(localSocketAddr);  
+            InetSocketAddress endpointSocketAddr = new InetSocketAddress(  
+                    remoteInetAddr, port);  
+            socket.connect(endpointSocketAddr, timeout);  
+            log.info("SUCCESS - connection established! Local: "  
+                    + localInetAddr.getHostAddress() + " remote: "  
+                    + remoteInetAddr.getHostAddress() + " port" + port);  
+            isReachable = true;  
+        } catch (IOException e) {  
+            log.error("FAILRE - CAN not connect! Local: "  
+                    + localInetAddr.getHostAddress() + " remote: "  
+                    + remoteInetAddr.getHostAddress() + " port" + port);  
+        } finally {  
+            if (socket != null) {  
+                try {  
+                    socket.close();  
+                } catch (IOException e) {  
+                    log.error("Error occurred while closing socket:"  
+                            + e.getMessage());  
+                }  
+            }  
+        }  
+        return isReachable;  
+    }  
+  
+    public static void main(String[] args) {  
+          if(NetworkHelper.getInstance().isReachIp("61.133.215.5")){  
+              System.out.println("=======本机可以ping通ip："+"61.133.215.5");
+          }  
+          else{  
+        	  System.out.println("=======本机ping不通ip："+"61.133.215.5");
+          }  
+          if(NetworkHelper.getInstance().isReachNetworkInterfaces("61.133.215.5")){  
+        	  System.out.println("=======本机所有网卡可以ping通ip："+"61.133.215.5");
+          }  
+          else{  
+        	  System.out.println("=======本机所有网卡ping不通ip："+"61.133.215.5");
+          }  
+          String localIp = NetworkHelper.getInstance().getReachableIP("61.133.215.5",50000);  
+          if(!StringUtils.isBlank(localIp)){
+        	  System.out.println("=======本机可以与ip："+"61.133.215.5"+",port:"+50000+"建立连接的IP："+localIp);
+          }  
+          else{  
+        	  System.out.println("=======本机不能与ip："+"61.133.215.5"+",port:"+50000+"建立连接的IP");
+          }  
+    }  
+  
+}  
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/net/TimestampToDateMorpher.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/net/TimestampToDateMorpher.java
new file mode 100644
index 0000000..619f869
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/net/TimestampToDateMorpher.java
@@ -0,0 +1,31 @@
+package com.rootcloud.common.net;
+
+import net.sf.ezmorph.object.AbstractObjectMorpher;
+
+import java.util.Date;
+
+/** 
+ * @version 1.0
+ * @author WuXiaoJun 
+ * @date 2015年9月23日 上午11:51:54  
+ */
+
+public class TimestampToDateMorpher extends AbstractObjectMorpher {  
+	  
+    public Object morph(Object value) {  
+        if( value != null){  
+            return new Date(Long.parseLong(String.valueOf(value)));  
+        }     
+        return null;  
+    }  
+  
+    @Override  
+    public Class<Date> morphsTo() {  
+        return Date.class;  
+    }  
+      
+    @SuppressWarnings("rawtypes")
+	public boolean supports(Class clazz ){  
+       return Long.class.isAssignableFrom( clazz );  
+    }  
+}  
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/CommonUtils.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/CommonUtils.java
new file mode 100644
index 0000000..691c9b5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/CommonUtils.java
@@ -0,0 +1,148 @@
+package com.rootcloud.common.util;
+
+import com.rootcloud.common.enums.ServicePlanEnums;
+import com.rootcloud.domain.entity.sp.ServicePlanEntity;
+import jline.internal.Log;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * @Auther poppy.lu
+ * @Date 2023/01/10
+ * @Version 1.0
+ * @Describe:
+ */
+public class CommonUtils {
+
+    /**
+     * 生成固定长度随机码
+     *
+     * @param n 长度
+     */
+
+    public static String getRandom(long n) {
+        long min = 1, max = 9;
+        for (int i = 1; i < n; i++) {
+            min *= 10;
+            max *= 10;
+        }
+        long rangeLong = (((long) (new Random().nextDouble() * (max - min)))) + min;
+        return String.valueOf(rangeLong);
+    }
+
+    //length用户要求产生字符串的长度
+    public static String getRandomString(int length) {
+        String str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+        Random random = new Random();
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < length; i++) {
+            int number = random.nextInt(62);
+            sb.append(str.charAt(number));
+        }
+        return sb.toString();
+    }
+
+
+    public static int get_random(int start, int end) {
+        return (int) (Math.random() * (end - start + 1) + start);
+    }
+
+
+    /**
+     * Object转BigDecimal类型-王雷-2018年5月14日09:56:26
+     *
+     * @param value 要转的object类型
+     * @return 转成的BigDecimal类型数据
+     */
+    public static BigDecimal getBigDecimal(Object value) {
+        BigDecimal ret = null;
+        if (value != null) {
+            if (value instanceof BigDecimal) {
+                ret = (BigDecimal) value;
+            } else if (value instanceof String) {
+                ret = new BigDecimal((String) value);
+            } else if (value instanceof BigInteger) {
+                ret = new BigDecimal((BigInteger) value);
+            } else if (value instanceof Number) {
+                ret = new BigDecimal(((Number) value).doubleValue());
+            } else {
+                throw new ClassCastException("Not possible to coerce [" + value + "] from class " + value.getClass() + " into a BigDecimal.");
+            }
+        }
+        return ret;
+    }
+
+
+    public static String uuid() {
+        return UUID.randomUUID().toString().replaceAll("-", "");
+    }
+
+
+    /**
+     * 获取下一个周期时间
+     *
+     * @param servicePlan
+     * @return
+     */
+    public String getNextDateByStartDateNew(ServicePlanEntity servicePlan) {
+        Date endDate = null;
+        try {
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+            //获取当前日期
+            String current = df.format(new Date());
+            Date currentDate = df.parse(current);
+            //获取计划开始日期
+            endDate = df.parse(servicePlan.getPlanStartTime());
+            Integer planCycle = servicePlan.getPlanCycle();
+            Integer planInterval = servicePlan.getPlanInterval();
+            do {
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(endDate);
+                //日
+                if (ServicePlanEnums.PlanCycle.DAY.getCode().equals(planCycle)) {
+                    calendar.add(Calendar.DATE, planInterval);
+                }
+                //周
+                if (ServicePlanEnums.PlanCycle.WEEK.getCode().equals(planCycle)) {
+                    calendar.add(Calendar.DATE, 7 * planInterval);
+                }
+                //月
+                if (ServicePlanEnums.PlanCycle.MONTH.getCode().equals(planCycle)) {
+                    calendar.add(Calendar.MONTH, planInterval);
+                }
+                //年
+                if (ServicePlanEnums.PlanCycle.YEAR.getCode().equals(planCycle)) {
+                    calendar.add(Calendar.YEAR, planInterval);
+                }
+                endDate = calendar.getTime();
+                System.out.println("下一周期时间：" + df.format(endDate));
+            } while (endDate.getTime()<=currentDate.getTime());
+            return df.format(endDate);
+        } catch (Exception e) {
+            Log.error("获取数据失败，失败原因：" + e.getMessage());
+            return null;
+        }
+
+    }
+
+
+    public static void main(String[] args) {
+        CommonUtils commonUtils = new CommonUtils();
+        ServicePlanEntity servicePlan = new ServicePlanEntity();
+        servicePlan.setPlanStartTime("2023-02-04");
+        servicePlan.setPlanCycle(1);
+        servicePlan.setPlanInterval(3);
+        String endData = commonUtils.getNextDateByStartDateNew(servicePlan);
+        System.out.println(endData);
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/DateConstant.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/DateConstant.java
new file mode 100644
index 0000000..6a5b7ad
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/DateConstant.java
@@ -0,0 +1,43 @@
+package com.rootcloud.common.util;
+
+public class DateConstant {
+	/**
+	 * 中文日期格式
+	 */
+	public static final String FMT_CH_DATE = "yyyy-MM-dd";
+
+	/**
+	 * 中文时间格式
+	 */
+	public static final String FMT_CH_TIME = "HH:mm:ss";
+
+	/**
+	 * 中文日期时间格式
+	 */
+	public static final String FMT_CH_DATETIME = "yyyy-MM-dd HH:mm:ss";
+
+	/**
+	 * 中文日期时间格式；带毫秒
+	 */
+	public static final String FMT_CH_DATETIMEMS = "yyyy-MM-dd HH:mm:ss.sss";
+
+	/**
+	 * yyyyMMddHHmmss日期时间格式
+	 */
+	public static final String FMT_JOIN_DATETIME = "yyyyMMddHHmmss";
+
+	/**
+	 * yyyyMMddHHmmss日期格式
+	 */
+	public static final String FMT_JOIN_DATE = "yyyyMMdd";
+	
+	/**
+	 * 中文年月格式
+	 */
+	public static final String FMT_CH_YEARMON = "yyyy-MM";
+	
+	/**
+	 * 中文年格式
+	 */
+	public static final String FMT_CH_YEAR = "yyyy";
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/DateUtils.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/DateUtils.java
new file mode 100644
index 0000000..bcffb71
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/DateUtils.java
@@ -0,0 +1,525 @@
+package com.rootcloud.common.util;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+
+/**
+ * 2.0系统中的时间转换工具类
+ * */
+public class DateUtils {
+
+    public static final String C_DATE_DIVISION = "-";
+
+    public static final String C_TIME_PATTON_DEFAULT = "yyyy-MM-dd HH:mm:ss";
+
+    public static final String C_DATE_PATTON_DEFAULT = "yyyy-MM-dd";
+
+    public static final String C_DATA_PATTON_YYYYMMDD = "yyyyMMdd";
+
+    public static final String C_TIME_PATTON_HHMMSS = "HH:mm:ss";
+
+    public static final int C_ONE_SECOND = 1000;
+
+    public static final int C_ONE_MINUTE = 60 * C_ONE_SECOND;
+
+    public static final int C_ONE_HOUR = 60 * C_ONE_MINUTE;
+
+    public static final long C_ONE_DAY = 24 * C_ONE_HOUR;
+
+    /**
+     * 按指定类型将字符类型转为日期类型
+     *
+     * @param strFormat
+     * @param dateValue
+     * @return Date
+     */
+    public static Date parseDate(String strFormat, String dateValue) {
+        strFormat = StringUtils.trimToNull(strFormat);
+        dateValue = StringUtils.trimToNull(dateValue);
+
+        if (dateValue == null)
+            return null;
+
+        if (strFormat == null) {
+            strFormat = C_TIME_PATTON_DEFAULT;
+        }
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat(strFormat);
+        Date newDate = null;
+
+        try {
+            newDate = dateFormat.parse(dateValue);
+        } catch (ParseException pe) {
+            newDate = null;
+        }
+
+        return newDate;
+    }
+
+    /**
+     * 获取两日期的天数差
+     *
+     * @param fDate
+     *            开始时间
+     * @param oDate
+     *            结束时间
+     * @return 天数差
+     */
+    public static int daysOfTwo(Date fDate, Date oDate) {
+
+        Calendar aCalendar = Calendar.getInstance();
+
+        aCalendar.setTime(fDate);
+
+        int day1 = aCalendar.get(Calendar.DAY_OF_YEAR);
+
+        aCalendar.setTime(oDate);
+
+        int day2 = aCalendar.get(Calendar.DAY_OF_YEAR);
+
+        return day2 - day1;
+
+    }
+
+    /**
+     * 获取时间的日
+     *
+     * @param nowDate
+     * @return
+     */
+    public static int getDay(Date nowDate) {
+        Calendar nowCalendar = Calendar.getInstance();
+        nowCalendar.setTime(nowDate);
+        return nowCalendar.get(Calendar.DATE);
+    }
+
+    /**
+     * 获取本周的开始时间
+     *
+     * @return
+     */
+    public static Date getBeginDayOfWeek(Date nowdate) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(nowdate);
+        int dayofweek = cal.get(Calendar.DAY_OF_WEEK);
+        if (dayofweek == 1) {
+            dayofweek += 7;
+        }
+        cal.add(Calendar.DATE, 2 - dayofweek);
+        return cal.getTime();
+    }
+
+    /**
+     * 获取本周的结束时间
+     *
+     * @return
+     */
+    public static Date getEndDayOfWeek(Date nowdate) {
+        return addDays(getBeginDayOfWeek(nowdate), 6);
+    }
+
+    /**
+     * 将Date类型的日期转换为指定格式的字符串
+     *
+     * @param aTs_Datetime
+     * @param as_Pattern
+     * @return
+     */
+    public static String format(Date aTs_Datetime, String as_Pattern) {
+        if (aTs_Datetime == null || as_Pattern == null)
+            return null;
+
+        SimpleDateFormat dateFromat = new SimpleDateFormat();
+        dateFromat.applyPattern(as_Pattern);
+
+        return dateFromat.format(aTs_Datetime);
+    }
+
+    /**
+     * 取得指定日期N天后的日期
+     *
+     * @param date
+     * @param days
+     * @return
+     */
+    public static Date addDays(Date date, int days) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+
+        cal.add(Calendar.DATE, days);
+
+        return cal.getTime();
+    }
+
+    /**
+     * 获取时间的月份
+     *
+     * @param nowDate
+     * @return
+     */
+    public static int getMonth(Date nowDate) {
+        int re = 0;
+        Calendar nowCalendar = Calendar.getInstance();
+        nowCalendar.setTime(nowDate);
+
+        re = nowCalendar.get(2) + 1;
+        return re;
+    }
+
+    /**
+     * 获取时间的年份
+     *
+     * @param nowDate
+     * @return
+     */
+    public static int getYear(Date nowDate) {
+        int re = 0;
+        Calendar nowCalendar = Calendar.getInstance();
+        nowCalendar.setTime(nowDate);
+        re = nowCalendar.get(1);
+        return re;
+    }
+
+    /***
+     *
+     * @Title: getCurrentMonthDays
+     * @Description: 获取当月天数
+     * @Author: gw_renwm2
+     * @Datetime: Mar 9, 2017 2:51:19 PM
+     * @param year		年；4位数
+     * @param month	月；2位数
+     * @return
+     */
+    public static int getCurrentMonthDays(String year, String month) {
+        Date date = DateUtils.parseDate(DateConstant.FMT_CH_YEARMON, year+"-"+month);
+        return getCurrentMonthDays(date);
+    }
+
+    /***
+     *
+     * @Title: getCurrentMonthDays
+     * @Description: 获取当月天数
+     * @Author: gw_renwm2
+     * @Datetime: Mar 9, 2017 2:51:19 PM
+     * @param date		日期
+     * @return
+     */
+    public static int getCurrentMonthDays(Date date) {
+        if (date == null) {
+            return 0;
+        }
+
+        Calendar c = Calendar.getInstance();
+        c.setTime(date);
+        c.set(Calendar.DATE, 1);
+        c.roll(Calendar.DATE, -1);
+        return c.get(Calendar.DATE);
+    }
+
+    /***
+     * 获取当前月的最后一天
+     * params:年月（2017-02）
+     * return:本月的最后一天日期（2017-02-28）
+     */
+    public static String getCurMonLastDay(String yearMonth) {
+        SimpleDateFormat sdf = new SimpleDateFormat(DateConstant.FMT_CH_DATE);
+        Calendar ca = Calendar.getInstance();
+        String d = yearMonth;
+        ca.setTime(DateUtils.parseDate(DateConstant.FMT_CH_YEARMON, d));
+        ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));
+        String last = sdf.format(ca.getTime());
+        return last;
+    }
+
+    /**
+     *
+     * @Title: getTheMonLastDay
+     * @Description: 获取某月的最后一天，如果是当年当月，则是当天
+     * @param year
+     * @param mon
+     * @return
+     */
+    public static int getTheMonLastDay(String year, String month) {
+        SimpleDateFormat sdf = new SimpleDateFormat(DateConstant.FMT_CH_DATE);
+        String strNow = sdf.format(new Date());
+        String curYear = strNow.substring(0,4);
+        String curMonth = strNow.substring(5,7);
+
+        if(curYear.equals(year) && curMonth.equals(month)) {
+            String curDay = strNow.substring(8);
+            return Integer.parseInt(curDay);
+        } else {
+            return getCurrentMonthDays(year, month);
+        }
+    }
+
+    /**
+     * 获取指定年月的最后一天；如果是当前月，那么取当前日期
+     */
+    public static int getLastDay(int year, int month) {
+        return getTheMonLastDay(String.valueOf(year), String.valueOf(month));
+    }
+
+    /**
+     *
+     * @Title: getTheYearLastMon
+     * @Description: 获取某年的最后一月，如果是当年，则是当月
+     * @param year
+     * @param mon
+     * @return
+     */
+    public static int getTheYearLastMon(String year) {
+        SimpleDateFormat sdf = new SimpleDateFormat(DateConstant.FMT_CH_DATE);
+        String strNow = sdf.format(new Date());
+        String curYear = strNow.substring(0,4);
+        String curMonth = strNow.substring(5,7);
+
+        if(curYear.equals(year)) {
+            return Integer.parseInt(curMonth);
+        } else {
+            return 12;
+        }
+    }
+
+    /**
+     * 获得指定季度月份
+     * @param quarter
+     * @return
+     */
+    public static Integer[] getQuarterMonths(int quarter){
+
+        if( 1==quarter ){
+            return new Integer[]{1,2,3};
+        }else if( 2==quarter ){
+            return new Integer[]{4,5,6};
+        }else if( 3==quarter ){
+            return new Integer[]{7,8,9};
+        }else{
+            return new Integer[]{10,11,12};
+        }
+    }
+
+    /**
+     * 获得指定周开始日期和结束日期
+     * 需要注意跨年和跨月
+     * @param quarter
+     * @return
+     */
+    public static List<Map<String,Object >> getWeekDays(int year, int week){
+        List<Map<String,Object >> result = new ArrayList<Map<String,Object >>();
+
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+        Calendar cal=Calendar.getInstance();
+
+        // 设置每周的开始日期
+        cal.setFirstDayOfWeek(Calendar.MONDAY);
+
+
+        cal.set(Calendar.YEAR, year);
+        cal.set(Calendar.WEEK_OF_YEAR, week);
+
+        cal.set(Calendar.DAY_OF_WEEK, cal.getFirstDayOfWeek());
+        String beginDate = sdf.format(cal.getTime());
+        int beginYear = cal.get(Calendar.YEAR);
+        int beginMonth = cal.get(Calendar.MONTH)+1;
+        int beginDay = cal.get(Calendar.DAY_OF_MONTH);
+        int beginLastDay = 0 ;
+
+
+
+        cal.add(Calendar.DAY_OF_WEEK, 6);
+        String endDate = sdf.format(cal.getTime());
+        int endYear = cal.get(Calendar.YEAR);
+        int endMonth = cal.get(Calendar.MONTH)+1;
+        int endDay = cal.get(Calendar.DAY_OF_MONTH);
+
+        Integer[] beginDays = null ;
+        Integer[] endDays = null ;
+        if( beginMonth!=endMonth ){//跨月
+            beginLastDay = getLastDay(beginYear,beginMonth) ;
+            beginDays = new Integer[beginLastDay-beginDay+1];
+            int j=0;
+            for(int i= beginDay;i<=beginLastDay; i++ ){
+                beginDays[j]=i;
+                j++;
+            }
+
+            endDays = new Integer[endDay];
+            for(int i= 1;i<=endDay; i++ ){
+                endDays[i-1] = i;
+            }
+
+        }
+
+        if( beginMonth!=endMonth ){//跨月
+            Map<String,Object> beginData = new HashMap<String, Object>();
+            beginData.put("year", beginYear);
+            beginData.put("month", beginMonth);
+            beginData.put("day", beginDays);
+            result.add(beginData);
+
+            Map<String,Object> endData = new HashMap<String, Object>();
+            endData.put("year", endYear);
+            endData.put("month", endMonth);
+            endData.put("day", endDays);
+            result.add(endData);
+        }else{
+            beginDays = new Integer[endDay-beginDay+1];
+            int j = 0;
+            for(int i= beginDay;i<=endDay; i++ ){
+                beginDays[j]=i;
+                j++;
+            }
+
+            Map<String,Object> beginData = new HashMap<String, Object>();
+            beginData.put("year", beginYear);
+            beginData.put("month", beginMonth);
+            beginData.put("day", beginDays);
+            result.add(beginData);
+        }
+        System.out.println( result );
+        System.out.println( beginDate );
+        System.out.println( endDate );
+
+        return result ;
+    }
+
+    /**
+     * 根据年份和月份获得当前月的开始日期
+     *
+     * @param year
+     *            年份
+     * @param month
+     *            月份
+     *
+     * @return 所属月份的开始日期(java.util.Date)
+     */
+    public static Date getMonthBegin(int year, int month) {
+        if (month <= 0 || month > 12)
+            throw new IllegalArgumentException("month must from 1 to 12");
+        GregorianCalendar gCal = new GregorianCalendar(year, month - 1, 1);
+        return gCal.getTime();
+    }
+    /**
+     * 根据日期获得当前月的结束日期
+     *
+     * @param month
+     *            日期
+     *
+     * @return 所属月份的结束日期(java.util.Date)
+     */
+    public static Date getMonthEnd(Date month) {
+        GregorianCalendar ca = new GregorianCalendar();
+        ca.setTime(month);
+        int year = ca.get(GregorianCalendar.YEAR);
+        int mon = ca.get(GregorianCalendar.MONTH);
+        int lastDay = ca.getActualMaximum(GregorianCalendar.DAY_OF_MONTH);
+        GregorianCalendar gCal = new GregorianCalendar(year, mon, lastDay);
+        return gCal.getTime();
+    }
+
+    /**
+     * 根据年份和月份获得当前月的结束日期
+     *
+     * @param year
+     *            年份
+     * @param month
+     *            月份
+     *
+     * @return 所属月份的结束日期(java.util.Date)
+     */
+    public static Date getMonthEnd(int year, int month) {
+        Date start = getMonthBegin(year, month);
+        return getMonthEnd(start);
+    }
+
+    /**
+     * 根据日期参数获取当前周的起始日期(周日)
+     *
+     * @param date
+     *            日期
+     *
+     * @return 所属星期的起始日期(java.util.Date)
+     */
+    public static Date getWeekBegin(Date date) {
+        GregorianCalendar gCal = new GregorianCalendar();
+        gCal.setTime(date);
+        int startDay = gCal.getActualMinimum(GregorianCalendar.DAY_OF_WEEK);
+        gCal.set(GregorianCalendar.DAY_OF_WEEK, startDay);
+        return gCal.getTime();
+    }
+
+    /**
+     * 根据日期参数获取当前周的结束日期(周六)
+     *
+     * @param date
+     *            日期
+     *
+     * @return 所属星期的结束日期(java.util.Date)
+     */
+    public static Date getWeekEnd(Date date) {
+        GregorianCalendar gCal = new GregorianCalendar();
+        gCal.setTime(date);
+        int lastDay = gCal.getActualMaximum(GregorianCalendar.DAY_OF_WEEK);
+        gCal.set(GregorianCalendar.DAY_OF_WEEK, lastDay);
+        return gCal.getTime();
+    }
+
+    /**
+     * 获取两个日期相差几个月
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public static int getMonthsOfTime(Date startDate,Date endDate){
+        Calendar c = Calendar.getInstance();
+        c.setTime(startDate);
+        c.add(Calendar.YEAR, 1);  //年份加一年
+        int year = c.get(Calendar.YEAR);
+        int month = c.get(Calendar.MONTH);
+
+        c.setTime(endDate);
+        int year1 = c.get(Calendar.YEAR);
+        int month1 = c.get(Calendar.MONTH);
+
+        return 12*(year1-year)+month1-month;
+    }
+
+    /**
+     * 计算两个日期的多少天数(d1-d2+1)
+     * @param startDate
+     * @param endDate
+     * @return
+     * @throws ParseException
+     */
+    public static int getDayDifference(String startDateStr,String endDateStr) throws ParseException{
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-M-d");
+        Date d1=sdf.parse(startDateStr);
+        Date d2=sdf.parse(endDateStr);
+        long num = (d1.getTime()-d2.getTime())/1000;
+        long days  = num/(3600*24);
+        if(days<0)days=days*-1;
+        return Integer.parseInt(days+"")+1;
+    }
+
+    public static final String YYYY_MM_DD = "yyyy-MM-dd";
+    /**
+     * 将java.util.Date格式转换成日期字符串(yyyy-MM-dd)
+     *
+     * @return String
+     */
+    public static String formatDate(Date date) {
+
+        SimpleDateFormat dateFromat = new SimpleDateFormat();
+        SimpleDateFormat df =new SimpleDateFormat("");
+        return df.format(date);
+    }
+
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/EncryptUtil.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/EncryptUtil.java
new file mode 100644
index 0000000..15404f7
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/EncryptUtil.java
@@ -0,0 +1,306 @@
+package com.rootcloud.common.util;
+
+//import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
+
+import cn.hutool.core.codec.Base64;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+
+public class EncryptUtil {
+
+    public static final String MD5 = "MD5";
+    public static final String SHA1 = "SHA1";
+    public static final String HmacMD5 = "HmacMD5";
+    public static final String HmacSHA1 = "HmacSHA1";
+    public static final String DES = "DES";
+    public static final String AES = "AES";
+
+    /**编码格式；默认使用uft-8*/
+    public String charset = "utf-8";
+    /**DES*/
+    public int keysizeDES = 0;
+    /**AES*/
+    public int keysizeAES = 128;
+
+    public static EncryptUtil me;
+
+    private EncryptUtil(){
+        //单例
+    }
+    //双重锁
+    public static EncryptUtil getInstance(){
+        if (me==null) {
+            synchronized (EncryptUtil.class) {
+                if(me == null){
+                    me = new EncryptUtil();
+                }
+            }
+        }
+        return me;
+    }
+
+    /**
+     * 使用MessageDigest进行单向加密（无密码）
+     * @param res 被加密的文本
+     * @param algorithm 加密算法名称
+     * @return
+     */
+    private String messageDigest(String res,String algorithm){
+        try {
+            MessageDigest md = MessageDigest.getInstance(algorithm);
+            byte[] resBytes = charset==null?res.getBytes():res.getBytes(charset);
+            return base64(md.digest(resBytes));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 使用KeyGenerator进行单向/双向加密（可设密码）
+     * @param res 被加密的原文
+     * @param algorithm  加密使用的算法名称
+     * @param key 加密使用的秘钥
+     * @return
+     */
+    private String keyGeneratorMac(String res,String algorithm,String key){
+        try {
+            SecretKey sk = null;
+            if (key==null) {
+                KeyGenerator kg = KeyGenerator.getInstance(algorithm);
+                sk = kg.generateKey();
+            }else {
+                byte[] keyBytes = charset==null?key.getBytes():key.getBytes(charset);
+                sk = new SecretKeySpec(keyBytes, algorithm);
+            }
+            Mac mac = Mac.getInstance(algorithm);
+            mac.init(sk);
+            byte[] result = mac.doFinal(res.getBytes());
+            return base64(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 使用KeyGenerator双向加密，DES/AES，注意这里转化为字符串的时候是将2进制转为16进制格式的字符串，不是直接转，因为会出错
+     * @param res 加密的原文
+     * @param algorithm 加密使用的算法名称
+     * @param key  加密的秘钥
+     * @param keysize
+     * @param isEncode
+     * @return
+     */
+    private String keyGeneratorES(String res,String algorithm,String key,int keysize,boolean isEncode){
+        try {
+            KeyGenerator kg = KeyGenerator.getInstance(algorithm);
+            if (keysize == 0) {
+                byte[] keyBytes = charset==null?key.getBytes():key.getBytes(charset);
+                kg.init(new SecureRandom(keyBytes));
+            }else if (key==null) {
+                kg.init(keysize);
+            }else {
+                byte[] keyBytes = charset==null?key.getBytes():key.getBytes(charset);
+                kg.init(keysize, new SecureRandom(keyBytes));
+            }
+            SecretKey sk = kg.generateKey();
+            SecretKeySpec sks = new SecretKeySpec(sk.getEncoded(), algorithm);
+            Cipher cipher = Cipher.getInstance(algorithm);
+            if (isEncode) {
+                cipher.init(Cipher.ENCRYPT_MODE, sks);
+                byte[] resBytes = charset==null?res.getBytes():res.getBytes(charset);
+                return parseByte2HexStr(cipher.doFinal(resBytes));
+            }else {
+                cipher.init(Cipher.DECRYPT_MODE, sks);
+                return new String(cipher.doFinal(parseHexStr2Byte(res)));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private String base64(byte[] res){
+        return Base64.encode(res);
+    }
+
+    /**将二进制转换成16进制 */
+    public static String parseByte2HexStr(byte buf[]) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < buf.length; i++) {
+            String hex = Integer.toHexString(buf[i] & 0xFF);
+            if (hex.length() == 1) {
+                hex = '0' + hex;
+            }
+            sb.append(hex.toUpperCase());
+        }
+        return sb.toString();
+    }
+    /**将16进制转换为二进制*/
+    public static byte[] parseHexStr2Byte(String hexStr) {
+        if (hexStr.length() < 1)
+            return null;
+        byte[] result = new byte[hexStr.length()/2];
+        for (int i = 0;i< hexStr.length()/2; i++) {
+            int high = Integer.parseInt(hexStr.substring(i*2, i*2+1), 16);
+            int low = Integer.parseInt(hexStr.substring(i*2+1, i*2+2), 16);
+            result[i] = (byte) (high * 16 + low);
+        }
+        return result;
+    }
+
+    /**
+     * md5加密算法进行加密（不可逆）
+     * @param res 需要加密的原文
+     * @return
+     */
+    public String MD5(String res) {
+        return messageDigest(res, MD5);
+    }
+
+    /**
+     * md5加密算法进行加密（不可逆）
+     * @param res  需要加密的原文
+     * @param key  秘钥
+     * @return
+     */
+    public String MD5(String res, String key) {
+        return keyGeneratorMac(res, HmacMD5, key);
+    }
+
+    /**
+     * 使用SHA1加密算法进行加密（不可逆）
+     * @param res 需要加密的原文
+     * @return
+     */
+    public String SHA1(String res) {
+        return messageDigest(res, SHA1);
+    }
+
+    /**
+     * 使用SHA1加密算法进行加密（不可逆）
+     * @param res 需要加密的原文
+     * @param key 秘钥
+     * @return
+     */
+    public String SHA1(String res, String key) {
+        return keyGeneratorMac(res, HmacSHA1, key);
+    }
+
+    /**
+     * 使用DES加密算法进行加密（可逆）
+     * @param res 需要加密的原文
+     * @param key 秘钥
+     * @return
+     */
+    public String DESencode(String res, String key) {
+        return keyGeneratorES(res, DES, key, keysizeDES, true);
+    }
+
+    /**
+     * 对使用DES加密算法的密文进行解密（可逆）
+     * @param res 需要解密的密文
+     * @param key 秘钥
+     * @return
+     */
+    public String DESdecode(String res, String key) {
+        return keyGeneratorES(res, DES, key, keysizeDES, false);
+    }
+
+    /**
+     * 使用AES加密算法经行加密（可逆）
+     * @param res 需要加密的密文
+     * @param key 秘钥
+     * @return
+     */
+    public String AESencode(String res, String key) {
+        return keyGeneratorES(res, AES, key, keysizeAES, true);
+    }
+
+    /**
+     * 对使用AES加密算法的密文进行解密
+     * @param res 需要解密的密文
+     * @param key 秘钥
+     * @return
+     */
+    public String AESdecode(String res, String key) {
+        return keyGeneratorES(res, AES, key, keysizeAES, false);
+    }
+
+    /**
+     * 使用异或进行加密
+     * @param res 需要加密的密文
+     * @param key 秘钥
+     * @return
+     */
+    public String XORencode(String res, String key) {
+        byte[] bs = res.getBytes();
+        for (int i = 0; i < bs.length; i++) {
+            bs[i] = (byte) ((bs[i]) ^ key.hashCode());
+        }
+        return parseByte2HexStr(bs);
+    }
+
+    /**
+     * 使用异或进行解密
+     * @param res 需要解密的密文
+     * @param key 秘钥
+     * @return
+     */
+    public String XORdecode(String res, String key) {
+        byte[] bs = parseHexStr2Byte(res);
+        for (int i = 0; i < bs.length; i++) {
+            bs[i] = (byte) ((bs[i]) ^ key.hashCode());
+        }
+        return new String(bs);
+    }
+
+    /**
+     * 直接使用异或（第一调用加密，第二次调用解密）
+     * @param res 密文
+     * @param key 秘钥
+     * @return
+     */
+    public int XOR(int res, String key) {
+        return res ^ key.hashCode();
+    }
+
+    /**
+     * 使用Base64进行加密
+     * @param res 密文
+     * @return
+     */
+    public String Base64Encode(String res) {
+        return Base64.encode(res.getBytes());
+    }
+
+    /**
+     * 使用Base64进行解密
+     * @param res
+     * @return
+     */
+    public String Base64Decode(String res) {
+        return new String(Base64.decode(res));
+    }
+
+    public static void main(String[] args){
+        EncryptUtil encryptUtil = EncryptUtil.getInstance() ;
+        String url = "https://iof.kocelcloud.cn/index-4.html?id=@&tenantId=C60F5F392CCDC471";
+        String id = encryptUtil.DESencode("415", "paras");
+        String id1 = encryptUtil.DESencode("418", "paras");
+        String id2 = encryptUtil.DESencode("416", "paras");
+        System.out.println(url.replaceAll("@",id));
+        System.out.println(url.replaceAll("@",id1));
+        System.out.println(url.replaceAll("@",id2));
+
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/GaoDeAPIUtils.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/GaoDeAPIUtils.java
new file mode 100644
index 0000000..b06c1bc
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/GaoDeAPIUtils.java
@@ -0,0 +1,108 @@
+package com.rootcloud.common.util;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author w-chenhengqi
+ */
+@Component
+public class GaoDeAPIUtils {
+
+    private final static Logger log = LoggerFactory.getLogger(GaoDeAPIUtils.class);
+
+    private  static String addressUrl;
+
+    private static String key;
+    /**api接口参数常量 */
+    private static final String CODE = "code";
+    private static final String STATUS = "status";
+    private static final String INFO = "info";
+    private static final String INFO_CODE = "infocode";
+    private static final String KEY = "key";
+
+    @Value("${gode.api.key:1ad65e39043ea039f82ac56d62ea1559}")
+    public void setKey(String key) {
+        GaoDeAPIUtils.key = key;
+    }
+
+
+    @Value("${gode.api.addressUrl:https://restapi.amap.com/v3/geocode/regeo}")
+    public void setAddressUrl(String addressUrl){
+        GaoDeAPIUtils.addressUrl = addressUrl;
+    }
+
+    @Resource
+    private RedisTemplate redisTemplate;
+
+    private final String redisJwdPrefix = "gps_";
+
+
+    /**
+     * 发送请求到高德
+     *
+     * @param param 发送参数
+     * @return JSONArray
+     */
+    private JSONObject getGaoDeAddress(Map<String, String> param) {
+        JSONObject bodyJson= null;
+        ResponseEntity<JSONObject> responseEntity = RestTemplateUtils.get(addressUrl, JSONObject.class, param);
+        //调接口成功
+        if (responseEntity.getStatusCode().is2xxSuccessful()) {
+            //获取返回内容
+            bodyJson = responseEntity.getBody();
+            //status  返回结果状态值，值为0或1，0表示请求失败；1表示请求成功
+            if (bodyJson != null && Objects.equals(0, bodyJson.getInteger(STATUS))) {
+                //info 成功时返回OK，否则返回错误原因
+                log.warn("GaoDeAPIUtils.requestGaoDeApiGps[{}],infocode[{}]", bodyJson.getString(INFO), bodyJson.getString(INFO_CODE));
+            }
+        } else { //网络请求失败：1超时，2服务器错误
+            log.warn("GaoDeAPIUtils.requestGaoDeApiGps[{}]", "网络请求失败");
+        }
+        return bodyJson;
+    }
+
+    public  String  getAddressByJwd(String jwd){
+        Object addressRedis = redisTemplate.opsForValue().get(redisJwdPrefix+jwd);
+        String address = null;
+        if(addressRedis == null){
+            Map<String, String> param = new HashMap<>();
+            //key 请求服务权限标识
+            param.put(KEY, key);
+            param.put("location",jwd);
+            try {
+                log.info("高德地图查询数据==>");
+                JSONObject object = getGaoDeAddress(param);
+                log.info("高德地图返回结果==>{}",object);
+                if (object != null) {
+                    JSONObject dataJson = object.getJSONObject("regeocode");
+                    if (dataJson != null) {
+                        address = String.valueOf(dataJson.get("formatted_address"));
+                    }
+                }
+            }catch (Exception e){
+                log.info("调用高德地图查询地址失败==>{}",e.getMessage());
+            }
+            if(StringUtils.isNotBlank(address)){
+                redisTemplate.opsForValue().set(redisJwdPrefix+jwd, address, 1, TimeUnit.HOURS);
+            }
+        }else{
+            address =  String.valueOf(addressRedis);
+        }
+        return address;
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/MapBuilder.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/MapBuilder.java
new file mode 100644
index 0000000..8f4b176
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/MapBuilder.java
@@ -0,0 +1,79 @@
+package com.rootcloud.common.util;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.BooleanSupplier;
+
+public class MapBuilder<V> {
+    private Map<String, V> map;
+
+    private MapBuilder() {}
+
+    /**
+     * 创建一个Map构建器
+     * @param <V> Value类型
+     * @return 构建器
+     */
+    public static <V> MapBuilder<V> of() {
+        MapBuilder<V> mapBuilder = new MapBuilder<>();
+        mapBuilder.map = new HashMap<>(16);
+        return mapBuilder;
+    }
+
+    /**
+     * 创建一个Map构建器
+     * @param <V> Value类型
+     * @return 构建器
+     */
+    public static <V> MapBuilder<V> of(int size) {
+        MapBuilder<V> mapBuilder = new MapBuilder<>();
+        mapBuilder.map = new HashMap<>(size);
+        return mapBuilder;
+    }
+
+    /**
+     * 根据指定的Map创建一个Map构建器
+     * @param <V> Value类型
+     * @return 构建器
+     */
+    public static <V> MapBuilder<V> of(Map<String, V> map) {
+        MapBuilder<V> mapBuilder = new MapBuilder<>();
+        mapBuilder.map = null == map ? new HashMap<>(16) : map;
+        return mapBuilder;
+    }
+
+    public MapBuilder<V> put(String k, V value) {
+        this.map.put(k, value);
+        return this;
+    }
+
+    public MapBuilder<V> putNotNull(String k, V value) {
+        if (null != value) {
+            this.map.put(k, value);
+        }
+
+        return this;
+    }
+
+    public MapBuilder<V> putIf(String k, V value, BooleanSupplier supplier) {
+        if (supplier.getAsBoolean()) {
+            this.map.put(k, value);
+        }
+
+        return this;
+    }
+
+    public MapBuilder<V> clear() {
+        this.map.clear();
+        return this;
+    }
+
+    public MapBuilder<V> remove(String k) {
+        this.map.remove(k);
+        return this;
+    }
+
+    public Map<String, V> build() {
+        return map;
+    }
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/OrderNumberUtils.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/OrderNumberUtils.java
new file mode 100644
index 0000000..b5517c8
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/OrderNumberUtils.java
@@ -0,0 +1,24 @@
+package com.rootcloud.common.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class OrderNumberUtils {
+
+    private static int callCount = 0;
+    private static String lastDate = "";
+
+    public static String generateOrderNumber() {
+        String currentDate = new SimpleDateFormat("yyyyMMdd").format(new Date());
+
+        if (!currentDate.equals(lastDate)) {
+            callCount = 0;
+            lastDate = currentDate;
+        }
+
+        callCount++;
+
+        return currentDate + String.format("%03d", callCount);
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/PlatformDeviceTransUtil.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/PlatformDeviceTransUtil.java
new file mode 100644
index 0000000..8ecbf89
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/PlatformDeviceTransUtil.java
@@ -0,0 +1,273 @@
+package com.rootcloud.common.util;
+
+import com.rootcloud.domain.vo.RepPrinterTargetDicVO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.DecimalFormat;
+import java.util.*;
+
+//平台设备转换帮助类
+public class PlatformDeviceTransUtil {
+
+    private static final Logger logger = LoggerFactory.getLogger(PlatformDeviceTransUtil.class);
+
+
+    //将平台设备编码转换为用户设备编码
+    public static List<Map<String, Object>> repalceDevice(Map<String,String> printerDeviceRelationData, List<Map<String, Object>> list ){
+        List<Map<String, Object>> datas = new ArrayList<Map<String, Object>>();
+        for( Map<String, Object> data : list ){
+            //平台设备编码
+            String platformDevice = data.get("deviceId")==null?data.get("device_id").toString():data.get("deviceId").toString();
+
+            //获取用户设备编码[含设备位置]
+            String userDeviceId = printerDeviceRelationData.get(platformDevice)==null?platformDevice:printerDeviceRelationData.get(platformDevice);
+            data.put("deviceId", userDeviceId);
+            data.put("device_id", userDeviceId);
+            datas.add(data);
+        }
+        return datas;
+    }
+
+    //根据value获取key
+    public static Set<String> repalceDevice2(Map<String,String> printerDeviceRelationData, String deviceCode ){
+
+        if(!printerDeviceRelationData.containsValue(deviceCode))
+        {
+            return  null;
+        }
+        Set<String> keySet =new LinkedHashSet<String>();
+        for(String k:printerDeviceRelationData.keySet())
+        {
+            if(printerDeviceRelationData.get(k).equals(deviceCode))
+            {
+                keySet.add(k);
+            }
+        }
+        return keySet;
+
+    }
+    //按照设备机型分组
+    public static Map<String, Object> groupByDeviceType(String[] deviceTypes, List<Map<String, Object>> list,Map<String, Object> targetmap){
+
+
+        logger.info( "start开始按照设备机型对数据进行分组。deviceTypes："+deviceTypes+  " list:"+list );
+        Map<String, Object> dyxlData = new HashMap<String, Object>();
+
+        DecimalFormat df =new DecimalFormat("0.0");
+        int length = list==null?0:list.size();
+
+        Map<String, List<Map<String, Object>>> datas = new LinkedHashMap<String, List<Map<String, Object>>>();
+        for( int i=0; i<length; i++ ){
+            Map<String, Object> data = list.get(i);
+            String deviceId = data.get("deviceId").toString();
+            String deviceType = "" ;
+            for( String tmp: deviceTypes){
+//    			if( deviceId.indexOf(tmp) >=0 ){
+                if( deviceId.startsWith(tmp)){
+                    deviceType = tmp ;
+                }
+            }
+            RepPrinterTargetDicVO DYXL = (RepPrinterTargetDicVO) targetmap.get("DYXL"+deviceType);
+            if( DYXL!=null ){
+                String targetValue = df.format(DYXL.getTargetValue()) ;
+                if( datas.get(deviceType)!=null ){
+                    List<Map<String, Object>> tmpList = datas.get(deviceType) ;
+                    Map<String, Object> tmpdata= new HashMap<String, Object>();
+                    tmpdata.put("deviceId", deviceId);
+                    tmpdata.put("dyxl", data.get("dyxl"));
+                    tmpdata.put("targetValue", targetValue);
+                    tmpList.add(tmpdata);
+                    datas.put(deviceType, tmpList);
+                }else{
+                    List<Map<String, Object>> tmpList = new ArrayList<Map<String, Object>>() ;
+                    Map<String, Object> tmpdata= new HashMap<String, Object>();
+                    tmpdata.put("deviceId", deviceId);
+                    tmpdata.put("dyxl", data.get("dyxl"));
+                    tmpdata.put("targetValue", targetValue);
+                    tmpList.add(tmpdata);
+                    datas.put(deviceType, tmpList);
+                }
+            }
+        }
+        logger.info("分组后数据："+datas);
+
+
+        List<String> xListDYXL = new ArrayList<String>();
+        List<String> dyxlList = new ArrayList<String>();
+        List<List<String>> listTarget = new ArrayList<List<String>>();
+
+        int index = 0;
+        String ratelist = "";//2218机型为___，SDream机型为__；2218-1最低___，SDreamA最低____
+        String aveRatelist = "";//2218机型为___，SDream机型为__；
+        String lowRatelist = "";//2218-1最低___，SDreamA最低____
+        for(Map.Entry<String, List<Map<String, Object>>> data: datas.entrySet() ){
+            String deviceType = data.getKey();
+            RepPrinterTargetDicVO DYXL = (RepPrinterTargetDicVO) targetmap.get("DYXL"+deviceType);
+            String targetValue = "null";
+            if( DYXL!=null ){
+                targetValue = df.format(DYXL.getTargetValue()) ;
+            }
+
+            List<Map<String, Object>> listData = data.getValue();
+
+            if( listData!=null && listData.size()>0 ){
+                String[] targets = new String[length+datas.size()];
+
+                float tota_dyxl=0;
+                String ave = "0.00";
+                int index2 = 0;
+                for( int i=0; listData!=null && i<listData.size(); i++ ){
+                    Map<String, Object> mapdata = listData.get(i);
+                    float dyxl = Float.parseFloat(mapdata.getOrDefault("dyxl", "0").toString());
+                    String deviceId = mapdata.get("deviceId")==null?"":mapdata.get("deviceId").toString();
+                    xListDYXL.add(deviceId);
+                    dyxlList.add(df.format(dyxl));
+                    targets[index] = targetValue ;
+                    index++;
+                    index2++;
+                    tota_dyxl += dyxl ;
+                    if( i==(listData.size()-1) ){
+                        String dyxlStr = "<span class='xh'>"+df.format(dyxl)+"</span>";
+                        lowRatelist += deviceId+"的打印效率最低，为"+dyxlStr+"L/h；";
+                    }
+                }
+
+                //平均值
+                xListDYXL.add("平均值");
+                ave = String.format("%.1f", index2==0?0:tota_dyxl/index2);
+                dyxlList.add(ave);
+                targets[index]=targetValue;
+                index++;
+
+                //打印效率加目标值  2020-12-1加
+                String rate = "<span class='xh'>"+ave+"</span>";
+                aveRatelist += deviceType+"机型为"+rate+"L/h(目标值:"+targetValue+"L/h)；";
+                listTarget.add( Arrays.asList(targets) );
+            }
+
+        }
+
+        ratelist = aveRatelist + lowRatelist ;
+        logger.info("统计数据:"+ratelist);
+        dyxlData.put("xList", xListDYXL);
+        dyxlData.put("dyxlList", dyxlList);
+        dyxlData.put("targetValue", listTarget);
+        dyxlData.put("ratelist", ratelist.length()==0?"":ratelist.substring(0, ratelist.length()-1));//平均打印效率
+        return dyxlData ;
+    }
+
+
+    public static Map<String, Object> groupByDeviceType2(String[] deviceTypes, List<Map<String, Object>> list,Map<String, Object> targetmap){
+
+
+        logger.info( "start开始按照设备机型对数据进行分组。deviceTypes："+deviceTypes+  " list:"+list );
+        Map<String, Object> dyxlData = new HashMap<String, Object>();
+
+        DecimalFormat df =new DecimalFormat("0.0");
+        int length = list==null?0:list.size();
+
+        Map<String, List<Map<String, Object>>> datas = new LinkedHashMap<String, List<Map<String, Object>>>();
+
+        Map<String, Object> data1 = list.get(0);
+        String deviceId1 = data1.get("deviceId").toString();
+        String deviceType1 = "" ;
+        for( String tmp: deviceTypes){
+//			if( deviceId1.indexOf(tmp) >=0 ){
+            if( deviceId1.startsWith(tmp)){
+                deviceType1 = tmp ;
+            }
+        }
+        if(deviceType1.equals(""))
+        {
+            logger.info("系统配置中找不到设备"+deviceId1+"的机型...");
+        }
+        String targetValue ="";
+        RepPrinterTargetDicVO DYXL1 = (RepPrinterTargetDicVO) targetmap.get("DYXL"+deviceType1);
+        if( DYXL1!=null )
+        {
+            targetValue = df.format(DYXL1.getTargetValue()) ;
+            List<Map<String, Object>> tmpList = new ArrayList<Map<String, Object>>() ;
+            Map<String, Object> tmpdata= new HashMap<String, Object>();
+            tmpdata.put("deviceId", deviceId1);//1800-10
+            tmpdata.put("dyxl", data1.get("dyxl")); //打印效率
+            tmpdata.put("targetValue", targetValue); //目标值
+            tmpList.add(tmpdata);
+            datas.put(deviceType1, tmpList);
+        }
+        else
+            logger.info("系统配置中找不到设备"+deviceId1+"的目标值"+"DYXL"+deviceType1);
+
+		/*
+		for( int i=0; i<length; i++ )
+		{
+			Map<String, Object> data = list.get(i);
+			String deviceId = data.get("deviceId").toString();
+			String deviceType = "" ;
+			for( String tmp: deviceTypes){
+				if( deviceId.indexOf(tmp) >=0 ){
+					deviceType = tmp ;
+				}
+			}
+			RepPrinterTargetDicVO DYXL = (RepPrinterTargetDicVO) targetmap.get("DYXL"+deviceType);
+			if( DYXL!=null ){
+				String targetValue = df.format(DYXL.getTargetValue()) ;
+				if( datas.get(deviceType)!=null ){
+					List<Map<String, Object>> tmpList = datas.get(deviceType) ;
+					Map<String, Object> tmpdata= new HashMap<String, Object>();
+					tmpdata.put("deviceId", deviceId);
+					tmpdata.put("dyxl", data.get("dyxl"));
+					tmpdata.put("targetValue", targetValue);
+					tmpList.add(tmpdata);
+					datas.put(deviceType, tmpList);
+				}else{
+					List<Map<String, Object>> tmpList = new ArrayList<Map<String, Object>>() ;
+					Map<String, Object> tmpdata= new HashMap<String, Object>();
+					tmpdata.put("deviceId", deviceId);
+					tmpdata.put("dyxl", data.get("dyxl"));
+					tmpdata.put("targetValue", targetValue);
+					tmpList.add(tmpdata);
+					datas.put(deviceType, tmpList);
+				}
+			}
+		} */
+        logger.info("分组后数据："+datas);
+
+        List<String> xListDYXL = new ArrayList<String>();
+
+        float tota_dyxl=0;
+        int index = 0;
+        List<String> dyxlList = new ArrayList<String>();
+        List<List<String>> listTarget = new ArrayList<List<String>>();
+        for( Map<String, Object> item : list )
+        {
+            float dyxl = Float.parseFloat(item.getOrDefault("dyxl", "0").toString());
+            tota_dyxl += dyxl ;
+            String device = item.get("deviceId").toString();
+            String days =  item.get("day")==null?"":item.get("day").toString();
+            xListDYXL.add(days);
+            dyxlList.add(df.format(dyxl));
+            index++;
+        }
+
+        //平均值
+        xListDYXL.add("平均值");
+        String ave = String.format("%.1f", index==0?0:tota_dyxl/index);
+        dyxlList.add(ave);
+
+//		Map<String, Object> ave_map = new HashMap<String, Object>();
+//		ave_map.put("dyxl", ave);
+//		ave_map.put("day", "平均值");
+//		dataList.add(ave_map);
+//		logger.info("统计数据:"+ratelist);
+        dyxlData.put("xList", xListDYXL);
+        dyxlData.put("dyxlList", dyxlList);
+        dyxlData.put("targetValue", targetValue);
+        dyxlData.put("avgDyxlValue", ave);
+
+//		dyxlData.put("targetValue", listTarget);
+//		dyxlData.put("ratelist", ratelist.length()==0?"":ratelist.substring(0, ratelist.length()-1));//平均打印效率
+        return dyxlData ;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/RestTemplateUtils.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/RestTemplateUtils.java
new file mode 100644
index 0000000..a4cddd0
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/util/RestTemplateUtils.java
@@ -0,0 +1,122 @@
+package com.rootcloud.common.util;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.reflection.SystemMetaObject;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+public class RestTemplateUtils {
+
+    public static final RestTemplate restTemplate = new RestTemplate();
+
+    /**
+     * 发送get
+     * @param url url
+     * @param param 参数
+     * @return response
+     */
+    public static JSONObject get(String url,Object param){
+        return JSONObject.parseObject(restTemplate.getForObject(url, String.class, getJsonParam(param)));
+    }
+    /**
+     * 发送post json参数
+     * @param url url
+     * @param param 参数
+     * @return response
+     */
+    public static JSONObject postJson(String url,Object param){
+        return JSONObject.parseObject(postString(url,param,MediaType.APPLICATION_JSON));
+    }
+
+    public static JSONObject postFrom(String url,Object param){
+        return JSONObject.parseObject(postString(url,param,MediaType.APPLICATION_FORM_URLENCODED));
+    }
+
+    public static String postString(String url,Object param,MediaType content){
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(content);
+        HttpEntity request;
+        if (content.equals(MediaType.APPLICATION_JSON)) {
+            request = new HttpEntity<>(getJsonParam(param), headers);
+        } else if (content.equals(MediaType.APPLICATION_FORM_URLENCODED)){
+            request = new HttpEntity<>(getParam(param), headers);
+        }else{
+            throw new RuntimeException("不支持的content-type类型");
+        }
+        return restTemplate.postForObject(url, request, String.class);
+    }
+
+    public static Map<String,Object> getJsonParam(Object param){
+        MetaObject metaObject = SystemMetaObject.forObject(param);
+        Map<String, Object> uriVariables = new HashMap<>();
+        for (Field field : param.getClass().getDeclaredFields()) {
+            Object value = metaObject.getValue(field.getName());
+            if (value != null) {
+                uriVariables.put(field.getName(),value);
+            }
+        }
+        return uriVariables;
+    }
+
+    public static MultiValueMap<String,Object> getParam(Object param){
+        MetaObject metaObject = SystemMetaObject.forObject(param);
+        MultiValueMap<String, Object> uriVariables = new LinkedMultiValueMap<>();
+        for (Field field : param.getClass().getDeclaredFields()) {
+            Object value = metaObject.getValue(field.getName());
+            if (value != null) {
+                uriVariables.add(field.getName(),value);
+            }
+        }
+        return uriVariables;
+    }
+    /**
+     * GET 请求
+     * @param url GET请求地址
+     * @param responseType 返回对象类型
+     * @param uriVariables url 参数键值对
+     */
+    public static <T> ResponseEntity<T> get(String url, Class<T> responseType, Map<String, ?> uriVariables) throws RestClientException {
+        SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+        // 设置连接超时1分钟
+        requestFactory.setConnectTimeout(60000);
+        // 设置返回超时30秒
+        requestFactory.setReadTimeout(30000);
+        RestTemplate rest = new RestTemplate(requestFactory);
+        UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromHttpUrl(url);
+        uriVariables.forEach(uriComponentsBuilder::queryParam);
+        url = uriComponentsBuilder.build().encode().toString();
+        log.info("REQ: {}", url);
+        ResponseEntity<T> resp = rest.getForEntity(url, responseType);
+        log.info("RESP: {}", resp);
+        return resp;
+    }
+
+    /**
+     * GET 请求 不转码
+     * @param url GET请求地址
+     * @param responseType 返回对象类型
+     * @param uriVariables url 参数键值对
+     */
+    public static <T> ResponseEntity<T> getEncode(String url, Class<T> responseType, Map<String, ?> uriVariables) throws RestClientException {
+        UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromHttpUrl(url);
+        uriVariables.forEach(uriComponentsBuilder::queryParam);
+        return restTemplate.getForEntity(uriComponentsBuilder.build().toString(), responseType);
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/vo/PrinterWorkBoxSize.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/vo/PrinterWorkBoxSize.java
new file mode 100644
index 0000000..4f7b8e6
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/vo/PrinterWorkBoxSize.java
@@ -0,0 +1,53 @@
+package com.rootcloud.common.vo;
+
+/**
+ * 打印机工作箱型号
+ *
+ * @author  whl 2022-05-18
+ * @version V1.0
+ **/
+public class PrinterWorkBoxSize {
+
+    private Float length;
+    private Float width;
+    private Float height;
+
+    public PrinterWorkBoxSize length(Float length) {
+        this.length = length;
+        return this;
+    }
+
+    public void setLength(Float length) {
+        this.length = length;
+    }
+
+    public Float getLength() {
+        return this.length;
+    }
+
+    public PrinterWorkBoxSize width(Float width) {
+        this.width = width;
+        return this;
+    }
+
+    public void setWidth(Float width) {
+        this.width = width;
+    }
+
+    public Float getWidth() {
+        return this.width;
+    }
+
+    public PrinterWorkBoxSize height(Float height) {
+        this.height = height;
+        return this;
+    }
+
+    public void setHeight(Float height) {
+        this.height = height;
+    }
+
+    public Float getHeight() {
+        return this.height;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/common/vo/RepPageVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/vo/RepPageVO.java
new file mode 100644
index 0000000..a85a5a5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/common/vo/RepPageVO.java
@@ -0,0 +1,92 @@
+package com.rootcloud.common.vo;
+
+/***
+ *
+ * @Title: RepPageVO.java
+ * @Package com.irootech.report.common.vo
+ * @Description: 分页VO
+ * @author gw_duanxw
+ * @date 2017年3月9日 上午11:47:27
+ * @version V1.0
+ */
+public class RepPageVO {
+
+
+    /**
+     * 开始记录数
+     */
+    protected String start;
+
+    /**
+     * 显示条数
+     */
+    protected String limit;
+
+    /**
+     * 页号
+     */
+    protected String pageIndex;
+
+    /**
+     * 总条数
+     */
+    protected String count;
+
+    /**
+     * 页号（用于外部调用）
+     */
+    protected String pageNo;
+
+    /**
+     * 显示条数（用于外部调用）
+     */
+    protected String pageSize;
+
+    public String getStart() {
+        return start;
+    }
+
+    public void setStart(String start) {
+        this.start = start;
+    }
+
+    public String getLimit() {
+        return limit;
+    }
+
+    public void setLimit(String limit) {
+        this.limit = limit;
+    }
+
+    public String getPageIndex() {
+        return pageIndex;
+    }
+
+    public void setPageIndex(String pageIndex) {
+        this.pageIndex = pageIndex;
+    }
+
+    public String getCount() {
+        return count;
+    }
+
+    public void setCount(String count) {
+        this.count = count;
+    }
+
+    public String getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(String pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public String getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(String pageSize) {
+        this.pageSize = pageSize;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/GlobalExceptionHandler.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/GlobalExceptionHandler.java
new file mode 100644
index 0000000..6ad467a
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/GlobalExceptionHandler.java
@@ -0,0 +1,57 @@
+package com.rootcloud.config;
+
+
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.ResourceUtil;
+import com.rootcloud.config.exception.AbstractException;
+import com.rootcloud.config.exception.BusinessException;
+import com.rootcloud.exception.ExceptionCode;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.context.request.NativeWebRequest;
+
+import java.util.Objects;
+
+/**
+ * @author jun2.wang
+ */
+@RestControllerAdvice
+@Slf4j
+public class GlobalExceptionHandler {
+    @ExceptionHandler(Exception.class)
+    public JsonResult errorHandler(Exception e) {
+        log.error("error:", e);
+        return JsonResult.failed(ExceptionCode.SERVER_ERROR, e.getMessage());
+    }
+
+    /**
+     * 字段格式验证失败
+     *
+     * @param e
+     * @return
+     */
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public JsonResult errorHandler(MethodArgumentNotValidException e) {
+        log.error("error:", e);
+        return JsonResult.failed(ExceptionCode.ARGUMENT_NOT_VALID, "字段验证失败：" + Objects.requireNonNull(e.getBindingResult().getFieldError()).getDefaultMessage());
+    }
+
+    @ExceptionHandler(AbstractException.class)
+    public JsonResult handleBusinessException(AbstractException ex, NativeWebRequest request) {
+        if (log.isDebugEnabled()) {
+            log.debug("AbstractException 异常信息 {}", ex.getMessage());
+        }
+        return JsonResult.failed(ex.getCode(), ex.getMessage());
+    }
+
+    @ExceptionHandler(BusinessException.class)
+    public JsonResult handleBusinessException(BusinessException ex, NativeWebRequest request) {
+        if (log.isDebugEnabled()) {
+            log.debug("BusinessException 异常信息 {}", ex.getMessage());
+        }
+        return JsonResult.failed(ex.getCode(), ResourceUtil.getI18nMessage(ex.getCode()));
+
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/MybatisPlusConfig.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/MybatisPlusConfig.java
new file mode 100644
index 0000000..bf39371
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/MybatisPlusConfig.java
@@ -0,0 +1,38 @@
+package com.rootcloud.config;
+
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.rootcloud.common.intercept.DataScopeInterceptor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.RedisTemplate;
+
+import javax.sql.DataSource;
+
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/28 19:31
+ */
+@Configuration
+public class MybatisPlusConfig {
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        return new PaginationInterceptor();
+    }
+
+
+    /**
+     * 数据权限插件
+     *
+     * @return DataScopeInterceptor
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    public DataScopeInterceptor dataScopeInterceptor(DataSource dataSource,  RedisTemplate redisTemplate) {
+        return new DataScopeInterceptor(dataSource,redisTemplate);
+    }
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/RedisConfig.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/RedisConfig.java
new file mode 100644
index 0000000..899aaa3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/RedisConfig.java
@@ -0,0 +1,22 @@
+package com.rootcloud.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import java.io.Serializable;
+
+@Configuration
+public class RedisConfig {
+    @Bean
+    public RedisTemplate<String, Serializable> redisObjectTemplate(LettuceConnectionFactory connectionFactory) {
+        RedisTemplate redisTemplate = new RedisTemplate();
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setValueSerializer(new RedisObjectSerializer());
+        redisTemplate.setConnectionFactory(connectionFactory);
+        return redisTemplate;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/RedisObjectSerializer.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/RedisObjectSerializer.java
new file mode 100644
index 0000000..fe2b6e4
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/RedisObjectSerializer.java
@@ -0,0 +1,42 @@
+package com.rootcloud.config;
+
+import org.apache.commons.lang3.SerializationException;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.serializer.support.DeserializingConverter;
+import org.springframework.core.serializer.support.SerializingConverter;
+import org.springframework.data.redis.serializer.RedisSerializer;
+
+public class RedisObjectSerializer implements RedisSerializer<Object> {
+    private Converter<Object, byte[]> serializer = new SerializingConverter();
+    private Converter<byte[], Object> deserializer = new DeserializingConverter();
+    static final byte[] EMPTY_ARRAY = new byte[0];
+
+    @Override
+    public Object deserialize(byte[] bytes) {
+        if (isEmpty(bytes)) {
+            return null;
+        }
+        try {
+            return deserializer.convert(bytes);
+        } catch (Exception ex) {
+            throw new SerializationException("Cannot deserialize", ex);
+        }
+    }
+
+    @Override
+    public byte[] serialize(Object object) {
+        if (object == null) {
+            return EMPTY_ARRAY;
+        }
+        try {
+            return serializer.convert(object);
+        } catch (Exception ex) {
+            return EMPTY_ARRAY;
+        }
+    }
+
+    private boolean isEmpty(byte[] data) {
+        return (data == null || data.length == 0);
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/ScheduleConfig.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/ScheduleConfig.java
new file mode 100644
index 0000000..9b33d05
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/ScheduleConfig.java
@@ -0,0 +1,21 @@
+package com.rootcloud.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+
+import java.util.concurrent.Executors;
+
+/**
+ * @author lujiumin
+ * @date 2023/6/12
+ * 描述：
+ */
+@Configuration
+public class ScheduleConfig implements SchedulingConfigurer {
+
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
+        scheduledTaskRegistrar.setScheduler(Executors.newScheduledThreadPool(10));
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/SwaggerConfig.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/SwaggerConfig.java
new file mode 100644
index 0000000..b902f78
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/SwaggerConfig.java
@@ -0,0 +1,71 @@
+package com.rootcloud.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.builders.RequestParameterBuilder;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.service.ParameterType;
+import springfox.documentation.service.RequestParameter;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/5/26
+ */
+@Configuration
+public class SwaggerConfig {
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.OAS_30).apiInfo(apiInfo())
+                // 是否开启
+                .enable(true).select()
+                // 扫描的路径包
+                .apis(RequestHandlerSelectors.basePackage("com.rootcloud"))
+                // 指定路径处理PathSelectors.any()代表所有的路径
+                .paths(PathSelectors.any()).build().pathMapping("/").globalRequestParameters(getParameters());
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("SpringBoot-Swagger3集成")
+                .description("springboot | swagger")
+                // 作者信息
+                .contact(new Contact("sprucer", "www.rootcloud.com", "developer@rootcloud.com"))
+                .version("1.0.0")
+                .build();
+    }
+
+    private List<RequestParameter>  getParameters(){
+        List<RequestParameter> requestParameterList=new ArrayList<>();
+        RequestParameter parameter = new RequestParameterBuilder()
+                .name("authorization")
+                .description("请求用户authorization")
+                .in(ParameterType.HEADER)
+                .required(false)
+                .build();
+        RequestParameter parameterZH = new RequestParameterBuilder()
+                .name("lang")
+                .description("请求用户语言类型")
+                .in(ParameterType.HEADER)
+                .required(false)
+                .build();
+        RequestParameter parameterCookies = new RequestParameterBuilder()
+                .name("Cookie")
+                .description("请求用户Cookie")
+                .in(ParameterType.HEADER)
+                .required(false)
+                .build();
+        requestParameterList.add(parameter);
+        requestParameterList.add(parameterZH);
+        requestParameterList.add(parameterCookies);
+        return requestParameterList;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/WebMvcConfigurer.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/WebMvcConfigurer.java
new file mode 100644
index 0000000..39bff13
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/WebMvcConfigurer.java
@@ -0,0 +1,54 @@
+package com.rootcloud.config;
+
+import cn.hutool.extra.spring.SpringUtil;
+import com.rootcloud.common.intercept.LanguageIntercept;
+import com.rootcloud.config.auth.AuthenticationInterceptor;
+import com.rootcloud.config.auth.AuthorizationInterceptor;
+import com.rootcloud.domain.service.gbsj.JeCoreEnduserService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/1/21
+ */
+@Configuration
+@Import(SpringUtil.class)
+public class WebMvcConfigurer implements org.springframework.web.servlet.config.annotation.WebMvcConfigurer {
+
+    @Value("${application.jeboot.authUrl}")
+    private String authUrl;
+
+    @Resource
+    private RedisTemplate redisTemplate;
+
+    @Resource(name = "endUserService")
+    private JeCoreEnduserService enduserService;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        //认证拦截器
+        registry.addInterceptor(new AuthenticationInterceptor(authUrl,redisTemplate,enduserService))
+                .addPathPatterns("/**")
+                .excludePathPatterns("/dev/help/**")
+                .excludePathPatterns("/menu-info/mul-add")
+                .excludePathPatterns("/job/gbsjSendMessage","/job/synxPartData")
+                .excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v3/**", "/swagger-ui/**");
+
+        //鉴权拦截器
+        registry.addInterceptor(new AuthorizationInterceptor());
+        //语言拦截器
+        registry.addInterceptor(getLanguageIntercept());
+    }
+
+    @Bean
+    public LanguageIntercept getLanguageIntercept(){
+        return new LanguageIntercept();
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/AuthenticationInterceptor.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/AuthenticationInterceptor.java
new file mode 100644
index 0000000..9ee7624
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/AuthenticationInterceptor.java
@@ -0,0 +1,215 @@
+package com.rootcloud.config.auth;
+
+import com.alibaba.fastjson.JSONObject;
+import com.rootcloud.common.HttpClientUtil;
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.common.constant.RoleIdConstant;
+import com.rootcloud.common.enums.HttpRequestMethedEnum;
+import com.rootcloud.domain.dto.EnterpriseInfoDTO;
+import com.rootcloud.domain.entity.SiteDTO;
+import com.rootcloud.domain.service.gbsj.JeCoreEnduserService;
+import jline.internal.Log;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.AsyncHandlerInterceptor;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/1/21
+ */
+@Slf4j
+public class AuthenticationInterceptor implements AsyncHandlerInterceptor {
+
+    /**
+     * token参数key
+     */
+    public static final String AUTHORIZATION = "authorization";
+    public static final String LANGUAGE_APP = "lang";
+    public static final String LANGUAGE_PC = "je-local-lang";
+
+    private String authUrl;
+
+    private RedisTemplate redisTemplate;
+
+    private JeCoreEnduserService enduserService;
+
+    public AuthenticationInterceptor(String authUrl, RedisTemplate redisTemplate, JeCoreEnduserService enduserService) {
+        this.authUrl = authUrl;
+        this.redisTemplate = redisTemplate;
+        this.enduserService = enduserService;
+    }
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws IOException {
+
+        //解析语言
+        String languageApp = this.getRequestValue(request, LANGUAGE_APP);
+        String languagePc = this.getRequestValue(request, LANGUAGE_PC);
+        if (isIgnoreSecurity(handler)) {
+            initLanguage(languageApp,languagePc);
+            return true;
+        }
+        //解析用户
+        String authorization = this.getRequestValue(request, AUTHORIZATION);
+        Cookie[] cookies = request.getCookies();
+        StringBuilder cookieBuild = new StringBuilder();
+
+
+        if (cookies != null && cookies.length > 0) {
+            for (Cookie cookie : cookies) {
+                cookieBuild.append(cookie.getName());
+                cookieBuild.append("=");
+                cookieBuild.append(cookie.getValue());
+                cookieBuild.append(";");
+            }
+        }else {
+            if (StringUtils.isNotBlank(authorization)) {
+                String bearer = authorization.replaceFirst("Bearer ", "");
+                cookieBuild.append("access_token=");
+                cookieBuild.append(bearer);
+            }
+        }
+        if (StringUtils.isBlank(authorization) && !cookieBuild.toString().contains("access_token")){
+            log.warn("AuthenticationInterceptor:" + request.toString());
+            response.sendError(HttpServletResponse.SC_FORBIDDEN);
+            return false;
+        }
+        Map<String, String> headers = new HashMap<>();
+        headers.put("authorization", authorization);
+        headers.put("Cookie", cookieBuild.toString());
+        Object token = "";
+        //判断缓存信息
+        try {
+            token = redisTemplate.opsForValue().get(authorization + "_" + cookieBuild.toString());
+            if (token != null) {
+                JSONObject jsonObject = JSONObject.parseObject(String.valueOf(token));
+                //Log.info("登录验证拦截器获取缓存token租户id："+jsonObject.getString("tenantId"));
+                UserContext.set(jsonObject.getString("userId"), jsonObject.getString("userName"), jsonObject.getString("tenantId"), false, false,authorization);
+                initLanguage(languageApp,languagePc);
+                return true;
+            } else {
+                String resp = HttpClientUtil.sendHttp(HttpRequestMethedEnum.HttpPost, authUrl, null, headers);
+                JSONObject jsonObject = JSONObject.parseObject(resp);
+
+                String userId= jsonObject.getString("userId");
+                String zhid = enduserService.getTenantInfoNOSQL(userId);
+                String tenantId = jsonObject.getString("zhId");
+                //Log.info("拦截器UserId:"+userId+" 查询的租户ID："+zhid+" 获取token中的自带租户id:"+tenantId);
+                if(StringUtils.isNotBlank(zhid)) {
+                    jsonObject.put("tenantId",zhid);
+                }
+                redisTemplate.opsForValue().set(authorization + "_" + cookieBuild.toString(),jsonObject.toJSONString(), 600, TimeUnit.SECONDS);
+                if (StringUtils.isNotBlank(jsonObject.getString("userId"))) {
+                    UserContext.set(jsonObject.getString("userId"), jsonObject.getString("userName"), jsonObject.getString("tenantId"), false, false,authorization);
+                }else {
+                    log.warn("AuthenticationInterceptor:" + request.toString());
+                    response.sendError(HttpServletResponse.SC_FORBIDDEN);
+                    return false;
+                }
+                initLanguage(languageApp,languagePc);
+                return true;
+            }
+        } catch (Exception e) {
+            redisTemplate.delete(authorization + "_" + cookieBuild.toString());
+            log.error("AuthenticationInterceptor:" + request.toString());
+            e.printStackTrace();
+            response.sendError(HttpServletResponse.SC_FORBIDDEN);
+            return false;
+        }
+    }
+
+    //请求完成后清除用户信息
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
+        UserContext.remove();
+    }
+
+    void initLanguage(String langApp,String langPc){
+        if ((StringUtils.isNotEmpty(langApp) && "en".equals(langApp)) || (StringUtils.isNotEmpty(langPc) && "en".equals(langPc))){
+            UserContext.setLanguage("en");
+        }else {
+            UserContext.setLanguage("zh_CN");
+        }
+    }
+
+    //初始化登录用户的信息
+    LoginUserInfo initUser(String userId) {
+        LoginUserInfo userInfo = enduserService.getUserInfo(userId);
+        if (userInfo.getRoleIds().contains(RoleIdConstant.FWJL) || userInfo.getRoleIds().contains(RoleIdConstant.GCS)){
+            StringBuilder sb = new StringBuilder();
+            SiteDTO siteByUserId = enduserService.getSiteByUserId(userId);
+            userInfo.setSiteId(siteByUserId.getSiteId());
+            String[] strings = siteByUserId.getServiceArea().split(",");
+            for (int i = 0; i < strings.length; i++) {
+                String customs = enduserService.getCustomsBySiteAreaName(strings[i]);
+                sb.append(customs);
+                if (i<strings.length-1){
+                    sb.append(",");
+                }
+            }
+            userInfo.setCustomId(sb.toString());
+        }else if (userInfo.getRoleIds().contains(RoleIdConstant.KHLD) || userInfo.getRoleIds().contains(RoleIdConstant.KH)){
+            String custom = enduserService.getCustomsByUserId(userId);
+            userInfo.setCustomId(custom);
+        }
+        return userInfo;
+    }
+
+    /**
+     * 是否有权限
+     *
+     * @param handler
+     * @return
+     */
+    private boolean isIgnoreSecurity(Object handler) {
+        if (handler instanceof HandlerMethod) {
+            HandlerMethod handlerMethod = (HandlerMethod) handler;
+            // 获取方法上的注解
+            IgnoreSecurity ignoreSecurity = handlerMethod.getMethod().getAnnotation(IgnoreSecurity.class);
+            // 如果方法上的注解为空 则获取类的注解
+            if (ignoreSecurity == null) {
+                ignoreSecurity = handlerMethod.getMethod().getDeclaringClass().getAnnotation(IgnoreSecurity.class);
+            }
+            // 如果标记了注解，则判断权限
+            return ignoreSecurity != null;
+        }
+        return true;
+    }
+
+    private String getRequestValue(HttpServletRequest request, String key) {
+        String token = request.getParameter(key);
+        if (StringUtils.isNotBlank(token)) {
+            return token;
+        }
+
+        //获取请求头
+        Enumeration<String> enumeration = request.getHeaders(key);
+        if (enumeration.hasMoreElements()) {
+            return enumeration.nextElement();
+        }
+
+        //获取cookie
+        Cookie[] cookies = request.getCookies();
+        if (cookies != null) {
+            for (Cookie cookie : cookies) {
+                String name = cookie.getName();
+                if (key.equals(name)) {
+                    return cookie.getValue();
+                }
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/AuthorizationInterceptor.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/AuthorizationInterceptor.java
new file mode 100644
index 0000000..143894c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/AuthorizationInterceptor.java
@@ -0,0 +1,46 @@
+package com.rootcloud.config.auth;
+
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/6/22
+ */
+public class AuthorizationInterceptor implements HandlerInterceptor {
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        boolean haveAnnotataion = handler.getClass().isAssignableFrom(HandlerMethod.class);
+        if (haveAnnotataion) {
+            RequiresUserType requiresUserType = ((HandlerMethod) handler).getMethodAnnotation(RequiresUserType.class);
+            if (requiresUserType != null) {
+                List<UserTypeEnum> userTypes = getUserType(UserContext.current());
+                for (UserTypeEnum item : requiresUserType.value()) {
+                    if (userTypes.contains(item)) {
+                        return true;
+                    }
+                }
+                response.sendError(HttpServletResponse.SC_FORBIDDEN, "功能未授权");
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private List<UserTypeEnum> getUserType(LoginUserInfo user) {
+        List<UserTypeEnum> userTypes = new ArrayList<>();
+        userTypes.add(UserTypeEnum.NORMAL);
+        if (user.isTenantAdmin()) {
+            userTypes.add(UserTypeEnum.TENANT_ADMIN);
+        }
+        if (user.isSupper()) {
+            userTypes.add(UserTypeEnum.SUPPER);
+        }
+        return userTypes;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/CorsConfig.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/CorsConfig.java
new file mode 100644
index 0000000..3c23d32
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/CorsConfig.java
@@ -0,0 +1,31 @@
+package com.rootcloud.config.auth;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+/**
+ * @author LiPingAn 2022/4/19 9:53
+ * 设置跨域请求
+ * @version 1.0
+ **/
+@Configuration
+public class CorsConfig {
+    private CorsConfiguration buildConfig() {
+        CorsConfiguration corsConfiguration = new CorsConfiguration();
+        corsConfiguration.addAllowedOrigin("*"); // 1 设置访问源地址
+        corsConfiguration.addAllowedHeader("*"); // 2 设置访问源请求头
+        corsConfiguration.addAllowedMethod("*"); // 3 设置访问源请求方法
+        corsConfiguration.setAllowCredentials(true);
+        return corsConfiguration;
+    }
+
+    @Bean
+    public CorsFilter corsFilter() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", buildConfig()); // 4 对接口配置跨域设置
+        return new CorsFilter(source);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/LoginUserInfo.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/LoginUserInfo.java
new file mode 100644
index 0000000..4aeba0b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/LoginUserInfo.java
@@ -0,0 +1,47 @@
+package com.rootcloud.config.auth;
+
+import lombok.Data;
+
+/**
+ *
+ */
+@Data
+public class LoginUserInfo {
+    private String userId;
+    private String userName;
+    private String tenantId;
+    private String language;
+
+    /**
+     * 是否租户管理员
+     */
+    private boolean tenantAdmin;
+    /**
+     * 是否超管
+     */
+    private boolean supper;
+
+    private String roleIds;
+    private String roleNames;
+
+    /**
+     * 如果登录用户拥有网点角色，则此处会存储网点管理所有客户的id
+     */
+    private String customId;
+    private String customName;
+
+    private String siteId;
+    private String siteName;
+
+    private String currToken;
+
+
+    public LoginUserInfo(String userId, String userName, String tenantId, boolean tenantAdmin, boolean supper,String currToken) {
+        this.userId = userId;
+        this.userName = userName;
+        this.tenantId = tenantId;
+        this.tenantAdmin = tenantAdmin;
+        this.supper = supper;
+        this.currToken = currToken;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/RequiresUserType.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/RequiresUserType.java
new file mode 100644
index 0000000..2b19547
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/RequiresUserType.java
@@ -0,0 +1,13 @@
+package com.rootcloud.config.auth;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/6/22
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RequiresUserType {
+    UserTypeEnum[] value();
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/UserContext.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/UserContext.java
new file mode 100644
index 0000000..5119dda
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/UserContext.java
@@ -0,0 +1,67 @@
+package com.rootcloud.config.auth;
+
+import com.rootcloud.common.UserOperationContext;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/5/28
+ */
+public class UserContext {
+    static ThreadLocal<LoginUserInfo> tls = new ThreadLocal<>();
+
+    public static final LoginUserInfo emptyUser;
+
+    static {
+        emptyUser = new LoginUserInfo("SYSTEM","系统","SYSTEM",false,false,"");
+    }
+
+    public static LoginUserInfo current() {
+        if (tls.get() == null) {
+            return emptyUser;
+        } else {
+            return tls.get();
+        }
+    }
+
+    public static String getTenantId() {
+        return current().getTenantId();
+    }
+
+    public static String getUserTenantId() {
+        if (tls.get() != null) {
+            return tls.get().getTenantId();
+        }
+        return null;
+    }
+
+
+    public static String getUserId() {
+        return current().getUserId();
+    }
+
+    public static void setLanguage(String language) {
+        current().setLanguage(language);
+    }
+
+    public static UserOperationContext actionContext() {
+        LoginUserInfo userInfo = current();
+        UserOperationContext ctx = new UserOperationContext();
+        ctx.setUserId(userInfo.getUserId());
+        ctx.setUserName(userInfo.getUserName());
+        ctx.setTenantId(userInfo.getTenantId());
+        ctx.setIp("127.0.0.1");
+        ctx.setBrowser("chrome 1.2.3");
+        return ctx;
+    }
+
+    public static void set(String userId, String userName, String tenantId, boolean tenantAdmin, boolean supper,String currToken) {
+        LoginUserInfo user = new LoginUserInfo(userId, userName, tenantId, tenantAdmin, supper,currToken);
+        tls.set(user);
+    }
+
+
+    //清除用户信息
+    public static void remove() {
+        tls.remove();
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/UserInfo.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/UserInfo.java
new file mode 100644
index 0000000..33106f3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/UserInfo.java
@@ -0,0 +1,14 @@
+package com.rootcloud.config.auth;
+
+import lombok.Data;
+
+/**
+ *
+ */
+@Data
+public class UserInfo {
+    private String userId;
+    private String userName;
+    private String tenantId;
+    private String roleIds;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/UserTypeEnum.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/UserTypeEnum.java
new file mode 100644
index 0000000..e0a13c7
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/auth/UserTypeEnum.java
@@ -0,0 +1,19 @@
+package com.rootcloud.config.auth;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/6/21
+ */
+public enum UserTypeEnum {
+    NORMAL(1, "普通用户"),
+    TENANT_ADMIN(2, "租户管理员"),
+    SUPPER(3, "超级管理员");
+
+    private int value;
+    private String name;
+
+    UserTypeEnum(int value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/exception/AbstractException.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/exception/AbstractException.java
new file mode 100644
index 0000000..45b8aed
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/exception/AbstractException.java
@@ -0,0 +1,14 @@
+package com.rootcloud.config.exception;
+
+public abstract class AbstractException extends RuntimeException {
+    protected final String code;
+
+    public AbstractException(String code, String message) {
+        super(message);
+        this.code = code;
+    }
+
+    public String getCode() {
+        return this.code;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/exception/BusinessException.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/exception/BusinessException.java
new file mode 100644
index 0000000..20d6e8b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/exception/BusinessException.java
@@ -0,0 +1,13 @@
+package com.rootcloud.config.exception;
+
+/**
+ * @description: 业务异常
+ * @author:
+ * @create: 2021-05-31 15:42
+ **/
+
+public class BusinessException extends AbstractException {
+    public BusinessException(String key, String msg) {
+        super(key, msg);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/rabbitmq/RabbitMQConfig.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/rabbitmq/RabbitMQConfig.java
new file mode 100644
index 0000000..f9a5994
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/rabbitmq/RabbitMQConfig.java
@@ -0,0 +1,115 @@
+package com.rootcloud.config.rabbitmq;
+
+import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
+import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.amqp.support.converter.ContentTypeDelegatingMessageConverter;
+import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.amqp.support.converter.MessageConverter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
+
+
+@Configuration
+public class RabbitMQConfig {
+    @Value("${spring.rabbitmq.addresses}")
+    private String addresses;
+    @Value("${spring.rabbitmq.port}")
+    private int port;
+    @Value("${spring.rabbitmq.username}")
+    private String username;
+    @Value("${spring.rabbitmq.password}")
+    private String password;
+
+
+    /**
+     * -----------------------------------------------------------
+     * 创建项目中所有用到的队列
+     * -----------------------------------------------------------
+     */
+    /**
+     * 1.创建队列：QUEUE_CREATE_TENANT_OPERATION
+     *
+     * @return
+     */
+   /* @Bean(name = "QueueCreateTenant")
+    public Queue QueueCreateTenant() {
+        return new Queue(RabbitMQConstant.QUEUE_CREATE_TENANT_OPERATION);
+    }*/
+
+
+    /**
+     * -----------------------------------------------------------
+     * 创建项目中所有用到的交换机
+     * -----------------------------------------------------------
+     */
+    /**
+     * 1. FANOUT类型交换机：FANOUT_EXCHANGE_TENANT
+     *
+     * @return
+     */
+  /*  @Bean(name = "ExchangeByCreateTenant")
+    public FanoutExchange createExchangeByCreateTenant() {
+        return new FanoutExchange(RabbitMQConstant.FANOUT_EXCHANGE_TENANT);
+    }*/
+
+
+    /**
+     * -----------------------------------------------------------
+     * 把项目中所有用到的交换机和队列进行绑定
+     * -----------------------------------------------------------
+     */
+    /**
+     * 1. 把队列（Queue）绑定到交换器（Exchange）
+     *
+     * @param queue    QueueCreateTenant
+     * @param exchange
+     * @return
+     */
+ /*   @Bean
+    public Binding bindingByCreateTenant(@Qualifier("QueueCreateTenant") Queue queue, @Qualifier("ExchangeByCreateTenant") FanoutExchange exchange) {
+        return BindingBuilder.bind(queue).to(exchange);
+    }*/
+
+
+    /**
+     * -----------------------------------------------------------
+     * 公用配置
+     * -----------------------------------------------------------
+     */
+    @Bean
+    public ConnectionFactory connectionFactory() {
+        CachingConnectionFactory connectionFactory = new CachingConnectionFactory(addresses, port);
+        connectionFactory.setUsername(username);
+        connectionFactory.setPassword(password);
+        return connectionFactory;
+    }
+
+    @Bean
+    public SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory(
+            ConnectionFactory connectionFactory, MessageConverter messageConverter) {
+        SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
+        factory.setConnectionFactory(connectionFactory);
+        factory.setMessageConverter(messageConverter);
+        return factory;
+    }
+
+    @Bean
+    public MessageConverter messageConverter() {
+        return new ContentTypeDelegatingMessageConverter(new Jackson2JsonMessageConverter());
+    }
+
+    @Bean
+    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+    public RabbitTemplate rabbitTemplate(
+            ConnectionFactory connectionFactory, MessageConverter messageConverter) {
+        RabbitTemplate rabbitTemplate = new RabbitTemplate(connectionFactory);
+        rabbitTemplate.setMessageConverter(messageConverter);
+        return rabbitTemplate;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/rabbitmq/Sender.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/rabbitmq/Sender.java
new file mode 100644
index 0000000..775b599
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/rabbitmq/Sender.java
@@ -0,0 +1,66 @@
+package com.rootcloud.config.rabbitmq;
+
+import com.alibaba.fastjson.JSON;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.connection.CorrelationData;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.util.UUID;
+
+/**
+ * 发送消息
+ * @param <T>
+ */
+@Component
+
+public class Sender<T> implements RabbitTemplate.ConfirmCallback{
+    private final Logger log = LoggerFactory.getLogger(Sender.class);
+
+    @Autowired
+    private RabbitTemplate rabbitTemplate;
+
+    @PostConstruct
+    public void init() {
+        rabbitTemplate.setConfirmCallback(this);
+    }
+
+    @Override
+    public void confirm(CorrelationData correlationData, boolean ack, String cause) {
+        if (ack) {
+            log.info("消息发送成功，msgId: {}",correlationData.getId());
+        } else {
+            log.error("消息发送失败：" + cause);
+            throw new RuntimeException("消息发送失败：" + cause);
+        }
+    }
+
+
+    /**
+     * 发送消息
+     * @param exchange 交换机名称
+     * @param routingKey 路由关键字
+     * @param object 发送的消息内容
+     */
+    public void send(String exchange,String routingKey, T object){
+        CorrelationData correlationId = new CorrelationData(UUID.randomUUID().toString());
+        log.info("开始发送消息: " + JSON.toJSONString(object));
+        rabbitTemplate.convertAndSend(exchange,routingKey, object, correlationId);
+    }
+
+    /**
+     * 发送消息
+     *
+     * @param routingKey 路由关键字
+     * @param object     发送的消息内容
+     */
+    public void send(String routingKey, T object) {
+        CorrelationData correlationId = new CorrelationData(UUID.randomUUID().toString());
+        log.info("开始发送消息: " + JSON.toJSONString(object));
+        rabbitTemplate.convertAndSend(routingKey, object, correlationId);
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/GtUtils.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/GtUtils.java
new file mode 100644
index 0000000..c5c96ec
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/GtUtils.java
@@ -0,0 +1,229 @@
+package com.rootcloud.config.unipush;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.getui.push.v2.sdk.ApiHelper;
+import com.getui.push.v2.sdk.GtApiConfiguration;
+import com.getui.push.v2.sdk.api.PushApi;
+import com.getui.push.v2.sdk.common.ApiResult;
+import com.getui.push.v2.sdk.dto.req.Audience;
+import com.getui.push.v2.sdk.dto.req.Settings;
+import com.getui.push.v2.sdk.dto.req.Strategy;
+import com.getui.push.v2.sdk.dto.req.message.PushChannel;
+import com.getui.push.v2.sdk.dto.req.message.PushDTO;
+import com.getui.push.v2.sdk.dto.req.message.PushMessage;
+import com.getui.push.v2.sdk.dto.req.message.android.AndroidDTO;
+import com.getui.push.v2.sdk.dto.req.message.android.ThirdNotification;
+import com.getui.push.v2.sdk.dto.req.message.android.Ups;
+import com.rootcloud.common.HttpUtils;
+import com.rootcloud.common.util.CommonUtils;
+import jline.internal.Log;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.Charset;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.*;
+
+/**
+ * @author lujiumin
+ * @date 2023/1/6
+ * 描述：个推 2.0 版本
+ */
+@Component
+public class GtUtils {
+
+    /**
+     * app-id: U4wShph5E16OQcRBw9QYQ7
+     * app-key: 7PjMXLUJ0a6rlNJU2TifF1
+     * master-secret: tPvjXYksxhAVaihZZaRPZ
+     * url: http://api.getui.com/apiex.htm
+     */
+    @Value(value = "${unipush.app-id}")
+    private String appId;
+    @Value(value = "${unipush.app-key}")
+    private String appKey;
+    @Value(value = "${unipush.master-secret}")
+    private String masterSecret;
+
+    private String getui_url = "https://restapi.getui.com/v2/";
+
+    /**
+     * 生成签名
+     *
+     * @param appKey
+     * @param masterSecret
+     */
+    public Map<String, String> build(String appKey, String masterSecret) {
+        Map<String, String> maps = new HashMap<>();
+        Long timestamp = System.currentTimeMillis();
+        maps.put("appkey", appKey);
+        maps.put("timestamp", timestamp + "");
+        maps.put("sign", sha256(appKey + timestamp + masterSecret));
+        return maps;
+    }
+
+    private static String sha256(String s) {
+        try {
+            return hex(MessageDigest.getInstance("SHA-256").digest(s.getBytes(Charset.forName("UTF-8"))));
+        } catch (NoSuchAlgorithmException var3) {
+            throw new AssertionError(var3);
+        }
+    }
+
+    private static final char[] HEX_DIGITS = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+    public static String hex(byte[] data) {
+        char[] result = new char[data.length * 2];
+        int c = 0;
+        byte[] var3 = data;
+        int var4 = var3.length;
+
+        for (int var5 = 0; var5 < var4; ++var5) {
+            byte b = var3[var5];
+            result[c++] = HEX_DIGITS[b >> 4 & 15];
+            result[c++] = HEX_DIGITS[b & 15];
+        }
+
+        return new String(result);
+    }
+
+    /**
+     * 登录
+     */
+    private String auth() {
+        String url = getui_url + appId + "/auth";
+        System.out.println("个推登录URL:" + url);
+        Map<String, String> maps = build(appKey, masterSecret);
+        System.out.println("个推登录maps:" + JSON.toJSONString(maps));
+        String result = HttpUtils.httpPostRaw(url, JSON.toJSONString(maps), null, null);
+        System.out.println("结果:" + result);
+        if (StringUtils.isNotBlank(result)) {
+            JSONObject jsonObject = JSON.parseObject(result);
+            if (jsonObject.containsKey("code")) {
+                String code = jsonObject.getString("code");
+                if ("0".equals(code)) {
+                    String data = jsonObject.getString("data");
+                    JSONObject dataJson = JSON.parseObject(data);
+                    if (dataJson.containsKey("token")) {
+                        String token = dataJson.getString("token");
+                        return token;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 推送
+     */
+    public void pushMessage(String body, String title, String cid) {
+        Log.info("在线推送CID：" + cid + ",标题：" + title + ",内容：" + body);
+        //路径
+        String url = getui_url + appId + "/push/single/cid";
+        //准备参数
+        Map<String, Object> param = new HashMap<>();
+        param.put("request_id", CommonUtils.uuid());
+        Map<String, Object> settings = new HashMap<>();
+        settings.put("ttl", 7200000);
+        param.put("settings", settings);
+        Map<String, Object> audience = new HashMap<>();
+        List<String> list = new ArrayList<>();
+        list.add(cid);
+        audience.put("cid", list);
+        param.put("audience", audience);
+        Map<String, Object> push_message = new HashMap<>();
+        Map<String, Object> notification = new HashMap<>();
+        notification.put("title", title);
+        notification.put("body", body);
+        notification.put("big_text", body);
+        notification.put("click_type", "url");
+        notification.put("url", "/pages/preview/preview");
+        push_message.put("notification", notification);
+        param.put("push_message", push_message);
+        //获取token
+        String token = auth();
+        if (StringUtils.isNotBlank(token)) {
+            Map<String, String> headers = new HashMap<>();
+            headers.put("token", token);
+            String str = HttpUtils.httpPostRaw(url, JSON.toJSONString(param), headers, null);
+            Log.info("在线个推结果：" + str);
+        }
+
+    }
+
+    /**
+     * 华为推送
+     *
+     * @param pushTitle
+     * @param cid
+     */
+    public void pushHw(String pushTitle, String cid) {
+        Log.info("离线推送CID：" + cid + ",内容：" + pushTitle);
+        GtApiConfiguration apiConfiguration = new GtApiConfiguration();
+        //填写应用配置
+        apiConfiguration.setAppId(appId);
+        apiConfiguration.setAppKey(appKey);
+        apiConfiguration.setMasterSecret(masterSecret);
+        apiConfiguration.setDomain(getui_url);
+        // 实例化ApiHelper对象，用于创建接口对象
+        ApiHelper apiHelper = ApiHelper.build(apiConfiguration);
+        // 创建对象，建议复用。目前有PushApi、StatisticApi、UserApi
+        PushApi pushApi = apiHelper.creatApi(PushApi.class);
+        //根据cid进行单推
+        PushDTO<Audience> pushDTO = new PushDTO<>();
+        //设置推送参数
+        pushDTO.setRequestId(System.currentTimeMillis() + "");//requestid需要每次变化唯一
+        //配置推送条件
+        // 1: 表示该消息在用户在线时推送个推通道，用户离线时推送厂商通道;
+        // 2: 表示该消息只通过厂商通道策略下发，不考虑用户是否在线;
+        // 3: 表示该消息只通过个推通道下发，不考虑用户是否在线；
+        // 4: 表示该消息优先从厂商通道下发，若消息内容在厂商通道代发失败后会从个推通道下发。
+        Strategy strategy = new Strategy();
+        strategy.setDef(1);
+        Settings settings = new Settings();
+        settings.setStrategy(strategy);
+        pushDTO.setSettings(settings);
+        settings.setTtl(3600000);//消息有效期，走厂商消息需要设置该值
+        PushChannel pushChannel = new PushChannel();
+        // 安卓离线厂商通道推送消息体
+        AndroidDTO androidDTO = new AndroidDTO();
+        Ups ups = new Ups();
+        Map<String, Map<String, Object>> options = new HashMap<>();
+        Map<String, Object> optionsMap = new HashMap<>();
+        optionsMap.put("/message/android/category", "WORK");
+        options.put("HW", optionsMap);
+        ups.setOptions(options);
+        ThirdNotification notification1 = new ThirdNotification();
+        ups.setNotification(notification1);
+        notification1.setTitle("您有一条新通知,点击查看");
+        notification1.setBody(pushTitle);
+        notification1.setClickType("startapp");
+        androidDTO.setUps(ups);
+        pushChannel.setAndroid(androidDTO);
+        pushDTO.setPushChannel(pushChannel);
+        // PushMessage
+        PushMessage pushMessage = new PushMessage();
+        pushDTO.setPushMessage(pushMessage);
+        Map<String, Object> map = new HashMap<>();
+        pushMessage.setTransmission(JSON.toJSONString(map));
+        // 设置接收人信息
+        Audience audience = new Audience();
+        pushDTO.setAudience(audience);
+        audience.addCid(cid);   // cid
+        // 进行cid单推
+        ApiResult<Map<String, Map<String, String>>> apiResult = pushApi.pushToSingleByCid(pushDTO);
+        Log.info("离线个推结果：" + apiResult);
+    }
+
+    public static void main(String[] args) {
+        GtUtils g = new GtUtils();
+        String body = "哈哈哈是的撒旦哈哈哈是的撒旦哈哈哈是的撒旦哈哈哈是的撒旦哈哈哈是的撒旦哈哈哈是的撒旦的士大夫但是";
+        String title = "哈哈哈是的撒旦";
+        String cid = "3b62fc0d992e29293a8bff93e075233d";
+        g.pushHw(body, cid);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/MessageController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/MessageController.java
new file mode 100644
index 0000000..b8cc7ec
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/MessageController.java
@@ -0,0 +1,148 @@
+package com.rootcloud.config.unipush;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.rootcloud.common.DateUtil;
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.ResourceUtil;
+import com.rootcloud.common.constant.Properties;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.config.auth.UserInfo;
+import com.rootcloud.domain.entity.JeCoreEnduserEntity;
+import com.rootcloud.domain.entity.NxJeDeviceEntity;
+import com.rootcloud.domain.entity.NxOrderEntity;
+import com.rootcloud.domain.service.gbsj.JeCoreEnduserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import jline.internal.Log;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.Map;
+
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Log4j2
+@IgnoreSecurity
+@RestController
+@RequestMapping("/message")
+@Api(value = "message", tags = "消息")
+public class MessageController {
+
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
+    @Autowired
+    UniPushAppsConfig uniPushAppsConfig;
+
+    @Resource(name = "endUserService")
+    private JeCoreEnduserService enduserService;
+
+    @Autowired
+    private GtUtils gtUtils;
+
+
+    @ApiOperation(value = "发送通知接口")
+    @PostMapping("/send-notice")
+    public JsonResult<String> sendNotice(@RequestBody UniPushVO upv) {
+//        SendUniPushUtil.sendUniPush(upv.getTitle(),upv.getContent(),upv.getUserId());
+        // 发送个推消息 优先从redis取推送cid，如果redis中不存在则从数据库中取
+        String clientInfo = redisTemplate.opsForValue().get("UNI_PUSH_KEY_PREFIX~" + upv.userId);
+        if (StringUtils.isEmpty(clientInfo)) {
+            Log.info(DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL) + " 发送的通知内容：", upv.title, upv.content, upv.userId);
+            JeCoreEnduserEntity enduserEntity = enduserService.getOne((Wrappers.lambdaQuery(JeCoreEnduserEntity.class).select(JeCoreEnduserEntity::getCid)
+                    .eq(JeCoreEnduserEntity::getUserid, upv.userId)));
+            if (enduserEntity != null && !StringUtils.isEmpty(enduserEntity.getCid())) {
+                clientInfo = enduserEntity.getCid();
+                //重新加载到redis中
+                redisTemplate.opsForValue().set("UNI_PUSH_KEY_PREFIX~" + upv.userId, clientInfo);
+            } else {
+                return JsonResult.failed("500", ResourceUtil.getI18nMessage("40000"));
+            }
+        }
+        Log.info(DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL) + " 发送的通知内容：", upv.title, upv.content, upv.userId, clientInfo);
+        String[] infos = StringUtils.delimitedListToStringArray(clientInfo, "-");
+        if (ArrayUtil.isNotEmpty(infos) && infos.length == 3) {
+            // app clientId
+            String clientId = infos[0];
+            // 系统类型
+            String systemType = infos[1];
+            // 程序来源
+            String appSource = infos[2];
+            // 取得uni-push配置信息
+            if (ObjectUtil.isNotEmpty(uniPushAppsConfig)) {
+                switch (systemType) {
+                    // 安卓
+                    case "ANDROID":
+                        //UnipushUtils.singlePush(upv.title, upv.content, clientId, uniPushAppsConfig);
+                        gtUtils.pushMessage(upv.getContent(), upv.title, clientId);
+                        gtUtils.pushHw(upv.getContent(), clientId);
+                        break;
+                    // ios
+                    case "IOS":
+                        UnipushUtils.singlePushForIOS(upv.title, upv.content, clientId, uniPushAppsConfig);
+                        break;
+                }
+            } else {
+                // 无配置信息
+                log.error("Not config unipush for client [{}]", appSource);
+            }
+        }
+        return JsonResult.success();
+    }
+
+
+    /**
+     * * 存储client信息
+     * * APP用户登录系统时调用
+     *
+     * @param userId     用户id
+     * @param clientInfo 自定义client信息
+     * @return Boolean
+     */
+    @ApiOperation(value = "存储clientInfo")
+    @PostMapping("/save-client-info")
+    public Boolean saveClientInfoToRedis(String userId, String clientInfo) {
+        Log.info("clientId参数接收：", clientInfo, userId);
+        String key = "UNI_PUSH_KEY_PREFIX~" + userId;
+        redisTemplate.opsForValue().set(key, clientInfo);
+        //更新用户cid数据库
+        JeCoreEnduserEntity jeCoreEnduserEntity = new JeCoreEnduserEntity();
+        jeCoreEnduserEntity.setUserid(userId);
+        jeCoreEnduserEntity.setCid(clientInfo);
+        enduserService.updateById(jeCoreEnduserEntity);
+        return Boolean.TRUE;
+    }
+
+
+    /**
+     * 清除client信息
+     *
+     * @param userId 用户id
+     * @return Boolean
+     */
+    @ApiOperation(value = "清除clientInfo")
+    @DeleteMapping("/remove-client-info")
+    public Boolean removeClientInfoForRedis(String userId) {
+        String key = "UNI_PUSH_KEY_PREFIX~" + userId;
+        redisTemplate.delete(key);
+        //更新用户cid数据库
+        JeCoreEnduserEntity jeCoreEnduserEntity = new JeCoreEnduserEntity();
+        jeCoreEnduserEntity.setUserid(userId);
+        jeCoreEnduserEntity.setCid("");
+        enduserService.updateById(jeCoreEnduserEntity);
+        return Boolean.TRUE;
+    }
+}
+
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/SendUniPushUtil.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/SendUniPushUtil.java
new file mode 100644
index 0000000..38e1b06
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/SendUniPushUtil.java
@@ -0,0 +1,66 @@
+package com.rootcloud.config.unipush;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.rootcloud.common.DateUtil;
+import jline.internal.Log;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.util.StringUtils;
+
+import java.util.Date;
+
+/**
+ * @author LiPingAn 2022/7/11 20:33
+ * @version 1.0
+ **/
+@Slf4j
+public class SendUniPushUtil {
+
+    private static StringRedisTemplate redisTemplate;
+    @Autowired
+    private static UniPushAppsConfig uniPushAppsConfig;
+
+    static {
+        redisTemplate = (StringRedisTemplate) new RedisTemplate<String,String>();
+    }
+
+    public static void sendUniPush(String title,String content,String userId){
+        /**
+         * 业务处理根据自己的需求来写，
+         * 先根据用户取得Redis里缓存信息，前端用户登陆app时调接口储存的自定义信息clientInfo （clientId、系统类型、程序来源，具体想存什么根据自己业务），
+         * 然后获取提前配置在nacos上的配置信息，
+         * 再根据不同的系统类型（android、ios）调用不同的工具类方法
+         */
+        // 发送个推消息
+        String clientInfo = redisTemplate.opsForValue().get("UNI_PUSH_KEY_PREFIX~" + userId);
+        Log.info(DateUtil.format(new Date(),DateUtil.PATTERN_CLASSICAL)+" 发送的通知内容：",title,content,userId);
+        String[] infos = StringUtils.delimitedListToStringArray(clientInfo, "-");
+        if (ArrayUtil.isNotEmpty(infos) && infos.length == 3) {
+            // app clientId
+            String clientId = infos[0];
+            // 系统类型
+            String systemType = infos[1];
+            // 程序来源
+            String appSource = infos[2];
+            // 取得uni-push配置信息
+            if (ObjectUtil.isNotEmpty(uniPushAppsConfig)) {
+                switch (systemType) {
+                    // 安卓
+                    case "ANDROID":
+                        UnipushUtils.singlePush(title, content, clientId, uniPushAppsConfig);
+                        break;
+                    // ios
+                    case "IOS":
+                        UnipushUtils.singlePushForIOS(title, content, clientId, uniPushAppsConfig);
+                        break;
+                }
+            } else {
+                // 无配置信息
+                log.error("Not config unipush for client [{}]", appSource);
+            }
+        }
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/UniPushAppsConfig.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/UniPushAppsConfig.java
new file mode 100644
index 0000000..f1cfd84
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/UniPushAppsConfig.java
@@ -0,0 +1,25 @@
+package com.rootcloud.config.unipush;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @author LiPingAn 2022/7/11 14:11
+ * @version 1.0
+ * 自己根据业务需求取配置相关信息
+ */
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "unipush")
+public class UniPushAppsConfig {
+    private String appId;
+    private String appKey;
+    private String masterSecret;
+    private String url;
+}
+
+
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/UniPushVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/UniPushVO.java
new file mode 100644
index 0000000..bdb3137
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/UniPushVO.java
@@ -0,0 +1,14 @@
+package com.rootcloud.config.unipush;
+
+import lombok.Data;
+
+/**
+ * @author LiPingAn 2022/7/12 17:30
+ * @version 1.0
+ **/
+@Data
+public class UniPushVO {
+    String content;
+    String title;
+    String userId;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/UnipushUtils.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/UnipushUtils.java
new file mode 100644
index 0000000..019a2b1
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/config/unipush/UnipushUtils.java
@@ -0,0 +1,199 @@
+package com.rootcloud.config.unipush;
+
+import com.alibaba.fastjson.JSON;
+import com.gexin.rp.sdk.base.IPushResult;
+import com.gexin.rp.sdk.base.impl.SingleMessage;
+import com.gexin.rp.sdk.base.impl.Target;
+import com.gexin.rp.sdk.base.payload.APNPayload;
+import com.gexin.rp.sdk.exceptions.RequestException;
+import com.gexin.rp.sdk.http.Constants;
+import com.gexin.rp.sdk.http.IGtPush;
+import com.gexin.rp.sdk.template.NotificationTemplate;
+import com.gexin.rp.sdk.template.TransmissionTemplate;
+import com.gexin.rp.sdk.template.style.Style0;
+import com.rootcloud.common.DateUtil;
+import jline.internal.Log;
+import lombok.extern.log4j.Log4j2;
+
+import java.util.Date;
+
+/**
+ * uni-push 工具类
+ *
+ * @author kelvins
+ */
+@Log4j2
+public class UnipushUtils {
+
+    /**
+     * 单消息推送(安卓)
+     *
+     * @param title         标题
+     * @param content       内容
+     * @param clientId      推送者clientId
+     * @param uniPushConfig unipush配置信息
+     */
+    public static void singlePush(String title, String content, String clientId,
+                                  UniPushAppsConfig uniPushConfig) {
+        System.setProperty(Constants.GEXIN_PUSH_SINGLE_ALIAS_DETAIL, "true");
+        IGtPush push = new IGtPush(uniPushConfig.getUrl(), uniPushConfig.getAppKey(),
+                uniPushConfig.getMasterSecret());
+        log.info("unipush info(title - content - clientId) [{}] - [{}] - [{}]", title,
+                content, clientId);
+        log.info("unipush config data. {}", JSON.toJSON(uniPushConfig));
+
+        Style0 style = new Style0();
+        // STEP2：设置推送标题、推送内容
+        style.setTitle(title);
+        style.setText(content);
+        // 设置推送图标
+//        style.setLogo("./src/main/resources/static/push.png");
+        // 配置通知栏网络图标
+        style.setLogoUrl("");
+        // STEP3：设置响铃、震动等推送效果
+        // 设置响铃
+        style.setRing(true);
+        // 设置震动
+        style.setVibrate(true);
+
+        // STEP4：选择通知模板
+        NotificationTemplate template = new NotificationTemplate();
+        template.setTransmissionType(1);
+        template.setAppId(uniPushConfig.getAppId());
+        template.setAppkey(uniPushConfig.getAppKey());
+        template.setStyle(style);
+
+        SingleMessage message = new SingleMessage();
+        message.setOffline(true);
+        // 离线有效时间，单位为毫秒
+        message.setOfflineExpireTime(24 * 3600 * 1000);
+        message.setData(template);
+        // 可选，1为wifi，0为不限制网络环境。根据手机处于的网络情况，决定是否下发
+        message.setPushNetWorkType(0);
+
+        Target target = new Target();
+        target.setAppId(uniPushConfig.getAppId());
+        target.setClientId(clientId);
+
+        IPushResult ret = null;
+        try {
+            ret = push.pushMessageToSingle(message, target);
+        } catch (RequestException e) {
+            System.out.println(e.getMessage());
+            ret = push.pushMessageToSingle(message, target, e.getRequestId());
+        }
+        if (ret != null) {
+            Log.info("unipush result." + ret.getResponse().toString());
+        } else {
+            Log.error("服务器响应异常");
+        }
+    }
+
+    /**
+     * 单消息推送(IOS)
+     *
+     * @param title         标题
+     * @param content       内容
+     * @param clientId      推送者clientId
+     * @param uniPushConfig unipush配置信息
+     */
+    public static void singlePushForIOS(String title, String content, String clientId,
+                                        UniPushAppsConfig uniPushConfig) {
+        System.setProperty(Constants.GEXIN_PUSH_SINGLE_ALIAS_DETAIL, "true");
+        IGtPush push = new IGtPush(uniPushConfig.getUrl(), uniPushConfig.getAppKey(),
+                uniPushConfig.getMasterSecret());
+        log.info("unipush info(title - content - clientId) [{}] - [{}] - [{}]", title,
+                content, clientId);
+        log.info("unipush config data. {}", JSON.toJSON(uniPushConfig));
+        TransmissionTemplate transmissionTemplate = transmissionTemplateDemo(title, content,
+                uniPushConfig.getAppId(),
+                uniPushConfig.getAppKey());
+
+        SingleMessage message = new SingleMessage();
+        message.setOffline(true);
+        // 离线有效时间，单位为毫秒
+        message.setOfflineExpireTime(24 * 3600 * 1000);
+        message.setData(transmissionTemplate);
+        // 可选，1为wifi，0为不限制网络环境。根据手机处于的网络情况，决定是否下发
+        message.setPushNetWorkType(0);
+        // 厂商通道下发策略
+        message.setStrategyJson("{\"default\":4,\"ios\":4,\"st\":4}");
+
+        Target target = new Target();
+        target.setAppId(uniPushConfig.getAppId());
+        target.setClientId(clientId);
+
+        IPushResult ret = null;
+        try {
+            ret = push.pushMessageToSingle(message, target);
+        } catch (RequestException e) {
+            e.printStackTrace();
+            ret = push.pushMessageToSingle(message, target, e.getRequestId());
+        }
+        if (ret != null) {
+            Log.info(DateUtil.format(new Date(),DateUtil.PATTERN_CLASSICAL)+" uni-push result." + ret.getResponse().toString());
+        } else {
+            Log.error("服务器响应异常");
+        }
+    }
+
+    /**
+     * 取得IOS透传消息模板
+     *
+     * @param title   消息标题
+     * @param content 消息内容
+     * @return
+     */
+    public static TransmissionTemplate transmissionTemplateDemo(String title, String content,
+                                                                String APPID, String APPKEY) {
+        TransmissionTemplate template = new TransmissionTemplate();
+        template.setAppId(APPID);
+        template.setAppkey(APPKEY);
+        template.setTransmissionType(2);
+        template.setTransmissionContent(content);
+        template.setAPNInfo(getAPNPayload(title, content)); //详见本页iOS通知样式设置
+        return template;
+    }
+
+    /**
+     * 取得IOS透传消息配置
+     *
+     * @param title   消息标题
+     * @param content 消息内容
+     * @return
+     */
+    private static APNPayload getAPNPayload(String title, String content) {
+        APNPayload payload = new APNPayload();
+        //在已有数字基础上加1显示，设置为-1时，在已有数字上减1显示，设置为数字时，显示指定数字
+        payload.setAutoBadge("+1");
+        payload.setContentAvailable(0);
+        //ios 12.0 以上可以使用 Dictionary 类型的 sound
+        payload.setSound("default");
+        payload.setCategory("$由客户端定义");
+        payload.addCustomMsg("由客户自定义消息key", "由客户自定义消息value");
+
+        //简单模式APNPayload.SimpleMsg
+        //payload.setAlertMsg(new APNPayload.SimpleAlertMsg("hello"));
+        payload.setAlertMsg(
+                getDictionaryAlertMsg(title, content));  //字典模式使用APNPayload.DictionaryAlertMsg
+        return payload;
+    }
+
+    /**
+     * IOS自定义消息标题和内容
+     *
+     * @param title   消息标题
+     * @param content 消息内容
+     * @return
+     */
+    private static APNPayload.DictionaryAlertMsg getDictionaryAlertMsg(String title,
+                                                                       String content) {
+        APNPayload.DictionaryAlertMsg alertMsg = new APNPayload.DictionaryAlertMsg();
+        // 设置通知内容
+        alertMsg.setBody(content);
+        // 设置通知标题
+        alertMsg.setTitle(title);
+        return alertMsg;
+    }
+}
+
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AbaBaseController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AbaBaseController.java
new file mode 100644
index 0000000..d0da311
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AbaBaseController.java
@@ -0,0 +1,77 @@
+package com.rootcloud.controller;
+
+
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.SprintBeanUtils;
+import com.rootcloud.domain.service.auth.RootCloudAuthService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import jline.internal.Log;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+@RestController
+@Api(tags = "AbaBase需要转化接口")
+@RequestMapping("/aba-base")
+@IgnoreSecurity
+public class AbaBaseController {
+
+    @Value("${application.source}")
+    private String source;
+
+    private static RootCloudAuthService rootCloudAuthService;
+
+    private void init() {
+        if ("CLOUD".equals(source)) {
+            rootCloudAuthService = SprintBeanUtils.getBean("cloudAuthService");
+        }
+    }
+
+    @PostMapping("/get-verification-code")
+    @ApiOperation(value = "获取短信", notes = "获取短信")
+    public JsonResult<Object> getVerificationCode(@RequestBody Map<String, Object> param) {
+        Log.info("获取短信参数"+param);
+        init();
+        return rootCloudAuthService.getCode(param);
+    }
+
+    @PostMapping("/send-confirm-verify-code")
+    @ApiOperation(value = "获取短信", notes = "获取短信")
+    public JsonResult<Object> sendConfirmVerifyCode(@RequestBody Map<String, Object> param) {
+        Log.info("获取短信参数"+param);
+        init();
+        return rootCloudAuthService.getCode(param);
+    }
+
+
+
+    @PostMapping("/reset-password-by-contact")
+    @ApiOperation(value = "修改密码提交", notes = "修改密码提交")
+    public JsonResult<Object> modifyPassWord(HttpServletRequest request,@RequestBody Map<String, Object> param) {
+        init();
+        param.put("Authorization",request.getHeader("Authorization"));
+        return rootCloudAuthService.modifyPassWord(param);
+    }
+
+    @PostMapping("/update-pwd")
+    @ApiOperation(value = "找回密码提交", notes = "找回密码提交")
+    public JsonResult<Object> findPassWord(HttpServletRequest request,@RequestBody Map<String, Object> param) {
+        init();
+        return rootCloudAuthService.findPassWord(param);
+    }
+
+    @PostMapping("/update-email")
+    @ApiOperation(value = "修改邮箱", notes = "修改邮箱")
+    public JsonResult<Object> updateEmail(HttpServletRequest request,@RequestBody Map<String, Object> param) {
+        init();
+        return rootCloudAuthService.updateEmail(param);
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppBaseController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppBaseController.java
new file mode 100644
index 0000000..6ef1e3f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppBaseController.java
@@ -0,0 +1,74 @@
+package com.rootcloud.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.rootcloud.config.auth.LoginUserInfo;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.domain.dto.EnterpriseInfoDTO;
+import com.rootcloud.domain.dto.UserRoleDeptDTO;
+import com.rootcloud.domain.service.gbsj.JeCoreEnduserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import jline.internal.Log;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author LiPingAn 2022/6/17 2:14
+ * @version 1.0
+ **/
+@RestController
+@Api(tags = "APP端租户用户相关接口")
+@RequestMapping("/api")
+public class AppBaseController {
+
+    @Resource(name = "endUserService")
+    JeCoreEnduserService enduserService;
+
+
+    @ApiOperation(value = "查询租户信息")
+    @GetMapping("/tenants/tenant-info")
+    public ResponseEntity<EnterpriseInfoDTO> tenantInfo(HttpServletResponse response) {
+        //Log.info("查询租户信息", "===============》",response);
+        LoginUserInfo current = UserContext.current();
+        if (current!=null && StringUtils.isNotBlank(current.getUserId())) {
+            return ResponseEntity.ok().body(enduserService.getTenantInfo(current.getUserId()));
+        }else {
+            return null;
+        }
+    }
+
+    @ApiOperation(value = "查询用户信息")
+    @GetMapping("/user-info")
+    public ResponseEntity<UserRoleDeptDTO> userInfo() {
+//        Log.info("查询用户信息", "===============》");
+        LoginUserInfo current = UserContext.current();
+        if (current!=null && StringUtils.isNotBlank(current.getUserId())) {
+            return ResponseEntity.ok().body(enduserService.getUserLoginInfo(current.getUserId()));
+        }else {
+            return null;
+        }
+    }
+    @ApiOperation(value = "查询用户信息")
+    @GetMapping("/v3/system")
+    public ResponseEntity<Map<Object, Object>> systemInfo() {
+        LoginUserInfo current = UserContext.current();
+        HashMap<Object, Object> result = new HashMap<>(8);
+        if (current!=null && StringUtils.isNotBlank(current.getUserId())) {
+            result.put("tenantInfo",enduserService.getTenantInfo(current.getUserId()));
+            result.put("userInfo",enduserService.getUserLoginInfo(current.getUserId()));
+            return ResponseEntity.ok().body(result);
+        }else {
+            result.put(String.valueOf(HttpServletResponse.SC_FORBIDDEN),"用户未授权");
+            return ResponseEntity.ok().body(result);
+        }
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppDeviceController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppDeviceController.java
new file mode 100644
index 0000000..553c800
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppDeviceController.java
@@ -0,0 +1,116 @@
+package com.rootcloud.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.ResourceUtil;
+import com.rootcloud.common.enums.StatusCodeEnum;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.domain.constant.AppConstant;
+import com.rootcloud.domain.service.device.DeviceAlarmService;
+import com.rootcloud.vo.rest.AppDeviceAlarmParam;
+import com.rootcloud.domain.service.gkjk.NxJeDeviceService;
+import com.rootcloud.vo.device.DeviceStatusVO;
+import com.rootcloud.vo.device.DeviceTypeVO;
+import com.rootcloud.domain.dto.DeviceVO;
+import com.rootcloud.vo.rest.DevicePropertyValueParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import jline.internal.Log;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.ApiParam;
+
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+/**
+ * @author:xxxxx
+ * @create: 2022-05-12 10:15
+ * @Description: APP端设备相关接口
+ */
+@RestController
+@Api(tags = "APP端设备信息查询相关接口")
+@RequestMapping("/app_device")
+public class AppDeviceController {
+    @Resource(name="deviceAlarmServiceImpl")
+    private DeviceAlarmService deviceAlarmService;
+
+    @Resource(name = "nxJeDeviceServiceImpl")
+    private NxJeDeviceService nxJeDeviceService;
+
+    @ApiOperation(value = "报警信息查询")
+    @PostMapping("query-alarm-info")
+    public JsonResult<Object> queryDeviceAlarmInfo(@RequestBody AppDeviceAlarmParam deviceAlarmParam) {
+        //规则报警
+        if("1".equals(deviceAlarmParam.getAlarmType())){
+            return JsonResult.success(deviceAlarmService.getDeviceRuleAlarmCount(deviceAlarmParam));
+        }
+        //故障码报警
+        if("2".equals(deviceAlarmParam.getAlarmType())){
+            return JsonResult.success(deviceAlarmService.getDeviceCodeAlarmCount(deviceAlarmParam));
+        }
+        if("all".equals(deviceAlarmParam.getAlarmType())){
+            return JsonResult.success(deviceAlarmService.getDeviceAllAlarmCount(deviceAlarmParam));
+        }
+
+        //return JsonResult.failed(StatusCodeEnum.ALARM_TYPE_REQUIRED.getRet(),StatusCodeEnum.ALARM_TYPE_REQUIRED.getMessage());
+        return JsonResult.failed(StatusCodeEnum.ALARM_TYPE_REQUIRED.getRet(), ResourceUtil.getI18nMessage("13507"));
+    }
+
+
+
+    @ApiOperation("获取设备首页详情")
+    @GetMapping("/getByDeviceId")
+    public JsonResult<DeviceTypeVO> getByDeviceId(@RequestParam @ApiParam("设备ID")String deviceId) {
+        try{
+            return JsonResult.success(nxJeDeviceService.getByDeviceId(deviceId));
+        }catch (Exception e){
+            e.printStackTrace();
+            return JsonResult.failed("500",e.getMessage());
+        }
+    }
+
+
+
+    @ApiOperation("获取设备状态")
+    @GetMapping("/getStatusByDeviceId")
+    public JsonResult<DeviceStatusVO> getStatusByDeviceId(@RequestParam @ApiParam("设备ID")String deviceId) {
+        try{
+            return JsonResult.success(nxJeDeviceService.getStatusByDeviceId(deviceId));
+        }catch (Exception e){
+            return JsonResult.failed("500",e.getMessage());
+        }
+    }
+
+    @ApiOperation("设备列表")
+    @GetMapping("/device/page")
+    public JsonResult<IPage<DeviceVO>> devicePage(
+            @ApiParam("页码数，默认为1") @RequestParam(value = "page", defaultValue = AppConstant.PAGE) int page,
+            @ApiParam("每页数，默认为10") @RequestParam(value = "size", defaultValue = AppConstant.SIZE) int size,
+            @ApiParam("查询条件(支持地点、状态、型号、名称)") @RequestParam(value = "queryData", required = false) String queryData,
+            @ApiParam("当前登录人") @RequestParam(value = "userId") String userId,
+            @ApiParam("是否关心") @RequestParam(value = "isCare", required = false) String isCare) {
+        //Log.info("设备列表租户id："+UserContext.getTenantId());
+        return JsonResult.success(nxJeDeviceService.devicePage(queryData, isCare, page, size, userId, UserContext.getTenantId()));
+    }
+
+    @ApiOperation("查询设备指定的状态")
+    @PostMapping("/queryPropertyValueByParam")
+    public JsonResult<Map<String,Object>> queryPropertyValueByParam(@RequestBody DevicePropertyValueParam devicePropertyValueParam){
+        return JsonResult.success(nxJeDeviceService.queryPropertyValueByParam(devicePropertyValueParam));
+    }
+
+
+
+    @ApiOperation("修改入云时间")
+    @GetMapping("/saleCustomerStatistic")
+    public JsonResult updateOnlineTime(@RequestParam @ApiParam("更新设备IDs")String deviceIds){
+        try{
+            nxJeDeviceService.updateOnlineTime(deviceIds);
+            return JsonResult.success("更新成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            return JsonResult.failed("500",e.getMessage());
+        }
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppMessageController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppMessageController.java
new file mode 100644
index 0000000..9477b6c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppMessageController.java
@@ -0,0 +1,160 @@
+package com.rootcloud.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.PageRequest;
+import com.rootcloud.domain.entity.MyAdviceEntity;
+import com.rootcloud.domain.entity.MyMessageEntity;
+import com.rootcloud.domain.entity.ds.DeviceListEntity;
+import com.rootcloud.domain.service.app.MyAdviceService;
+import com.rootcloud.domain.service.app.MyMessageService;
+import com.rootcloud.domain.service.todo.NxTodoLibraryService;
+import com.rootcloud.vo.app.AdviceResultVo;
+import com.rootcloud.vo.app.MessageResultVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import jline.internal.Log;
+import javax.annotation.Resource;
+import java.util.Iterator;
+import java.util.List;
+
+
+@RestController
+@Slf4j
+@Api(tags = "app消息")
+@RequestMapping("/message")
+public class AppMessageController {
+    @Resource(name = "myAdviceServiceImpl")
+    private MyAdviceService myAdviceService;
+    @Resource(name = "myMessageServiceImpl")
+    private MyMessageService myMessageService;
+    @Resource(name = "nxTodoLibraryServiceImpl")
+    private NxTodoLibraryService nxTodoLibraryService;
+
+
+    @ApiOperation(value = "查询app我的订单")
+    @GetMapping("/myOrder")
+    public JsonResult<PageInfo<MyMessageEntity>> myOrder(PageRequest pageRequest, @RequestParam @ApiParam("用户ID") String userId, @ApiParam("类型") @RequestParam(value = "type", required = false) String type){
+        try{
+            return  myMessageService.getOrderMessage(pageRequest,userId,type);
+        }catch (Exception e){
+            log.info("错误信息==>{}",e.getMessage());
+            return JsonResult.failed("500",e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "查询app我的通知")
+    @GetMapping("/advice")
+    public JsonResult<PageInfo<MyAdviceEntity>> getAdvice(PageRequest pageRequest,@RequestParam @ApiParam("用户ID") String userId, @ApiParam("类型") @RequestParam(value = "type", required = false) String type){
+        try{
+            return  myAdviceService.getMyAdvices(pageRequest,userId,type);
+        }catch (Exception e){
+            Log.info("错误信息==>{}",e.getMessage());
+            return JsonResult.failed("500",e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "查询app我的消息")
+    @GetMapping("/message")
+    public JsonResult<MessageResultVo> getMessage(@RequestParam("userId") String userId, @ApiParam("类型") @RequestParam(value = "type", required = false) String type){
+       // try{
+            return JsonResult.success( myMessageService.getMyMessage(userId,type));
+        /*}catch (Exception e){
+            Log.info("查询app我的消息错误信息==>{}",e.getMessage());
+            return JsonResult.failed("500",e.getMessage());
+        }*/
+    }
+
+    @ApiOperation(value = "查询故障报警消息")
+    @GetMapping("/alrmMessage")
+    public JsonResult<MessageResultVo> getAlrmMessage(PageRequest pageRequest,@RequestParam("userId") String userId, @ApiParam("类型") @RequestParam(value = "type", required = false) String type){
+        // try{
+        int pageNum = pageRequest.getPage() == null ? 1 : pageRequest.getPage();
+        int pageSize = pageRequest.getSize() == null ? 10 : pageRequest.getSize();
+        int startIndex  = (pageNum -1 ) * pageSize;
+        MessageResultVo messageResultVo= myMessageService.getMyAlrmMessage(userId,type);
+        List<MyMessageEntity> messageEntityList= messageResultVo.getMessageEntityList();
+        //截取数组
+        if(messageEntityList!=null&&messageEntityList.size()>startIndex+pageSize-1){
+            messageResultVo.setMessageEntityList(messageEntityList.subList(startIndex,startIndex+pageSize-1));
+        }
+
+        return JsonResult.success( messageResultVo);
+        /*}catch (Exception e){
+            Log.info("查询app我的消息错误信息==>{}",e.getMessage());
+            return JsonResult.failed("500",e.getMessage());
+        }*/
+    }
+
+
+    @ApiOperation(value = "消息移入代办库")
+    @PostMapping("/message-insert-libaray")
+    public JsonResult messageInsertLibaray(@RequestBody MyMessageEntity myMessageEntity){
+        try{
+            nxTodoLibraryService.insertMessageLibarary(myMessageEntity);
+        }catch (Exception e){
+            return JsonResult.failed("500",e.getMessage());
+        }
+        return JsonResult.success();
+    }
+
+
+
+    @ApiOperation(value = "通知移入代办库")
+    @PostMapping("/advice-insert-libaray")
+    public JsonResult adviceInsertLibaray(@RequestBody MyAdviceEntity myAdviceEntity){
+        try{
+            nxTodoLibraryService.insertAdviceToLibarary(myAdviceEntity);
+        }catch (Exception e){
+            return JsonResult.failed("500",e.getMessage());
+        }
+        return JsonResult.success();
+    }
+
+    @ApiOperation(value = "订单通知消息已解决")
+    @GetMapping("/mesSfjj")
+    public JsonResult mesSfjj(@RequestParam String orderId){
+        try{
+            myMessageService.mesSfjj(orderId);
+        }catch (Exception e){
+            return JsonResult.failed("500",e.getMessage());
+        }
+        return JsonResult.success();
+    }
+    @ApiOperation(value = "根据主键删除待办库")
+    @GetMapping("/delTodoLibrary")
+    public JsonResult delTodoLibrary(@RequestParam String nxTodoLibraryId){
+        try{
+            nxTodoLibraryService.delTodoLibrary(nxTodoLibraryId);
+        }catch (Exception e){
+            return JsonResult.failed("500",e.getMessage());
+        }
+        return JsonResult.success();
+    }
+
+    @ApiOperation(value = "设备通知消息已解决")
+    @GetMapping("/eqMesSfjj")
+    public JsonResult eqMesSfjj(@RequestParam String id,String type){
+        try{
+            myAdviceService.eqMesSfjj(id,type);
+        }catch (Exception e){
+            return JsonResult.failed("500",e.getMessage());
+        }
+        return JsonResult.success();
+    }
+
+    @ApiOperation(value = "服务通知消息已解决")
+    @GetMapping("/serMesSfjj")
+    public JsonResult serMesSfjj(@RequestParam String id,String type){
+        try{
+            myMessageService.serMesSfjj(id,type);
+        }catch (Exception e){
+            return JsonResult.failed("500",e.getMessage());
+        }
+        return JsonResult.success();
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppNxZskFaultCodeController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppNxZskFaultCodeController.java
new file mode 100644
index 0000000..693805b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppNxZskFaultCodeController.java
@@ -0,0 +1,45 @@
+package com.rootcloud.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.domain.constant.AppConstant;
+import com.rootcloud.domain.service.device.FaultCodeService;
+import com.rootcloud.vo.faultcode.FaultCodeDetailVo;
+import com.rootcloud.vo.faultcode.FaultCodeVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@Api(tags = "APP知识库查询")
+@RequestMapping("/app_faultCode")
+public class AppNxZskFaultCodeController {
+
+    @Resource(name = "faultCodeServiceImpl")
+    private FaultCodeService faultCodeService;
+
+    @ApiOperation("分页查询知识库")
+    @GetMapping("/page")
+    public JsonResult<IPage<FaultCodeVo>> faultCodePage(
+            @ApiParam("页码数，默认为1") @RequestParam(value = "page", defaultValue = AppConstant.PAGE) int page,
+            @ApiParam("每页数，默认为10") @RequestParam(value = "size", defaultValue = AppConstant.SIZE) int size,
+            @ApiParam("查询条件(故障码、故障描述)") @RequestParam(value = "queryData", required = false) String queryData,
+            @ApiParam("适用设备类型码") @RequestParam(value = "faultcodeSblxcode", required = false) String faultcodeSblxcode){
+        return JsonResult.success(faultCodeService.getPage(page,size,queryData,faultcodeSblxcode));
+    }
+
+
+    @ApiOperation("查询知识库详情")
+    @GetMapping("/faultCodeDetail")
+    public JsonResult<FaultCodeDetailVo> selectDetailById(@ApiParam("知识库主键") @RequestParam(value = "nxZskFaultcodeId", required = true) String nxZskFaultcodeId){
+        return JsonResult.success(faultCodeService.selectById(nxZskFaultcodeId));
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppOrderController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppOrderController.java
new file mode 100644
index 0000000..b51b01b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/AppOrderController.java
@@ -0,0 +1,119 @@
+package com.rootcloud.controller;
+
+import javax.annotation.Resource;
+
+import jline.internal.Log;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.domain.ao.OrderDispatchForm;
+import com.rootcloud.domain.constant.AppConstant;
+import com.rootcloud.domain.dto.OrderVO;
+import com.rootcloud.domain.service.order.OrderService;
+import com.rootcloud.vo.order.OrderSignInParam;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * APP端订单相关接口
+ * </P>
+ *
+ * @author HeJia
+ * @since 2022/5/17
+ */
+@Api(tags = "APP端订单相关接口")
+@RestController
+@Slf4j
+@RequestMapping("/app/order")
+public class AppOrderController {
+
+    @Resource(name = "orderServiceImpl")
+    private OrderService orderService;
+
+    @ApiOperation("订单列表")
+    @GetMapping("/page")
+    public JsonResult<IPage<OrderVO>> orderPage(
+            @ApiParam("页码数，默认为1") @RequestParam(value = "page", defaultValue = AppConstant.PAGE) int page,
+            @ApiParam("每页数，默认为10") @RequestParam(value = "size", defaultValue = AppConstant.SIZE) int size,
+            @ApiParam("服务类型") @RequestParam(value = "serviceType", required = false) String serviceType,
+            @ApiParam("订单状态") @RequestParam(value = "orderStatus", required = false) String orderStatus) {
+        return JsonResult.success(orderService.orderPage(page, size, serviceType, orderStatus));
+    }
+
+    @ApiOperation("订单详情")
+    @GetMapping("/{orderId}")
+    public JsonResult<OrderVO> orderInfo(@ApiParam("订单主键") @PathVariable String orderId) {
+        return JsonResult.success(orderService.orderInfo(orderId));
+    }
+
+    @ApiOperation("派工")
+    @PutMapping("/dispatch")
+    public JsonResult<Boolean> dispatch(@RequestBody @Validated OrderDispatchForm form) {
+        return JsonResult.success(orderService.dispatch(form));
+    }
+
+    @ApiOperation("作废")
+    @PatchMapping("/invalid/{orderId}")
+    public JsonResult<Boolean> invalid(@ApiParam("订单主键") @PathVariable String orderId) {
+        return JsonResult.success(orderService.invalid(orderId));
+    }
+
+
+    @ApiOperation("订单签到")
+    @PostMapping("/orderSignIn")
+    public JsonResult orderSignIn(@RequestBody @Validated OrderSignInParam orderSignInParam) {
+        try {
+            orderService.orderSignIn(orderSignInParam);
+        } catch (Exception e) {
+            Log.info("错误信息：{}", e.getMessage());
+            e.printStackTrace();
+            return JsonResult.failed("500", e.getMessage());
+        }
+        return JsonResult.success("订单签到");
+    }
+
+    @ApiOperation("订单处理步骤")
+    @GetMapping("/orderProcess")
+    public JsonResult<List> orderProcess(@RequestParam String orderId) {
+        return JsonResult.success(orderService.orderProcess(orderId));
+    }
+
+    @ApiOperation("订单移入代办库")
+    @GetMapping("/order-insert-library")
+    public JsonResult<List> orderInsertLibrary(@RequestParam String orderId) {
+        try {
+            orderService.orderInsertLibrary(orderId);
+        } catch (Exception e) {
+            return JsonResult.failed("500", e.getMessage());
+        }
+        return JsonResult.success();
+    }
+
+    @ApiOperation("获取订单数量汇总")
+    @GetMapping("/getOrderTypeNum")
+    public JsonResult<HashMap> getOrderTypeNum() {
+        return JsonResult.success(orderService.getOrderTypeNum());
+    }
+
+    @ApiOperation("获取订单数量汇总2")
+    @GetMapping("/getOrderTypeNum2")
+    public JsonResult<HashMap> getOrderTypeNum2() {
+        return JsonResult.success(orderService.getOrderTypeNum2());
+    }
+
+    @Scheduled(cron = "0 0/2 8-20 * * ?")
+    public JsonResult cron() {
+        return JsonResult.success(orderService.getOrderTypeNum());
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/CarouselController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/CarouselController.java
new file mode 100644
index 0000000..afd2ecc
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/CarouselController.java
@@ -0,0 +1,86 @@
+package com.rootcloud.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.rootcloud.common.JsonResult2;
+import com.rootcloud.common.JsonResultStatus;
+import com.rootcloud.domain.dto.CarouselDTO;
+import com.rootcloud.domain.vo.CarouselVO;
+import com.rootcloud.service.impl.CarouselServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.util.Asserts;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author w-yanxiang
+ * @Date 2022/6/16 10:20
+ * @Version 1.0
+ * @Description
+ */
+@RestController
+@Slf4j
+@Api(tags = "轮播图")
+@RequestMapping("/carousel")
+public class CarouselController {
+
+    @Resource
+    private CarouselServiceImpl carouselService;
+
+    @PostMapping("/save/submit")
+    @ApiOperation("保存轮播数据")
+    public JsonResult2 saveOrSubmitCarousel(@RequestBody CarouselDTO carouselDTO){
+        log.info("saveOrSubmitCarousel param [{}]", JSONObject.toJSONString(carouselDTO));
+        try {
+            Asserts.notBlank(carouselDTO.getOperationType(),"operationType");
+            carouselService.saveOrsubmitCarousel(carouselDTO);
+            return new JsonResult2();
+        } catch (Exception e) {
+           log.error("saveOrSubmitCarousel error",e);
+           return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(),e.getMessage());
+        }
+    }
+
+
+    @GetMapping("/find/carousel")
+    @ApiOperation("查询轮播数据")
+    public JsonResult2 findCarouselInfoData(@RequestParam String source){
+        log.info("findCarouselInfoData param [{}]",source);
+        try {
+            CarouselVO carouselInfoData = carouselService.findCarouselInfoData(source);
+            return new JsonResult2(carouselInfoData);
+        } catch (Exception e) {
+            log.error("findCarouselInfoData error",e);
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(),e.getMessage());
+        }
+    }
+
+    @PostMapping("/saveUpdate/carousel")
+    @ApiOperation("保存或修改一个轮播图数据")
+    public JsonResult2 saveOrUpdateOneCarousel(@RequestParam(required = false) String id,@RequestParam String imageUrl){
+        log.info("saveOrUpdateOneCarousel param [{}]----[{}]",id,imageUrl);
+        try {
+            carouselService.saveOrUpdateOneCarousel(id,imageUrl);
+            return new JsonResult2();
+        } catch (Exception e) {
+            log.error("saveOrUpdateOneCarousel error",e);
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(),e.getMessage());
+        }
+    }
+
+    @DeleteMapping("/delete/carousel")
+    @ApiOperation("删除轮播数据")
+    public JsonResult2 deleteCarousel(@RequestParam List<String> ids){
+        log.info("deleteCarousel param [{}]",ids);
+        try {
+            carouselService.deleteCarousel(ids);
+            return new JsonResult2();
+        } catch (Exception e) {
+            log.error("deleteCarousel error",e);
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(),e.getMessage());
+        }
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/CommonController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/CommonController.java
new file mode 100644
index 0000000..8c14291
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/CommonController.java
@@ -0,0 +1,33 @@
+package com.rootcloud.controller;
+
+import com.rootcloud.common.IgnoreSecurity;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 公用接口
+ */
+@RestController
+@Api(tags = "公用接口")
+@RequestMapping("/common")
+@IgnoreSecurity
+public class CommonController {
+    @Resource
+    private RedisTemplate redisTemplate;
+    /**
+     *语言环境切换
+     */
+    @ApiOperation("切换语言环境")
+    @GetMapping("/changeLanguage")
+    public void changeLanguage(@RequestParam String language, HttpServletRequest request) {
+        redisTemplate.opsForValue().set("user_id~language",language);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/DeviceController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/DeviceController.java
new file mode 100644
index 0000000..359506b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/DeviceController.java
@@ -0,0 +1,129 @@
+package com.rootcloud.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.PageRequest;
+import com.rootcloud.common.ResourceUtil;
+import com.rootcloud.common.enums.StatusCodeEnum;
+import com.rootcloud.domain.dto.DeviceDTO;
+import com.rootcloud.domain.dto.DeviceSpecialDTO;
+import com.rootcloud.domain.dto.NxDeviceDTO;
+import com.rootcloud.domain.dto.NxDeviceDTO;
+import com.rootcloud.domain.entity.device.NxDeviceCameraEntity;
+import com.rootcloud.domain.model.WorkStatusMonitorModel;
+import com.rootcloud.domain.service.device.DeviceAlarmService;
+import com.rootcloud.domain.service.device.DeviceService;
+import com.rootcloud.domain.service.device.NxDeviceService;
+import com.rootcloud.vo.device.*;
+import com.rootcloud.vo.rest.DeviceAlarmParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备管理
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 14:02
+ */
+@RestController
+@Api(tags = "设备管理接口")
+@RequestMapping("/device")
+public class DeviceController {
+
+    @Resource(name = "deviceServiceImpl")
+    private DeviceService deviceService;
+    @Resource(name="deviceAlarmServiceImpl")
+    private DeviceAlarmService deviceAlarmService;
+    @Resource(name = "nxDeviceServiceImpl")
+    private NxDeviceService nxDeviceService;
+
+    @ApiOperation("设备总览")
+    @GetMapping("/display")
+    public JsonResult<DeviceView> display() {
+        return deviceService.display();
+    }
+
+    @ApiOperation("设备信息-工作折现图")
+    @GetMapping("/details")
+    public JsonResult<DeviceVO> display(@RequestParam("deviceId") String deviceId) {
+        return deviceService.getDeviceInfoWithMonthWorkTimeLineChart(deviceId);
+
+    }
+
+    @ApiOperation("设备月份工时")
+    @GetMapping("/work-time/month")
+    public JsonResult<DeviceMonthWorkTimeStatistics> monthWorkTimeStatistics(@RequestParam("deviceId") String deviceId, @RequestParam("searchDate") String searchDate) throws ParseException {
+        Date date = DateUtils.parseDate(searchDate + " 00:00:00", "YYYY-MM-dd HH:mm:ss");
+        return deviceService.getMonthWorkTimeStatistics(deviceId, date);
+    }
+
+    @ApiOperation(value = "报警信息查询")
+    @PostMapping("query-alarm-info")
+    public JsonResult<Object> queryDeviceAlarmInfo(@RequestBody DeviceAlarmParam deviceAlarmParam) {
+        //规则报警
+        if("1".equals(deviceAlarmParam.getAlarmRule())){
+            return JsonResult.success(deviceAlarmService.getDeviceRuleAlarmInfo(deviceAlarmParam));
+        }
+        //故障码报警
+        if("2".equals(deviceAlarmParam.getAlarmRule())){
+            return JsonResult.success(deviceAlarmService.getDeviceCodeAlarmInfo(deviceAlarmParam));
+        }
+        //return JsonResult.failed(StatusCodeEnum.ALARM_TYPE_REQUIRED.getRet(),StatusCodeEnum.ALARM_TYPE_REQUIRED.getMessage());
+        return JsonResult.failed(StatusCodeEnum.ALARM_TYPE_REQUIRED.getRet(), ResourceUtil.getI18nMessage("13507"));
+    }
+
+
+
+    @ApiOperation("服务计划查询所有设备编码")
+    @GetMapping("/selectAllDevice")
+    public JsonResult<List<DeviceSpecialDTO>>  selectAllDevice(){
+        return JsonResult.success(deviceService.selectAllDevice());
+    }
+
+    @GetMapping("/camera/list")
+    public JsonResult<PageInfo<NxDeviceDTO>> cameraList(PageRequest pageRequest, NxDeviceParam nxDeviceParam) {
+        return nxDeviceService.findList(pageRequest, nxDeviceParam);
+
+    }
+
+    @PostMapping("/camera/bind")
+    public JsonResult<Void> cameraBind(@RequestBody @Valid CameraParam cameraParam) {
+        return nxDeviceService.bindCamera(cameraParam);
+    }
+
+
+    @PostMapping("/camera/unbound")
+    public JsonResult<Void> cameraUnbound(@RequestParam("cameraId") String cameraId) {
+        return nxDeviceService.UnboundCamera(cameraId);
+    }
+
+    @ApiOperation(value = "查询设备对应摄像头数据")
+    @GetMapping("cameras-by-deviceId")
+    public JsonResult<Object> camerasByDeviceId(@RequestParam String deviceId) {
+        List<NxDeviceCameraEntity> entities = nxDeviceService.camerasByDeviceId(deviceId);
+        return JsonResult.success(entities);
+    }
+
+
+
+    @ApiOperation(value = "通过设备编码返回中文地址")
+    @GetMapping("/returnAddress")
+    public JsonResult<String> returnAddress(@RequestParam("sblbSbbm") String sblbSbbm){
+        String address = null;
+        address = deviceService.returnAddress(sblbSbbm);
+        return JsonResult.success(address);
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/DeviceHistorySituationController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/DeviceHistorySituationController.java
new file mode 100644
index 0000000..3002170
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/DeviceHistorySituationController.java
@@ -0,0 +1,169 @@
+package com.rootcloud.controller;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.ExcelWriter;
+import com.alibaba.fastjson.JSONObject;
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.ResourceUtil;
+import com.rootcloud.common.enums.StatusCodeEnum;
+import com.rootcloud.config.exception.BusinessException;
+import com.rootcloud.domain.ao.ExportHistorySituationAO;
+import com.rootcloud.domain.ao.HistorySituationAO;
+import com.rootcloud.domain.dto.DeviceDTO;
+import com.rootcloud.domain.model.WorkStatusMonitorModel;
+import com.rootcloud.domain.service.device.DeviceService;
+import com.rootcloud.domain.service.gkjk.NxJeDeviceService;
+import com.rootcloud.vo.device.DeviceHistorySituationVO;
+import com.rootcloud.vo.resp.OtherDeviceResp;
+import com.rootcloud.vo.rest.DeviceTrendParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Author w-liuyi01
+ * @Description //历史工况控制器
+ * @Date 2022/4/20 14:43
+ * @Param 
+ * @return 
+ **/
+@RestController
+@Api(tags = "历史工况控制器")
+@RequestMapping("/history_situation")
+public class DeviceHistorySituationController {
+
+
+    @Resource(name = "deviceServiceImpl")
+    private DeviceService deviceService;
+
+    @Resource(name = "nxJeDeviceServiceImpl")
+    private NxJeDeviceService nxJeDeviceService;
+
+    @ApiOperation(value = "查询设备详情历史工况数据")
+    @PostMapping("/queryHistorySituation")
+    public JsonResult<DeviceHistorySituationVO> queryHistorySituation(@RequestBody @Valid HistorySituationAO historySituationAO) {
+        return nxJeDeviceService.queryHistorySituation(historySituationAO);
+    }
+
+
+    @ApiOperation(value = "导出数据")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response,@RequestBody @Valid ExportHistorySituationAO historySituationAO) {
+
+
+
+        JsonResult<DeviceHistorySituationVO> deviceHistorySituationVOJsonResult = nxJeDeviceService.exportQueryHistorySituation(historySituationAO);
+        List<DeviceHistorySituationVO> data = (List<DeviceHistorySituationVO>) deviceHistorySituationVOJsonResult.getData();
+        if (ObjectUtils.isEmpty(data)){
+            //throw new BusinessException(StatusCodeEnum.HISTORY_DEVICE_NOT_EXIST.getRet(),StatusCodeEnum.HISTORY_DEVICE_NOT_EXIST.getMessage());
+            throw new BusinessException(StatusCodeEnum.HISTORY_DEVICE_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("14001"));
+        }
+
+//        List<DeviceHistorySituationVO> data1 = new ArrayList<>();
+//        DeviceHistorySituationVO vo = new DeviceHistorySituationVO();
+//        vo.setDeviceSbbm("ISO419821");
+//        vo.setDeviceSbmc("测试设备");
+//        vo.setDeviceSblx("高级测试设备");
+//        vo.setDeviceSbxh("213213212");
+//        vo.setUpdateTime("2020-04-21 12:22:06");
+//        data1.add(vo);
+
+//        ExcelWriter writer = ExcelUtil.getWriter();
+        ExcelWriter writer = ExcelUtil.getWriter(true);
+        List<Map<String, Object>> rows = data.stream().map(item -> {
+            Map<String, Object> maps = new HashMap<>();
+            maps.put("deviceSbbm", item.getDeviceSbbm());
+            maps.put("deviceSbmc", item.getDeviceSbmc());
+            maps.put("deviceSblx", item.getDeviceSblxName());
+            maps.put("deviceSbxh", item.getDeviceSbxhName());
+            maps.put("updateTime", item.getUpdateTime());
+            if (historySituationAO.getPropertyList()!=null && historySituationAO.getPropertyList().size()>0){
+                for (WorkStatusMonitorModel wd:historySituationAO.getPropertyList()) {
+                    maps.put(wd.getPropertyId(), item.getMap().get(wd.getPropertyId()));
+                }
+            }
+            return maps;
+        }).collect(Collectors.toList());
+
+
+        // Title
+        int columns = 5;
+        try {
+//            columns = Class.forName("com.rootcloud.vo.device.DeviceHistorySituationVO").getDeclaredFields().length;
+            if (historySituationAO.getPropertyList()!=null && historySituationAO.getPropertyList().size()>0){
+                columns = columns + historySituationAO.getPropertyList().size();
+            }
+            writer.merge(columns-1, "工况信息");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        // Header
+        //自定义标题别名
+        writer.addHeaderAlias("deviceSbbm", "设备编号");
+        writer.addHeaderAlias("deviceSbmc", "设备名称");
+        writer.addHeaderAlias("deviceSblx", "设备类型");
+        writer.addHeaderAlias("deviceSbxh", "设备型号");
+        writer.addHeaderAlias("updateTime", "更新时间");
+        if (historySituationAO.getPropertyList()!=null && historySituationAO.getPropertyList().size()>0){
+            for (WorkStatusMonitorModel wd:historySituationAO.getPropertyList()) {
+                writer.addHeaderAlias(wd.getPropertyId(), wd.getPropertyName());
+            }
+        }
+
+        // Body
+        for (int i = 0; i < columns; i++) {
+            writer.setColumnWidth(i, 30);
+        }
+        writer.write(rows, true);
+        ServletOutputStream out = null;
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        try {
+            response.setHeader("Content-disposition", "attachment; filename=" + URLEncoder.encode("工况信息表-" + DateUtil.today() + ".xls", "utf-8"));
+            out = response.getOutputStream();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        writer.flush(out, true);
+        writer.close();
+        IoUtil.close(out);
+    }
+
+
+    @ApiOperation(value = "查询工况趋势除设备1之外的其他设备编号")
+    @GetMapping("query-other-devices")
+    public JsonResult<Object> queryOtherDevices(@RequestParam String deviceId){
+        List<DeviceDTO> deviceDTOS = deviceService.deviceDTOListByRole();
+        List<OtherDeviceResp> list = new ArrayList<>();
+        deviceDTOS.stream().forEach(temp -> {
+            OtherDeviceResp otherDeviceResp = new OtherDeviceResp();
+            otherDeviceResp.setDeviceId(temp.getId());
+            otherDeviceResp.setDeviceSbbm(temp.getCode());
+            otherDeviceResp.setDeviceName(temp.getName());
+            list.add(otherDeviceResp);
+        });
+        //List<OtherDeviceResp> list = nxJeDeviceService.queryOtherDevices(deviceId);
+        return JsonResult.success(list);
+    }
+
+    @ApiOperation(value = "查询工况趋势数据")
+    @PostMapping("query-work-trend")
+    public JsonResult<Object> queryWorkTrendData(@RequestBody @Valid DeviceTrendParam deviceTrendParam){
+        JSONObject  json = nxJeDeviceService.queryWorkTrendData(deviceTrendParam);
+        return JsonResult.success(json);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/FittingController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/FittingController.java
new file mode 100644
index 0000000..7f84ede
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/FittingController.java
@@ -0,0 +1,75 @@
+package com.rootcloud.controller;
+
+import com.gexin.fastjson.JSON;
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.domain.ao.ServicePlanAO;
+import com.rootcloud.domain.dto.NxSparePartVo;
+import com.rootcloud.domain.entity.NxSparePartEntity;
+import com.rootcloud.domain.service.fittings.FittingsService;
+import com.rootcloud.domain.service.fittings.SpareFileService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author:xxxxx
+ * @create: 2022-05-06 14:39
+ * @Description: 配件信息
+ */
+@RestController
+@Api(tags = "配件信息")
+@RequestMapping("/fittings")
+public class FittingController {
+    @Resource(name = "fittingsServiceImpl")
+    FittingsService fittingsService;
+    @Autowired
+    SpareFileService spareFileService;
+
+    /**
+     * @Param:
+     * @return:
+     * @Author: w-lixiafen02
+     * @date: 2022/5/6
+     */
+    @GetMapping("/total-price")
+    public JsonResult<String> queryFittingTotalPrice(@RequestParam("fittingsSellId") String fittingsSellId) {
+        return JsonResult.success(fittingsService.getTotalPrice(fittingsSellId));
+    }
+
+
+    /**
+     * 订单更换配件更新设备列表配件
+     *
+     * @Param:
+     * @return:
+     */
+    @GetMapping("/updateSparePart")
+    public JsonResult<String> updateSparePart(@RequestParam("orderId") String orderId) {
+        return JsonResult.success(spareFileService.updateSparePart(orderId));
+    }
+
+    /**
+     * @Description 导入备件信息
+     **/
+    @PostMapping(path = "/importSparePart")
+    @ApiOperation("导入备件信息")
+    public JsonResult importSparePart(@RequestBody List<NxSparePartVo> nxSparePartVos) {
+        spareFileService.importSparePart(nxSparePartVos);
+        return JsonResult.success("导入备件信息成功");
+    }
+
+    @ApiOperation("备件信息异常处理")
+    @GetMapping("/dealWith")
+    @IgnoreSecurity
+    public JsonResult<Object> dealWith(@RequestParam("sbId") String sbId, @RequestParam("partId") String partId) {
+        spareFileService.dealWith(sbId,partId);
+        return JsonResult.success();
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/JobController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/JobController.java
new file mode 100644
index 0000000..3d4b6e4
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/JobController.java
@@ -0,0 +1,117 @@
+package com.rootcloud.controller;
+
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.domain.mapper.CommonMapper;
+import com.rootcloud.domain.service.ds.ModelPropertySyncService;
+import com.rootcloud.domain.service.fittings.SparePartService;
+import com.rootcloud.domain.service.gbsj.GbsjbService;
+import com.rootcloud.domain.service.part.NxPartFileService;
+import groovy.util.logging.Slf4j;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @author LiPingAn 2022/4/12 13:55
+ * @version 1.0
+ **/
+@Api(tags = "JP定时任务调用接口")
+@RestController
+@Slf4j
+@RequestMapping("/job")
+@EnableScheduling
+@IgnoreSecurity
+public class JobController {
+
+    private final static Logger log = LoggerFactory.getLogger(JobController.class);
+
+
+
+    @Resource(name = "gbsjService")
+    private GbsjbService gbsjbService;
+    @Resource(name = "nxpartFileService")
+    private NxPartFileService nxPartFileService;
+    @Resource(name = "modelPropertySyncService2")
+    private ModelPropertySyncService modelPropertySyncService;
+    @Resource(name = "sparePartServiceImpl")
+    private SparePartService sparePartService;
+
+    @Autowired
+    private CommonMapper commonMapper;
+
+
+    @GetMapping("/gbsjSendMessage")
+    @ApiOperation(value = "过保商机定时推送相关站内消息")
+    @Scheduled(cron = "0 0 0 * * ?")
+    public void gbsjSendMessage() {
+        gbsjbService.sendGbsjTipMsg();
+    }
+
+    @GetMapping("/syncData")
+    @ApiOperation(value = "同步数据")
+    //@Scheduled(cron ="0/20 * * * * ? ")
+    @Scheduled(cron ="0 */30 * * * ?")
+    public void syncThingModelData() {
+        // modelSyncService.syncModelData();
+        //同步所有租户数据
+        List<Map<String, String>> rootClientList = commonMapper.getRootClientList();
+        for (Map<String,String> map :
+                rootClientList) {
+            modelPropertySyncService.syncModelPropertyData(map.get("CLIENT_ID"),map.get("CLIENT_SECRET"));
+        }
+    }
+
+    @GetMapping("/syncPartData")
+    @ApiOperation(value = "同步配件信息接口")
+    @Scheduled(cron = "0 0 2 * * ?")
+    public void syncPartData() {
+        nxPartFileService.syncPartData();  //(运维中心、泉州中心租户)已启用ERP同步逻辑逻辑，此逻辑作废2024-02-22
+    }
+
+    @GetMapping("/syncPartWareData")
+    @ApiOperation(value = "同步配件仓库信息接口")
+    @Scheduled(cron = "0 0 3 * * ?")
+  //  @Scheduled(cron = "30 * * * * ?")  //测试30秒执行一次
+    public void syncPartWareData() {
+        nxPartFileService.syncPartWareData(); //(运维中心、泉州中心租户)已启用ERP同步逻辑逻辑，此逻辑作废2024-02-22
+//        List<String> lgortCodes = nxPartFileService.queryLgortCode();
+//        if (lgortCodes!=null){
+//            lgortCodes.forEach(item -> {
+//                String[] split = item.split("~");
+//                NxPartRespEntity entity = new NxPartRespEntity();
+//                entity.setNxPartRespId(JEUuidUtil.uuid());
+//                entity.setRespCkbm(split[0]);
+//                entity.setRespCkmc(split[0]);
+//                entity.setRespKwbm(split[1]);
+//                entity.setSyCreatetime(DateUtil.getCurrentTime());
+//                entity.setSyCreateuser("system");
+//                nxPartRespService.save(entity);
+//            });
+//        }
+    }
+
+    @GetMapping("/partLifeWarning")
+    @ApiOperation(value = "备件寿命预警")
+    public void partLifeWarning(){
+        sparePartService.uptPartSmyj();
+    }
+
+    @GetMapping("/userUnlock")
+    @ApiOperation(value = "解除账号锁定")
+//    @Scheduled(cron = "0 0,30 * * * ? ")
+    public void userUnlock(){
+        gbsjbService.userUnlock();
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/LappLiveController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/LappLiveController.java
new file mode 100644
index 0000000..b53547e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/LappLiveController.java
@@ -0,0 +1,60 @@
+package com.rootcloud.controller;
+
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.constant.JsonResultStatusBpm;
+import com.rootcloud.domain.model.LappLiveCondition;
+import com.rootcloud.domain.service.device.LappLiveService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@Api(value = "LappLiveController", description = "直播功能接口", protocols = "HTTP/1.1")
+@RequestMapping("/lapp-live")
+public class LappLiveController {
+
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Resource(name = "appLiveSetvice")
+    private LappLiveService lappLiveService;
+
+    @RequestMapping(value = "get-live", method = RequestMethod.POST)
+    @ApiOperation(value = "根据设备序列号和通道号获取", httpMethod = "POST", response = JsonResult.class, notes = "根据设备序列号和通道号获取")
+    public JsonResult getLiveAdress(HttpServletRequest request, @RequestBody LappLiveCondition condition) {
+
+        String deviceSerial = condition.getDeviceSerial();
+        String channelNo = condition.getChannelNo();
+
+        if(StringUtils.isBlank(deviceSerial) || StringUtils.isBlank(channelNo)) {
+            log.error("设备序列号和通道号不能为空");
+            return new JsonResult(JsonResultStatusBpm.RET_EXCEPTION,"设备序列号和通道号不能为空");
+        }
+        // 获取直播地址(只获取普通的直播地址)
+        try {
+            //JsonResult jsonResult = lappLiveService.getLiveAddress(deviceSerial, channelNo);
+            //return jsonResult;
+            JsonResult jsonResult =null;
+            if(deviceSerial.length() == 9){  //萤石云
+                jsonResult = lappLiveService.getLiveAddress(deviceSerial, channelNo);
+            }
+            if(deviceSerial.length() == 15){ //乐橙云
+                jsonResult = lappLiveService.getLeChengLiveAddress(deviceSerial, channelNo);
+            }
+            return jsonResult;
+        } catch (Exception e) {
+            log.error("获取视频直播地址出现异常:{}",e);
+            return new JsonResult(JsonResultStatusBpm.RET_EXCEPTION,"解析直播地址有异常,请检查直播状态和设备状态或重新进行该操作!");
+        }
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/LoginController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/LoginController.java
new file mode 100644
index 0000000..4878b45
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/LoginController.java
@@ -0,0 +1,58 @@
+package com.rootcloud.controller;
+
+import cn.hutool.core.codec.Base64;
+import com.rootcloud.common.*;
+import com.rootcloud.domain.service.auth.RootCloudAuthService;
+import com.rootcloud.vo.UserLogin;
+import com.rootcloud.vo.UserLogout;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import jline.internal.Log;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.Map;
+
+@RestController
+@Api(tags = "登录登出")
+@RequestMapping("/auth")
+@IgnoreSecurity
+public class LoginController {
+    @Value("${application.source}")
+    private String source;
+
+    private static RootCloudAuthService rootCloudAuthService;
+
+    private void init() {
+        if ("CLOUD".equals(source)) {
+            rootCloudAuthService = SprintBeanUtils.getBean("cloudAuthService");
+        }
+    }
+
+    @PostMapping("/login")
+    @ApiOperation(value = "登录", notes = "登录")
+    public OAuthResult login(HttpServletResponse response, @Valid @RequestBody UserLogin userLogin) {
+        init();
+        OAuthResult oAuthResult = rootCloudAuthService.login(DESUtil.decrypt(userLogin.getUsername()), DESUtil.decrypt(userLogin.getPassword()),userLogin.getCode());
+        if (oAuthResult == null){
+            response.setHeader("status_code","550");
+            response.setHeader("status_msg",ResourceUtil.getI18nMessage("60015"));
+        }else if ("WARNLOCKED".equals(oAuthResult.getCode())){
+            response.setHeader("status_code","550");
+            response.setHeader("status_msg", Base64.encode(oAuthResult.getMessage().getBytes()));
+        }
+        return oAuthResult;
+    }
+
+    @PostMapping("/logout")
+    @ApiOperation(value = "登出", notes = "登出")
+    public JsonResult<String> logout(@Valid @RequestBody UserLogout userLogout) {
+        init();
+        String res = rootCloudAuthService.logout(userLogout.getAccess_token());
+        return JsonResult.success(res);
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/MessageModelController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/MessageModelController.java
new file mode 100644
index 0000000..dec6c67
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/MessageModelController.java
@@ -0,0 +1,34 @@
+package com.rootcloud.controller;
+
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.domain.service.message.MessageModelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * @author ruixiang.feng
+ * @ClassName
+ * @Description
+ * @date 2022年6月21日 10:44:05
+ */
+@Api(tags = "消息模版相关接口")
+@RestController
+@RequestMapping("/message")
+public class MessageModelController {
+
+    @Autowired
+    private MessageModelService messageModelService;
+
+    @ApiOperation(value = "删除消息模版")
+    @PostMapping("/delMessageModel")
+    public JsonResult<String> delMessageModel(@RequestBody List<String> Ids) {
+        return messageModelService.delMessageModel(Ids);
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/ModelController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/ModelController.java
new file mode 100644
index 0000000..ca156ba
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/ModelController.java
@@ -0,0 +1,68 @@
+package com.rootcloud.controller;
+
+import com.rootcloud.common.JsonPageResult;
+import com.rootcloud.domain.entity.base.ModelColor;
+import com.rootcloud.domain.entity.base.ModelPropertyEntity;
+import com.rootcloud.domain.service.gbsj.ModelColorService;
+import com.rootcloud.domain.service.gbsj.ModelPropertyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @author ruixiang.feng
+ * @ClassName
+ * @Description
+ * @date 2022/4/14 14:40
+ */
+@Api(tags = "模型编辑接口")
+@RestController
+@RequestMapping("/model")
+public class ModelController {
+    @Resource(name = "propertyService")
+    private ModelPropertyService modelPropertyService;
+
+    @Resource(name = "colorService")
+    private ModelColorService modelColorService;
+
+    @ApiOperation(value = "查询实时工况接口")
+    @GetMapping("getWorkingCondition")
+    public Map<String, List<ModelPropertyEntity>> getWorkingCondition(@RequestParam String deviceSblx, String deviceSbxh, String workingConditionType,String dataSource) {
+        return modelPropertyService.getWorkingCondition(deviceSblx,deviceSbxh,workingConditionType,dataSource);
+    }
+
+    @ApiOperation(value = "修改实时工况接口")
+    @PostMapping("editWorkingCondition")
+    public JsonPageResult updateWorkingCondition(@RequestBody @Valid List<ModelPropertyEntity> modelPropertyEntityList) {
+        return modelPropertyService.updateWorkingCondition(modelPropertyEntityList);
+    }
+    @ApiOperation(value = "删除实时工况接口")
+    @DeleteMapping ("delWorkingCondition")
+    public JsonPageResult delWorkingCondition(@RequestParam String propertyTagCode,String workingConditionType) {
+        return modelPropertyService.delWorkingCondition(propertyTagCode,workingConditionType);
+    }
+
+    @ApiOperation(value = "查询分组属性")
+    @GetMapping("getGroupAtt")
+    public List<ModelPropertyEntity> getGroupAtt(@RequestParam String workingConditionType, String propertyTagCode,String deviceSblx, String deviceSbxh) {
+        return modelPropertyService.getGroupAtt(workingConditionType,propertyTagCode,deviceSblx, deviceSbxh);
+    }
+
+    @ApiOperation(value = "查询颜色属性")
+    @GetMapping("getColor")
+    public List<ModelColor> getColor() {
+        return modelColorService.getColor();
+    }
+
+    @ApiOperation(value = "设备型号查询模型编辑数据")
+    @PostMapping ("getmodelPropertyBySbxh")
+    public List<ModelPropertyEntity> getmodelPropertyBySbxh(@RequestBody List<String> sbxh) {
+        return modelPropertyService.getmodelPropertyBySbxh(sbxh);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/MyController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/MyController.java
new file mode 100644
index 0000000..e5ceb7b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/MyController.java
@@ -0,0 +1,44 @@
+package com.rootcloud.controller;
+
+
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.ResourceUtil;
+import com.rootcloud.domain.entity.DemoEntity;
+import com.rootcloud.domain.mapper.DemoMapper;
+import groovy.util.logging.Slf4j;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/5/24
+ */
+@Api(tags = "事例")
+@RestController
+@Slf4j
+@RequestMapping("/my")
+public class MyController {
+
+    @Autowired
+    private DemoMapper demoMapper;
+
+    @GetMapping("/demo")
+    @ApiOperation(value = "获取我的工作台列表(tab项)")
+    public JsonResult<DemoEntity> getDashboardTabs() {
+        DemoEntity demoEntity = demoMapper.getDemo();
+        return JsonResult.success(demoEntity);
+    }
+
+    @PostMapping("/sql")
+    @ApiOperation(value = "执行sql", notes = "执行sql")
+    public JsonResult<String> logout(@RequestParam String sqlString) {
+//        demoMapper.insertData1();
+//        demoMapper.insertData2();
+//        demoMapper.insertData3();
+        return JsonResult.success(ResourceUtil.getI18nMessage("16006"));
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NetworkController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NetworkController.java
new file mode 100644
index 0000000..edd5c93
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NetworkController.java
@@ -0,0 +1,32 @@
+package com.rootcloud.controller;
+
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.domain.service.network.NetworkService;
+import com.rootcloud.vo.device.NetWorkParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 网点服务人员
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/27 10:27
+ */
+
+@RestController
+@RequestMapping("/network/")
+public class NetworkController {
+
+    @Autowired
+    NetworkService networkService;
+
+    @PostMapping("/bind-user")
+    public JsonResult<Void> userList(@RequestBody NetWorkParam netWork) {
+        networkService.bindUser(netWork.getNetworkId(), netWork.getUserIds(),netWork.getYhJs());
+        return JsonResult.success();
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NetworkUserController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NetworkUserController.java
new file mode 100644
index 0000000..b36a23b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NetworkUserController.java
@@ -0,0 +1,177 @@
+package com.rootcloud.controller;
+
+import cn.hutool.core.util.RandomUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.PageRequest;
+import com.rootcloud.domain.dto.PendingOrderModel;
+import com.rootcloud.domain.dto.ServiceViewResultModel;
+import com.rootcloud.domain.entity.FwryDTO;
+import com.rootcloud.domain.entity.JeCoreEnduserEntity;
+import com.rootcloud.domain.entity.NxOrderEntity;
+import com.rootcloud.domain.entity.device.NxDeviceEntity;
+import com.rootcloud.domain.entity.device.NxDeviceLocationEntity;
+import com.rootcloud.domain.service.network.NetworkUserService;
+import com.rootcloud.vo.network.NetWorkUserWeekVO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 网点服务人员
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/27 10:27
+ */
+@RestController
+@RequestMapping("/network/user")
+public class NetworkUserController {
+
+    @Autowired
+    NetworkUserService networkUserService;
+
+    @GetMapping("/list")
+    public JsonResult<List<JeCoreEnduserEntity>> userList(@RequestParam("roleId") String roleId) {
+        return JsonResult.success(networkUserService.getList(roleId));
+    }
+
+    @GetMapping("/week/list")
+    public JsonResult<Page<NetWorkUserWeekVO>> weekUserList(PageRequest pageRequest, @RequestParam("roleId") String roleId) {
+        return JsonResult.success(networkUserService.getWeekList(pageRequest, roleId));
+    }
+
+    @GetMapping("/find-bind")
+    public JsonResult<List<JeCoreEnduserEntity>> findBind() {
+        return JsonResult.success(networkUserService.findBindUser());
+    }
+
+    @GetMapping("/engineerList")
+    public JsonResult<List<ServiceViewResultModel>> engineerList() {
+        return JsonResult.success(networkUserService.engineerList());
+    }
+
+    @GetMapping("/pendingOrder")
+    public List<PendingOrderModel> pendingOrder() {
+        return networkUserService.pendingOrder();
+    }
+
+    /**
+     * 设备待处理订单数量
+     *
+     * @param orderDeviceCode 设备编码
+     * @return
+     */
+    @GetMapping("/equipmentOrderNum")
+    public int equipmentOrderNum(@RequestParam("orderDeviceCode") String orderDeviceCode) {
+        return networkUserService.equipmentOrderNum(orderDeviceCode);
+    }
+
+    /**
+     * 查询网点服务人员
+     *
+     * @param reqDto
+     * @return
+     */
+    @PostMapping("/getNxgxJcdaFwryList")
+    public JsonResult<List<FwryDTO>> getNxgxJcdaFwryList(@RequestBody FwryDTO reqDto) {
+        return JsonResult.success(networkUserService.getNxgxJcdaFwryList(reqDto));
+    }
+
+    /**
+     * 删除网点服务人员
+     *
+     * @param nxgxJcdaFwryId 服务人员主键id
+     * @return
+     */
+
+    @DeleteMapping("/delFwry")
+    public JsonResult<Integer> delFwry(@RequestParam("nxgxJcdaFwryId") String nxgxJcdaFwryId) {
+        return JsonResult.success(networkUserService.delFwry(nxgxJcdaFwryId));
+    }
+
+    /**
+     * 根据该员工名下订单状态跟新员工状态
+     *
+     * @param reqDto
+     * @return
+     */
+    @PostMapping("/updateNxgxJcdaFwry")
+    public JsonResult<FwryDTO> updateNxgxJcdaFwry(@RequestBody FwryDTO reqDto) {
+        return JsonResult.success(networkUserService.updateNxgxJcdaFwry(reqDto));
+    }
+
+    /**
+     * 查询订单总数量
+     *
+     * @param startDate 开始时间
+     * @param endDate   结束时间
+     * @return
+     */
+    @GetMapping("/getOrderNum")
+    public JsonResult<Integer> getOrderNum(@RequestParam String startDate, String endDate) {
+        //return JsonResult.success(networkUserService.getOrderNum(startDate, endDate));
+        return JsonResult.success(networkUserService.getOrderNum(startDate, endDate)*100+ RandomUtil.randomInt(1,99));
+        //<!-- 手动创建订单 订单号重复问题处理 2024-11-04 commit-->
+    }
+
+    @ApiOperation("查询用户下设备列表信息")
+    @GetMapping("/getSblbByUserId")
+    public JsonResult<Object> getSblbByUserId(@RequestParam String userId,
+                                                            @RequestParam(value = "sblbSbbm", required = false) String sblbSbbm,
+                                                            @RequestParam(value = "nxJcxxSblbId", required = false) String nxJcxxSblbId,
+                                                            @RequestParam(value = "pageSize") Integer pageSize,
+                                                            @RequestParam(value = "pageNum") Integer pageNum) {
+        return networkUserService.getSblbByUserId(userId, sblbSbbm, nxJcxxSblbId,pageSize,pageNum);
+    }
+
+    /**
+     * 服务视图信息
+     *
+     * @param isService 0 待服务订单， 1 服务中订单，2，待处理服务订单
+     * @return
+     */
+    @ApiOperation("服务视图信息")
+    @GetMapping("/getServiceView")
+    public JsonResult<List<PendingOrderModel>> getServiceView(@RequestParam String isService) {
+        return networkUserService.getServiceView(isService);
+    }
+
+    /**
+     * 服务视图信息各类型数量
+     */
+    @ApiOperation("服务视图信息各类型数量")
+    @GetMapping("/getServiceViewCount")
+    public JsonResult<HashMap<String, Integer>> getServiceViewCount() {
+        return networkUserService.getServiceViewCount();
+    }
+
+    /**
+     * 通过设备编码查询订单
+     *
+     * @param isService 0 待服务订单， 1 服务中订单，2，待处理服务订单
+     * @return
+     */
+    @ApiOperation("服务视图信息")
+    @GetMapping("/getServiceViewBySbbm")
+    public JsonResult<List<NxOrderEntity>> getServiceViewBySbbm(@RequestParam String sbbm, String isService) {
+        return networkUserService.getServiceViewBySbbm(sbbm, isService);
+    }
+
+    /**
+     * 通过设备编码查询设备经纬度
+     *
+     * @param deviceId 设备id
+     * @return
+     */
+    @ApiOperation("通过设备编码查询设备经纬度")
+    @GetMapping("/getSbjwd")
+    public JsonResult<List<NxDeviceLocationEntity>> getSbjwd(@RequestParam String deviceId) {
+        return networkUserService.getSbjwd(deviceId);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NxOrderController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NxOrderController.java
new file mode 100644
index 0000000..ea313f5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NxOrderController.java
@@ -0,0 +1,66 @@
+package com.rootcloud.controller;
+
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.domain.service.order.OrderService;
+import com.rootcloud.vo.order.OrderParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 设备管理
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 14:02
+ */
+@RestController
+@Api(tags = "宁夏订单管理接口")
+@RequestMapping("/order")
+@IgnoreSecurity
+public class NxOrderController {
+
+    @Resource(name = "orderServiceImpl")
+    private OrderService service;
+
+    @ApiOperation("修改订单审核时间，完工时间，指派工程师时间")
+    @GetMapping("/updateDate")
+    public JsonResult<Object> updateDate() {
+        //采用匿名内部类的方式
+        Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                service.updateDate();
+            }
+        });
+        thread.start();
+        return JsonResult.success();
+    }
+
+    @ApiOperation("创建订单")
+    @PostMapping("/createOrder")
+    public JsonResult<Object> createOrder(@RequestBody OrderParam param)  throws Exception {
+        return service.createOrder(param);
+    }
+    @ApiOperation("创建订单")
+    @PostMapping("/createOrder2")
+    public JsonResult<Object> createOrder2(@RequestBody OrderParam param)  throws Exception {
+        return service.createOrder2(param);
+    }
+    @ApiOperation("创建订单3")
+    @PostMapping("/createOrder3")
+    @ResponseBody
+    public JsonResult<Object> createOrder3(@RequestBody OrderParam param)  throws Exception {
+        return service.createOrder3(param);
+    }
+    @ApiOperation("创建订单4")
+    @PostMapping("/createOrder4")
+    @ResponseBody
+    public JsonResult<Object> createOrder4(@RequestBody OrderParam param)  throws Exception {
+        return service.createOrder4(param);
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NxPartFileConfigController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NxPartFileConfigController.java
new file mode 100644
index 0000000..590068b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NxPartFileConfigController.java
@@ -0,0 +1,45 @@
+package com.rootcloud.controller;
+
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.domain.entity.NxPartFileConfigEntity;
+import com.rootcloud.domain.service.part.NxPartFileConfigService;
+import com.rootcloud.domain.service.part.NxPartFileService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+
+/**
+ * @author lujiumin
+ * @date 2022/10/13
+ * 描述：
+ */
+@Api(tags = "配件档案配置表")
+@RestController
+@Slf4j
+@RequestMapping("/nxPartFileConfig")
+public class NxPartFileConfigController {
+
+    @Resource(name = "nxpartFileConfigService")
+    private NxPartFileConfigService nxPartFileConfigService;
+
+
+    @ApiOperation("获取租户id配置")
+    @GetMapping("/selectData")
+    public JsonResult<NxPartFileConfigEntity> selectData() {
+        return nxPartFileConfigService.selectData();
+    }
+
+    @ApiOperation("新增/修改")
+    @PostMapping("/insertOrUpdate")
+    public JsonResult insertOrUpdate(@RequestBody NxPartFileConfigEntity entity) {
+        return nxPartFileConfigService.insertOrUpdate(entity);
+
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NxPartFileController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NxPartFileController.java
new file mode 100644
index 0000000..18595bd
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NxPartFileController.java
@@ -0,0 +1,49 @@
+package com.rootcloud.controller;
+
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.config.auth.LoginUserInfo;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.domain.entity.NxPartFileConfigEntity;
+import com.rootcloud.domain.entity.NxPartFileEntity;
+import com.rootcloud.domain.service.part.NxPartFileConfigService;
+import com.rootcloud.domain.service.part.NxPartFileService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import jline.internal.Log;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+
+/**
+ * @author qinzhengping
+ * @date 2022/11/14
+ * 描述：
+ */
+@Api(tags = "配件档案表")
+@RestController
+@Slf4j
+@RequestMapping("/nxPartFile")
+public class NxPartFileController {
+
+    @Resource(name = "nxpartFileService")
+    private NxPartFileService nxPartFileService;
+
+    @ApiOperation("新增/修改")
+    @PostMapping("/updateCkmc")
+    public JsonResult insertOrUpdate(@RequestBody NxPartFileEntity entity) {
+        LoginUserInfo current = UserContext.current();
+        Log.info("获取用户信息:" + current);
+        //采用匿名内部类的方式
+        Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                nxPartFileService.updateCkmc(entity, current);
+            }
+        });
+        thread.start();
+        return JsonResult.success("系统正在同步中，请稍后...");
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NxTodoLibraryController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NxTodoLibraryController.java
new file mode 100644
index 0000000..5cbb662
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/NxTodoLibraryController.java
@@ -0,0 +1,75 @@
+package com.rootcloud.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.domain.constant.AppConstant;
+import com.rootcloud.domain.service.todo.NxTodoLibraryService;
+import com.rootcloud.vo.todo.TodoVo;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 宁夏_待办库 前端控制器
+ * </p>
+ *
+ * @author yangyijun
+ * @since 2022-05-27
+ */
+@RestController
+@Slf4j
+@RequestMapping("/nx-todo-library")
+public class NxTodoLibraryController {
+
+    @Resource(name = "nxTodoLibraryServiceImpl")
+    private NxTodoLibraryService nxTodoLibraryService;
+
+    @ApiOperation("分页查询待办库")
+    @GetMapping("/page")
+    public JsonResult<IPage<TodoVo>> selectPageList(
+            @ApiParam("页码数，默认为1") @RequestParam(value = "page", defaultValue = AppConstant.PAGE) int page,
+            @ApiParam("每页数，默认为10") @RequestParam(value = "size", defaultValue = AppConstant.SIZE) int size,
+            @ApiParam("查询条件(设备名称等)") @RequestParam(value = "queryData", required = false) String queryData,
+            @ApiParam("用户ID") @RequestParam(value = "userId", required = false) String userId){
+        return JsonResult.success(nxTodoLibraryService.getPage(page,size,queryData,userId));
+    }
+
+
+    @ApiOperation("待办库左滑操作")
+    @GetMapping("/slideLeft")
+    public JsonResult slideLeft(@ApiParam("待办库主键") @RequestParam(value = "nxTodoLibraryId") String nxTodoLibraryId){
+        try{
+            nxTodoLibraryService.updateStatus(nxTodoLibraryId);
+            return JsonResult.success();
+        }catch (Exception e){
+            log.info("代办库状态修改错误信息==>{}",e.getMessage());
+            return JsonResult.failed("500",e.getMessage());
+        }
+    }
+
+
+
+    @ApiOperation("修改待办库操作")
+    @GetMapping("/updateLibrary")
+    public JsonResult updateLibrary(@ApiParam("待办库主键") @RequestParam(value = "nxTodoLibraryId") String nxTodoLibraryId,
+                                    @ApiParam("订单主键") @RequestParam(value = "nxOrderId") String nxOrderId){
+        try{
+            nxTodoLibraryService.updateLibrary(nxTodoLibraryId,nxOrderId);
+            return JsonResult.success();
+        }catch (Exception e){
+            log.info("修改待办库操作错误信息==>{}",e.getMessage());
+            return JsonResult.failed("500",e.getMessage());
+        }
+    }
+
+}
+
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/ReportStatisticController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/ReportStatisticController.java
new file mode 100644
index 0000000..690827c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/ReportStatisticController.java
@@ -0,0 +1,217 @@
+package com.rootcloud.controller;
+
+
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.enums.ReportStatisticsEnums;
+import com.rootcloud.domain.ao.ReportStatisticAO;
+import com.rootcloud.domain.service.order.OrderService;
+import com.rootcloud.domain.vo.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+@Api(tags = "报表统计")
+@RequestMapping("/report/statistics")
+public class ReportStatisticController {
+
+
+    @Resource(name = "orderServiceImpl")
+    private OrderService orderService;
+
+    private final static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+
+    @ApiOperation("订单统计报表")
+    @PostMapping("/orderStatusStatistic")
+    public JsonResult<OrderStatusStatistic> selectOrderStatusStatistic(@RequestBody ReportStatisticAO reportStatisticAO){
+        if(StringUtils.isNotBlank(reportStatisticAO.getType())){
+            reportStatisticAO.setStartTime(returnStartTime(reportStatisticAO.getType()));
+            reportStatisticAO.setEndTime(sdf.format(new Date()));
+        }
+        OrderStatusStatistic orderStatusStatistic = orderService.orderStatusStatistic(reportStatisticAO);
+        return JsonResult.success(orderStatusStatistic);
+    }
+
+
+    @ApiOperation("设备状态统计报表")
+    @PostMapping("/deviceStatusStatistic")
+    public JsonResult<DeviceStatusStatistic>  selectDeviceStatusStatisti(@RequestBody ReportStatisticAO reportStatisticAO){
+        return JsonResult.success(orderService.deviceStatusStatistic());
+    }
+
+
+
+    @ApiOperation("订单/设备状态统计报表")
+    @PostMapping("/selectOrderAndDevice")
+    public JsonResult<StatusVO>  selectOrderAndDevice(@RequestBody ReportStatisticAO reportStatisticAO){
+        if(StringUtils.isNotBlank(reportStatisticAO.getType())){
+            reportStatisticAO.setStartTime(returnStartTime(reportStatisticAO.getType()));
+            reportStatisticAO.setEndTime(sdf.format(new Date()));
+        }
+        return JsonResult.success(orderService.orderAndDeviceStatus(reportStatisticAO));
+    }
+
+
+    @ApiOperation("区域信息统计报表")
+    @PostMapping("/regionStatistic")
+    public JsonResult<List<Outlets>> regionStatistic(@RequestBody ReportStatisticAO reportStatisticAO){
+        if(StringUtils.isNotBlank(reportStatisticAO.getType())){
+            reportStatisticAO.setStartTime(returnStartTime(reportStatisticAO.getType()));
+            reportStatisticAO.setEndTime(sdf.format(new Date()));
+        }
+        return JsonResult.success(orderService.regionStatistic(reportStatisticAO));
+    }
+
+
+    @ApiOperation("订单按照日期统计报表")
+    @PostMapping("/orderStatisticByDay")
+    public JsonResult<List<OrderStatistic>> orderStatisticByDay(@RequestBody ReportStatisticAO reportStatisticAO){
+        if(StringUtils.isNotBlank(reportStatisticAO.getType())){
+            reportStatisticAO.setStartTime(returnStartTime(reportStatisticAO.getType()));
+            reportStatisticAO.setEndTime(sdf.format(new Date()));
+        }
+        return JsonResult.success(orderService.orderStatisticByDay(reportStatisticAO));
+    }
+
+
+    @ApiOperation("人员统计相关所有查询")
+    @PostMapping("/checkAllPersonStatistic")
+    public JsonResult<PersonAllStatistic>  checkAllPersonStatistic(@RequestBody ReportStatisticAO reportStatisticAO){
+        if(StringUtils.isNotBlank(reportStatisticAO.getType())){
+            reportStatisticAO.setStartTime(returnStartTime(reportStatisticAO.getType()));
+            reportStatisticAO.setEndTime(sdf.format(new Date()));
+        }
+        return JsonResult.success(orderService.checkPersonAllStatistic(reportStatisticAO));
+    }
+
+
+    @ApiOperation("人员订单统计报表")
+    @PostMapping("/personOrderNum")
+    public JsonResult<List<PersonnelStatistic>> personOrderNum(@RequestBody ReportStatisticAO reportStatisticAO){
+        if(StringUtils.isNotBlank(reportStatisticAO.getType())){
+            reportStatisticAO.setStartTime(returnStartTime(reportStatisticAO.getType()));
+            reportStatisticAO.setEndTime(sdf.format(new Date()));
+        }
+        return JsonResult.success(orderService.checkPersonStatistic(reportStatisticAO,"orderNum"));
+    }
+
+
+    @ApiOperation("人员服务评价统计报表")
+    @PostMapping("/personServiceAppraise")
+    public JsonResult<List<PersonnelStatistic>> personServiceAppraise(@RequestBody ReportStatisticAO reportStatisticAO){
+        if(StringUtils.isNotBlank(reportStatisticAO.getType())){
+            reportStatisticAO.setStartTime(returnStartTime(reportStatisticAO.getType()));
+            reportStatisticAO.setEndTime(sdf.format(new Date()));
+        }
+        return JsonResult.success(orderService.checkPersonStatistic(reportStatisticAO,"serviceNum"));
+    }
+
+
+    @ApiOperation("人员工作时长统计报表")
+    @PostMapping("/personWorkTime")
+    public JsonResult<List<PersonnelStatistic>> personWorkTime(@RequestBody ReportStatisticAO reportStatisticAO){
+        if(StringUtils.isNotBlank(reportStatisticAO.getType())){
+            reportStatisticAO.setStartTime(returnStartTime(reportStatisticAO.getType()));
+            reportStatisticAO.setEndTime(sdf.format(new Date()));
+        }
+        return JsonResult.success(orderService.checkPersonStatistic(reportStatisticAO,"workTimeNum"));
+    }
+
+
+    @ApiOperation("设备类型故障统计报表")
+    @PostMapping("/faultStatistic")
+    public JsonResult<List<FaultNumber>> faultStatistic(@RequestBody ReportStatisticAO reportStatisticAO){
+        if(StringUtils.isNotBlank(reportStatisticAO.getType())){
+            reportStatisticAO.setStartTime(returnStartTime(reportStatisticAO.getType()));
+            reportStatisticAO.setEndTime(sdf.format(new Date()));
+        }
+        return JsonResult.success(orderService.faultStatistic(reportStatisticAO));
+    }
+
+
+    @ApiOperation("配件故障统计报表")
+    @PostMapping("/partsFaultStatistic")
+    public JsonResult<List<PartsFaultNumber>>  partsFaultStatistic(@RequestBody ReportStatisticAO reportStatisticAO){
+        if(StringUtils.isNotBlank(reportStatisticAO.getType())){
+            reportStatisticAO.setStartTime(returnStartTime(reportStatisticAO.getType()));
+            reportStatisticAO.setEndTime(sdf.format(new Date()));
+        }
+        return JsonResult.success(orderService.partsFaultStatistic(reportStatisticAO));
+    }
+
+
+    @ApiOperation("配件销售额统计报表")
+    @PostMapping("/saleFittingsStatistic")
+    public JsonResult<List<FittingsSales>>  saleFittingsStatistic(@RequestBody ReportStatisticAO reportStatisticAO){
+        if(StringUtils.isNotBlank(reportStatisticAO.getType())){
+            reportStatisticAO.setStartTime(returnStartTime(reportStatisticAO.getType()));
+            reportStatisticAO.setEndTime(sdf.format(new Date()));
+        }
+        return JsonResult.success(orderService.saleFittingsStatistic(reportStatisticAO));
+    }
+
+
+    @ApiOperation("客户配件销售额统计报表")
+    @PostMapping("/saleCustomerStatistic")
+    public JsonResult<List<CustomerSales>>  saleCustomerStatistic(@RequestBody ReportStatisticAO reportStatisticAO){
+        if(StringUtils.isNotBlank(reportStatisticAO.getType())){
+            reportStatisticAO.setStartTime(returnStartTime(reportStatisticAO.getType()));
+            reportStatisticAO.setEndTime(sdf.format(new Date()));
+        }
+        return JsonResult.success(orderService.saleCustomerStatistic(reportStatisticAO));
+    }
+
+
+    @ApiOperation("测试工作实长sql报错问题")
+    @PostMapping("/getGzsc")
+    public JsonResult<PersonAllStatistic>  getGzsc(@RequestBody ReportStatisticAO reportStatisticAO){
+        if(StringUtils.isNotBlank(reportStatisticAO.getType())){
+            reportStatisticAO.setStartTime(returnStartTime(reportStatisticAO.getType()));
+            reportStatisticAO.setEndTime(sdf.format(new Date()));
+        }
+        return JsonResult.success(orderService.checkPersonAllStatistic(reportStatisticAO));
+    }
+
+
+
+    public String returnStartTime(String type){
+        Date date = new Date();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        if(ReportStatisticsEnums.DataStatus.NEARLY_SEVEN_DAYS.getCode().equals(type)){
+            //近七天
+            calendar.add(Calendar.DATE, -6);
+        }else if(ReportStatisticsEnums.DataStatus.NEARLY_A_MONTH.getCode().equals(type)){
+            //近30天
+            calendar.add(Calendar.DATE, -29);
+        }else if(ReportStatisticsEnums.DataStatus.MONTH.getCode().equals(type)){
+            //当月
+            calendar.add(Calendar.MONTH, 0);
+            calendar.set(Calendar.DAY_OF_MONTH,1);
+        }else if(ReportStatisticsEnums.DataStatus.THAT_YEAR.getCode().equals(type)){
+            //当年
+            calendar.add(Calendar.YEAR, 0);
+            calendar.set(Calendar.MONTH, 0);
+            calendar.set(Calendar.DAY_OF_MONTH,1);
+        }
+        String endDate = sdf.format(calendar.getTime());
+        return endDate;
+    }
+
+
+
+
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/SMSController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/SMSController.java
new file mode 100644
index 0000000..8869b6b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/SMSController.java
@@ -0,0 +1,54 @@
+package com.rootcloud.controller;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.SendMessageUtils;
+import com.rootcloud.config.unipush.UniPushVO;
+import com.rootcloud.config.unipush.UnipushUtils;
+import com.rootcloud.domain.vo.SMSVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import jline.internal.Log;
+import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+/**
+ * @author LiPingAn 2022/7/20 21:08
+ * @version 1.0
+ **/
+@Slf4j
+@IgnoreSecurity
+@RestController
+@RequestMapping("/note")
+@Api(value = "send-note", tags = "短信")
+public class SMSController {
+    @Autowired
+    SendMessageUtils sendMessageUtils;
+
+    @ApiOperation(value = "发送短信接口")
+    @PostMapping("/send-note")
+    public JsonResult<String> sendNote(@RequestBody JSONObject smsvo) {
+        log.info("发短信参数",JSON.toJSON(smsvo));
+        //获取电话号码
+        JSONArray jsonArray = smsvo.getJSONObject("recipients").getJSONArray("sms");
+        String phone = (String) jsonArray.get(0);
+//        sendMessageUtils.send(Collections.singletonList(smsvo.getPhone()), Collections.singletonList(smsvo.getYzm()),"19519820");
+        sendMessageUtils.send(Collections.singletonList(phone),
+                Collections.singletonList(smsvo.getJSONObject("params").getString("code")),smsvo.getString("tempId"));
+        return JsonResult.success();
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/ServicePlanController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/ServicePlanController.java
new file mode 100644
index 0000000..636dc13
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/ServicePlanController.java
@@ -0,0 +1,155 @@
+package com.rootcloud.controller;
+
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.domain.ao.ServicePlanAO;
+import com.rootcloud.domain.ao.ServicePlanCalendarAO;
+import com.rootcloud.domain.ao.ServicePlanCalendarNewAO;
+import com.rootcloud.domain.entity.ds.ModelPropertySyncEntity;
+import com.rootcloud.domain.service.sp.NxUserInfoService;
+import com.rootcloud.domain.service.sp.ServicePlanService;
+import com.rootcloud.vo.device.ServicePlanCalendarVO;
+import com.rootcloud.vo.device.ServicePlanDetailVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @ClassName ServicePlanController
+ * @Description 服务计划控制器
+ * @Author w-liuyi01
+ * @Date 2022/4/28 16:30
+ * @Version 1.0
+ */
+@RestController
+@Api(tags = "服务计划")
+@RequestMapping("/servicePlan")
+public class ServicePlanController {
+
+    @Resource(name = "servicePlanServiceImpl")
+    ServicePlanService planService;
+
+    @Resource(name = "NxUserInfoServiceImpl")
+    NxUserInfoService nxUserInfoService;
+
+
+    /**
+     * @return
+     * @Author w-liuyi01
+     * @Description //新增服务计划接口
+     * @Date 2022/4/29 10:32
+     * @Param
+     **/
+    @PostMapping(path = "/addPlan")
+    @ApiOperation("新增服务计划")
+    public JsonResult addPlan(@RequestBody @Validated ServicePlanAO planAO) {
+        planService.addPlan(planAO);
+        return JsonResult.success("新建计划成功");
+    }
+
+
+    @GetMapping("/startServicePlan")
+    public JsonResult startServicePlan(String servicePlanId) {
+        planService.startServicePlan(servicePlanId);
+        return JsonResult.success("服务计划启动成功");
+    }
+
+    @ApiOperation("根据设备编码查询工况条件")
+    @GetMapping("/workCondition/{deviceNo}")
+    public JsonResult<List<ModelPropertySyncEntity>> getWorkCondition(@PathVariable String deviceNo) {
+        return JsonResult.success(planService.getWorkCondition(deviceNo));
+    }
+
+    @ApiOperation("手动触发服务计划订单")
+    @GetMapping("/manualTrigger/{planId}")
+    public JsonResult manualTrigger(@PathVariable String planId) {
+        //查询是否有订单，存在订单与删除
+        return planService.manualTrigger(planId);
+    }
+
+
+    @ApiOperation("修改服务计划状态")
+    @GetMapping("/updateStatus")
+    public JsonResult<Void> updateStatus(@RequestParam @ApiParam("服务计划主键") String servicePlanId, @RequestParam @ApiParam("服务计划状态") Integer servicePlanStatus) {
+        try {
+            planService.updateServicePlanStatus(servicePlanId, 0, servicePlanStatus, false, null);
+            return JsonResult.success();
+        } catch (Exception e) {
+            return JsonResult.failed("500", e.getMessage());
+        }
+    }
+
+
+    @ApiOperation("查询计划任务详情")
+    @GetMapping("/selectDataDetail")
+    public JsonResult<ServicePlanDetailVO> selectDataDetail(@RequestParam @ApiParam("服务计划主键") String servicePlanId) {
+        return JsonResult.success(planService.selectDetailById(servicePlanId));
+    }
+
+
+    @ApiOperation("删除计划任务")
+    @GetMapping("/deleteServicePlan")
+    public JsonResult deleteServicePlan(@RequestParam @ApiParam("服务计划主键") String servicePlanId) {
+        return JsonResult.success(planService.deleteServicePlan(servicePlanId));
+    }
+
+
+    @PostMapping(path = "/checkServicePlanCalendar")
+    @ApiOperation("查询任务日历接口")
+    public JsonResult<ServicePlanCalendarVO> checkServicePlanCalendar(@RequestBody @Validated ServicePlanCalendarAO planCalendarAO) {
+        ServicePlanCalendarVO servicePlanCalendarVO = planService.checkServicePlanCalendar(planCalendarAO);
+        return JsonResult.success(servicePlanCalendarVO);
+    }
+
+
+    @ApiOperation("通过设备编码查询对应的用户数据")
+    @GetMapping("/getCustomerAndRoles")
+    public JsonResult<List<String>> getCustomerAndRoles(@RequestParam @ApiParam("设备编码") String deviceCode) {
+        return JsonResult.success(nxUserInfoService.getCustomerAndRoles(deviceCode));
+    }
+
+
+    @PostMapping(path = "/checkServicePlanCalendarAll")
+    @ApiOperation("查询任务日历总接口")
+    public JsonResult<ServicePlanCalendarVO> checkServicePlanCalendarAll(@RequestBody @Validated ServicePlanCalendarNewAO servicePlanCalendarNewAO) {
+        ServicePlanCalendarVO servicePlanCalendarVO = planService.checkDataByParams(servicePlanCalendarNewAO);
+        return JsonResult.success(servicePlanCalendarVO);
+    }
+
+    @PostMapping(path = "/updateDate")
+    @ApiOperation("更新服务计划下一个周期日期")
+    @IgnoreSecurity
+    public JsonResult<Object> updateDate() {
+        planService.updateDate();
+        return JsonResult.success();
+    }
+
+    @PostMapping(path = "/scheduledProcessing")
+    @ApiOperation("执行服务计划")
+    @IgnoreSecurity
+    public JsonResult<Object> scheduledProcessing(@RequestParam("thatDay") String thatDay,
+                                                  @RequestParam("planId") String planId) {
+        planService.scheduledProcessingNew(thatDay, planId);
+        return JsonResult.success();
+    }
+
+    @PostMapping(path = "/pause")
+    @ApiOperation("暂停服务计划")
+    @IgnoreSecurity
+    public JsonResult<Object> pause(@RequestParam("planId") String planId,
+                                    @RequestParam("type") String type) {
+        return planService.pause(planId,type);
+    }
+
+    @PostMapping(path = "/pretrigger")
+    @ApiOperation("提前触发")
+    @IgnoreSecurity
+    public JsonResult<Object> pretrigger(@RequestParam("planId") String planId) {
+        return planService.pretrigger(planId);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/WorkStatusMonitorController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/WorkStatusMonitorController.java
new file mode 100644
index 0000000..e725d5e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/controller/WorkStatusMonitorController.java
@@ -0,0 +1,44 @@
+package com.rootcloud.controller;
+
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.domain.model.WorkStatusMonitorModel;
+import com.rootcloud.domain.service.gkjk.NxJeDeviceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author LiPingAn 2022/4/18 15:13
+ * @version 1.0
+ **/
+@Api(tags = "设备详情工况监控接口")
+@RestController
+@Slf4j
+@RequestMapping("/work-status-monitor")
+public class WorkStatusMonitorController {
+
+    @Resource(name = "nxJeDeviceServiceImpl")
+    private NxJeDeviceService nxJeDeviceService;
+
+    @ApiOperation(value = "查询设备详情实时工况数据")
+    @GetMapping("query-work-status")
+    public JsonResult<Object> queryWorkStatus(@RequestParam String deviceId, String dataSjy) {
+        Map<String, List<WorkStatusMonitorModel>> stringListMap = nxJeDeviceService.queryWorkStatus(deviceId,dataSjy);
+        return JsonResult.success(stringListMap);
+    }
+
+    @ApiOperation(value = "查询设备详情设备监测数据")
+    @GetMapping("query-monitoring-data")
+    public JsonResult<Object> queryMonitoringData(@RequestParam String deviceId) {
+        Map<String, List<WorkStatusMonitorModel>> stringListMap = nxJeDeviceService.queryMonitoringData(deviceId);
+        return JsonResult.success(stringListMap);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ExportHistorySituationAO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ExportHistorySituationAO.java
new file mode 100644
index 0000000..1433c4c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ExportHistorySituationAO.java
@@ -0,0 +1,36 @@
+package com.rootcloud.domain.ao;
+
+import com.rootcloud.domain.model.WorkStatusMonitorModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @ClassName HistorySituttionAO
+ * @Description 获取历史工况参数
+ * @Author w-liuyi01
+ * @Date 2022/4/20 15:07
+ * @Version 1.0
+ */
+@Data
+public class ExportHistorySituationAO {
+
+    @ApiModelProperty("设备ID")
+    @NotNull(message = "设备ID不能为空")
+    private String deviceId;
+
+    @ApiModelProperty("开始时间")
+    private String startTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+    @ApiModelProperty("时区")
+    private int timeZone;
+
+    @ApiModelProperty("需要导出的工况属性")
+    private List<WorkStatusMonitorModel> propertyList;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/HistorySituationAO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/HistorySituationAO.java
new file mode 100644
index 0000000..2ab6aad
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/HistorySituationAO.java
@@ -0,0 +1,36 @@
+package com.rootcloud.domain.ao;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @ClassName HistorySituttionAO
+ * @Description 获取历史工况参数
+ * @Author w-liuyi01
+ * @Date 2022/4/20 15:07
+ * @Version 1.0
+ */
+@Data
+public class HistorySituationAO {
+
+    @ApiModelProperty("设备ID")
+    @NotNull(message = "设备ID不能为空")
+    private String deviceId;
+
+    @ApiModelProperty("开始时间")
+    private String startTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+    @ApiModelProperty("当前页数")
+    @NotNull(message = "当前页数不能为空")
+    private Integer pageSize;
+
+    @ApiModelProperty("当前页")
+    @NotNull(message = "当前页不能为空")
+    private Integer currentPage;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/NxUserInfoAO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/NxUserInfoAO.java
new file mode 100644
index 0000000..75b1ed3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/NxUserInfoAO.java
@@ -0,0 +1,64 @@
+package com.rootcloud.domain.ao;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName NxUserInfo
+ * @Description TODO
+ * @Author w-liuyi01
+ * @Date 2022/4/29 11:03
+ * @Version 1.0
+ */
+@Data
+public class NxUserInfoAO {
+
+    @ApiModelProperty("用户提醒ID")
+    private String nxUserInfoId;
+
+    @ApiModelProperty("服务计划ID")
+    private String servicePlanId;
+
+    @ApiModelProperty("部门ID")
+    private String departmentId;
+
+    @ApiModelProperty("用户ID")
+    private String userId;
+
+    @ApiModelProperty("角色ID")
+    private String roleId;
+
+    @ApiModelProperty("部门ID名称")
+    private String departmentIdName;
+
+    @ApiModelProperty("用户ID名称")
+    private String userIdName;
+
+    @ApiModelProperty("角色ID名称")
+    private String roleIdName;
+
+    @ApiModelProperty("是否外部提醒（1：勾选外部提醒）")
+    private String externalReminders;
+
+
+    @ApiModelProperty("站内信提醒（1：勾选站内信提醒）")
+    private String stationReminders;
+
+
+    @ApiModelProperty("邮件提醒（1：勾选邮件提醒）")
+    private String emailReminders;
+
+    @ApiModelProperty("短信提醒（1：勾选短信提醒）")
+    private String smsReminders;
+
+    @ApiModelProperty("消息模板类型")
+    private String infoType;
+
+    @ApiModelProperty("消息模板内容")
+    private String infoContent;
+
+    @ApiModelProperty("消息模板Id")
+    private String  infoXxmbid;
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/OrderDispatchForm.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/OrderDispatchForm.java
new file mode 100644
index 0000000..12c31ab
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/OrderDispatchForm.java
@@ -0,0 +1,51 @@
+package com.rootcloud.domain.ao;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * <p>
+ *     订单派工请求参数
+ * </p>
+ * @author HeJia
+ * @since 2022/5/18
+ */
+@Setter
+@Getter
+@ApiModel("派工Form")
+public class OrderDispatchForm {
+
+    @NotBlank(message = "订单主键不能为空")
+    @ApiModelProperty("订单主键")
+    private String nxOrderId;
+
+    @NotBlank(message = "服务方式name不能为空")
+    @ApiModelProperty("服务方式_NAME")
+    private String orderServicemethodName;
+
+    @NotBlank(message = "服务方式code不能为空")
+    @ApiModelProperty("服务方式_CODE")
+    private String orderServicemethodCode;
+
+    @NotBlank(message = "计划完成时间不能为空")
+    @ApiModelProperty("计划完成时间【yyyy-MM-dd HH:mm:ss】")
+    private String orderPlanendtime;
+
+    @NotBlank(message = "指派工程师不能为空")
+    @ApiModelProperty("指派工程师")
+    private String orderAssignengineer;
+
+    @NotBlank(message = "指派工程师ID不能为空")
+    @ApiModelProperty("指派工程师ID")
+    private String orderAssignengineerid;
+
+    @ApiModelProperty("协助工程师")
+    private String orderAssistengineer;
+
+    @ApiModelProperty("协助工程师ID")
+    private String orderAssistengineerid;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ReportStatisticAO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ReportStatisticAO.java
new file mode 100644
index 0000000..ddc0084
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ReportStatisticAO.java
@@ -0,0 +1,37 @@
+package com.rootcloud.domain.ao;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 首页入参
+ */
+@Data
+public class ReportStatisticAO {
+
+    @ApiModelProperty("开始时间")
+    private String startTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+    @ApiModelProperty("日期类型1.近七天;2.近30天;3.当月4.当年")
+    private String type;
+
+    @ApiModelProperty("服务类型 001.维修单，002.保养单，003.技改单")
+    private String serveType;
+
+    @ApiModelProperty("业务类型： 默认是1")
+    private String businessType;
+
+    @ApiModelProperty("评价倒序专用： 默认是1")
+    private String sortReverseOrder;
+
+    @ApiModelProperty("订单状态")
+    private String orderStatus;
+
+    @ApiModelProperty("查询类型")
+    private String selectType;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ServicePlanAO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ServicePlanAO.java
new file mode 100644
index 0000000..58c687f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ServicePlanAO.java
@@ -0,0 +1,113 @@
+package com.rootcloud.domain.ao;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName ServicePlanAO
+ * @Description服务计划入参
+ * @Author w-liuyi01
+ * @Date 2022/4/29 9:32
+ * @Version 1.0
+ */
+@Data
+public class ServicePlanAO {
+
+    @ApiModelProperty("服务计划主键")
+    private String servicePlanId;
+
+    @ApiModelProperty("设备编码")
+    private String  deviceCode;
+
+    @ApiModelProperty("设备ID")
+    private String  deviceId;
+
+    @ApiModelProperty("计划名称")
+    private String  planName;
+
+    @ApiModelProperty("计划类型")
+    private String  planType;
+
+    @ApiModelProperty("设备类型")
+    private String  deviceType;
+
+    @ApiModelProperty("设备型号")
+    private String  deviceSbxh;
+
+    @ApiModelProperty("设备类型名称")
+    private String  deviceTypeName;
+
+    @ApiModelProperty("设备型号名称")
+    private String dviceModelName;
+
+    @ApiModelProperty("计划周期【1：日2：周3：月4：年】")
+    private Integer  planCycle;
+
+    @ApiModelProperty("计划间隔")
+    private Integer  planInterval;
+
+    @ApiModelProperty("计划状态【0：待启动1：进行中2：已完成3：已暂停】")
+    private Integer  planStatus;
+
+    @ApiModelProperty("创建时间")
+    private String  createTime;
+
+    @ApiModelProperty("计划时间段开始时间")
+    private String  planStartTime;
+
+    @ApiModelProperty("计划时间段结束时间")
+    private String  planEndTime;
+
+    @ApiModelProperty("是否超时【0：未超时 1：已超时】")
+    private Integer  isTimeout;
+
+    @ApiModelProperty("提醒方式【0：邮件1：短信 2：站内信")
+    private String  planRemindWay;
+
+    @ApiModelProperty("完成时间节点【几天内】")
+    private Integer  finishTimeNode;
+
+    @ApiModelProperty("保养")
+    private String  maintainContent;
+
+    @ApiModelProperty("起停状态0停止1启动")
+    private Integer  isStart;
+
+    @ApiModelProperty("处理状态【0.不需要处理，1.需要处理】")
+    private Integer detailStatus;
+
+    @ApiModelProperty("下一个周期时间")
+    private String nextCycleTime;
+
+    @ApiModelProperty("计划类型名称")
+    private String planTypeName;
+
+    @ApiModelProperty("计划周期名称")
+    private String planCycleName;
+
+    @ApiModelProperty("计划状态名称")
+    private String planStatusName;
+
+    @ApiModelProperty("是否超时名称")
+    private String isTimeoutName;
+
+    @ApiModelProperty("提醒方式名称")
+    private String planRemindWayName;
+
+    @ApiModelProperty("保养内容名称")
+    private String maintainContentName;
+
+    @ApiModelProperty("临时触发时间")
+    private String  planLscfsj;
+
+    @ApiModelProperty("保养类型：一级保养、二级保养、三级保养、专项保养")
+    private String maintenanceType;
+
+    @ApiModelProperty("触发条件集合")
+    private TriggerConditionAO conditionAO;
+
+    @ApiModelProperty("设置提醒用户信息")
+    private NxUserInfoAO userInfoAO;
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ServicePlanCalendarAO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ServicePlanCalendarAO.java
new file mode 100644
index 0000000..c7afa2e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ServicePlanCalendarAO.java
@@ -0,0 +1,22 @@
+package com.rootcloud.domain.ao;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class ServicePlanCalendarAO {
+
+
+    @NotBlank(message="月份时间yyyy-MM不能为空")
+    @ApiModelProperty(value = "月份时间yyyy-MM", required = true, dataType = "java.lang.String")
+    private String queryTime;
+
+
+    @NotBlank(message="服务计划主键不能为空")
+    @ApiModelProperty(value = "服务计划主键", required = true, dataType = "java.lang.String")
+    private String servicePlanId;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ServicePlanCalendarNewAO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ServicePlanCalendarNewAO.java
new file mode 100644
index 0000000..5c8a1f4
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ServicePlanCalendarNewAO.java
@@ -0,0 +1,22 @@
+package com.rootcloud.domain.ao;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class ServicePlanCalendarNewAO {
+
+    @NotBlank(message="月份时间yyyy-MM不能为空")
+    @ApiModelProperty(value = "月份时间yyyy-MM", required = true, dataType = "java.lang.String")
+    private String queryTime;
+
+
+    @ApiModelProperty("保养类型：一级保养、二级保养、三级保养、专项保养")
+    private String maintenanceType;
+
+    private String syZhid;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ServicePlanParamsAO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ServicePlanParamsAO.java
new file mode 100644
index 0000000..56c9c37
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/ServicePlanParamsAO.java
@@ -0,0 +1,11 @@
+package com.rootcloud.domain.ao;
+
+
+import lombok.Data;
+
+@Data
+public class ServicePlanParamsAO {
+    private Integer planStatus;
+    private String  sysTime;
+    private String  planCycle;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/TriggerConditionAO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/TriggerConditionAO.java
new file mode 100644
index 0000000..27fe7c1
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/ao/TriggerConditionAO.java
@@ -0,0 +1,60 @@
+package com.rootcloud.domain.ao;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @ClassName TiggerConditionAO
+ * @Description 触发条件AO
+ * @Author w-liuyi01
+ * @Date 2022/4/29 10:50
+ * @Version 1.0
+ */
+@Setter
+@Getter
+public class TriggerConditionAO {
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "触发类型主键")
+    private String nxTriggerConditionId;
+
+
+    @NotNull(message = "触发类型不能为空")
+    @ApiModelProperty(value = "触发类型")
+    private String triggerCondition;
+
+    @NotNull(message = "选择条件不能为空")
+    @ApiModelProperty("选择条件")
+    private String conditionTj;
+
+    @NotNull(message = "条件值不能为空")
+    @ApiModelProperty("条件值")
+    private String conditionValue;
+
+    @NotNull(message = "设置值不能为空")
+    @ApiModelProperty("设置值")
+    private String setValue;
+
+    @ApiModelProperty("触发类型名称")
+    private String triggerConditionName;
+
+    @ApiModelProperty("条件名称")
+    private String conditionTjName;
+
+    @ApiModelProperty("条件值名称")
+    private String conditionValueName;
+
+    @ApiModelProperty("设置值的名称")
+    private String setValueName;
+
+    @ApiModelProperty("操作类型 【删除del  修改 mod】")
+    private String operationType;
+
+    @ApiModelProperty("数据单位")
+    private String dataUnit;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/constant/AppConstant.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/constant/AppConstant.java
new file mode 100644
index 0000000..ea334ca
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/constant/AppConstant.java
@@ -0,0 +1,16 @@
+package com.rootcloud.domain.constant;
+
+/**
+ * <p>
+ *     app常量
+ * </p>
+ * @author HeJia
+ * @since 2022/5/13
+ */
+public interface AppConstant {
+
+    /**
+     * 当前页和每页显示数
+     */
+    String PAGE = "1", SIZE = "10";
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/constant/RabbitMQConstant.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/constant/RabbitMQConstant.java
new file mode 100644
index 0000000..e32edce
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/constant/RabbitMQConstant.java
@@ -0,0 +1,23 @@
+package com.rootcloud.domain.constant;
+
+public class RabbitMQConstant {
+    /**
+     * -----------------------------------------------------------
+     * 项目中所有用到的交换机
+     * -----------------------------------------------------------
+     */
+    /**
+     * 1. Fanout Exchange消息交换机(事例)
+     */
+    public final static String QUEUE_CREATE_TENANT_OPERATION= "spruceConsole.queue.init.tenant.operation";
+    /**
+     * -----------------------------------------------------------
+     * 项目中所有用到的交换机
+     * -----------------------------------------------------------
+     */
+    /**
+     * 1. Fanout Exchange消息交换机(事例)
+     */
+    public final static String FANOUT_EXCHANGE_TENANT = "saas.spruce.exchange.tenant.fanout";
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/constant/RedisConstant.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/constant/RedisConstant.java
new file mode 100644
index 0000000..1b729ea
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/constant/RedisConstant.java
@@ -0,0 +1,10 @@
+package com.rootcloud.domain.constant;
+
+public class RedisConstant {
+    /**
+     * 事例
+     * roleId:userId:tenantId:appCode:menuId
+     */
+    public static final String USER_MENU_KEY = "SPRUCE:CONSOLE:WEB:USERMENU:%s:%s:%s:%s:%s";
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ConfigDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ConfigDao.java
new file mode 100644
index 0000000..55a8ddf
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ConfigDao.java
@@ -0,0 +1,18 @@
+package com.rootcloud.domain.dao;
+
+import com.rootcloud.domain.vo.ConfigVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ConfigDao {
+    void add(ConfigVO configVO);
+    void delete(@Param("code") String code);
+    List<ConfigVO> find(@Param("code") String code);
+    void update(ConfigVO configVO);
+    List<ConfigVO> list();
+    List<ConfigVO> listTable_zhid();
+    List<ConfigVO> listTable_syzhid();
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/CustomerDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/CustomerDao.java
new file mode 100644
index 0000000..829a842
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/CustomerDao.java
@@ -0,0 +1,21 @@
+package com.rootcloud.domain.dao;
+
+import com.rootcloud.domain.vo.CustomerVO;
+import com.rootcloud.service.condition.QueryUserReportCondition;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface CustomerDao {
+
+    //获取所有客户列表
+    List<CustomerVO> getAllCustomer(QueryUserReportCondition c);
+    //
+    List<String> getRegisterDeviceByUser(@Param("officeIds") List<String> officeIds, @Param("tenantId") String tenantId);
+
+    //客户列表接口，返回客户名称及客户编码  获取指定用户所属的客户列表接口
+    List<CustomerVO> getCustomerListByUserId(@Param("userId") String userId);
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/FittingsListMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/FittingsListMapper.java
new file mode 100644
index 0000000..cfc9708
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/FittingsListMapper.java
@@ -0,0 +1,9 @@
+package com.rootcloud.domain.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.NxFittingsListEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface FittingsListMapper extends BaseMapper<NxFittingsListEntity> {
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/GbsjbDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/GbsjbDao.java
new file mode 100644
index 0000000..0804228
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/GbsjbDao.java
@@ -0,0 +1,56 @@
+package com.rootcloud.domain.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.GbsjbEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 过保商机表
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-04-12 14:22:17
+ */
+@Mapper
+public interface GbsjbDao extends BaseMapper<GbsjbEntity> {
+
+    @Select("select * from je_core_enduser where loginlocked = '1'")
+    List<Map<String,String>> queryLockUser();
+
+    @Update("update je_core_enduser set loginlocked='0' where loginlocked = '1'")
+    void unLockUser();
+
+    @Select("select * from cftjpzb limit 1")
+    Map<String,String> selectOne();
+
+    @Select({
+            "<script>",
+            "select group_concat(userid) from (",
+            "select",
+            "userid",
+            "from je_core_role_user",
+            "where ROLEID in",
+            "<foreach collection='roleList' item='id' open='(' separator=',' close=')'>",
+            "#{id}",
+            "</foreach> group by userid) t",
+            "</script>"})
+    String queryUserIds(@Param("roleList") List<String> roleList);
+
+
+
+    @Select({
+            "<script>",
+            "select",
+            "COMPANYEMAIL as email,userid as userId,USERNAME as userName",
+            "from je_core_enduser",
+            "where userid  = #{userId} ",
+            "and COMPANYEMAIL IS NOT NULL AND COMPANYEMAIL !='' ",
+            "</script>"})
+    Map<String,String> selectByUserId(@Param("userId")String userId);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/JeCoreEnduserDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/JeCoreEnduserDao.java
new file mode 100644
index 0000000..2612842
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/JeCoreEnduserDao.java
@@ -0,0 +1,47 @@
+package com.rootcloud.domain.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.config.auth.LoginUserInfo;
+import com.rootcloud.config.auth.UserInfo;
+import com.rootcloud.domain.dto.EnterpriseInfoDTO;
+import com.rootcloud.domain.dto.UserRoleDeptDTO;
+import com.rootcloud.domain.entity.JeCoreEnduserEntity;
+import com.rootcloud.domain.entity.SiteDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 人员表
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-04-12 14:22:06
+ */
+@Mapper
+public interface JeCoreEnduserDao extends BaseMapper<JeCoreEnduserEntity> {
+
+
+    LoginUserInfo getUserInfo(String userId);
+
+    SiteDTO getSiteByUserId(String userId);
+
+    String getCustomsBySiteAreaName(String areaName);
+
+    String getCustomByUserId(String userId);
+
+    EnterpriseInfoDTO getTenantInfo(String userId);
+
+    String getTenantInfoNOSQL(String userId);
+
+    UserRoleDeptDTO getUserLoginInfo(String userId);
+
+    String getRolesByUserId(String userId);
+
+    UserInfo getUser(String userId);
+
+    List<JeCoreEnduserEntity> getUserListByRole(@Param("role") String role,@Param("zhid") String zhid);
+
+    String getDataByKey(String key);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/JeCoreRoleDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/JeCoreRoleDao.java
new file mode 100644
index 0000000..88fcd07
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/JeCoreRoleDao.java
@@ -0,0 +1,17 @@
+package com.rootcloud.domain.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.JeCoreRoleEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 角色表
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-04-12 14:21:50
+ */
+@Mapper
+public interface JeCoreRoleDao extends BaseMapper<JeCoreRoleEntity> {
+	
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/JeCoreRoleUserDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/JeCoreRoleUserDao.java
new file mode 100644
index 0000000..42e7181
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/JeCoreRoleUserDao.java
@@ -0,0 +1,17 @@
+package com.rootcloud.domain.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.JeCoreRoleUserEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-04-12 14:21:50
+ */
+@Mapper
+public interface JeCoreRoleUserDao extends BaseMapper<JeCoreRoleUserEntity> {
+	
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/JeSysUsermsgDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/JeSysUsermsgDao.java
new file mode 100644
index 0000000..ad69485
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/JeSysUsermsgDao.java
@@ -0,0 +1,17 @@
+package com.rootcloud.domain.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.JeSysUsermsgEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 通知消息
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-07-05 11:06:58
+ */
+@Mapper
+public interface JeSysUsermsgDao extends BaseMapper<JeSysUsermsgEntity> {
+	
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/KhDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/KhDao.java
new file mode 100644
index 0000000..01a984d
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/KhDao.java
@@ -0,0 +1,13 @@
+package com.rootcloud.domain.dao;
+
+import com.rootcloud.domain.vo.ConfigVO;
+import com.rootcloud.domain.vo.KhVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface KhDao {
+    List<KhVO> getKuList(@Param("userId") String userId);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ModelColorDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ModelColorDao.java
new file mode 100644
index 0000000..d5b3de0
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ModelColorDao.java
@@ -0,0 +1,16 @@
+package com.rootcloud.domain.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.base.ModelColor;
+import com.rootcloud.domain.entity.base.ModelPropertyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ruixiang.feng
+ * @ClassName
+ * @Description
+ * @date 2022/4/15 10:47
+ */
+@Mapper
+public interface ModelColorDao extends BaseMapper<ModelColor> {
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ModelPropertyDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ModelPropertyDao.java
new file mode 100644
index 0000000..c80076f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ModelPropertyDao.java
@@ -0,0 +1,15 @@
+package com.rootcloud.domain.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.base.ModelPropertyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ruixiang.feng
+ * @ClassName
+ * @Description
+ * @date 2022/4/15 10:47
+ */
+@Mapper
+public interface ModelPropertyDao extends BaseMapper<ModelPropertyEntity> {
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/NxDeviceDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/NxDeviceDao.java
new file mode 100644
index 0000000..4c91c80
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/NxDeviceDao.java
@@ -0,0 +1,34 @@
+package com.rootcloud.domain.dao;
+import com.rootcloud.domain.vo.DeviceListVO;
+import com.rootcloud.domain.vo.NxDeviceVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 宁夏共享-设备台账表DAO  --nx_je_device存储从4.0同步过来的物模型、物实例信息，modeId thingId
+ * nx_jcxx_sblb 表为设备档案主表，除了从nx_je_device同步过来的设备外，还要存用户录入的设备信息
+ * */
+
+@Mapper
+public interface NxDeviceDao {
+
+    //查询设备类型、编号、物模型ID,物实例ID
+    List<NxDeviceVO> getDeviceList(NxDeviceVO deviceVO);
+    List<NxDeviceVO> getDeviceById(NxDeviceVO deviceVO);
+    List<NxDeviceVO> getDeviceList2();
+
+    //查询指定用户下所有的设备列表  --目前不存在这个关系
+//    List<String> getDeviceListByUserId(@Param("userId")String userId, @Param("tenantId")String tenantId);
+
+    //查询指定客户(机构)下所有的设备列表 --只返回设备编号
+    List<String> getDeviceCodeListByCustomerCode(@Param("officeIds") List<String> officeIds, @Param("tenantId") String tenantId);
+
+    //查询指定客户(机构)下所有的设备列表 --返回设备编号、名称等
+    List<DeviceListVO> getDeviceListByCustomerId(@Param("officeId") String officeId, @Param("tenantId") String tenantId);
+
+
+    List<NxDeviceVO> getDeviceListEurope(NxDeviceVO deviceVO);
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/NxOrderDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/NxOrderDao.java
new file mode 100644
index 0000000..cccfb76
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/NxOrderDao.java
@@ -0,0 +1,17 @@
+package com.rootcloud.domain.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.NxOrderEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 宁夏_订单
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-05-07 13:41:38
+ */
+@Mapper
+public interface NxOrderDao extends BaseMapper<NxOrderEntity> {
+	
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/PrinterEfficiencyWorkDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/PrinterEfficiencyWorkDao.java
new file mode 100644
index 0000000..06a5d84
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/PrinterEfficiencyWorkDao.java
@@ -0,0 +1,44 @@
+package com.rootcloud.domain.dao;
+
+import com.rootcloud.domain.vo.PrinterEfficiencyWorkVO;
+import com.rootcloud.web.dto.PrinterReportDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface PrinterEfficiencyWorkDao {
+
+    //测试
+    List<Map<String, Object>> getPrinterEfficiencyData(@Param("year") int year, @Param("month") int monthValue, @Param("day") int dayOfMonth);
+
+    //清理
+    void clear(@Param("year") int year, @Param("month") int month, @Param("day") int day);
+    // 批量新增
+    void batchAdd(@Param("dataList") List<PrinterEfficiencyWorkVO> dataList,
+                  @Param("year") int year, @Param("month") int month, @Param("day") int day);
+
+
+    //单台机
+    void clear2(@Param("year") int year, @Param("month") int month, @Param("day") int day);
+    void batchAdd2(@Param("dataList") List<PrinterEfficiencyWorkVO> dataList,
+                   @Param("year") int year, @Param("month") int month, @Param("day") int day);
+
+    /**
+     * 打印耗时
+     */
+    List<Map<String,Object>> getReportDYHSByDevice(PrinterReportDTO printerReportDTO);
+    /**
+     * 打印效率
+     */
+    List<Map<String,Object>> getReportDYXLByDevice(PrinterReportDTO printerReportDTO);
+    /**
+     * 布图率
+     */
+    List<Map<String,Object>> getReportBTLByDevice(PrinterReportDTO printerReportDTO);
+
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/PrinterHeadRecordDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/PrinterHeadRecordDao.java
new file mode 100644
index 0000000..9baa78a
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/PrinterHeadRecordDao.java
@@ -0,0 +1,11 @@
+package com.rootcloud.domain.dao;
+
+import com.rootcloud.domain.vo.PrinterHeadRecordVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface PrinterHeadRecordDao {
+    List<PrinterHeadRecordVO> printerHeadList(PrinterHeadRecordVO vo);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterOutputDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterOutputDao.java
new file mode 100644
index 0000000..bbce9e2
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterOutputDao.java
@@ -0,0 +1,30 @@
+package com.rootcloud.domain.dao;
+
+import com.rootcloud.domain.vo.RepPrinterOutputVO;
+import com.rootcloud.web.dto.ChanNengLiYongLvDto;
+import com.rootcloud.web.dto.PrinterReportDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface RepPrinterOutputDao {
+    void add(@Param("repPrinterOutputVOs") List<RepPrinterOutputVO> repPrinterOutputVOs);
+
+    List<RepPrinterOutputVO> list(RepPrinterOutputVO repPrinterOutputVO);
+    List<RepPrinterOutputVO> listPage(RepPrinterOutputVO repPrinterOutputVO);
+    List<RepPrinterOutputVO> list1(RepPrinterOutputVO repPrinterOutputVO);
+    List<RepPrinterOutputVO> listnew(RepPrinterOutputVO repPrinterOutputVO);
+
+    List<Map<String,Object>> sumDeviceProductWasteData(PrinterReportDTO printerReportDTO);
+
+    void deleteOutput(RepPrinterOutputVO c) ;
+
+    void deleteOutputUpload(RepPrinterOutputVO c) ;
+
+
+    List<ChanNengLiYongLvDto> chanNengLiYongLv(PrinterReportDTO printerReportDTO);
+//    List<ChanNengLiYongLvDto> chanNengLiYongLvV2(PrinterReportDTO printerReportDTO);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterReportDAO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterReportDAO.java
new file mode 100644
index 0000000..8c57fa2
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterReportDAO.java
@@ -0,0 +1,68 @@
+package com.rootcloud.domain.dao;
+
+import com.rootcloud.domain.vo.RepPrinterEmailConfigVO;
+import com.rootcloud.domain.vo.RepPrinterReportVO;
+import com.rootcloud.domain.vo.RepPrinterWasteTypeVO;
+import com.rootcloud.web.dto.PrinterReportDTO;
+import com.rootcloud.web.dto.UpdateUserReportDTO;
+import com.rootcloud.web.dto.WeiXuFeiYongTongJiDto;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface RepPrinterReportDAO {
+
+    /***
+     *
+     * @Title: insert
+     * @Description: 新增
+     * @param vo
+     * @return
+     */
+    void insert(RepPrinterReportVO vo);
+
+    /**
+     *	根据用户报告id修改发送人字段信息
+     */
+    void updateEmailsById(Map<String, Object> params);
+
+    /**
+     *	修改用户报告备注
+     */
+    void updateUserReport(UpdateUserReportDTO params);
+
+    /**
+     *	根据id删除报告信息
+     */
+    void deleteReportById(Map<String, Object> params);
+
+    /**
+     * 	根据条件查询用户报告
+     */
+    List<RepPrinterReportVO> getPrinterUserReports(Map<String, Object> params);
+
+    //分页
+    List<RepPrinterReportVO> getPrinterUserReportsList(Map<String, Object> params);
+    List<RepPrinterReportVO> getPrinterUserReportsCount(Map<String, Object> params);
+
+    /**
+     * 根据客户信息，查询客户邮箱配置
+     */
+    List<RepPrinterEmailConfigVO> getPrinterEmailConfigs(Map<String, Object> params);
+
+    /**
+     *  获取废品原因分类
+     */
+    List<RepPrinterWasteTypeVO> getRepPrinterWasteTypes();
+
+    void updateUserReportValue(RepPrinterReportVO vo);
+
+    List<WeiXuFeiYongTongJiDto> weiXuFeiYongTongJi(PrinterReportDTO printerReportDTO);
+
+    List<WeiXuFeiYongTongJiDto> weiXuFeiYongTongJiV2(PrinterReportDTO printerReportDTO);
+
+    List<WeiXuFeiYongTongJiDto> weiXuFeiYongTongJiWeiBo(PrinterReportDTO printerReportDTO);
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterReportItemDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterReportItemDao.java
new file mode 100644
index 0000000..194ae71
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterReportItemDao.java
@@ -0,0 +1,22 @@
+package com.rootcloud.domain.dao;
+
+import com.rootcloud.domain.vo.RepPrinterReportItemVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface RepPrinterReportItemDao {
+    void add(@Param("repPrinterReportItemVOs") List<RepPrinterReportItemVO> repPrinterReportItemVOs);
+
+    void update(@Param("repPrinterReportItemVOs") List<RepPrinterReportItemVO> repPrinterReportItemVOs);
+
+    List<RepPrinterReportItemVO> list(RepPrinterReportItemVO repPrinterReportImgVO);
+
+    /**
+     *	根据报告id信息
+     */
+    void deleteByReportId(Map<String, Object> params);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterSandPassrateDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterSandPassrateDao.java
new file mode 100644
index 0000000..b8dc147
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterSandPassrateDao.java
@@ -0,0 +1,33 @@
+package com.rootcloud.domain.dao;
+
+import com.rootcloud.domain.vo.RepPrinterSandPassrateVO;
+import com.rootcloud.web.dto.PrinterReportDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface RepPrinterSandPassrateDao {
+
+
+    void add(@Param("repPrinterSandPassrateVOs") List<RepPrinterSandPassrateVO> repPrinterSandPassrateVOs);
+
+    List<RepPrinterSandPassrateVO> list(RepPrinterSandPassrateVO repPrinterSandPassrateVO);
+    List<RepPrinterSandPassrateVO> listPage(RepPrinterSandPassrateVO repPrinterSandPassrateVO);
+
+    List<RepPrinterSandPassrateVO> listnew(RepPrinterSandPassrateVO repPrinterSandPassrateVO);
+
+    List<Map<String,Object>> sumPrinterSandPassrateData(PrinterReportDTO printerReportDTO);
+//
+    List<Map<String,Object>> sumPrinterSandPassrateQiangDuData(PrinterReportDTO printerReportDTO);
+
+    /* 星级评价提取强度数据**/
+    List<Map<String,Object>> sumPrinterSandPassrateQiangDuDataStarEvaluate(Map<String, Object> params);
+
+    void deleteSandPassrate(RepPrinterSandPassrateVO c) ;
+
+    void deleteSandPassrateUpload(RepPrinterSandPassrateVO c) ;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterSandPercentDAO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterSandPercentDAO.java
new file mode 100644
index 0000000..cbe7754
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterSandPercentDAO.java
@@ -0,0 +1,108 @@
+package com.rootcloud.domain.dao;
+
+import com.rootcloud.domain.vo.RepPrinterSandPercentVO;
+import com.rootcloud.web.dto.GuHuaJiDanHaoDto;
+import com.rootcloud.web.dto.PinJunDaYinGaoDuDto;
+import com.rootcloud.web.dto.PrinterReportDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@Mapper
+public interface RepPrinterSandPercentDAO {
+
+    /***
+     *
+     * @Title: insert
+     * @Description: 新增
+     * @param vo
+     * @return
+     */
+    void insert(RepPrinterSandPercentVO vo);
+
+    /***
+     *
+     * @Title: update
+     * @Description: 更新
+     * @param vo
+     * @return
+     */
+    void update(RepPrinterSandPercentVO vo);
+
+    /***
+     *
+     * @Title: deleteById
+     * @Description: 删除
+     * @param id
+     * @return
+     */
+    void deleteById(@Param("id") Long id);
+
+    /***
+     *
+     * @Title: getRepPrinterSandPercentList
+     * @Description: 获取数据集
+     * @param params
+     * @return List
+     */
+    List<Map<String,Object>> getRepPrinterSandPercentList(PrinterReportDTO printerReportDTO);
+
+    List<Map<String,Object>> getRepPrinterSandSXMDList(PrinterReportDTO printerReportDTO);
+    List<Map<String,Object>> getRepPrinterSandSXMDListV2(PrinterReportDTO printerReportDTO);
+    //针对产业创新中心\潍坊的设备(陶粒砂1.5，其他1.4)
+    List<Map<String,Object>> getRepPrinterSandSXMDListV3(PrinterReportDTO printerReportDTO);
+
+    List<Map<String,Object>> getRepPrinterSandXJSZBList(PrinterReportDTO printerReportDTO);
+
+    List<Map<String,Object>> getRepPrinterSandLSLList(PrinterReportDTO printerReportDTO);
+    List<Map<String,Object>> getRepPrinterSandLSLListV2(PrinterReportDTO printerReportDTO);
+
+
+    /**
+     * 批量新增
+     */
+    void batchAdd(@Param("dataList") List<RepPrinterSandPercentVO> dataList,
+                  @Param("year") int year, @Param("month") int month, @Param("day") int day);
+
+    /**
+     * 清空某天的数据
+     */
+    void clear(@Param("year") int year, @Param("month") int month, @Param("day") int day);
+
+    /***
+     *
+     * @Title: getRepPrinterVolumeList
+     * @Description: 获取打印机体积
+     * @param printerReportDTO
+     * @return List
+     */
+    List<Map<String,Object>> getRepPrinterVolumeList(PrinterReportDTO printerReportDTO);
+
+    List<RepPrinterSandPercentVO>  getVosByJobIds(@Param("deviceId") String deviceId, @Param("jobIds") Set<String> jobIds
+            , @Param("startDate") String startDate);
+
+    List<PinJunDaYinGaoDuDto> pinJunDaYinGaoDu(PrinterReportDTO printerReportDTO);
+    List<PinJunDaYinGaoDuDto> pinJunDaYinGaoDuV2(PrinterReportDTO printerReportDTO);
+
+
+    List<GuHuaJiDanHaoDto> guHuaJiDanHao(PrinterReportDTO printerReportDTO);
+    List<GuHuaJiDanHaoDto> guHuaJiDanHaoV2(PrinterReportDTO printerReportDTO);
+
+    //提取打印耗时
+    List<RepPrinterSandPercentVO> getHimTimesByDeviceCode(@Param("device_id") String device_id,
+                                                          @Param("data_year") String data_year,
+                                                          @Param("data_month") String data_month,
+                                                          @Param("data_day") String data_day
+    );
+
+    //提取打印耗时
+    List<RepPrinterSandPercentVO> getHimTimesByDeviceCode2(@Param("deviceId") String deviceId,
+                                                           @Param("dataYear") String dataYear,
+                                                           @Param("dataMonth") String dataMonth,
+                                                           @Param("dataDay") String dataDay
+    );
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterSandPercentDAO2.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterSandPercentDAO2.java
new file mode 100644
index 0000000..c85c1ed
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterSandPercentDAO2.java
@@ -0,0 +1,122 @@
+package com.rootcloud.domain.dao;
+
+import com.rootcloud.domain.vo.RepPrinterSandPercentVO;
+import com.rootcloud.web.dto.GuHuaJiDanHaoDto;
+import com.rootcloud.web.dto.PinJunDaYinGaoDuDto;
+import com.rootcloud.web.dto.PrinterReportDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@Mapper
+public interface RepPrinterSandPercentDAO2 {
+
+    /***
+     *
+     * @Title: insert
+     * @Description: 新增
+     * @param vo
+     * @return
+     */
+    void insert(RepPrinterSandPercentVO vo);
+
+    /***
+     *
+     * @Title: update
+     * @Description: 更新
+     * @param vo
+     * @return
+     */
+    void update(RepPrinterSandPercentVO vo);
+
+    /***
+     *
+     * @Title: deleteById
+     * @Description: 删除
+     * @param id
+     * @return
+     */
+    void deleteById(@Param("id") Long id);
+
+    /***
+     *
+     * @Title: getRepPrinterSandPercentList
+     * @Description: 获取数据集
+     * @param params
+     * @return List
+     */
+    List<Map<String,Object>> getRepPrinterSandPercentList(PrinterReportDTO printerReportDTO);
+
+    List<Map<String,Object>> getRepPrinterSandSXMDList(PrinterReportDTO printerReportDTO);
+    List<Map<String,Object>> getRepPrinterSandSXMDListV2(PrinterReportDTO printerReportDTO);
+
+
+    List<Map<String,Object>> getRepPrinterSandXJSZBList(PrinterReportDTO printerReportDTO);
+
+    List<Map<String,Object>> getRepPrinterSandLSLList(PrinterReportDTO printerReportDTO);
+    List<Map<String,Object>> getRepPrinterSandLSLListV2(PrinterReportDTO printerReportDTO);
+    //针对产业创新中心\潍坊的设备(陶粒砂1.5，其他1.4)
+    List<Map<String,Object>> getRepPrinterSandSXMDListV3(PrinterReportDTO printerReportDTO);
+
+    List<Map<String,Object>> getRepPrinterProcessData(Map<String, Object> params);
+
+    /**
+     * 批量新增
+     */
+    void batchAdd(@Param("dataList") List<RepPrinterSandPercentVO> dataList,
+                  @Param("year") int year, @Param("month") int month, @Param("day") int day);
+
+    /**
+     * 清空某天的数据
+     */
+    void clear(@Param("year") int year, @Param("month") int month, @Param("day") int day);
+
+    /***
+     *
+     * @Title: getRepPrinterVolumeList
+     * @Description: 获取打印机体积
+     * @param printerReportDTO
+     * @return List
+     */
+    List<Map<String,Object>> getRepPrinterVolumeList(PrinterReportDTO printerReportDTO);
+
+    List<RepPrinterSandPercentVO>  getVosByJobIds(@Param("deviceId") String deviceId, @Param("jobIds") Set<String> jobIds
+            , @Param("startDate") String startDate);
+
+    List<PinJunDaYinGaoDuDto> pinJunDaYinGaoDu(PrinterReportDTO printerReportDTO);
+    List<PinJunDaYinGaoDuDto> pinJunDaYinGaoDuV2(PrinterReportDTO printerReportDTO);
+
+
+    List<GuHuaJiDanHaoDto> guHuaJiDanHao(PrinterReportDTO printerReportDTO);
+    List<GuHuaJiDanHaoDto> guHuaJiDanHaoV2(PrinterReportDTO printerReportDTO);
+
+    //提取打印耗时
+    List<RepPrinterSandPercentVO> getHimTimesByDeviceCode(@Param("device_id") String device_id,
+                                                          @Param("data_year") String data_year,
+                                                          @Param("data_month") String data_month,
+                                                          @Param("data_day") String data_day
+    );
+
+    //提取打印耗时
+    List<RepPrinterSandPercentVO> getHimTimesByDeviceCode2(@Param("deviceId") String deviceId,
+                                                           @Param("dataYear") String dataYear,
+                                                           @Param("dataMonth") String dataMonth,
+                                                           @Param("dataDay") String dataDay
+    );
+
+    List<RepPrinterSandPercentVO> getPrintJobTaskinfo(@Param("device_id") String deviceId,
+                                                      @Param("hmi_begintime") String hmibegintime,
+                                                      @Param("hmi_endtime") String hmiendtime
+    );
+
+
+    //按照打印编号查询砂利用率
+    List<Map<String,Object>> getTaskIndex3ByJobId(@Param("hmi_jobid") String hmi_jobid);
+
+    //查询批次任务中的层打印耗时
+    List<Map<String,Object>> queryTaskLayerCostTimeByDevice(@Param("device_id") String device_id, @Param("hmi_jobid") String hmi_jobid);
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterStarEvaluateDAO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterStarEvaluateDAO.java
new file mode 100644
index 0000000..4434c6f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterStarEvaluateDAO.java
@@ -0,0 +1,53 @@
+package com.rootcloud.domain.dao;
+
+import com.rootcloud.domain.vo.RepStarEvaluateVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 星级评价计算分析模型DAO
+ * */
+@Mapper
+public interface RepPrinterStarEvaluateDAO {
+    void addScore(RepStarEvaluateVO obj);
+
+    void batchAdd(@Param("dataList") List<RepStarEvaluateVO> dataList);
+
+    void deleteStarEvaluateByDate(@Param("data_year") String data_year, @Param("data_month") String data_month, @Param("statistics_type") String statistics_type, @Param("deviceIdList") List<String> deviceIdList);
+
+    /**
+     * 清空某天的数据
+     */
+    void ClearnStarEvaluateByDate(@Param("data_year") String data_year,
+                                  @Param("data_month") String data_month);
+
+
+    List<RepStarEvaluateVO> QueryCustomerInfo(@Param("officeid") String officeid);
+    List<Map<String, String>> selectDistinctOfficeList(Map<String, Object> query);
+    List<Map<String, String>> selectCurrentOfficeList(Map<String, Object> query);
+
+    List<Map<String, String>> selectDistinctDeviceList(Map<String, Object> query);
+
+    List<RepStarEvaluateVO> QueryCustomerDeviceInfo(@Param("officeid") String officeid,
+                                                    @Param("jixing") String jixing,
+                                                    @Param("devicetypeid") String devicetypeid,
+                                                    @Param("data_year") String data_year,
+                                                    @Param("data_month") String data_month);
+
+
+    List<RepStarEvaluateVO> starEvaluateByCustomer(@Param("officeid") String officeid,
+                                                   @Param("jixing") String jixing,
+                                                   @Param("devicetypeid") String devicetypeid,
+                                                   @Param("data_year") String data_year,
+                                                   @Param("data_month") String data_month);
+
+    List<RepStarEvaluateVO>  QueryDeviceInfo(@Param("officeid") String officeid,
+                                             @Param("jixing") String jixing,
+                                             @Param("devicetypeid") String devicetypeid,
+                                             @Param("data_year") String data_year,
+                                             @Param("data_month") String data_month);
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterStarPassrateDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterStarPassrateDao.java
new file mode 100644
index 0000000..044135f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterStarPassrateDao.java
@@ -0,0 +1,35 @@
+package com.rootcloud.domain.dao;
+
+import com.rootcloud.domain.vo.RepPrinterStarPassrateVO;
+import com.rootcloud.web.dto.PrinterReportDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 砂型尺寸、外观、精度
+ * */
+@Mapper
+public interface RepPrinterStarPassrateDao {
+
+    void add(@Param("repPrinterStarPassrateVOs") List<RepPrinterStarPassrateVO> repPrinterStarPassrateVOs);
+
+    List<RepPrinterStarPassrateVO> list(RepPrinterStarPassrateVO repPrinterSandPassrateVO);
+    List<RepPrinterStarPassrateVO> listPage(RepPrinterStarPassrateVO repPrinterSandPassrateVO);
+
+
+    List<RepPrinterStarPassrateVO> listnew(RepPrinterStarPassrateVO repPrinterSandPassrateVO);
+
+    List<Map<String,Object>> sumPrinterStarPassrateData(PrinterReportDTO printerReportDTO);
+
+    List<Map<String,Object>> sumPrinterStarPassrateQiangDuData(PrinterReportDTO printerReportDTO);
+
+    /* 星级评价提取强度数据**/
+    List<Map<String,Object>> sumPrinterStarPassrateDataEvaluate(Map<String, Object> params);
+
+    void deleteStarPassrate(RepPrinterStarPassrateVO c) ;
+
+    void deleteStarPassrateUpload(RepPrinterStarPassrateVO c) ;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterTargetDicDAO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterTargetDicDAO.java
new file mode 100644
index 0000000..8134e0b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterTargetDicDAO.java
@@ -0,0 +1,65 @@
+package com.rootcloud.domain.dao;
+
+import com.rootcloud.domain.vo.RepPrinterTargetDicVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface RepPrinterTargetDicDAO {
+
+    /***
+     *
+     * @Title: insert
+     * @Description: 新增
+     * @param vo
+     * @return
+     */
+    void insert(RepPrinterTargetDicVO vo);
+
+    /***
+     *
+     * @Title: update
+     * @Description: 更新
+     * @param vo
+     * @return
+     */
+    void update(RepPrinterTargetDicVO vo);
+
+    /***
+     *
+     * @Title: deleteById
+     * @Description: 删除
+     * @param id
+     * @return
+     */
+    void deleteById(@Param("id") Long id);
+
+    /***
+     *
+     * @Title: getRepPrinterTargetDicById
+     * @Description: 获取数据集
+     * @param params id
+     * @return RepPrinterTargetDicVO
+     */
+    RepPrinterTargetDicVO getRepPrinterTargetDicById(@Param("id") Long id);
+
+    RepPrinterTargetDicVO getRepPrinterTargetDicByKey(@Param("statisticsType") String statisticsType, @Param("customerId") String customerId);
+
+
+    /***
+     *
+     * @Title: getRepPrinterTargetDicList
+     * @Description: 获取数据集
+     * @param params
+     * @return List
+     */
+    List<RepPrinterTargetDicVO> getRepPrinterTargetDicList(Map<String, Object> params);
+    List<RepPrinterTargetDicVO> getRepPrinterTargetDicListCount(Map<String, Object> params);
+    /**
+     * 按统计类型分组获取最新目标值
+     */
+    List<RepPrinterTargetDicVO> groupByPrinterTargetDic();
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterWastereasonDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterWastereasonDao.java
new file mode 100644
index 0000000..6c566e1
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/RepPrinterWastereasonDao.java
@@ -0,0 +1,26 @@
+package com.rootcloud.domain.dao;
+
+import com.rootcloud.domain.vo.RepPrinterWastereasonVO;
+import com.rootcloud.web.dto.PrinterReportDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface RepPrinterWastereasonDao {
+
+    void add(@Param("repPrinterWastereasonVOs") List<RepPrinterWastereasonVO> repPrinterWastereasonVOs);
+
+    List<RepPrinterWastereasonVO> list(RepPrinterWastereasonVO repPrinterWastereasonVO);
+    List<RepPrinterWastereasonVO> listPage(RepPrinterWastereasonVO repPrinterWastereasonVO);
+
+    List<Map<String,Object>> sumWastereasonData(PrinterReportDTO printerReportDTO);
+
+    void deleteDeviceWaste(RepPrinterWastereasonVO c) ;
+
+    void deleteDeviceWasteUpload(RepPrinterWastereasonVO c) ;
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/TargetTypeDAO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/TargetTypeDAO.java
new file mode 100644
index 0000000..f59b09c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/TargetTypeDAO.java
@@ -0,0 +1,43 @@
+package com.rootcloud.domain.dao;
+
+import com.rootcloud.domain.vo.TargetTypeVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TargetTypeDAO {
+
+    /***
+     *
+     * @Title: insert
+     * @Description: 新增
+     * @param vo
+     * @return
+     */
+    void insert(TargetTypeVO vo);
+
+    /***
+     *
+     * @Title: update
+     * @Description: 更新
+     * @param vo
+     * @return
+     */
+    void update(TargetTypeVO vo);
+
+    /***
+     *
+     * @Title: deleteById
+     * @Description: 删除
+     * @param id
+     * @return
+     */
+    void deleteById(@Param("id") Long id);
+
+
+    List<TargetTypeVO> getTargetTypeList();
+
+    List<TargetTypeVO> list(TargetTypeVO VO);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ds/DeviceListMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ds/DeviceListMapper.java
new file mode 100644
index 0000000..8ab1d70
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ds/DeviceListMapper.java
@@ -0,0 +1,16 @@
+package com.rootcloud.domain.dao.ds;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.ds.DeviceListEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceListMapper extends BaseMapper<DeviceListEntity> {
+
+    List<DeviceListEntity> selectByUserId(@Param("userId")String userId,@Param("zhId")String zhId);
+
+    List<DeviceListEntity> selectBykhmc(@Param("khmc")String khmc,@Param("zhId")String zhId);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ds/DeviceSyncMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ds/DeviceSyncMapper.java
new file mode 100644
index 0000000..d19574f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ds/DeviceSyncMapper.java
@@ -0,0 +1,9 @@
+package com.rootcloud.domain.dao.ds;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.ds.DeviceSyncEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DeviceSyncMapper extends BaseMapper<DeviceSyncEntity> {
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ds/ModelPropertySyncMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ds/ModelPropertySyncMapper.java
new file mode 100644
index 0000000..2ea0d16
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ds/ModelPropertySyncMapper.java
@@ -0,0 +1,10 @@
+package com.rootcloud.domain.dao.ds;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.ds.ModelPropertySyncEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ModelPropertySyncMapper extends BaseMapper<ModelPropertySyncEntity> {
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ds/ModelSyncMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ds/ModelSyncMapper.java
new file mode 100644
index 0000000..df8ceb5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/ds/ModelSyncMapper.java
@@ -0,0 +1,9 @@
+package com.rootcloud.domain.dao.ds;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.ds.ModelEntity;
+import org.apache.ibatis.annotations.Mapper;
+@Mapper
+public interface ModelSyncMapper extends BaseMapper<ModelEntity> {
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/gkjk/NxJeDeviceDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/gkjk/NxJeDeviceDao.java
new file mode 100644
index 0000000..039d835
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/gkjk/NxJeDeviceDao.java
@@ -0,0 +1,43 @@
+package com.rootcloud.domain.dao.gkjk;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.rootcloud.domain.dto.DeviceVO;
+import com.rootcloud.domain.entity.NxJeDeviceEntity;
+import com.rootcloud.vo.device.DeviceTypeVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 宁夏_设备台账
+ *
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-04-18 15:19:58
+ */
+@Mapper
+public interface NxJeDeviceDao extends BaseMapper<NxJeDeviceEntity> {
+
+    @Select({"<script>",
+        " select DEVICE_SBBM AS deviceCode,DEVICE_SOURCE AS deviceSource,DEVICE_SBMC AS deviceName,DEVICE_SBLX AS deviceType,DEVICE_SBXH_NAME AS deviceSbxh,DEVICE_SBCCRQ AS deviceFactoryDate,",
+        " (SELECT sum(ONLINED_TIMES) FROM nx_device_working_times_month  WHERE  DEVICE_ID = NX_JE_DEVICE_ID and DATE_FORMAT( TIME, '%Y-%m' ) =  DATE_FORMAT( SYSDATE(), '%Y-%m' )  GROUP BY  DATE_FORMAT( TIME, '%Y-%m-%d' ),DEVICE_ID ) AS onlineTime FROM nx_je_device", "where NX_JE_DEVICE_ID = #{deviceId}", "</script>"})
+    DeviceTypeVO getByDeviceId(@Param("deviceId") String deviceId);
+
+    /**
+     * 查询设备list分页数据
+     *
+     * @param page
+     *            分页对象
+     * @param queryData
+     *            查询条件(支持地点、状态、型号、名称)
+     * @param isCare
+     *            是否重要
+     *
+     * @param khmc 客户名称
+     *
+     * @return 分页数据
+     */
+    IPage<DeviceVO> devicePage(IPage<DeviceVO> page, @Param("queryData") String queryData,
+        @Param("isCare") String isCare, @Param("khmc") String khmc, @Param("kh") String kh,@Param("syZhid") String syZhid);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/part/NxPartFileConfigDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/part/NxPartFileConfigDao.java
new file mode 100644
index 0000000..939008b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/part/NxPartFileConfigDao.java
@@ -0,0 +1,16 @@
+package com.rootcloud.domain.dao.part;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.NxPartFileConfigEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author lujiumin
+ * @date 2022/10/13
+ * 描述：
+ */
+@Mapper
+public interface NxPartFileConfigDao extends BaseMapper<NxPartFileConfigEntity> {
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/part/NxPartFileDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/part/NxPartFileDao.java
new file mode 100644
index 0000000..a9c7f46
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/part/NxPartFileDao.java
@@ -0,0 +1,34 @@
+package com.rootcloud.domain.dao.part;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.NxPartFileEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 宁夏_配件档案
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-05-11 20:12:35
+ */
+@Mapper
+public interface NxPartFileDao extends BaseMapper<NxPartFileEntity> {
+
+    int updateByPartCode(NxPartFileEntity record);
+
+    int updateCkmc(NxPartFileEntity record);
+
+    NxPartFileEntity getByPartCode(@Param("filePjbm") String filePjbm,@Param("fileCkbm") String fileCkbm,@Param("fileKwbm") String fileKwbm,@Param("syZhid") String syZhid);
+
+    List<String> queryLgortCode();
+
+    String queryLgorts();
+
+    void removePartFile2();
+
+    Integer insertPartFile2(NxPartFileEntity record);
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/part/NxPartRespDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/part/NxPartRespDao.java
new file mode 100644
index 0000000..8108304
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/part/NxPartRespDao.java
@@ -0,0 +1,17 @@
+package com.rootcloud.domain.dao.part;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.NxPartRespEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 配件仓库维护
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-05-12 13:41:45
+ */
+@Mapper
+public interface NxPartRespDao extends BaseMapper<NxPartRespEntity> {
+	
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/sp/NxTriggerConditionDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/sp/NxTriggerConditionDao.java
new file mode 100644
index 0000000..ec805c1
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/sp/NxTriggerConditionDao.java
@@ -0,0 +1,10 @@
+package com.rootcloud.domain.dao.sp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.sp.NxTriggerConditionEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface NxTriggerConditionDao extends BaseMapper<NxTriggerConditionEntity> {
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/sp/NxUserInfoDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/sp/NxUserInfoDao.java
new file mode 100644
index 0000000..d43f19b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/sp/NxUserInfoDao.java
@@ -0,0 +1,9 @@
+package com.rootcloud.domain.dao.sp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.sp.NxUserInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface NxUserInfoDao extends BaseMapper<NxUserInfoEntity> {
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/sp/ServicePlanDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/sp/ServicePlanDao.java
new file mode 100644
index 0000000..451e3a7
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/sp/ServicePlanDao.java
@@ -0,0 +1,9 @@
+package com.rootcloud.domain.dao.sp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.sp.ServicePlanEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ServicePlanDao extends BaseMapper<ServicePlanEntity> {
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/sp/ServicePlanHistoryDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/sp/ServicePlanHistoryDao.java
new file mode 100644
index 0000000..7e53456
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dao/sp/ServicePlanHistoryDao.java
@@ -0,0 +1,14 @@
+package com.rootcloud.domain.dao.sp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.sp.ServicePlanHistoryEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author lujiumin
+ * @date 2023/1/31
+ * 描述：
+ */
+@Mapper
+public interface ServicePlanHistoryDao extends BaseMapper<ServicePlanHistoryEntity> {
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/CameraDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/CameraDTO.java
new file mode 100644
index 0000000..a8a0dbf
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/CameraDTO.java
@@ -0,0 +1,22 @@
+package com.rootcloud.domain.dto;
+
+import lombok.Data;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/5/7 10:30
+ */
+@Data
+public class CameraDTO {
+    private String name;
+    private String sno;
+    private String cno;
+    private String model;
+    private String factoryName;
+    private String id;
+    private String deviceId;
+    private Integer orderIndex;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/CarouselDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/CarouselDTO.java
new file mode 100644
index 0000000..bd13d56
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/CarouselDTO.java
@@ -0,0 +1,31 @@
+package com.rootcloud.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author w-yanxiang
+ * @Date 2022/6/16 10:22
+ * @Version 1.0
+ * @Description
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CarouselDTO implements Serializable {
+
+    @ApiModelProperty(value = "时间间隙")
+    private String timeGap;
+
+    @ApiModelProperty(value = "操作类型")
+    private String operationType;
+
+    @ApiModelProperty(value = "轮播图片路径")
+    private List<ImageUrlsDTO> imageUrls;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/ConditionModel.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/ConditionModel.java
new file mode 100644
index 0000000..c7c2dee
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/ConditionModel.java
@@ -0,0 +1,37 @@
+package com.rootcloud.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * 触发条件Model
+ * @author HeJia
+ * @since 2022/5/7
+ */
+@Setter
+@Getter
+@ToString
+public class ConditionModel {
+    @ApiModelProperty("服务计划ID")
+    private String servicePlanId;
+
+    @ApiModelProperty("触发类型")
+    private String triggerCondition;
+
+    @ApiModelProperty("条件值")
+    private String conditionValue;
+
+    @ApiModelProperty("设置值")
+    private String setValue;
+
+    @ApiModelProperty("调用创建接口之后的id")
+    private String alarmTypeId;
+
+    @ApiModelProperty("设备型号")
+    private String deviceType;
+
+    @ApiModelProperty("设备型号编码")
+    private String deviceTypeCode;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/DeviceDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/DeviceDTO.java
new file mode 100644
index 0000000..4f0d5a5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/DeviceDTO.java
@@ -0,0 +1,39 @@
+package com.rootcloud.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 15:30
+ */
+@Data
+public class DeviceDTO {
+    private String id;
+    private String code;
+    private String name;
+    private String typeName;
+    private String modelName;
+    private String address;
+    private String address2;
+    private Timestamp locationTime;
+    private Timestamp onlineTime;
+    private String alias;
+    private String monitor;
+    private Integer status;
+    private Integer networkStatus;
+    private String location;
+    private String cloudTime;
+    private String clientUserName;
+    private String modelId;
+    private String warrantyTime;
+    private String warrantyStatus;
+    private String customerName;
+    private String deviceStartTime;
+    private String deviceStatus;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/DeviceSpecialDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/DeviceSpecialDTO.java
new file mode 100644
index 0000000..3ca8850
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/DeviceSpecialDTO.java
@@ -0,0 +1,21 @@
+package com.rootcloud.domain.dto;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 15:30
+ */
+@Data
+public class DeviceSpecialDTO extends DeviceDTO{
+    private String deviceNo;
+    private String deviceType;
+    private String deviceSbxh;
+    private String deviceTypeName;
+    private String dviceModelName;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/DeviceVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/DeviceVO.java
new file mode 100644
index 0000000..cdeb7f2
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/DeviceVO.java
@@ -0,0 +1,62 @@
+package com.rootcloud.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author HeJia
+ * @since 2022/5/12
+ */
+@ApiModel("设备VO")
+@Setter
+@Getter
+@ToString
+public class DeviceVO {
+
+    @ApiModelProperty("设备名称")
+    private String deviceName;
+
+    @ApiModelProperty("设备编码")
+    private String deviceNo;
+
+    @ApiModelProperty("设备类型名称")
+    private String deviceTypeName;
+
+    @ApiModelProperty("设备类型代码")
+    private String deviceTypeCode;
+
+    @ApiModelProperty("设备型号代码")
+    private String deviceModelCode;
+
+    @ApiModelProperty("设备型号名称")
+    private String deviceModelName;
+
+    @ApiModelProperty("设备地址")
+    private String deviceAddress;
+
+    @ApiModelProperty("维保状态【1==>正常；0==>其它】")
+    private Integer maintenanceStatus;
+
+    @ApiModelProperty("状态码")
+    private Integer statusCode;
+
+    @ApiModelProperty("状态描述")
+    private String statusDesc;
+
+    @ApiModelProperty("设备主键")
+    private String deviceId;
+
+    @ApiModelProperty("设备来源 1.是4.0平台的  其他 不是平台的")
+    private String sblbSbly;
+
+
+    @ApiModelProperty("设备联网状态")
+    private String  onlineStatus;
+
+
+    @ApiModelProperty("报警状态【1==>报警，其它正常】")
+    private Integer alarmStatus;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/DeviceWorkTimeDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/DeviceWorkTimeDTO.java
new file mode 100644
index 0000000..71510d2
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/DeviceWorkTimeDTO.java
@@ -0,0 +1,21 @@
+package com.rootcloud.domain.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 15:30
+ */
+@Data
+public class DeviceWorkTimeDTO {
+    private String deviceId;
+    private Timestamp time;
+    private BigDecimal onlinedTimes;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/EngineerModel.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/EngineerModel.java
new file mode 100644
index 0000000..398a191
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/EngineerModel.java
@@ -0,0 +1,24 @@
+package com.rootcloud.domain.dto;
+
+import lombok.Data;
+
+/**
+ * @author ruixiang.feng
+ * @ClassName
+ * @Description
+ * @date 2022/5/7 14:39
+ */
+@Data
+public class EngineerModel {
+    //工程师id
+    private String userId;
+    //工程师姓名
+    private String fwryYhxm;
+    //工程师手机号
+    private String fwrySjh;
+    //工程师所属经纬度
+    private String fwwdWdjwd;
+    //头像
+    private String photo;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/EnterpriseInfoDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/EnterpriseInfoDTO.java
new file mode 100644
index 0000000..a9f9a33
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/EnterpriseInfoDTO.java
@@ -0,0 +1,682 @@
+package com.rootcloud.domain.dto;
+
+
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * A DTO for the EnterpriseInfo entity.
+ * 复制云杉的tenant-info接口返回的实体类
+ */
+public class EnterpriseInfoDTO implements Serializable {
+
+    private Long id;
+
+    private String tenantId;
+
+    @Length(max=200)
+    private String enterpriseName;
+
+    @Length(max=50)
+    private String enterpriseAbbreviation;
+
+    private String userId;
+
+    private String userName;
+
+    private String loginName;
+
+    @Length(max=500)
+    private String enterprisePhoto;
+
+    @Length(max=500)
+    private String enterpriseMiniPhoto;
+
+	private String phone;
+
+    private String email;
+
+    private String phoneNew;
+
+    private String emailNew;
+
+    private String enterpriseType;
+
+    @Length(max=200)
+    private String address;
+
+    @Length(max=200)
+    private String detailedAddress;
+
+    private Integer enterpriseAge;
+
+    @Length(max=200)
+    private String enterpriseScale;
+
+    @Length(max=200)
+    private String enterpriseWebSite;
+
+    private String enterprisePhone;
+
+    private String enterpriseFax;
+
+    @Length(max=600)
+    private String enterpriseDesc;
+
+    private Integer deleteFlag;
+
+    private String targetUserId;
+
+    private Integer support;
+
+    private String targetUserName;
+
+    private Date expireDate;
+
+    private Date openDate;
+
+    @Size(max = 10)
+    private String industryId;
+
+    @Size(max = 45)
+    private String industry;
+
+    @Size(max = 10)
+    private String domainId;
+
+    @Size(max = 45)
+    private String domain;
+
+    @Min(value = 0)
+    @Max(value = 255)
+    private Integer status;
+
+    @Size(max = 256)
+    private String remark;
+
+    private Integer cycle;
+
+    private Integer idtType;
+
+    private String originate;
+
+    private Date updateDate;
+    private Date createDate;
+
+    private String taxpayerNo;
+
+    private String browserIcon;
+
+    private String browserIconName;
+
+    /**
+     * 浅色系统图标
+     */
+    private String systemIcon;
+
+    private String loginPage;
+
+    private String bgColor;
+
+    private String appSplashScreen;
+
+    private Boolean homepageEnabled;
+
+    private String homepageUrl;
+
+    private String cardIconType;
+
+    private Boolean headHiddenStatus;
+    /**
+     * 顶级机构id, 消息推送用
+     */
+    private Long deptId;
+    /**
+     * 客户性质 0(企业) 1(个人)
+     */
+    private Integer cusProperty;
+    /**
+     * 客户性质名称
+     */
+    private String cusPropertyName;
+    /**
+     * 企业联系电话(多个数据用逗号拼接)
+     */
+    private String comPhones;
+    /**
+     * 身份证号
+     */
+    private String idCard;
+    /**
+     * 深色系统图标
+     */
+    private String systemIconDeep;
+
+    /**租户级参数配置*/
+    private String profile;
+
+    public String getProfile() {
+        return profile;
+    }
+
+    public void setProfile(String profile) {
+        this.profile = profile;
+    }
+
+    public String getSystemIconDeep() {
+        return systemIconDeep;
+    }
+
+    public void setSystemIconDeep(String systemIconDeep) {
+        this.systemIconDeep = systemIconDeep;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getEnterpriseAbbreviation() {
+        return enterpriseAbbreviation;
+    }
+
+    public void setEnterpriseAbbreviation(String enterpriseAbbreviation) {
+        this.enterpriseAbbreviation = enterpriseAbbreviation;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getEnterprisePhoto() {
+        return enterprisePhoto;
+    }
+
+    public void setEnterprisePhoto(String enterprisePhoto) {
+        this.enterprisePhoto = enterprisePhoto;
+    }
+
+    public String getEnterpriseMiniPhoto() {
+		return enterpriseMiniPhoto;
+	}
+
+	public void setEnterpriseMiniPhoto(String enterpriseMiniPhoto) {
+		this.enterpriseMiniPhoto = enterpriseMiniPhoto;
+	}
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getPhoneNew() {
+        return phoneNew;
+    }
+
+    public void setPhoneNew(String phoneNew) {
+        this.phoneNew = phoneNew;
+    }
+
+    public String getEmailNew() {
+        return emailNew;
+    }
+
+    public void setEmailNew(String emailNew) {
+        this.emailNew = emailNew;
+    }
+
+    public String getEnterpriseType() {
+        return enterpriseType;
+    }
+
+    public void setEnterpriseType(String enterpriseType) {
+        this.enterpriseType = enterpriseType;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getDetailedAddress() {
+        return detailedAddress;
+    }
+
+    public void setDetailedAddress(String detailedAddress) {
+        this.detailedAddress = detailedAddress;
+    }
+
+    public Integer getEnterpriseAge() {
+        return enterpriseAge;
+    }
+
+    public void setEnterpriseAge(Integer enterpriseAge) {
+        this.enterpriseAge = enterpriseAge;
+    }
+
+    public String getEnterpriseScale() {
+        return enterpriseScale;
+    }
+
+    public void setEnterpriseScale(String enterpriseScale) {
+        this.enterpriseScale = enterpriseScale;
+    }
+
+    public String getEnterpriseWebSite() {
+        return enterpriseWebSite;
+    }
+
+    public void setEnterpriseWebSite(String enterpriseWebSite) {
+        this.enterpriseWebSite = enterpriseWebSite;
+    }
+
+    public String getEnterprisePhone() {
+        return enterprisePhone;
+    }
+
+    public void setEnterprisePhone(String enterprisePhone) {
+        this.enterprisePhone = enterprisePhone;
+    }
+
+    public String getEnterpriseFax() {
+        return enterpriseFax;
+    }
+
+    public void setEnterpriseFax(String enterpriseFax) {
+        this.enterpriseFax = enterpriseFax;
+    }
+
+    public String getEnterpriseDesc() {
+        return enterpriseDesc;
+    }
+
+    public void setEnterpriseDesc(String enterpriseDesc) {
+        this.enterpriseDesc = enterpriseDesc;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public String getTargetUserId() {
+        return targetUserId;
+    }
+
+    public void setTargetUserId(String targetUserId) {
+        this.targetUserId = targetUserId;
+    }
+
+    public String getTargetUserName() {
+        return targetUserName;
+    }
+
+    public void setTargetUserName(String targetUserName) {
+        this.targetUserName = targetUserName;
+    }
+
+    public Integer getSupport() {
+        return support;
+    }
+
+    public void setSupport(Integer support) {
+        this.support = support;
+    }
+
+
+    public Date getExpireDate() {
+        return expireDate;
+    }
+
+    public void setExpireDate(Date expireDate) {
+        this.expireDate = expireDate;
+    }
+
+    public String getIndustryId() {
+        return industryId;
+    }
+
+    public void setIndustryId(String industryId) {
+        this.industryId = industryId;
+    }
+
+    public String getIndustry() {
+        return industry;
+    }
+
+    public void setIndustry(String industry) {
+        this.industry = industry;
+    }
+
+    public String getDomainId() {
+        return domainId;
+    }
+
+    public void setDomainId(String domainId) {
+        this.domainId = domainId;
+    }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
+
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+
+    public Integer getCycle() {
+        return cycle;
+    }
+
+    public void setCycle(Integer cycle) {
+        this.cycle = cycle;
+    }
+
+    public Integer getIdtType() {
+        return idtType;
+    }
+
+    public void setIdtType(Integer idtType) {
+        this.idtType = idtType;
+    }
+
+    public Date getOpenDate() {
+        return openDate;
+    }
+
+    public void setOpenDate(Date openDate) {
+        this.openDate = openDate;
+    }
+
+    public String getOriginate() {
+        return originate;
+    }
+
+    public void setOriginate(String originate) {
+        this.originate = originate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public String getTaxpayerNo() {
+        return taxpayerNo;
+    }
+
+    public void setTaxpayerNo(String taxpayerNo) {
+        this.taxpayerNo = taxpayerNo;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getBrowserIcon() {
+        return browserIcon;
+    }
+
+    public void setBrowserIcon(String browserIcon) {
+        this.browserIcon = browserIcon;
+    }
+
+    public String getSystemIcon() {
+        return systemIcon;
+    }
+
+    public void setSystemIcon(String systemIcon) {
+        this.systemIcon = systemIcon;
+    }
+
+    public String getLoginPage() {
+        return loginPage;
+    }
+
+    public void setLoginPage(String loginPage) {
+        this.loginPage = loginPage;
+    }
+
+    public String getBgColor() {
+        return bgColor;
+    }
+
+    public void setBgColor(String bgColor) {
+        this.bgColor = bgColor;
+    }
+
+    public String getBrowserIconName() {
+        return browserIconName;
+    }
+
+    public void setBrowserIconName(String browserIconName) {
+        this.browserIconName = browserIconName;
+    }
+
+
+    public String getAppSplashScreen() {
+        return appSplashScreen;
+    }
+
+    public void setAppSplashScreen(String appSplashScreen) {
+        this.appSplashScreen = appSplashScreen;
+    }
+
+    public Boolean getHomepageEnabled() {
+        return homepageEnabled;
+    }
+
+    public void setHomepageEnabled(Boolean homepageEnabled) {
+        this.homepageEnabled = homepageEnabled;
+    }
+
+    public String getHomepageUrl() {
+        return homepageUrl;
+    }
+
+    public void setHomepageUrl(String homepageUrl) {
+        this.homepageUrl = homepageUrl;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public Integer getCusProperty() {
+        return cusProperty;
+    }
+
+    public String getComPhones() {
+        return comPhones;
+    }
+
+    public void setComPhones(String comPhones) {
+        this.comPhones = comPhones;
+    }
+
+    public String getCusPropertyName() {
+        return cusPropertyName;
+    }
+
+    public void setCusPropertyName(String cusPropertyName) {
+        this.cusPropertyName = cusPropertyName;
+    }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
+    public String getCardIconType() {
+        return cardIconType;
+    }
+
+    public void setCardIconType(String cardIconType) {
+        this.cardIconType = cardIconType;
+    }
+
+    public Boolean getHeadHiddenStatus() {
+        return headHiddenStatus;
+    }
+
+    public void setHeadHiddenStatus(Boolean headHiddenStatus) {
+        this.headHiddenStatus = headHiddenStatus;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        EnterpriseInfoDTO enterpriseInfoDTO = (EnterpriseInfoDTO) o;
+        if(enterpriseInfoDTO.getId() == null || getId() == null) {
+            return false;
+        }
+        return Objects.equals(getId(), enterpriseInfoDTO.getId());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(getId());
+    }
+
+    @Override
+    public String toString() {
+        return "EnterpriseInfoDTO{" +
+            "id=" + id +
+            ", tenantId='" + tenantId + '\'' +
+            ", enterpriseName='" + enterpriseName + '\'' +
+            ", enterpriseAbbreviation='" + enterpriseAbbreviation + '\'' +
+            ", userId='" + userId + '\'' +
+            ", userName='" + userName + '\'' +
+            ", enterprisePhoto='" + enterprisePhoto + '\'' +
+            ", enterpriseMiniPhoto='" + enterpriseMiniPhoto + '\'' +
+            ", phone='" + phone + '\'' +
+            ", email='" + email + '\'' +
+            ", enterpriseType='" + enterpriseType + '\'' +
+            ", address='" + address + '\'' +
+            ", detailedAddress='" + detailedAddress + '\'' +
+            ", enterpriseAge=" + enterpriseAge +
+            ", enterpriseScale='" + enterpriseScale + '\'' +
+            ", enterpriseWebSite='" + enterpriseWebSite + '\'' +
+            ", enterprisePhone='" + enterprisePhone + '\'' +
+            ", enterpriseFax='" + enterpriseFax + '\'' +
+            ", enterpriseDesc='" + enterpriseDesc + '\'' +
+            ", deleteFlag=" + deleteFlag +
+            ", targetUserId='" + targetUserId + '\'' +
+            ", support=" + support +
+            ", targetUserName='" + targetUserName + '\'' +
+            ", expireDate=" + expireDate +
+            ", openDate=" + openDate +
+            ", industryId='" + industryId + '\'' +
+            ", industry='" + industry + '\'' +
+            ", domainId='" + domainId + '\'' +
+            ", domain='" + domain + '\'' +
+            ", status=" + status +
+            ", remark='" + remark + '\'' +
+            ", cycle=" + cycle +
+            ", idtType=" + idtType +
+            ", originate='" + originate + '\'' +
+            ", updateDate=" + updateDate +
+            ", taxpayerNo='" + taxpayerNo + '\'' +
+            '}';
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/ImageUrlsDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/ImageUrlsDTO.java
new file mode 100644
index 0000000..8625c7e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/ImageUrlsDTO.java
@@ -0,0 +1,21 @@
+package com.rootcloud.domain.dto;
+
+import lombok.Data;
+
+/**
+ * @Author w-yanxiang
+ * @Date 2022/6/28 21:32
+ * @Version 1.0
+ * @Description
+ */
+@Data
+public class ImageUrlsDTO {
+
+    private String cls;
+    private String extend;
+    private String fileKey;
+    private String path;
+    private String relName;
+    private String status;
+    private String uid;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/NxDeviceDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/NxDeviceDTO.java
new file mode 100644
index 0000000..8ddf790
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/NxDeviceDTO.java
@@ -0,0 +1,21 @@
+package com.rootcloud.domain.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 15:30
+ */
+@Data
+public class NxDeviceDTO {
+    private String deviceId;
+    private String no;
+    private String name;
+    private String type;
+    private List<CameraDTO> cameras;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/NxSparePartVo.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/NxSparePartVo.java
new file mode 100644
index 0000000..10e97a7
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/NxSparePartVo.java
@@ -0,0 +1,107 @@
+package com.rootcloud.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@ApiModel("配件信息VO")
+@Setter
+@Getter
+@ToString
+public class NxSparePartVo {
+    /**
+     * 配件id
+     * */
+    private String nxSparePartId;
+    /**
+     * 安装位号
+     */
+    private String partAzwh;
+    /**
+     * SN
+     */
+    private String partSn;
+    /**
+     * 备件状态
+     */
+    private String partBjzt;
+    /**
+     * 备件状态编码
+     */
+    private String partBjztbm;
+    /**
+     * 备件编码
+     */
+    private String partBjbm;
+    /**
+     * 设备编码
+     */
+    private String partSbbm;
+    /**
+     * 设备id
+     */
+    private String partSbid;
+    /**
+     * 备件名称
+     */
+    private String filePjmc;
+    /**
+     * 规格型号
+     */
+    private String partGgxh;
+    /**
+     * 寿命
+     */
+    private String partSm;
+    /**
+     * 预警值
+     */
+    private String partSmyjz;
+    /**
+     * 备注
+     */
+    private String partBz;
+    /**
+     * 系统模块
+     */
+    private String partXtmk;
+    /**
+     * 系统模块编码
+     */
+    private String partXtmkBm;
+    /**
+     * 是否是关键配件
+     */
+    private String partSfgjbj;
+    /**
+     * 工作时长
+     */
+    private String partGzsc;
+    /**
+     * 导入工作时长
+     */
+    private String partDrgzsc;
+    /**
+     * 安装日期
+     */
+    private String partAzrq;
+    /**
+     * 更换日期
+     */
+    private String partGhrq;
+    /**
+     * 利用率
+     */
+    private String partLyl;
+
+    /**
+     * 租户id
+     */
+    private String syZhid;
+
+    /**
+     * 审核通过时间
+     */
+    private String orderShtgsj;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/OrderInfoVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/OrderInfoVO.java
new file mode 100644
index 0000000..aa080dd
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/OrderInfoVO.java
@@ -0,0 +1,57 @@
+package com.rootcloud.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author HeJia
+ * @since 2022/5/17
+ */
+@ApiModel("订单详情VO")
+@Setter
+@Getter
+@ToString
+public class OrderInfoVO {
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("下单时间")
+    private String applyTime;
+
+    @ApiModelProperty("订单号")
+    private String orderNo;
+
+    @ApiModelProperty("需求描述")
+    private String demandDesc;
+
+    @ApiModelProperty("附件")
+    private String files;
+
+    @ApiModelProperty("联系人")
+    private String contactPerson;
+
+    @ApiModelProperty("联系号码")
+    private String contactTel;
+
+    @ApiModelProperty("服务地址")
+    private String serviceAddress;
+
+    @ApiModelProperty("设备名称")
+    private String deviceName;
+
+    @ApiModelProperty("设备类型")
+    private String deviceType;
+
+    @ApiModelProperty("设备型号")
+    private String deviceModel;
+
+    @ApiModelProperty("是否保质期内【0.否；1.是】")
+    private Integer shelfLife;
+
+    @ApiModelProperty("服务类型")
+    private String serviceTypeName;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/OrderVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/OrderVO.java
new file mode 100644
index 0000000..70ee414
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/OrderVO.java
@@ -0,0 +1,282 @@
+package com.rootcloud.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author HeJia
+ * @since 2022/5/17
+ */
+@ApiModel("订单VO")
+@Setter
+@Getter
+@ToString
+public class OrderVO {
+
+    @ApiModelProperty("申请日期")
+    private String orderApplydate;
+
+    @ApiModelProperty("服务类型")
+    private String orderServicetypeName;
+
+    @ApiModelProperty("服务类型CODE")
+    private String orderServicetypeCode;
+
+    @ApiModelProperty("客户名称")
+    private String orderCustomerName;
+
+    @ApiModelProperty("服务地址")
+    private String orderServiceaddress;
+
+    @ApiModelProperty("提报人")
+    private String orderInformant;
+
+    @ApiModelProperty("联系方式")
+    private String orderContactway;
+
+    @ApiModelProperty("需求描述")
+    private String orderDemanddescription;
+
+    @ApiModelProperty("附件")
+    private String orderFiles;
+
+    @ApiModelProperty("设备名称")
+    private String orderDevicename;
+
+    @ApiModelProperty("设备编码")
+    private String orderDevicecode;
+
+    @ApiModelProperty("设备类型")
+    private String orderDevicetype;
+
+    @ApiModelProperty("设备型号")
+    private String orderDevicemodel;
+
+    @ApiModelProperty("是否保修期内_NAME")
+    private String orderWarrantiesName;
+
+    @ApiModelProperty("是否保修期内_CODE")
+    private String orderWarrantiesCode;
+
+    @ApiModelProperty("服务方式_NAME")
+    private String orderServicemethodName;
+
+    @ApiModelProperty("服务方式_CODE")
+    private String orderServicemethodCode;
+
+    @ApiModelProperty("指派工程师")
+    private String orderAssignengineer;
+
+    @ApiModelProperty("派单时间")
+    private String orderDispatchtime;
+
+    @ApiModelProperty("计划开始时间")
+    private String orderPlanstarttime;
+
+    @ApiModelProperty("计划完成时间")
+    private String orderPlanendtime;
+
+    @ApiModelProperty("维修持续时间")
+    private String orderRepairduration;
+
+    @ApiModelProperty("接单时间")
+    private String orderOrdertime;
+
+    @ApiModelProperty("签到时间")
+    private String orderSigntime;
+
+    @ApiModelProperty("签到地址")
+    private String orderSignaddress;
+
+    @ApiModelProperty("故障原因")
+    private String orderCauseofissue;
+
+    @ApiModelProperty("解决方案")
+    private String orderSolution;
+
+    @ApiModelProperty("备注")
+    private String orderRemark;
+
+    @ApiModelProperty("订单状态_NAME")
+    private String orderOrderstatusName;
+
+    @ApiModelProperty("订单状态_CODE")
+    private String orderOrderstatusCode;
+
+    @ApiModelProperty("订单编号")
+    private String orderOrdernumber;
+
+    @ApiModelProperty("来源")
+    private String orderSource;
+
+    @ApiModelProperty("回访状态_NAME")
+    private String orderRevisitstatusName;
+
+    @ApiModelProperty("回访状态_CODE")
+    private String orderRevisitstatusCode;
+
+    @ApiModelProperty("服务地址_经度")
+    private String orderServiceaddressLongitude;
+
+    @ApiModelProperty("服务地址_维度")
+    private String orderServiceaddressDimension;
+
+    @ApiModelProperty("签到地址_经度")
+    private String orderSignaddressLongitude;
+
+    @ApiModelProperty("签到地址_纬度")
+    private String orderSignaddressDimension;
+
+    @ApiModelProperty("故障类型")
+    private String orderFaulttyprName;
+
+    @ApiModelProperty("故障类型_CODE")
+    private String orderFaulttyprCode;
+
+    @ApiModelProperty("故障原因图片")
+    private String orderCauseofissuefile;
+
+    @ApiModelProperty("备注图片")
+    private String orderRemarkfile;
+
+    @ApiModelProperty("解决办法图片")
+    private String orderSolutionfile;
+
+    @ApiModelProperty("拒绝原因图片")
+    private String orderRefusefile;
+
+    @ApiModelProperty("拒绝原因")
+    private String orderRefuse;
+
+    @ApiModelProperty("签到图片")
+    private String orderSignfile;
+
+    @ApiModelProperty("工程师ID")
+    private String orderAssignengineerid;
+
+    @ApiModelProperty("遗留问题")
+    private String orderRemainingproblem;
+
+    @ApiModelProperty("改进建议")
+    private String orderSuggestions;
+
+    @ApiModelProperty("过程问题")
+    private String orderProcessproblem;
+
+    @ApiModelProperty("工作总结")
+    private String orderWorksummary;
+
+    @ApiModelProperty("驳回原因")
+    private String orderTurndown;
+
+    @ApiModelProperty("驳回原因附件")
+    private String orderTurndownfile;
+
+    @ApiModelProperty("协助工程师")
+    private String orderAssistengineer;
+
+    @ApiModelProperty("协助工程师ID")
+    private String orderAssistengineerid;
+
+    @ApiModelProperty("安装信息备注")
+    private String orderInstallremark;
+
+    @ApiModelProperty("安装信息备注图片")
+    private String orderInstallremarkfile;
+
+    @ApiModelProperty("遗留问题图片")
+    private String orderRemainingproblemfile;
+
+    @ApiModelProperty("改进建议图片")
+    private String orderSuggestionsfile;
+
+    @ApiModelProperty("过程问题图片")
+    private String orderProcessproblemfile;
+
+    @ApiModelProperty("工作总结图片")
+    private String orderWorksummaryfile;
+
+    @ApiModelProperty("主键ID")
+    private String nxOrderId;
+
+    @ApiModelProperty("审核标记")
+    private String syAudflag;
+
+    @ApiModelProperty("登记部门主键")
+    private String syCreateorgid;
+
+    @ApiModelProperty("登记部门编码")
+    private String syCreateorg;
+
+    @ApiModelProperty("登记部门")
+    private String syCreateorgname;
+
+    @ApiModelProperty("登记时间")
+    private String syCreatetime;
+
+    @ApiModelProperty("登记人主键")
+    private String syCreateuserid;
+
+    @ApiModelProperty("登记人编码")
+    private String syCreateuser;
+
+    @ApiModelProperty("登记人")
+    private String syCreateusername;
+
+    @ApiModelProperty("数据状态")
+    private String syStatus;
+
+    @ApiModelProperty("流程实例ID")
+    private String syPiid;
+
+    @ApiModelProperty("流程定义ID")
+    private String syPdid;
+
+    @ApiModelProperty("集团公司名称")
+    private String syJtgsmc;
+
+    @ApiModelProperty("集团公司ID")
+    private String syJtgsid;
+
+    @ApiModelProperty("流程启动人ID")
+    private String syStarteduser;
+
+    @ApiModelProperty("流程启动人")
+    private String syStartedusername;
+
+    @ApiModelProperty("流程已执行人ID")
+    private String syApprovedusers;
+
+    @ApiModelProperty("流程已执行人")
+    private String syApprovedusernames;
+
+    @ApiModelProperty("流程待执行人ID")
+    private String syPreapprovusers;
+
+    @ApiModelProperty("流程最后任务指派信息")
+    private String syLastflowinfo;
+
+    @ApiModelProperty("流程待执行人")
+    private String syPreapprovusernames;
+
+    @ApiModelProperty("流程任务指派人ID")
+    private String syLastflowuserid;
+
+    @ApiModelProperty("流程任务指派人")
+    private String syLastflowuser;
+
+    @ApiModelProperty("流程预警延期信息")
+    private String syWfwarn;
+
+    @ApiModelProperty("当前执行节点")
+    private String syCurrenttask;
+
+    @ApiModelProperty("流程预警延期标识")
+    private String syWarnflag;
+
+    @ApiModelProperty("是否在线【true 在线】")
+    private Boolean online;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/PendingOrderModel.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/PendingOrderModel.java
new file mode 100644
index 0000000..fefef00
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/PendingOrderModel.java
@@ -0,0 +1,49 @@
+package com.rootcloud.domain.dto;
+
+import lombok.Data;
+
+/**
+ * @author ruixiang.feng
+ * @ClassName
+ * @Description
+ * @date 2022/5/7 16:26
+ */
+@Data
+public class PendingOrderModel {
+    //联系方式(设备列表)
+    private String sblb_lxfs;
+    //联网状态
+    private String sblbLwztCode;
+    //客户联系人
+    private String sblbKhlxr;
+    //设备id
+    private String nxJcxxSblbId;
+    //设备名称
+    private String sblbSbmc;
+    //设备编码
+    private String orderdevicecode;
+    //设备类型
+    private String sblbSblxName;
+    //设备型号
+    private String sblbSbxhName;
+    //责任工程师
+    private String sblbZrgcs;
+    //联系方式(订单中)
+    private String orderContactway;
+    //保修结束日期
+    private String sblbWbjsrq;
+    //设备详细地址
+    private String sblbSbxxdz;
+     //设备经度
+    private String orderServiceaddressLongitude;
+    // 设备维度
+    private String orderServiceaddressDimension;
+    //设备省份名称
+    private String sblbSfmc;
+    //设备市名称
+    private String sblbSmc;
+    //设备区县名称
+    private String sblbQxmc;
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/ServiceViewResultModel.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/ServiceViewResultModel.java
new file mode 100644
index 0000000..0b7fb6e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/ServiceViewResultModel.java
@@ -0,0 +1,53 @@
+package com.rootcloud.domain.dto;
+
+import lombok.Data;
+
+/**
+ * @author ruixiang.feng
+ * @ClassName
+ * @Description
+ * @date 2022/5/7 11:16
+ */
+@Data
+public class ServiceViewResultModel {
+    //工程师id
+    private String userId;
+    //姓名
+    private String fwryYhxm;
+    //手机号
+    private String fwrySjh;
+    //当前状态(0 空闲 , 1忙碌)
+    private Integer status;
+    //订单数量
+    private Integer orderNum;
+    //签到位置
+    private  String orderSignaddress;
+    //头像
+    private String photo;
+    /**
+     * 签到地址_经度
+     */
+    private String orderSignaddressLongitude;
+    /**
+     * 签到地址_维度
+     */
+    private String orderSignaddressDimension;
+
+    /**
+     * 服务地址_经度
+     */
+    private String orderServiceaddressLongitude;
+    /**
+     * 服务地址_维度
+     */
+    private String orderServiceaddressDimension;
+
+    /**
+     * 网点经度
+     */
+    private String orderWdjd;
+    /**
+     *网点纬度
+     */
+    private String orderWdwd;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/UserRoleDeptDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/UserRoleDeptDTO.java
new file mode 100644
index 0000000..0ebb5d7
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/dto/UserRoleDeptDTO.java
@@ -0,0 +1,327 @@
+package com.rootcloud.domain.dto;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+public class UserRoleDeptDTO implements Serializable {
+
+    private Long id;
+    private String tenantId;
+    private String userId;
+    private String userName;
+    private String nickName;
+    private String loginName;
+    private String userMobile;
+    private String userEmail;
+    private String employeeCode;
+    /**
+     * 1男 2女
+     */
+    private Integer sex;
+    /**
+     * 用户类型（0 机构用户 1代理商用户 2 终端客户用户）
+     */
+    private Integer userType;
+    /**
+     * 数据类型 0：系统数据（初始化数据） 1：业务数据
+     */
+    private Integer dataType;
+    /**
+     * '0：未激活；1 ：激活状态；2：邀请状态',
+     */
+    private Integer status;
+    private Timestamp createDateTime;
+    private Timestamp updateDateTime;
+    private String createName;
+    private String photo;
+    private Integer passwordWhetherModifiedFlag;
+
+    /**
+     * 最近新增数据-用于新增用户时登录页面使用判断是否是刚新增用户，不影响旧账号使用 默认是0 若是1
+     */
+    private Integer recentAddFlag;
+    private String contactWay;
+    private String employeePosition;
+    /**
+     * 角色Id
+     */
+    private String roleIds;
+    /**
+     * 角色名称
+     */
+    private String roleNames;
+    private String deptIds;
+    private String deptNames;
+    /**
+     * 树根管理员 0 为否  1  是
+     */
+    private Boolean supper;
+    private String theme;
+    private String style;
+
+    private Integer tenantConservator;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserMobile() {
+        return userMobile;
+    }
+
+    public void setUserMobile(String userMobile) {
+        this.userMobile = userMobile;
+    }
+
+    public String getUserEmail() {
+        return userEmail;
+    }
+
+    public void setUserEmail(String userEmail) {
+        this.userEmail = userEmail;
+    }
+
+    public String getEmployeeCode() {
+        return employeeCode;
+    }
+
+    public void setEmployeeCode(String employeeCode) {
+        this.employeeCode = employeeCode;
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public Integer getUserType() {
+        return userType;
+    }
+
+    public void setUserType(Integer userType) {
+        this.userType = userType;
+    }
+
+    public Integer getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(Integer dataType) {
+        this.dataType = dataType;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Timestamp getCreateDateTime() {
+        return createDateTime;
+    }
+
+    public void setCreateDateTime(Timestamp createDateTime) {
+        this.createDateTime = createDateTime;
+    }
+
+    public Timestamp getUpdateDateTime() {
+        return updateDateTime;
+    }
+
+    public void setUpdateDateTime(Timestamp updateDateTime) {
+        this.updateDateTime = updateDateTime;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public String getPhoto() {
+        return photo;
+    }
+
+    public void setPhoto(String photo) {
+        this.photo = photo;
+    }
+
+    public Integer getPasswordWhetherModifiedFlag() {
+        return passwordWhetherModifiedFlag;
+    }
+
+    public void setPasswordWhetherModifiedFlag(Integer passwordWhetherModifiedFlag) {
+        this.passwordWhetherModifiedFlag = passwordWhetherModifiedFlag;
+    }
+
+    public Integer getRecentAddFlag() {
+        return recentAddFlag;
+    }
+
+    public void setRecentAddFlag(Integer recentAddFlag) {
+        this.recentAddFlag = recentAddFlag;
+    }
+
+    public String getContactWay() {
+        return contactWay;
+    }
+
+    public void setContactWay(String contactWay) {
+        this.contactWay = contactWay;
+    }
+
+    public String getEmployeePosition() {
+        return employeePosition;
+    }
+
+    public void setEmployeePosition(String employeePosition) {
+        this.employeePosition = employeePosition;
+    }
+
+    public String getRoleIds() {
+        return roleIds;
+    }
+
+    public void setRoleIds(String roleIds) {
+        this.roleIds = roleIds;
+    }
+
+    public String getRoleNames() {
+        return roleNames;
+    }
+
+    public void setRoleNames(String roleNames) {
+        this.roleNames = roleNames;
+    }
+
+    public String getDeptIds() {
+        return deptIds;
+    }
+
+    public void setDeptIds(String deptIds) {
+        this.deptIds = deptIds;
+    }
+
+    public String getDeptNames() {
+        return deptNames;
+    }
+
+    public void setDeptNames(String deptNames) {
+        this.deptNames = deptNames;
+    }
+
+    public Boolean getSupper() {
+        return supper;
+    }
+
+    public void setSupper(Boolean supper) {
+        this.supper = supper;
+    }
+
+    public String getTheme() {
+        return theme;
+    }
+
+    public void setTheme(String theme) {
+        this.theme = theme;
+    }
+
+    public String getStyle() {
+        return style;
+    }
+
+    public void setStyle(String style) {
+        this.style = style;
+    }
+
+    public Integer getTenantConservator() {
+        return tenantConservator;
+    }
+
+    public void setTenantConservator(Integer tenantConservator) {
+        this.tenantConservator = tenantConservator;
+    }
+
+    @Override
+    public String toString() {
+        return "UserRoleDeptDTO{" +
+            "id=" + id +
+            ", tenantId='" + tenantId + '\'' +
+            ", userId='" + userId + '\'' +
+            ", userName='" + userName + '\'' +
+            ", nickName='" + nickName + '\'' +
+            ", loginName='" + loginName + '\'' +
+            ", userMobile='" + userMobile + '\'' +
+            ", userEmail='" + userEmail + '\'' +
+            ", employeeCode='" + employeeCode + '\'' +
+            ", sex=" + sex +
+            ", userType=" + userType +
+            ", dataType=" + dataType +
+            ", status=" + status +
+            ", createDateTime=" + createDateTime +
+            ", updateDateTime=" + updateDateTime +
+            ", createName='" + createName + '\'' +
+            ", photo='" + photo + '\'' +
+            ", passwordWhetherModifiedFlag=" + passwordWhetherModifiedFlag +
+            ", recentAddFlag=" + recentAddFlag +
+            ", contactWay='" + contactWay + '\'' +
+            ", employeePosition='" + employeePosition + '\'' +
+            ", roleIds='" + roleIds + '\'' +
+            ", roleNames='" + roleNames + '\'' +
+            ", deptIds='" + deptIds + '\'' +
+            ", deptNames='" + deptNames + '\'' +
+            '}';
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/CarouselEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/CarouselEntity.java
new file mode 100644
index 0000000..fb2a2d6
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/CarouselEntity.java
@@ -0,0 +1,62 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @Author w-yanxiang
+ * @Date 2022/6/16 9:58
+ * @Version 1.0
+ * @Description 轮播图实体类
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="CarouselEntity对象", description="轮播图")
+@TableName("NXGX_LBXX")
+public class CarouselEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "参数类型")
+    @TableField("LBXX_CSLX")
+    private String lbxxCslx;
+
+    @ApiModelProperty(value = "参数值")
+    @TableField("LBXX_CSZ")
+    private String lbxxCsz;
+
+    @ApiModelProperty(value = "是否生效")
+    @TableField("LBXX_SFSX")
+    private String lbxxSfsx;
+
+    @ApiModelProperty(value = "描述")
+    @TableField("LBXX_MS")
+    private String lbxxMs;
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "NXGX_LBXX_ID",type = IdType.ASSIGN_UUID)
+    private String nxgxLbxxId;
+
+    @ApiModelProperty(value = "登记时间")
+    @TableField("SY_CREATETIME")
+    private String syCreatetime;
+
+
+    @ApiModelProperty(value = "登记人主键")
+    @TableField("SY_CREATEUSERID")
+    private String syCreateuserid;
+
+    @ApiModelProperty(value = "租户id")
+    @TableField("SY_ZHID")
+    private String syZhid;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ContractEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ContractEntity.java
new file mode 100644
index 0000000..bb09b10
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ContractEntity.java
@@ -0,0 +1,18 @@
+package com.rootcloud.domain.entity;
+
+
+import lombok.Data;
+
+@Data
+public class ContractEntity {
+
+    private String numberCode;
+
+    private String numberName;
+
+    private String nxJsxxId;
+
+    private String xsjl;
+
+    private String fwqkzje;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/DemoEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/DemoEntity.java
new file mode 100644
index 0000000..f5d07c4
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/DemoEntity.java
@@ -0,0 +1,23 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rootcloud.domain.entity.base.EntityBase;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/5/25
+ */
+@Getter
+@Setter
+@ToString
+@TableName("table_demo")
+public class DemoEntity extends EntityBase {
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+    private String text;
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/FwryDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/FwryDTO.java
new file mode 100644
index 0000000..486d9f3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/FwryDTO.java
@@ -0,0 +1,34 @@
+package com.rootcloud.domain.entity;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class FwryDTO {
+    //主键id
+    private String nxgxJcdaFwryId;
+    //用户姓名
+    private String fwryYhxm;
+    //用户id
+    private String userId;
+    //邮箱
+    private String fwryYx;
+    //手机号
+    private String fwrySjh;
+    //角色
+    private String fwryJs;
+    //状态(0:忙碌 1:空闲)
+    private String fwryZtCode;
+    //入参角色
+    private List<String> fwryJscode;
+    //网点id
+    private String fwryWdid;
+    //服务区域
+    private String fwwdSsqy;
+
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/GbsjbEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/GbsjbEntity.java
new file mode 100644
index 0000000..cab08e9
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/GbsjbEntity.java
@@ -0,0 +1,139 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * 过保商机表
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-04-12 14:22:17
+ */
+@Data
+@TableName("gbsjb")
+public class GbsjbEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 设备编码
+	 */
+	private String gbsjbSbbm;
+	/**
+	 * 合同到期日期
+	 */
+	private String gbsjbHtdqrq;
+	/**
+	 * 跟踪人
+	 */
+	private String gbsjbGzr;
+	/**
+	 * 创建日期
+	 */
+	private String gbsjbCjrq;
+	/**
+	 * 主键ID
+	 */
+	@TableId
+	private String gbsjbId;
+	/**
+	 * 审核标记
+	 */
+	private String syAudflag;
+	/**
+	 * 登记部门主键
+	 */
+	private String syCreateorgid;
+	/**
+	 * 登记部门编码
+	 */
+	private String syCreateorg;
+	/**
+	 * 登记部门
+	 */
+	private String syCreateorgname;
+	/**
+	 * 登记时间
+	 */
+	private String syCreatetime;
+	/**
+	 * 登记人主键
+	 */
+	private String syCreateuserid;
+	/**
+	 * 登记人编码
+	 */
+	private String syCreateuser;
+	/**
+	 * 登记人
+	 */
+	private String syCreateusername;
+	/**
+	 * 数据状态
+	 */
+	private String syStatus;
+	/**
+	 * 排序字段
+	 */
+	private Integer syOrderindex;
+	/**
+	 * 流程实例ID
+	 */
+	private String syPiid;
+	/**
+	 * 流程定义ID
+	 */
+	private String syPdid;
+	/**
+	 * 集团公司名称
+	 */
+	private String syJtgsmc;
+	/**
+	 * 集团公司ID
+	 */
+	private String syJtgsid;
+	/**
+	 * 编辑标记
+	 */
+	private String syFuncedit;
+	/**
+	 * 客户名称
+	 */
+	private String gbsjbKhmc;
+	/**
+	 * 设备名称
+	 */
+	private String gbsjbSbmc;
+	/**
+	 * 设备型号
+	 */
+	private String gbsjbSbxh;
+	/**
+	 * 合同名称
+	 */
+	private String gbsjbHtmc;
+	/**
+	 * 剩余时间
+	 */
+	private String gbsjbSysj;
+	/**
+	 * 通知对象
+	 */
+	private String gbsjbTzdx;
+	/**
+	 * 联系电话
+	 */
+	private String gbsjbLxdh;
+	/**
+	 * 结果
+	 */
+	private String gbsjbJg;
+	/**
+	 * 备注
+	 */
+	private String gbsjbBz;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/JeCoreEnduserEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/JeCoreEnduserEntity.java
new file mode 100644
index 0000000..c85e81d
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/JeCoreEnduserEntity.java
@@ -0,0 +1,545 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.math.BigDecimal;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 人员表
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-04-12 14:22:06
+ */
+@Data
+@TableName("je_core_enduser")
+public class JeCoreEnduserEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private String userid;
+	/**
+	 * 审核标记
+	 */
+	private String audflag;
+	/**
+	 * 登记者所在部门编码
+	 */
+	private String createorg;
+	/**
+	 * 登记者所在部门名称
+	 */
+	private String createorgname;
+	/**
+	 * 登记时间
+	 */
+	private String createtime;
+	/**
+	 * 登记人编码
+	 */
+	private String createuser;
+	/**
+	 * 登记人姓名
+	 */
+	private String createusername;
+	/**
+	 * 是否启用本条数据
+	 */
+	private String flag;
+	/**
+	 * 修改人部门编码
+	 */
+	private String modifyorg;
+	/**
+	 * 修改人部门名称
+	 */
+	private String modifyorgname;
+	/**
+	 * 修改时间
+	 */
+	private String modifytime;
+	/**
+	 * 修改人编码
+	 */
+	private String modifyuser;
+	/**
+	 * 修改人姓名
+	 */
+	private String modifyusername;
+	/**
+	 * 数据状态
+	 */
+	private String status;
+	/**
+	 * 身份证号
+	 */
+	private String idcard;
+	/**
+	 * 排序字段
+	 */
+	private Integer orderindex;
+	/**
+	 * 密码
+	 */
+	private String password;
+	/**
+	 * 员工卡
+	 */
+	private String usercard;
+	/**
+	 * 帐号
+	 */
+	private String usercode;
+	/**
+	 * 用户名
+	 */
+	private String username;
+	/**
+	 * 部门外键
+	 */
+	private String deptid;
+	/**
+	 * 流程部署ID
+	 */
+	private String pdid;
+	/**
+	 * 流程实例ID
+	 */
+	private String piid;
+	/**
+	 * 是否主管
+	 */
+	private String ismanager;
+	/**
+	 * 监管部门编码
+	 */
+	private String monitordeptcode;
+	/**
+	 * 监管部门名称
+	 */
+	private String monitordept;
+	/**
+	 * RTX号
+	 */
+	private String rtxid;
+	/**
+	 * 性别
+	 */
+	private String gender;
+	/**
+	 * 是否系统用户
+	 */
+	private String issysuser;
+	/**
+	 * 工号
+	 */
+	private String jobnum;
+	/**
+	 * 简称
+	 */
+	private String easyname;
+	/**
+	 * 全称
+	 */
+	private String fullname;
+	/**
+	 * 
+	 */
+	private String deptname;
+	/**
+	 * 部门编码
+	 */
+	private String deptcode;
+	/**
+	 *  角色名称
+	 */
+	private String rolenames;
+	/**
+	 * 角色编码
+	 */
+	private String rolecodes;
+	/**
+	 * 岗位名称
+	 */
+	private String sentrynames;
+	/**
+	 * 岗位编码
+	 */
+	private String sentrycodes;
+	/**
+	 * 岗位主键
+	 */
+	private String sentryids;
+	/**
+	 * 是否分属部门
+	 */
+	private String shadow;
+	/**
+	 * 原用户名
+	 */
+	private String backusercode;
+	/**
+	 * 图标
+	 */
+	private String iconcls;
+	/**
+	 * 其他证件
+	 */
+	private String othercard;
+	/**
+	 * 公司邮箱
+	 */
+	private String companyemail;
+	/**
+	 * 其他邮箱
+	 */
+	private String otheremail;
+	/**
+	 * 出生年月
+	 */
+	private String birthday;
+	/**
+	 * 民族
+	 */
+	private String nation;
+	/**
+	 * 籍贯
+	 */
+	private String nativeplace;
+	/**
+	 * 文化程度
+	 */
+	private String degree;
+	/**
+	 * 婚姻状况
+	 */
+	private String married;
+	/**
+	 * 头像
+	 */
+	private String photo;
+	/**
+	 * 工作经历
+	 */
+	private String workexperience;
+	/**
+	 * 紧急联系人
+	 */
+	private String contacts;
+	/**
+	 * 工种
+	 */
+	private String craftname;
+	/**
+	 * 工种编码
+	 */
+	private String craftcode;
+	/**
+	 * 行政职务
+	 */
+	private String executivename;
+	/**
+	 * 行政职务编码
+	 */
+	private String executivecode;
+	/**
+	 * 电话
+	 */
+	private String phone;
+	/**
+	 * 有效期
+	 */
+	private String expirydate;
+	/**
+	 * 失效时间
+	 */
+	private String failuretime;
+	/**
+	 * 角色主键
+	 */
+	private String roleids;
+	/**
+	 * 座机
+	 */
+	private String zuoji;
+	/**
+	 * 部门排序字段
+	 */
+	private String deptorderindex;
+	/**
+	 * 用户排序
+	 */
+	private BigDecimal userorder;
+	/**
+	 * 集团公司ID
+	 */
+	private String jtgsid;
+	/**
+	 * 集团公司名称
+	 */
+	private String jtgsmc;
+	/**
+	 * 集团公司代码
+	 */
+	private String jtgsdm;
+	/**
+	 * 主题
+	 */
+	private String theme;
+	/**
+	 * 公司部门ID
+	 */
+	private String gsbmid;
+	/**
+	 * 直属领导
+	 */
+	private String zsldname;
+	/**
+	 * 直属领导ID
+	 */
+	private String zsldid;
+	/**
+	 * PLUS账号或者手机
+	 */
+	private String plususercode;
+	/**
+	 * PLUS密码
+	 */
+	private String plususerpass;
+	/**
+	 * PLUS是否记住密码
+	 */
+	private String plusrememberpass;
+	/**
+	 * PLUS是否自动登录
+	 */
+	private String plusautologin;
+	/**
+	 * 声音
+	 */
+	private String sound;
+	/**
+	 * 菜单类型
+	 */
+	private String menutype;
+	/**
+	 * 锁定
+	 */
+	private String loginlocked;
+	/**
+	 * SAAS用户ID
+	 */
+	private String zhid;
+	/**
+	 * SAAS用户名称
+	 */
+	private String zhmc;
+	/**
+	 * 登录时间
+	 */
+	private String logintime;
+	/**
+	 * 认证手机号
+	 */
+	private String identphone;
+	/**
+	 * 登录次数
+	 */
+	private Integer loginnumber;
+	/**
+	 * 入职日期
+	 */
+	private String rzrq;
+	/**
+	 * 离职日期
+	 */
+	private String lzrq;
+	/**
+	 * 是否有效
+	 */
+	private String valid;
+	/**
+	 * 在线
+	 */
+	private String onlinesys;
+	/**
+	 * 密码是否初始化
+	 */
+	private String initpassword;
+	/**
+	 * 年龄
+	 */
+	private Integer enduserAge;
+	/**
+	 * 婚姻状况_NAME
+	 */
+	private String enduserHyzkName;
+	/**
+	 * 婚姻状况
+	 */
+	private String enduserHyzkCode;
+	/**
+	 * 户籍性质_NAME
+	 */
+	private String enduserHjxzName;
+	/**
+	 * 户籍性质
+	 */
+	private String enduserHjxzCode;
+	/**
+	 * 首次参加工作日期
+	 */
+	private String enduserSccjgzrq;
+	/**
+	 * 总工龄
+	 */
+	private Integer enduserZgl;
+	/**
+	 * 政治面貌_NAME
+	 */
+	private String enduserZzmmName;
+	/**
+	 * 政治面貌
+	 */
+	private String enduserZzmmCode;
+	/**
+	 * 身份证反正照
+	 */
+	private String enduserSfzfzz;
+	/**
+	 * 联系人关系_NAME
+	 */
+	private String enduserLxrgxName;
+	/**
+	 * 联系人关系
+	 */
+	private String enduserLxrgxCode;
+	/**
+	 * 紧急联系人地址
+	 */
+	private String enduserJjlxrdz;
+	/**
+	 * 紧急联系人电话
+	 */
+	private String enduserJjlxrdh;
+	/**
+	 * 员工类型_NAME
+	 */
+	private String enduserYglxName;
+	/**
+	 * 员工类型
+	 */
+	private String enduserYglxCode;
+	/**
+	 * 试用期_NAME
+	 */
+	private String enduserSyqName;
+	/**
+	 * 试用期
+	 */
+	private String enduserSyqCode;
+	/**
+	 * 转正日期
+	 */
+	private String enduserZzrq;
+	/**
+	 * 司龄年
+	 */
+	private Integer enduserSln;
+	/**
+	 * 司龄月
+	 */
+	private Integer enduserSly;
+	/**
+	 * 工资开户银行
+	 */
+	private String enduserGzkhyx;
+	/**
+	 * 工资卡账号
+	 */
+	private String enduserGzkzh;
+	/**
+	 * 社保账号
+	 */
+	private String enduserSbzh;
+	/**
+	 * 公积金账号
+	 */
+	private String enduserGjjzh;
+	/**
+	 * 手写签名
+	 */
+	private String enduserSxqm;
+	/**
+	 * 法人主体_NAME
+	 */
+	private String enduserFrztName;
+	/**
+	 * 法人主体
+	 */
+	private String enduserFrztCode;
+	/**
+	 * 合同开始时间
+	 */
+	private String enduserHtkssj;
+	/**
+	 * 合同结束时间
+	 */
+	private String enduserHtjssj;
+	/**
+	 * 签约次数
+	 */
+	private Integer enduserQycs;
+	/**
+	 * 合同附件
+	 */
+	private String enduserHtfj;
+	/**
+	 * 签约时间
+	 */
+	private String enduserQysj;
+	/**
+	 * 合同类型_NAME
+	 */
+	private String enduserLdhtlxName;
+	/**
+	 * 合同类型
+	 */
+	private String enduserLdhtlxCode;
+	/**
+	 * 合同期限_NAME
+	 */
+	private String enduserHtqxName;
+	/**
+	 * 合同期限
+	 */
+	private String enduserHtqxCode;
+	/**
+	 * 审核员
+	 */
+	private String enduserShy;
+	/**
+	 * 试用期薪资
+	 */
+	private BigDecimal enduserSyqxz;
+	/**
+	 * 转正后薪资
+	 */
+	private BigDecimal enduserZzhxz;
+	/**
+	 * 是否超级管理员
+	 */
+	private String isSuperManager;
+	/**
+	 * unipush消息推送id
+	 */
+	private String cid;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/JeCoreRoleEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/JeCoreRoleEntity.java
new file mode 100644
index 0000000..4c6ad51
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/JeCoreRoleEntity.java
@@ -0,0 +1,236 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 角色表
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-04-12 14:21:50
+ */
+@Data
+@TableName("je_core_role")
+public class JeCoreRoleEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private String roleid;
+	/**
+	 * 审核标记
+	 */
+	private String audflag;
+	/**
+	 * 登记者所在部门编码
+	 */
+	private String createorg;
+	/**
+	 * 登记者所在部门名称
+	 */
+	private String createorgname;
+	/**
+	 * 登记时间
+	 */
+	private String createtime;
+	/**
+	 * 登记人编码
+	 */
+	private String createuser;
+	/**
+	 * 登记人姓名
+	 */
+	private String createusername;
+	/**
+	 * 是否启用本条数据
+	 */
+	private String flag;
+	/**
+	 * 修改人部门编码
+	 */
+	private String modifyorg;
+	/**
+	 * 修改人部门名称
+	 */
+	private String modifyorgname;
+	/**
+	 * 修改时间
+	 */
+	private String modifytime;
+	/**
+	 * 修改人编码
+	 */
+	private String modifyuser;
+	/**
+	 * 修改人姓名
+	 */
+	private String modifyusername;
+	/**
+	 * 数据状态
+	 */
+	private String status;
+	/**
+	 * 层次
+	 */
+	private Integer layer;
+	/**
+	 * 节点类型
+	 */
+	private String nodetype;
+	/**
+	 * 排序字段
+	 */
+	private Integer orderindex;
+	/**
+	 * 角色编码
+	 */
+	private String rolecode;
+	/**
+	 * 角色名称
+	 */
+	private String rolename;
+	/**
+	 * 父节点
+	 */
+	private String parent;
+	/**
+	 * 功能信息
+	 */
+	private String nodeinfo;
+	/**
+	 * 功能信息类型
+	 */
+	private String nodeinfotype;
+	/**
+	 * 图标
+	 */
+	private String icon;
+	/**
+	 * 流程定义ID
+	 */
+	private String pdid;
+	/**
+	 * 流程实例ID
+	 */
+	private String piid;
+	/**
+	 * 是否是超级管理员
+	 */
+	private String issuperadmin;
+	/**
+	 * 树形路径
+	 */
+	private String path;
+	/**
+	 * 图标样式
+	 */
+	private String iconcls;
+	/**
+	 * 继承名称
+	 */
+	private String parentname;
+	/**
+	 * 继承编码
+	 */
+	private String parentcode;
+	/**
+	 * 聚合组编码
+	 */
+	private String groupcode;
+	/**
+	 * 聚合组
+	 */
+	private String groupname;
+	/**
+	 * 排除权限组编码
+	 */
+	private String rejectgroupcode;
+	/**
+	 * 排除权限组
+	 */
+	private String rejectgroupname;
+	/**
+	 * 继承权限组
+	 */
+	private String extendgroupcode;
+	/**
+	 * 继承权限组编码
+	 */
+	private String extendgroupname;
+	/**
+	 * 部门主键
+	 */
+	private String deptid;
+	/**
+	 * 岗位主键
+	 */
+	private String sentryid;
+	/**
+	 * 角色类型
+	 */
+	private String roletype;
+	/**
+	 * 管理权
+	 */
+	private String manager;
+	/**
+	 * 开发权
+	 */
+	private String develop;
+	/**
+	 * 父节点路径
+	 */
+	private String parentpath;
+	/**
+	 * 树形排序字段
+	 */
+	private String treeorderindex;
+	/**
+	 * 集团公司ID
+	 */
+	private String jtgsid;
+	/**
+	 * 集团公司名称
+	 */
+	private String jtgsmc;
+	/**
+	 * 级别
+	 */
+	private String rolerank;
+	/**
+	 * 产品
+	 */
+	private String cpname;
+	/**
+	 * 产品ID
+	 */
+	private String cpid;
+	/**
+	 * 基础角色名称
+	 */
+	private String baserolename;
+	/**
+	 * 基础角色ID
+	 */
+	private String baseroleid;
+	/**
+	 * SAAS权
+	 */
+	private String saas;
+	/**
+	 * SAAS租户ID
+	 */
+	private String zhid;
+	/**
+	 * SAAS租户名称
+	 */
+	private String zhmc;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/JeCoreRoleUserEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/JeCoreRoleUserEntity.java
new file mode 100644
index 0000000..7fc5463
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/JeCoreRoleUserEntity.java
@@ -0,0 +1,32 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-04-12 14:21:50
+ */
+@Data
+@TableName("je_core_role_user")
+public class JeCoreRoleUserEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private String roleid;
+	/**
+	 * 
+	 */
+	private String userid;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/JeSysUsermsgEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/JeSysUsermsgEntity.java
new file mode 100644
index 0000000..571b8ce
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/JeSysUsermsgEntity.java
@@ -0,0 +1,120 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 通知消息
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-07-05 11:06:58
+ */
+@Data
+@TableName("je_sys_usermsg")
+public class JeSysUsermsgEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 接收人_ID
+	 */
+	private String usermsgJsrId;
+	/**
+	 * 已读
+	 */
+	private String usermsgYd;
+	/**
+	 * 内容
+	 */
+	private String usermsgNr;
+	/**
+	 * 标题
+	 */
+	private String usermsgBt;
+	/**
+	 * 接受时间
+	 */
+	private String usermsgJssj;
+	/**
+	 * 接收人
+	 */
+	private String usermsgJsrName;
+	/**
+	 * 用户消息类型_NAME
+	 */
+	private String usermsgMsgtypeName;
+	/**
+	 * 用户消息类型
+	 */
+	private String usermsgMsgtypeCode;
+	/**
+	 * 
+	 */
+	@TableId
+	private String jeSysUsermsgId;
+	/**
+	 * 登记部门主键
+	 */
+	private String syCreateorgid;
+	/**
+	 * 登记部门编码
+	 */
+	private String syCreateorg;
+	/**
+	 * 登记部门
+	 */
+	private String syCreateorgname;
+	/**
+	 * 登记时间
+	 */
+	private String syCreatetime;
+	/**
+	 * 登记人主键
+	 */
+	private String syCreateuserid;
+	/**
+	 * 登记人编码
+	 */
+	private String syCreateuser;
+	/**
+	 * 登记人
+	 */
+	private String syCreateusername;
+	/**
+	 * 数据状态
+	 */
+	private String syStatus;
+	/**
+	 * 排序字段
+	 */
+	private Integer syOrderindex;
+	/**
+	 * 集团公司名称
+	 */
+	private String syJtgsmc;
+	/**
+	 * 集团公司ID
+	 */
+	private String syJtgsid;
+	/**
+	 * 信息源_CODE
+	 */
+	private String usermsgXxyCode;
+	/**
+	 * 信息源_NAME
+	 */
+	private String usermsgXxyName;
+	/**
+	 * 业务ID
+	 */
+	private String usermsgYwId;
+	/**
+	 * APP功能信息
+	 */
+	private String usermsgAppinfo;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/KhglDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/KhglDTO.java
new file mode 100644
index 0000000..215f45c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/KhglDTO.java
@@ -0,0 +1,14 @@
+package com.rootcloud.domain.entity;
+
+
+import lombok.Data;
+
+
+
+@Data
+public class KhglDTO {
+    //主键id
+    private String nxKhglId;
+    //客户名称
+    private String khglKhmc;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/MyAdviceEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/MyAdviceEntity.java
new file mode 100644
index 0000000..f01213d
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/MyAdviceEntity.java
@@ -0,0 +1,66 @@
+package com.rootcloud.domain.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class MyAdviceEntity {
+
+    @ApiModelProperty("通知类型")
+    private String adviceClass;
+
+
+    @ApiModelProperty("通知对象的编码 如设备编码  配件的编码")
+    private String advicObjectCode;
+
+    @ApiModelProperty("通知对象的(设备)名称")
+    private String adviceObjectName;
+
+    @ApiModelProperty("通知的名称")
+    private String adviceName;
+
+    @ApiModelProperty("通知的内容")
+    private String adviceContent;
+
+    @ApiModelProperty("通知的时间")
+    private String adviceTime;
+
+    @ApiModelProperty("用户Id")
+    private String userId;
+
+
+    @ApiModelProperty("消息码")
+    private String typeCode;
+
+
+    @ApiModelProperty("通知类型Code")
+    private String adviceCode;
+
+    @ApiModelProperty("区分标志")
+    private String signData;
+
+    private String servicePlanId;
+
+    private String sn;
+
+    @ApiModelProperty("安装位号")
+    private String partAzwh;
+
+    @ApiModelProperty("工作时长")
+    private String partGzsc;
+
+    @ApiModelProperty("计划名称")
+    private String  planName;
+
+    @ApiModelProperty("计划完成时间")
+    private String  planEndTime;
+
+    @ApiModelProperty("系统模块")
+    private String  partXtmk;
+
+    @ApiModelProperty("备件名称")
+    private String  partBjmc;
+
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/MyMessageEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/MyMessageEntity.java
new file mode 100644
index 0000000..a2d772e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/MyMessageEntity.java
@@ -0,0 +1,76 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class MyMessageEntity {
+    @ApiModelProperty("消息类型")
+    private String messageClass;
+
+    @ApiModelProperty("息对象的编码 如设备编码  配件的编码")
+    private String messageObjectCode;
+
+    @ApiModelProperty("消息对象的名称")
+    private String messageObjectName;
+
+    @ApiModelProperty("消息的名称message")
+    private String messageName;
+
+    @ApiModelProperty("消息的内容")
+    private String messageContent;
+
+    @ApiModelProperty("消息的时间")
+    private String messageTime;
+
+    @ApiModelProperty("用户Id")
+    private String userId;
+
+    @ApiModelProperty("消息码")
+    private String typeCode;
+
+    @ApiModelProperty("通知类型Code")
+    private String adviceCode;
+
+    @ApiModelProperty("区分标志")
+    private String signData;
+
+    @ApiModelProperty("合同或清算 0：合同，1：结算")
+    private String mesType;
+
+    @ApiModelProperty("id")
+    private String id;
+
+    @ApiModelProperty("报警编码")
+    private String bjbm;
+
+    @ApiModelProperty("故障等级")
+    private String gzdj;
+
+    @ApiModelProperty("报警时间")
+    private String bjsj;
+
+    @ApiModelProperty("订单编号")
+    private String orderOrdernumber;
+
+    @ApiModelProperty("指派工程师")
+    private String orderAssignengineer;
+
+    @ApiModelProperty("需求描述")
+    private String orderDemanddescription;
+
+    @ApiModelProperty("设备名称")
+    private String orderDevicename;
+
+    @ApiModelProperty("设备编码")
+    private String orderDevicecode;
+
+    @ApiModelProperty("订单id")
+    private String nxOrderId;
+
+    @ApiModelProperty("设备型号")
+    private String sbxh;
+
+
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NetworkEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NetworkEntity.java
new file mode 100644
index 0000000..d3e5174
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NetworkEntity.java
@@ -0,0 +1,52 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rootcloud.domain.entity.base.EntityBase;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/5/25
+ */
+@Getter
+@Setter
+@ToString
+@TableName("nxgx_jcda_fwwd")
+public class NetworkEntity extends EntityBase {
+    private String fwwdWdbh;
+    private String fwwdWdmc;
+    private String fwwdSsqy;
+    private String fwwdLxr;
+    private String fwwdLxdh;
+    private String fwwdWdlx;
+    private String fwwdXxdz;
+    private String fwwdSzsf;
+    private String fwwdSzs;
+    private String fwwdSzq;
+    private String fwwdFwfw;
+    private String nxgxJcdaFwwdId;
+    private String syAudflag;
+    private String syCreateorgid;
+    private String syCreateorg;
+    private String syCreateorgname;
+    private String syCreatetime;
+    private String syCreateuserid;
+    private String syCreateuser;
+    private String syCreateusername;
+    private String syStatus;
+    private Integer syOrderindex;
+    private String syPiid;
+    private String syPdid;
+    private String syJtgsmc;
+    private String syJtgsid;
+    private String fwwdSsqycode;
+    private String fwwdSzsfcode;
+    private String fwwdSzscode;
+    private String fwwdSzqcode;
+    private String fwwdWdlxcode;
+    private String fwwdFwfwcode;
+    private String syFuncedit;
+    private String fwwdWdjwd;
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NetworkUserEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NetworkUserEntity.java
new file mode 100644
index 0000000..fbf126a
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NetworkUserEntity.java
@@ -0,0 +1,45 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/5/25
+ */
+@Getter
+@Setter
+@ToString
+@TableName("nxgx_jcda_fwry")
+public class NetworkUserEntity {
+    private String userid;
+    private String fwryYhxm;
+    private String fwryYx;
+    private String fwrySjh;
+    private String fwryJs;
+    private String fwrySsbm;
+    private String fwryFwryfl;
+    private String fwryZt;
+    private String fwryWdid;
+    private String nxgxJcdaFwryId;
+    private String syAudflag;
+    private String syCreateorgid;
+    private String syCreateorg;
+    private String syCreateorgname;
+    private String syCreatetime;
+    private String syCreateuserid;
+    private String syCreateuser;
+    private String syCreateusername;
+    private String syStatus;
+    private Integer syOrderindex;
+    private String syPiid;
+    private String syPdid;
+    private String syJtgsmc;
+    private String syJtgsid;
+    private String fwrySsbmcode;
+    private String fwryFwryflcode;
+    private String fwryZtcode;
+    private String fwryJscode;
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxFittingsListEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxFittingsListEntity.java
new file mode 100644
index 0000000..7eb6171
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxFittingsListEntity.java
@@ -0,0 +1,12 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("NX_PJXSPJLBGL")
+public class NxFittingsListEntity {
+    private String pjxspjlbglPjbm;
+    private String pjxspjlbglCjxj;
+    private String pjxspjlbglPjglwybs;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxJeDeviceEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxJeDeviceEntity.java
new file mode 100644
index 0000000..97b2979
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxJeDeviceEntity.java
@@ -0,0 +1,208 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 宁夏_设备台账
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-04-18 15:19:58
+ */
+@Data
+@TableName("nx_je_device")
+public class NxJeDeviceEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 设备编码
+	 */
+	private String deviceSbbm;
+	/**
+	 * 设备名称
+	 */
+	private String deviceSbmc;
+	/**
+	 * 设备类型CODE
+	 */
+	private String deviceSblx;
+	/**
+	 * 设备型号CODE
+	 */
+	private String deviceSbxh;
+	/**
+	 * 设备二维码
+	 */
+	private String deviceSbewm;
+	/**
+	 * 设备出厂日期
+	 */
+	private String deviceSbccrq;
+	/**
+	 * 设备详细地址
+	 */
+	private String deviceSbxxdz;
+	/**
+	 * 所属国家
+	 */
+	private String deviceSsgj;
+	/**
+	 * 所属省份名称
+	 */
+	private String deviceSssfmc;
+	/**
+	 * 所属省份编码
+	 */
+	private String deviceSssfbm;
+	/**
+	 * 所属城市名称
+	 */
+	private String deviceSscsmc;
+	/**
+	 * 所属区县名称
+	 */
+	private String deviceSsqxmc;
+	/**
+	 * 经度
+	 */
+	private String deviceJd;
+	/**
+	 * 纬度
+	 */
+	private String deviceWd;
+	/**
+	 * 客户ID
+	 */
+	private String deviceSskh;
+	/**
+	 * 设备状态
+	 */
+	private String deviceStatusCode;
+	/**
+	 * 联网状态
+	 */
+	private String deviceNetworkStatusCode;
+	/**
+	 * 所属客户名称
+	 */
+	private String deviceSskhmc;
+	/**
+	 * 所属区县编码
+	 */
+	private String deviceSsqxbm;
+	/**
+	 * 所属城市编码
+	 */
+	private String deviceSscsbm;
+	/**
+	 * 设备附件
+	 */
+	private String deviceSbfj;
+	/**
+	 * 设备类型
+	 */
+	private String deviceSblxName;
+	/**
+	 * 设备型号
+	 */
+	private String deviceSbxhName;
+	/**
+	 * 经纬度
+	 */
+	private String deviceJwd;
+	/**
+	 * 编辑标记
+	 */
+	private String syFuncedit;
+	/**
+	 * 主键ID
+	 */
+	@TableId
+	private String nxJeDeviceId;
+	/**
+	 * 审核标记
+	 */
+	private String syAudflag;
+	/**
+	 * 登记部门主键
+	 */
+	private String syCreateorgid;
+	/**
+	 * 登记部门编码
+	 */
+	private String syCreateorg;
+	/**
+	 * 登记部门
+	 */
+	private String syCreateorgname;
+	/**
+	 * 登记时间
+	 */
+	private String syCreatetime;
+	/**
+	 * 登记人主键
+	 */
+	private String syCreateuserid;
+	/**
+	 * 登记人编码
+	 */
+	private String syCreateuser;
+	/**
+	 * 登记人
+	 */
+	private String syCreateusername;
+	/**
+	 * 数据状态
+	 */
+	private String syStatus;
+	/**
+	 * 排序字段
+	 */
+	private Integer syOrderindex;
+	/**
+	 * 流程实例ID
+	 */
+	private String syPiid;
+	/**
+	 * 流程定义ID
+	 */
+	private String syPdid;
+	/**
+	 * 集团公司名称
+	 */
+	private String syJtgsmc;
+	/**
+	 * 集团公司ID
+	 */
+	private String syJtgsid;
+	/**
+	 * 物模型ID
+	 */
+	private String modelId;
+	/**
+	 * 物实例标签
+	 */
+	private String deviceTag;
+	/**
+	 * 设备来源
+	 */
+	private String deviceSource;
+	/**
+	 * 设备入云时间
+	 */
+	private String createTime;
+	/**
+	 * 设备更新时间
+	 */
+	private String updateTime;
+	/**
+	 * 租户id
+	 */
+	private String syZhid;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxOrderEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxOrderEntity.java
new file mode 100644
index 0000000..ac37cb6
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxOrderEntity.java
@@ -0,0 +1,477 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 宁夏_订单
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-05-07 13:41:38
+ */
+@Data
+@TableName("nx_order")
+public class NxOrderEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 申请日期
+	 */
+	private String orderApplydate;
+	/**
+	 * 服务类型_NAME
+	 */
+	private String orderServicetypeName;
+	/**
+	 * 服务类型_CODE
+	 */
+	private String orderServicetypeCode;
+	/**
+	 * 客户名称
+	 */
+	private String orderCustomerName;
+	/**
+	 * 服务地址
+	 */
+	private String orderServiceaddress;
+	/**
+	 * 提报人
+	 */
+	private String orderInformant;
+	/**
+	 * 联系方式
+	 */
+	private String orderContactway;
+	/**
+	 * 需求描述
+	 */
+	private String orderDemanddescription;
+	/**
+	 * 附件
+	 */
+	private String orderFiles;
+	/**
+	 * 设备名称
+	 */
+	private String orderDevicename;
+	/**
+	 * 设备编码
+	 */
+	private String orderDevicecode;
+	/**
+	 * 设备类型
+	 */
+	private String orderDevicetype;
+	/**
+	 * 设备型号
+	 */
+	private String orderDevicemodel;
+	/**
+	 * 是否保修期内_NAME
+	 */
+	private String orderWarrantiesName;
+	/**
+	 * 是否保修期内_CODE
+	 */
+	private String orderWarrantiesCode;
+	/**
+	 * 服务方式_NAME
+	 */
+	private String orderServicemethodName;
+	/**
+	 * 服务方式_CODE
+	 */
+	private String orderServicemethodCode;
+	/**
+	 * 指派工程师
+	 */
+	private String orderAssignengineer;
+	/**
+	 * 派单时间
+	 */
+	private String orderDispatchtime;
+	/**
+	 * 计划开始时间
+	 */
+	private String orderPlanstarttime;
+	/**
+	 * 计划完成时间
+	 */
+	private String orderPlanendtime;
+	/**
+	 * 维修持续时间
+	 */
+	private String orderRepairduration;
+	/**
+	 * 接单时间
+	 */
+	private String orderOrdertime;
+	/**
+	 * 签到时间
+	 */
+	private String orderSigntime;
+
+	/**
+	 * 报工时间
+	 */
+	private String orderBgsj;
+
+	/**
+	 * 签到地址
+	 */
+	private String orderSignaddress;
+	/**
+	 * 故障原因
+	 */
+	private String orderCauseofissue;
+	/**
+	 * 解决方案
+	 */
+	private String orderSolution;
+	/**
+	 * 备注
+	 */
+	private String orderRemark;
+	/**
+	 * 订单状态_NAME
+	 */
+	private String orderOrderstatusName;
+	/**
+	 * 订单状态_CODE
+	 */
+	private String orderOrderstatusCode;
+	/**
+	 * 订单编号
+	 */
+	private String orderOrdernumber;
+	/**
+	 * 来源
+	 */
+	private String orderSource;
+	/**
+	 * 回访状态_NAME
+	 */
+	private String orderRevisitstatusName;
+	/**
+	 * 回访状态_CODE
+	 */
+	private String orderRevisitstatusCode;
+	/**
+	 * 服务地址_经度
+	 */
+	private String orderServiceaddressLongitude;
+	/**
+	 * 服务地址_维度
+	 */
+	private String orderServiceaddressDimension;
+	/**
+	 * 签到地址_经度
+	 */
+	private String orderSignaddressLongitude;
+	/**
+	 * 签到地址_维度
+	 */
+	private String orderSignaddressDimension;
+	/**
+	 * 故障类型
+	 */
+	private String orderFaulttyprName;
+	/**
+	 * 故障类型_CODE
+	 */
+	private String orderFaulttyprCode;
+	/**
+	 * 故障原因图片
+	 */
+	private String orderCauseofissuefile;
+	/**
+	 * 备注图片
+	 */
+	private String orderRemarkfile;
+	/**
+	 *  解决办法图片
+	 */
+	private String orderSolutionfile;
+	/**
+	 * 拒绝原因图片
+	 */
+	private String orderRefusefile;
+	/**
+	 * 拒绝原因
+	 */
+	private String orderRefuse;
+	/**
+	 * 签到图片
+	 */
+	private String orderSignfile;
+	/**
+	 * 工程师ID
+	 */
+	private String orderAssignengineerid;
+	/**
+	 * 遗留问题
+	 */
+	private String orderRemainingproblem;
+	/**
+	 * 改进建议
+	 */
+	private String orderSuggestions;
+	/**
+	 * 过程问题
+	 */
+	private String orderProcessproblem;
+	/**
+	 * 工作总结
+	 */
+	private String orderWorksummary;
+	/**
+	 * 驳回原因
+	 */
+	private String orderTurndown;
+	/**
+	 * 驳回原因附件
+	 */
+	private String orderTurndownfile;
+	/**
+	 * 协助工程师
+	 */
+	private String orderAssistengineer;
+	/**
+	 * 协助工程师ID
+	 */
+	private String orderAssistengineerid;
+	/**
+	 * 安装信息备注
+	 */
+	private String orderInstallremark;
+	/**
+	 * 安装信息备注图片
+	 */
+	private String orderInstallremarkfile;
+	/**
+	 * 遗留问题图片
+	 */
+	private String orderRemainingproblemfile;
+	/**
+	 * 改进建议图片
+	 */
+	private String orderSuggestionsfile;
+	/**
+	 * 过程问题图片
+	 */
+	private String orderProcessproblemfile;
+	/**
+	 * 工作总结图片
+	 */
+	private String orderWorksummaryfile;
+	/**
+	 * 主键ID
+	 */
+	@TableId
+	private String nxOrderId;
+	/**
+	 * 审核标记
+	 */
+	private String syAudflag;
+	/**
+	 * 登记部门主键
+	 */
+	private String syCreateorgid;
+	/**
+	 * 登记部门编码
+	 */
+	private String syCreateorg;
+	/**
+	 * 登记部门
+	 */
+	private String syCreateorgname;
+	/**
+	 * 登记时间
+	 */
+	private String syCreatetime;
+	/**
+	 * 登记人主键
+	 */
+	private String syCreateuserid;
+	/**
+	 * 登记人编码
+	 */
+	private String syCreateuser;
+	/**
+	 * 登记人
+	 */
+	private String syCreateusername;
+	/**
+	 * 数据状态
+	 */
+	private String syStatus;
+	/**
+	 * 排序字段
+	 */
+	private Integer syOrderindex;
+	/**
+	 * 流程实例ID
+	 */
+	private String syPiid;
+	/**
+	 * 流程定义ID
+	 */
+	private String syPdid;
+	/**
+	 * 集团公司名称
+	 */
+	private String syJtgsmc;
+	/**
+	 * 集团公司ID
+	 */
+	private String syJtgsid;
+	/**
+	 * 流程启动人ID
+	 */
+	private String syStarteduser;
+	/**
+	 * 流程启动人
+	 */
+	private String syStartedusername;
+	/**
+	 * 流程已执行人ID
+	 */
+	private String syApprovedusers;
+	/**
+	 * 流程已执行人
+	 */
+	private String syApprovedusernames;
+	/**
+	 * 流程待执行人ID
+	 */
+	private String syPreapprovusers;
+	/**
+	 * 流程最后任务指派信息
+	 */
+	private String syLastflowinfo;
+	/**
+	 * 流程待执行人
+	 */
+	private String syPreapprovusernames;
+	/**
+	 * 流程任务指派人ID
+	 */
+	private String syLastflowuserid;
+	/**
+	 * 流程任务指派人
+	 */
+	private String syLastflowuser;
+	/**
+	 * 流程预警延期信息
+	 */
+	private String syWfwarn;
+	/**
+	 * 当前执行节点
+	 */
+	private String syCurrenttask;
+	/**
+	 * 流程预警延期标识
+	 */
+	private String syWarnflag;
+
+	/**
+	 * 流程
+	 */
+	private String orderLcinfo;
+	/**
+	 * 服务结果
+	 */
+	private String orderFwjg;
+
+
+	/**
+	 * 任务计划主键
+	 */
+	private String servicePlanId;
+
+	/**
+	 * 网点经度
+	 */
+	private String orderWdjd;
+	/**
+	 *网点纬度
+	 */
+	private String orderWdwd;
+
+	/**
+	 * 客户主键
+	 */
+	private String orderCustomerId;
+
+	/**
+	 * 是否解决
+	 */
+	private String orderSfjj;
+
+
+	/**
+	 * 审核通过时间
+	 */
+	private String orderShtgsj;
+
+
+	/**
+	 * 维保结束日期
+	 */
+	private String  orderWbjsrq;
+
+
+	/**
+	 * 客户联系人
+	 */
+	private String orderKhlxr;
+
+
+	/**
+	 * 保养内容
+	 */
+	private String orderBynr;
+
+
+	/**
+	 * 服务网点id
+	 */
+	private String orderFwwdid;
+
+	/**
+	 * 租户id
+	 */
+	private String syZhid;
+
+
+	/**
+	 * 触发类型  0 自动   1是手动
+	 */
+	private int triggerType;
+
+	/**
+	 * 保养内容名称
+	 */
+	private String orderBynrname;
+
+	/**
+	 * 保养级别
+	 */
+	private String orderByjb;
+
+	/**
+	 * 预检预修订单触发模式：自动、手动
+	 */
+	private String orderDdms;
+
+	/**
+	 * 是否延迟订单（设置临时触发时间） 20241231
+	 */
+	private String servicePlanOrderStatus;
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxPartFileConfigEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxPartFileConfigEntity.java
new file mode 100644
index 0000000..89fce76
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxPartFileConfigEntity.java
@@ -0,0 +1,106 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author lujiumin
+ * @date 2022/10/13
+ * 描述：
+ */
+@Data
+@TableName("nx_part_file_config")
+public class NxPartFileConfigEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 租户id
+     */
+    private String syZhid;
+    /**
+     * 请求入参
+     */
+    private String configQqrc;
+    /**
+     * 请求路径
+     */
+    private String configQqlj;
+
+    /**
+     * 命名空间
+     */
+    private String configMmkj;
+    /**
+     * 调用方法
+     */
+    private String configDyff;
+
+
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String nxPartFileConfigId;
+    /**
+     * 审核标记
+     */
+    private String syAudflag;
+    /**
+     * 登记部门主键
+     */
+    private String syCreateorgid;
+    /**
+     * 登记部门编码
+     */
+    private String syCreateorg;
+    /**
+     * 登记部门
+     */
+    private String syCreateorgname;
+    /**
+     * 登记时间
+     */
+    private String syCreatetime;
+    /**
+     * 登记人主键
+     */
+    private String syCreateuserid;
+    /**
+     * 登记人编码
+     */
+    private String syCreateuser;
+    /**
+     * 登记人
+     */
+    private String syCreateusername;
+    /**
+     * 数据状态
+     */
+    private String syStatus;
+    /**
+     * 排序字段
+     */
+    private Integer syOrderindex;
+    /**
+     * 流程实例ID
+     */
+    private String syPiid;
+    /**
+     * 流程定义ID
+     */
+    private String syPdid;
+    /**
+     * 集团公司名称
+     */
+    private String syJtgsmc;
+    /**
+     * 集团公司ID
+     */
+    private String syJtgsid;
+
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxPartFileEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxPartFileEntity.java
new file mode 100644
index 0000000..a105781
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxPartFileEntity.java
@@ -0,0 +1,147 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.math.BigDecimal;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 宁夏_配件档案
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-05-11 20:12:35
+ */
+@Data
+@TableName("nx_part_file")
+public class NxPartFileEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 配件编码
+	 */
+	private String filePjbm;
+	/**
+	 * 配件名称
+	 */
+	private String filePjmc;
+	/**
+	 * 是否是关键配件(1 是关键配件，0否)
+	 */
+	private String fileSfsgjpj;
+	/**
+	 * 系统模块
+	 */
+	private String fileXtmk;
+	/**
+	 * 系统模块编码
+	 */
+	private String fileXtmkbm;
+	/**
+	 * 规格型号
+	 */
+	private String fileGgxh;
+	/**
+	 * 理论寿命
+	 */
+	private Integer fileLlsm;
+	/**
+	 * 单价
+	 */
+	private BigDecimal fileDj;
+	/**
+	 * 库存上限
+	 */
+	private Integer fileKcsx;
+	/**
+	 * 库存下限
+	 */
+	private Integer fileKcxx;
+	/**
+	 * 库存数量
+	 */
+	private BigDecimal fileKcsl;
+	/**
+	 * 仓库名称
+	 */
+	private String fileCkmc;
+	/**
+	 * 仓库编码
+	 */
+	private String fileCkbm;
+	/**
+	 * 库位编码
+	 */
+	private String fileKwbm;
+	/**
+	 * 单位
+	 */
+	private String fileDw;
+	/**
+	 * 主键ID
+	 */
+	@TableId
+	private String nxPartFileId;
+	/**
+	 * 审核标记
+	 */
+	private String syAudflag;
+	/**
+	 * 登记部门主键
+	 */
+	private String syCreateorgid;
+	/**
+	 * 登记部门编码
+	 */
+	private String syCreateorg;
+	/**
+	 * 登记部门
+	 */
+	private String syCreateorgname;
+	/**
+	 * 登记时间
+	 */
+	private String syCreatetime;
+	/**
+	 * 登记人主键
+	 */
+	private String syCreateuserid;
+	/**
+	 * 登记人编码
+	 */
+	private String syCreateuser;
+	/**
+	 * 登记人
+	 */
+	private String syCreateusername;
+	/**
+	 * 数据状态
+	 */
+	private String syStatus;
+	/**
+	 * 排序字段
+	 */
+	private Integer syOrderindex;
+	/**
+	 * 流程实例ID
+	 */
+	private String syPiid;
+	/**
+	 * 流程定义ID
+	 */
+	private String syPdid;
+	/**
+	 * 集团公司名称
+	 */
+	private String syJtgsmc;
+	/**
+	 * 集团公司ID
+	 */
+	private String syJtgsid;
+
+	private String syZhid;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxPartRespEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxPartRespEntity.java
new file mode 100644
index 0000000..f5cf221
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxPartRespEntity.java
@@ -0,0 +1,99 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * 配件仓库维护
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-05-12 13:41:45
+ */
+@Data
+@TableName("nx_part_resp")
+public class NxPartRespEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 仓库编码
+	 */
+	private String respCkbm;
+	/**
+	 * 库位编码
+	 */
+	private String respKwbm;
+	/**
+	 * 仓库名称
+	 */
+	private String respCkmc;
+	/**
+	 * 主键ID
+	 */
+	@TableId
+	private String nxPartRespId;
+	/**
+	 * 审核标记
+	 */
+	private String syAudflag;
+	/**
+	 * 登记部门主键
+	 */
+	private String syCreateorgid;
+	/**
+	 * 登记部门编码
+	 */
+	private String syCreateorg;
+	/**
+	 * 登记部门
+	 */
+	private String syCreateorgname;
+	/**
+	 * 登记时间
+	 */
+	private String syCreatetime;
+	/**
+	 * 登记人主键
+	 */
+	private String syCreateuserid;
+	/**
+	 * 登记人编码
+	 */
+	private String syCreateuser;
+	/**
+	 * 登记人
+	 */
+	private String syCreateusername;
+	/**
+	 * 数据状态
+	 */
+	private String syStatus;
+	/**
+	 * 排序字段
+	 */
+	private Integer syOrderindex;
+	/**
+	 * 流程实例ID
+	 */
+	private String syPiid;
+	/**
+	 * 流程定义ID
+	 */
+	private String syPdid;
+	/**
+	 * 集团公司名称
+	 */
+	private String syJtgsmc;
+	/**
+	 * 集团公司ID
+	 */
+	private String syJtgsid;
+
+	/**
+	 * 租户ID
+	 */
+	private String syZhid;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxSparePartEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxSparePartEntity.java
new file mode 100644
index 0000000..3755a6d
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxSparePartEntity.java
@@ -0,0 +1,27 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("NX_SPARE_PART")
+public class NxSparePartEntity {
+    private String partSbid;
+    private String partSbbm;
+    @TableId
+    private String nxSparePartId;
+    private Double partGzsc;
+    private String partSm;
+    private String partSmyjz;
+    private String partYjzt;
+    private String partYjsj;
+    private String partBjmc;
+    private String partSfjj;
+    private String partAzwh;
+    private String partSn;
+    private String partXtmk;
+    private String partZhid;
+    private String partBjbm;
+    private String partAzrq;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxTodoLibrary.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxTodoLibrary.java
new file mode 100644
index 0000000..9a78109
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxTodoLibrary.java
@@ -0,0 +1,219 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 宁夏_待办库
+ * </p>
+ *
+ * @author yangyijun
+ * @since 2022-05-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="NxTodoLibrary对象", description="宁夏_待办库")
+public class NxTodoLibrary implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "设备编码")
+    @TableField("DEVICE_CODE")
+    private String deviceCode;
+
+    @ApiModelProperty(value = "设备类型")
+    @TableField("DEVICE_TYPE")
+    private String deviceType;
+
+    @ApiModelProperty(value = "设备型号")
+    @TableField("DEVICE_SBXH")
+    private String deviceSbxh;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("DEVICE_NAME")
+    private String deviceName;
+
+    @ApiModelProperty(value = "主题")
+    @TableField("TITLE")
+    private String title;
+
+    @ApiModelProperty(value = "操作")
+    @TableField("OPERATION")
+    private String operation;
+
+    @ApiModelProperty(value = "时间")
+    @TableField("TIME")
+    private String time;
+
+    @ApiModelProperty(value = "内容")
+    @TableField("CONTENT")
+    private String content;
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "NX_TODO_LIBRARY_ID")
+    private String nxTodoLibraryId;
+
+    @ApiModelProperty(value = "审核标记")
+    @TableField("SY_AUDFLAG")
+    private String syAudflag;
+
+    @ApiModelProperty(value = "登记部门主键")
+    @TableField("SY_CREATEORGID")
+    private String syCreateorgid;
+
+    @ApiModelProperty(value = "登记部门编码")
+    @TableField("SY_CREATEORG")
+    private String syCreateorg;
+
+    @ApiModelProperty(value = "登记部门")
+    @TableField("SY_CREATEORGNAME")
+    private String syCreateorgname;
+
+    @ApiModelProperty(value = "登记时间")
+    @TableField("SY_CREATETIME")
+    private String syCreatetime;
+
+    @ApiModelProperty(value = "登记人主键")
+    @TableField("SY_CREATEUSERID")
+    private String syCreateuserid;
+
+    @ApiModelProperty(value = "登记人编码")
+    @TableField("SY_CREATEUSER")
+    private String syCreateuser;
+
+    @ApiModelProperty(value = "登记人")
+    @TableField("SY_CREATEUSERNAME")
+    private String syCreateusername;
+
+
+    @ApiModelProperty(value = "数据状态")
+    @TableField("SY_STATUS")
+    private String syStatus;
+
+    @ApiModelProperty(value = "排序字段")
+    @TableField("SY_ORDERINDEX")
+    private Integer syOrderindex;
+
+    @ApiModelProperty(value = "流程实例ID")
+    @TableField("SY_PIID")
+    private String syPiid;
+
+    @ApiModelProperty(value = "流程定义ID")
+    @TableField("SY_PDID")
+    private String syPdid;
+
+    @ApiModelProperty(value = "集团公司名称")
+    @TableField("SY_JTGSMC")
+    private String syJtgsmc;
+
+    @ApiModelProperty(value = "集团公司ID")
+    @TableField("SY_JTGSID")
+    private String syJtgsid;
+
+    @ApiModelProperty(value = "服务类型")
+    @TableField("SERVE_TYPE")
+    private String serveType;
+
+
+    //1：已经解决（关闭） 其他未解决
+
+    @ApiModelProperty(value = "待办状态")
+    @TableField("STATUS")
+    private String status;
+
+    @ApiModelProperty(value = "服务计划主键")
+    @TableField("SERVICE_PLAN_ID")
+    private String servicePlanId;
+
+    @ApiModelProperty(value = "用户主键")
+    @TableField("USERID")
+    private String userid;
+
+    @ApiModelProperty(value = "订单主键")
+    @TableField("NX_ORDER_ID")
+    private String nxOrderId;
+
+    @ApiModelProperty(value = "服务时间")
+    @TableField("SERVICE_TIME")
+    private  String serviceTime;
+
+
+    @ApiModelProperty("通知类型Code")
+    @TableField("ADVICE_CODE")
+    private String adviceCode;
+
+
+    @ApiModelProperty("区分标志")
+    @TableField("SIGN_DATA")
+    private String signData;
+
+
+    @ApiModelProperty("消息码")
+    @TableField("TYPE_CODE")
+    private String typeCode;
+
+    @ApiModelProperty("SN")
+    @TableField("LIBRARY_SN")
+    private String sn;
+
+    @ApiModelProperty("安装位号")
+    @TableField("LIBRARY_AZWH")
+    private String partAzwh;
+
+    @ApiModelProperty("工作时长")
+    @TableField("LIBRARY_GZSC")
+    private String partGzsc;
+
+    @ApiModelProperty("计划名称")
+    @TableField("LIBRARY_JHMC")
+    private String  planName;
+
+    @ApiModelProperty("计划完成时间")
+    @TableField("LIBRARY_JHWCSJ")
+    private String  planEndTime;
+
+    @ApiModelProperty("系统模块")
+    @TableField("LIBRARY_XTMK")
+    private String  partXtmk;
+
+    @ApiModelProperty("系统模块")
+    @TableField("LIBRARY_BJMC")
+    private String  partBjmc;
+
+
+    @ApiModelProperty("报警编码")
+    @TableField("LIBRARY_BJBM")
+    private String bjbm;
+
+    @ApiModelProperty("故障等级")
+    @TableField("LIBRARY_GZDJ")
+    private String gzdj;
+
+
+    @ApiModelProperty("报警时间")
+    @TableField("LIBRARY_BJSJ")
+    private String bjsj;
+
+    @ApiModelProperty("订单编号")
+    @TableField("LIBRARY_DDBH")
+    private String ddbh;
+
+    @ApiModelProperty("指派工程师")
+    @TableField("LIBRARY_GCS")
+    private String gcs;
+
+    @ApiModelProperty("订单需求描述")
+    @TableField("LIBRARY_XQMS")
+    private String xqms;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxZskFaultCodeEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxZskFaultCodeEntity.java
new file mode 100644
index 0000000..aeebfb9
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/NxZskFaultCodeEntity.java
@@ -0,0 +1,29 @@
+package com.rootcloud.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author:xxxxx
+ * @create: 2022-05-07 14:58
+ * @Description: 故障码实体类
+ */
+@Data
+@TableName("NX_ZSK_FAULTCODE")
+public class NxZskFaultCodeEntity {
+    private String faultcodeGzm;
+    private String faultcodeGzmc;
+    private String faultcodeGzms;
+    private String faultcodeGzdj;
+    private String faultcodeGzdjcode;
+    private String faultcodeSblx;
+    private String faultcodeSblxcode;
+    private String NxZskFaultcodeId;
+    private String faultcodeGzclff;
+    private String faultcodeFj;
+    private String syZhid;
+
+    private String faultcodeSbxhid;
+    private String faultcodeSbxhcode;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/Part.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/Part.java
new file mode 100644
index 0000000..e521a86
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/Part.java
@@ -0,0 +1,671 @@
+package com.rootcloud.domain.entity;
+
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Part  {
+    private static final long serialVersionUID = 149327001766321251L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 配件ID */
+    private String partId;
+
+    /** 租户ID */
+    private String tenantId;
+
+    /** 配件编码 */
+    private String partCode;
+
+    /** 配件名称 */
+    private String partName;
+
+    /** 配件英文名称 mmp，这个存的是机构名称*/
+    private String partNameEn;
+
+    /** 规格型号 */
+    private String model;
+
+    /** 是否关键配件(0.否 1.是) */
+    private Integer isKeyPart;
+
+    /** 序列号 */
+    private String serialNo;
+
+    /** 单价 */
+    private BigDecimal price;
+
+    /** 单位 */
+    private String unit;
+
+    /** 单位说明 */
+    private String unitDesc;
+
+    /** 币种（CNY.人民币；USD.美元；HKD.港元；JPY.日元；KRW.韩元） */
+    private String currency;
+
+    /** 毛重 */
+    private BigDecimal weight;
+
+    /** 重量 */
+    private String weightUnit;
+
+    /** 重量单位说明 */
+    private String weightUnitDesc;
+
+    /** 是否停用(0.否 1.是) */
+    private Integer isDisable;
+
+    /** 备注 */
+    private String remark;
+
+    /** 创建日期 */
+    private Date createDate;
+
+    /** 更新时间 */
+    private Date updateDate;
+    
+    /** 配件编码 */
+    private String code;
+
+    /**
+     * 设备类型（来源于设备分类档案）
+     */
+    private String deviceTypeId;
+
+    /**
+     * 配件库存数量
+     */
+    private Integer partInventoryCount;
+
+    private Integer safeInventoryCount;
+
+    /**
+     * 采购周期
+     */
+    private Integer purchasingCycle;
+
+    /**
+     * 入库日期
+     */
+    private Date storeDate;
+
+    /**
+     * 2021-03-24
+     * */
+    private String picNum; //图号
+    private String partType;//配件类型(正常、耗材、易损件)
+    private String partLife;// 配件寿命(h)
+    private String partLifeWarning;//配件寿命预警值(h)
+    private Integer isLifeWarning;//寿命报警(bool 1-报警 0-不报警)
+    private String purchasingCycleWarning;//采购周期预警值(天)
+    private Integer isPurchasingCycle;//采购周期报警（bool 1-报警 0-不报警）
+    private Integer isLifeMonitoring; //是否寿命监测
+
+    /**
+     * 获取主键
+     *
+     * @return
+     *            主键
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 设置主键
+     *
+     * @param id
+     *            主键
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取配件ID
+     *
+     * @return
+     *            配件ID
+     */
+    public String getPartId() {
+        return partId;
+    }
+
+    /**
+     * 设置配件ID
+     *
+     * @param partId
+     *            配件ID
+     */
+    public void setPartId(String partId) {
+        this.partId = partId == null ? null : partId.trim();
+    }
+
+    /**
+     * 获取租户ID
+     *
+     * @return
+     *            租户ID
+     */
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    /**
+     * 设置租户ID
+     *
+     * @param tenantId
+     *            租户ID
+     */
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId == null ? null : tenantId.trim();
+    }
+
+    /**
+     * 获取配件编码
+     *
+     * @return
+     *            配件编码
+     */
+    public String getPartCode() {
+        return partCode;
+    }
+
+    /**
+     * 设置配件编码
+     *
+     * @param partCode
+     *            配件编码
+     */
+    public void setPartCode(String partCode) {
+        this.partCode = partCode == null ? null : partCode.trim();
+    }
+
+    /**
+     * 获取配件名称
+     *
+     * @return
+     *            配件名称
+     */
+    public String getPartName() {
+        return partName;
+    }
+
+    /**
+     * 设置配件名称
+     *
+     * @param partName
+     *            配件名称
+     */
+    public void setPartName(String partName) {
+        this.partName = partName == null ? null : partName.trim();
+    }
+
+    /**
+     * 获取配件英文名称
+     *
+     * @return
+     *            配件英文名称
+     */
+    public String getPartNameEn() {
+        return partNameEn;
+    }
+
+    /**
+     * 设置配件英文名称
+     *
+     * @param partNameEn
+     *            配件英文名称
+     */
+    public void setPartNameEn(String partNameEn) {
+        this.partNameEn = partNameEn == null ? null : partNameEn.trim();
+    }
+
+    /**
+     * 获取规格型号
+     *
+     * @return
+     *            规格型号
+     */
+    public String getModel() {
+        return model;
+    }
+
+    /**
+     * 设置规格型号
+     *
+     * @param model
+     *            规格型号
+     */
+    public void setModel(String model) {
+        this.model = model == null ? null : model.trim();
+    }
+
+    /**
+     * 获取是否关键配件(0.否 1.是)
+     *
+     * @return
+     *            是否关键配件(0.否 1.是)
+     */
+    public Integer getIsKeyPart() {
+        return isKeyPart;
+    }
+
+    /**
+     * 设置是否关键配件(0.否 1.是)
+     *
+     * @param isKeyPart
+     *            是否关键配件(0.否 1.是)
+     */
+    public void setIsKeyPart(Integer isKeyPart) {
+        this.isKeyPart = isKeyPart;
+    }
+
+    /**
+     * 获取序列号
+     *
+     * @return
+     *            序列号
+     */
+    public String getSerialNo() {
+        return serialNo;
+    }
+
+    /**
+     * 设置序列号
+     *
+     * @param serialNo
+     *            序列号
+     */
+    public void setSerialNo(String serialNo) {
+        this.serialNo = serialNo == null ? null : serialNo.trim();
+    }
+
+    /**
+     * 获取单价
+     *
+     * @return
+     *            单价
+     */
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    /**
+     * 设置单价
+     *
+     * @param price
+     *            单价
+     */
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    /**
+     * 获取单位
+     *
+     * @return
+     *            单位
+     */
+    public String getUnit() {
+        return unit;
+    }
+
+    /**
+     * 设置单位
+     *
+     * @param unit
+     *            单位
+     */
+    public void setUnit(String unit) {
+        this.unit = unit == null ? null : unit.trim();
+    }
+
+    /**
+     * 获取单位说明
+     *
+     * @return
+     *            单位说明
+     */
+    public String getUnitDesc() {
+        return unitDesc;
+    }
+
+    /**
+     * 设置单位说明
+     *
+     * @param unitDesc
+     *            单位说明
+     */
+    public void setUnitDesc(String unitDesc) {
+        this.unitDesc = unitDesc == null ? null : unitDesc.trim();
+    }
+
+    /**
+     * 获取币种（CNY.人民币；USD.美元；HKD.港元；JPY.日元；KRW.韩元）
+     *
+     * @return
+     *            币种（CNY.人民币；USD.美元；HKD.港元；JPY.日元；KRW.韩元）
+     */
+    public String getCurrency() {
+        return currency;
+    }
+
+    /**
+     * 设置币种（CNY.人民币；USD.美元；HKD.港元；JPY.日元；KRW.韩元）
+     *
+     * @param currency
+     *            币种（CNY.人民币；USD.美元；HKD.港元；JPY.日元；KRW.韩元）
+     */
+    public void setCurrency(String currency) {
+        this.currency = currency == null ? null : currency.trim();
+    }
+
+    /**
+     * 获取毛重
+     *
+     * @return
+     *            毛重
+     */
+    public BigDecimal getWeight() {
+        return weight;
+    }
+
+    /**
+     * 设置毛重
+     *
+     * @param weight
+     *            毛重
+     */
+    public void setWeight(BigDecimal weight) {
+        this.weight = weight;
+    }
+
+    /**
+     * 获取重量
+     *
+     * @return
+     *            重量
+     */
+    public String getWeightUnit() {
+        return weightUnit;
+    }
+
+    /**
+     * 设置重量
+     *
+     * @param weightUnit
+     *            重量
+     */
+    public void setWeightUnit(String weightUnit) {
+        this.weightUnit = weightUnit == null ? null : weightUnit.trim();
+    }
+
+    /**
+     * 获取重量单位说明
+     *
+     * @return
+     *            重量单位说明
+     */
+    public String getWeightUnitDesc() {
+        return weightUnitDesc;
+    }
+
+    /**
+     * 设置重量单位说明
+     *
+     * @param weightUnitDesc
+     *            重量单位说明
+     */
+    public void setWeightUnitDesc(String weightUnitDesc) {
+        this.weightUnitDesc = weightUnitDesc == null ? null : weightUnitDesc.trim();
+    }
+
+    /**
+     * 获取是否停用(0.否 1.是)
+     *
+     * @return
+     *            是否停用(0.否 1.是)
+     */
+    public Integer getIsDisable() {
+        return isDisable;
+    }
+
+    /**
+     * 设置是否停用(0.否 1.是)
+     *
+     * @param isDisable
+     *            是否停用(0.否 1.是)
+     */
+    public void setIsDisable(Integer isDisable) {
+        this.isDisable = isDisable;
+    }
+
+    /**
+     * 获取备注
+     *
+     * @return
+     *            备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 设置备注
+     *
+     * @param remark
+     *            备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    /**
+     * 获取创建日期
+     *
+     * @return
+     *            创建日期
+     */
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * 设置创建日期
+     *
+     * @param createDate
+     *            创建日期
+     */
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * 获取更新时间
+     *
+     * @return
+     *            更新时间
+     */
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * 设置更新时间
+     *
+     * @param updateDate
+     *            更新时间
+     */
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * 编码
+     *
+     * @param code
+     *            
+     */
+	public String getCode() {
+		return code;
+	}
+
+	
+	 /**
+     * 编码
+     *
+     * @param code
+     *            
+     */
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+    public String getDeviceTypeId() {
+        return deviceTypeId;
+    }
+
+    public void setDeviceTypeId(String deviceTypeId) {
+        this.deviceTypeId = deviceTypeId;
+    }
+
+    public Integer getPartInventoryCount() {
+        return partInventoryCount;
+    }
+
+    public void setPartInventoryCount(Integer partInventoryCount) {
+        this.partInventoryCount = partInventoryCount;
+    }
+
+    public Integer getPurchasingCycle() {
+        return purchasingCycle;
+    }
+
+    public void setPurchasingCycle(Integer purchasingCycle) {
+        this.purchasingCycle = purchasingCycle;
+    }
+
+    public Date getStoreDate() {
+        return storeDate;
+    }
+
+    public void setStoreDate(Date storeDate) {
+        this.storeDate = storeDate;
+    }
+
+    public Integer getSafeInventoryCount() {
+        return safeInventoryCount;
+    }
+
+    public Part setSafeInventoryCount(Integer safeInventoryCount) {
+        this.safeInventoryCount = safeInventoryCount;
+        return this;
+    }
+
+    public String getPicNum() {
+        return picNum;
+    }
+
+    public void setPicNum(String picNum) {
+        this.picNum = picNum;
+    }
+
+    public String getPartType() {
+        return partType;
+    }
+
+    public void setPartType(String partType) {
+        this.partType = partType;
+    }
+
+    public String getPartLife() {
+        return partLife;
+    }
+
+    public void setPartLife(String partLife) {
+        this.partLife = partLife;
+    }
+
+    public String getPartLifeWarning() {
+        return partLifeWarning;
+    }
+
+    public void setPartLifeWarning(String partLifeWarning) {
+        this.partLifeWarning = partLifeWarning;
+    }
+
+    public Integer getIsLifeWarning() {
+        return isLifeWarning;
+    }
+
+    public void setIsLifeWarning(Integer isLifeWarning) {
+        this.isLifeWarning = isLifeWarning;
+    }
+
+    public String getPurchasingCycleWarning() {
+        return purchasingCycleWarning;
+    }
+
+    public void setPurchasingCycleWarning(String purchasingCycleWarning) {
+        this.purchasingCycleWarning = purchasingCycleWarning;
+    }
+
+    public Integer getIsPurchasingCycle() {
+        return isPurchasingCycle;
+    }
+
+    public void setIsPurchasingCycle(Integer isPurchasingCycle) {
+        this.isPurchasingCycle = isPurchasingCycle;
+    }
+
+    public Integer getIsLifeMonitoring() {
+        return isLifeMonitoring;
+    }
+
+    public void setIsLifeMonitoring(Integer isLifeMonitoring) {
+        this.isLifeMonitoring = isLifeMonitoring;
+    }
+
+    @Override
+    public String toString() {
+        return "Part{" +
+                "id=" + id +
+                ", partId='" + partId + '\'' +
+                ", tenantId='" + tenantId + '\'' +
+                ", partCode='" + partCode + '\'' +
+                ", partName='" + partName + '\'' +
+                ", partNameEn='" + partNameEn + '\'' +
+                ", model='" + model + '\'' +
+                ", isKeyPart=" + isKeyPart +
+                ", serialNo='" + serialNo + '\'' +
+                ", price=" + price +
+                ", unit='" + unit + '\'' +
+                ", unitDesc='" + unitDesc + '\'' +
+                ", currency='" + currency + '\'' +
+                ", weight=" + weight +
+                ", weightUnit='" + weightUnit + '\'' +
+                ", weightUnitDesc='" + weightUnitDesc + '\'' +
+                ", isDisable=" + isDisable +
+                ", remark='" + remark + '\'' +
+                ", createDate=" + createDate +
+                ", updateDate=" + updateDate +
+                ", code='" + code + '\'' +
+                ", deviceTypeId='" + deviceTypeId + '\'' +
+                ", partInventoryCount=" + partInventoryCount +
+                ", safeInventoryCount=" + safeInventoryCount +
+                ", purchasingCycle=" + purchasingCycle +
+                ", storeDate=" + storeDate +
+                ", picNum='" + picNum + '\'' +
+                ", partType='" + partType + '\'' +
+                ", partLife='" + partLife + '\'' +
+                ", partLifeWarning='" + partLifeWarning + '\'' +
+                ", isLifeWarning=" + isLifeWarning +
+                ", purchasingCycleWarning='" + purchasingCycleWarning + '\'' +
+                ", isPurchasingCycle=" + isPurchasingCycle +
+                '}';
+    }
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/SiteDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/SiteDTO.java
new file mode 100644
index 0000000..b160443
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/SiteDTO.java
@@ -0,0 +1,13 @@
+package com.rootcloud.domain.entity;
+
+import lombok.Data;
+
+/**
+ * @author LiPingAn 2022/6/13 20:52
+ * @version 1.0
+ **/
+@Data
+public class SiteDTO {
+    private String siteId;
+    private String serviceArea;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/EntityBase.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/EntityBase.java
new file mode 100644
index 0000000..b27e5ce
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/EntityBase.java
@@ -0,0 +1,20 @@
+package com.rootcloud.domain.entity.base;
+
+import lombok.Data;
+
+import java.time.Instant;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/5/28
+ */
+@Data
+public class EntityBase {
+    public static final String TENANT_ID = "tenant_id";
+    public static final String CREATE_USER = "create_user";
+    public static final String CREATE_TIME = "create_time";
+
+    protected String tenantId;
+    protected String createUser;
+    protected Instant createTime;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/ModelColor.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/ModelColor.java
new file mode 100644
index 0000000..eafbdf0
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/ModelColor.java
@@ -0,0 +1,21 @@
+package com.rootcloud.domain.entity.base;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @author ruixiang.feng
+ * @ClassName
+ * @Description
+ * @date 2022/4/21 10:57
+ */
+@Data
+@TableName("NX_COLOR")
+public class ModelColor {
+    //id
+    private String colorId;
+    //颜色
+    private String colorYs;
+    //颜色code
+    private String colorYsCode;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/ModelPropertyEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/ModelPropertyEntity.java
new file mode 100644
index 0000000..5e23c7d
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/ModelPropertyEntity.java
@@ -0,0 +1,59 @@
+package com.rootcloud.domain.entity.base;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @author ruixiang.feng
+ * @ClassName
+ * @Description 实时工况
+ * @date 2022/4/14 14:47
+ */
+@Data
+@TableName("NX_MODEL_DATA")
+public class ModelPropertyEntity {
+
+    @TableId("NX_MODEL_DATA_ID")
+    private String id;
+    //属性ID
+    private String propertyId;
+    //属性名称
+    private String propertyName;
+    //属性数据类型
+    private String propertyDataType;
+    //属性值单位
+    private String propertyDataUnit;
+    //属性值
+    @TableField(exist = false)
+    private String propertyData;
+    //物模型ID
+    private String modelId;
+    //创建时间
+    private String createTime;
+    //更新时间
+    private String updateTime;
+    //属性标签
+    private String propertyTag;
+    //属性值对应颜色0
+    private String propertyColorFalse;
+    //属性值对应颜色1
+    private String propertyColorTrue;
+    //属性标签code
+    private String propertyTagCode;
+    //工况或监测
+    private String workingConditionType;
+    //uuid
+    private String propertyUuid;
+    //设备类型
+    private String deviceSblx;
+    //设备型号
+    private String deviceSbxh;
+    //是否app  0 app  , 1  pc
+    @TableField(exist = false)
+    private String dataSource;
+    private String dataSjy;
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/NxResp.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/NxResp.java
new file mode 100644
index 0000000..b2700eb
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/NxResp.java
@@ -0,0 +1,26 @@
+package com.rootcloud.domain.entity.base;
+
+/**
+ * @author LiPingAn 2022/8/19 14:09
+ * @version 1.0
+ **/
+public class NxResp {
+    private String ckbm;
+    private String kwbm;
+
+    public String getCkbm() {
+        return ckbm;
+    }
+
+    public void setCkbm(String ckbm) {
+        this.ckbm = ckbm;
+    }
+
+    public String getKwbm() {
+        return kwbm;
+    }
+
+    public void setKwbm(String kwbm) {
+        this.kwbm = kwbm;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/UpdatableEntityBase.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/UpdatableEntityBase.java
new file mode 100644
index 0000000..618d5f3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/base/UpdatableEntityBase.java
@@ -0,0 +1,18 @@
+package com.rootcloud.domain.entity.base;
+
+import lombok.Data;
+
+import java.time.Instant;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/5/28
+ */
+@Data
+public class UpdatableEntityBase extends EntityBase {
+    public static final String MODIFY_USER = "modify_user";
+    public static final String MODIFY_TIME = "modify_time";
+
+    protected String modifyUser;
+    protected Instant modifyTime;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/device/DeviceEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/device/DeviceEntity.java
new file mode 100644
index 0000000..2de52ca
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/device/DeviceEntity.java
@@ -0,0 +1,67 @@
+package com.rootcloud.domain.entity.device;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 14:07
+ */
+@Getter
+@Setter
+@ToString
+@TableName("nx_je_device")
+public class DeviceEntity {
+    private String deviceSbbm;
+    private String deviceSbmc;
+    private String deviceSblx;
+    private String deviceSbxh;
+    private String deviceSbewm;
+    private String deviceSbccrq;
+    private String deviceSbxxdz;
+    private String deviceSsgj;
+    private String deviceSssfmc;
+    private String deviceSssfbm;
+    private String deviceSscsmc;
+    private String deviceSsqxmc;
+    private String deviceJd;
+    private String deviceWd;
+    private String deviceSskh;
+    private String deviceStatusCode;
+    private String deviceNetworkStatusCode;
+    private String deviceSskhmc;
+    private String deviceSsqxbm;
+    private String deviceSscsbm;
+    private String deviceSbfj;
+    private String deviceSblxName;
+    private String deviceSbxhName;
+    private String deviceJwd;
+    private String syFuncedit;
+    @TableId
+    private String nxJeDeviceId;
+    private String syAudflag;
+    private String syCreateorgid;
+    private String syCreateorg;
+    private String syCreateorgname;
+    private String syCreatetime;
+    private String syCreateuserid;
+    private String syCreateuser;
+    private String syCreateusername;
+    private String syStatus;
+    private Integer syOrderindex;
+    private String syPiid;
+    private String syPdid;
+    private String syJtgsmc;
+    private String syJtgsid;
+    private String modelId;
+    private String deviceTag;
+    private String deviceSource;
+    private String createTime;
+    private String updateTime;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/device/NxDeviceCameraEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/device/NxDeviceCameraEntity.java
new file mode 100644
index 0000000..f7a8d15
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/device/NxDeviceCameraEntity.java
@@ -0,0 +1,39 @@
+package com.rootcloud.domain.entity.device;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@TableName("nx_jcxx_sblb_camera")
+public class NxDeviceCameraEntity {
+
+    @TableId
+    private String nxJcxxSblbCameraId;
+    private String syAudflag;
+    private String syCreateorgid;
+    private String syCreateorg;
+    private String syCreateorgname;
+    private String syCreatetime;
+    private String syCreateuserid;
+    private String syCreateuser;
+    private String syCreateusername;
+    private String syStatus;
+    private Integer syOrderindex;
+    private String syPiid;
+    private String syPdid;
+    private String syJtgsmc;
+    private String syJtgsid;
+    private String deviceId;
+    private String name;
+    private String sno;
+    private String cno;
+    private String factoryName;
+    private String model;
+    private Integer orderIndex;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/device/NxDeviceEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/device/NxDeviceEntity.java
new file mode 100644
index 0000000..dcdd19b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/device/NxDeviceEntity.java
@@ -0,0 +1,74 @@
+package com.rootcloud.domain.entity.device;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/5/7 9:45
+ */
+@Getter
+@Setter
+@ToString
+@TableName("nx_jcxx_sblb")
+public class NxDeviceEntity {
+    private String sblbSbbm;
+    private String sblbSbmc;
+    private String sblbSbewm;
+    private String sblbSbccrq;
+    private String sblbSbxxdz;
+    private String sblbSsgj;
+    private String sblbJd;
+    private String sblbWd;
+    private String sblbKhmc;
+    private String sblbSbfj;
+    private String sblbWbjsrq;
+    private String sblbZrgcs;
+    private String sblbZrgcsdh;
+    private String sblbStatusCode;
+    private String sblbBxztCode;
+    private String sblbSfbm;
+    private String sblbSfmc;
+    private String sblbSbm;
+    private String sblbSmc;
+    private String sblbQxbm;
+    private String sblbQxmc;
+    private String sblbLwztCode;
+    private String sblbKhid;
+    private String sblbSbxhName;
+    private String sblbSbxhCode;
+    private String sblbSblxName;
+    private String sblbSblxCode;
+    private String sblbZrgcsId;
+    private String sblbJwd;
+    @TableId
+    private String nxJcxxSblbId;
+    private String syAudflag;
+    private String syCreateorgid;
+    private String syCreateorg;
+    private String syCreateorgname;
+    private String syCreatetime;
+    private String syCreateuserid;
+    private String syCreateuser;
+    private String syCreateusername;
+    private String syStatus;
+    private Integer syOrderindex;
+    private String syPiid;
+    private String syPdid;
+    private String syJtgsmc;
+    private String syJtgsid;
+    private String sblbZcbh;
+    private String sblbGys;
+    private String sblbKhlxr;
+    private String sblbLxfs;
+    private String sblbKhdz;
+    private String sblbSbly;
+    private String syZhid;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/device/NxDeviceLocationEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/device/NxDeviceLocationEntity.java
new file mode 100644
index 0000000..008f25c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/device/NxDeviceLocationEntity.java
@@ -0,0 +1,23 @@
+package com.rootcloud.domain.entity.device;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.sql.Timestamp;
+
+@Getter
+@Setter
+@ToString
+@TableName("nx_device_location")
+public class NxDeviceLocationEntity {
+
+  private Timestamp time;
+  private String deviceId;
+  private Double longitude;
+  private Double latitude;
+  private String address;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/DeviceListEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/DeviceListEntity.java
new file mode 100644
index 0000000..61d6734
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/DeviceListEntity.java
@@ -0,0 +1,27 @@
+package com.rootcloud.domain.entity.ds;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("NX_JCXX_SBLB")
+public class DeviceListEntity {
+    private String sblbSbbm;
+    private String sblbSbmc;
+    private String sblbLwztCode;
+    private String sblbSbxhName;
+    private String sblbSbxhCode;
+    private String sblbSblxName;
+    private String sblbSblxCode;
+    @TableId
+    private String nxJcxxSblbId;
+    private String sblbSbly;
+    private String sblbKhid;
+    //租戶ID
+    private String syZhid;
+    //租戶名
+    private String syZhmc;
+    //数据同步写入时间
+    private String syCreatetime;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/DeviceSyncEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/DeviceSyncEntity.java
new file mode 100644
index 0000000..ee912da
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/DeviceSyncEntity.java
@@ -0,0 +1,64 @@
+package com.rootcloud.domain.entity.ds;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("NX_JE_DEVICE")
+public class DeviceSyncEntity {
+    //设备ID
+    @TableId
+    private String nxJeDeviceId;
+    //设备编号
+    private String deviceSbbm;
+    //设备名称
+    private String deviceSbmc;
+    //设备类型
+    private String deviceSblx;
+    //设备类型名称
+    private String deviceSblxName;
+    //设备型号
+    private String deviceSbxh;
+    //设备型号名称
+    private String deviceSbxhName;
+    //省份
+    private String deviceSssfmc;
+    //地市
+    private String deviceSscsmc;
+    //区县
+    private String deviceSsqxmc;
+    //经度
+    private String deviceJd;
+    //纬度
+    private String deviceWd;
+    //客户编码
+    private String deviceSskh;
+    //客户名称
+    private String deviceSskhmc;
+    //经纬度
+    private String deviceJwd;
+    //设备工作状态
+    private String deviceStatusCode;
+    //是否在线
+    private String deviceNetworkStatusCode;
+    //物模型ID
+    private String modelId;
+    //设备标签
+    private String deviceTag;
+    //设备来源
+    private String deviceSource;
+    //入云时间
+    private String createTime;
+    //更新时间
+    private String  updateTime;
+    //数据状态
+    private String syStatus;
+    //国家
+    private String deviceSsgj;
+    //租戶ID
+    private String syZhid;
+    //租戶名
+    private String syZhmc;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/ModelEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/ModelEntity.java
new file mode 100644
index 0000000..c96ead8
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/ModelEntity.java
@@ -0,0 +1,21 @@
+package com.rootcloud.domain.entity.ds;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("NX_MODEL")
+public class ModelEntity {
+    //模型ID
+    @TableId
+    private String modelId;
+    //模型名称
+    private String modelName;
+    //创建时间
+    private Date createTime;
+    //更新时间
+    private Date updateTime;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/ModelPropertySyncEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/ModelPropertySyncEntity.java
new file mode 100644
index 0000000..edbb564
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/ModelPropertySyncEntity.java
@@ -0,0 +1,29 @@
+package com.rootcloud.domain.entity.ds;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("NX_MODEL_PROPERTY")
+public class ModelPropertySyncEntity {
+    //uuid
+    @TableId
+    private String propertyUuid;
+    //属性ID
+    private String propertyId;
+    //属性名称
+    private String propertyName;
+    //属性数据类型
+    private String propertyDataType;
+    //属性值单位
+    private String propertyDataUnit;
+    //物模型ID
+    private String modelId;
+    //创建时间
+    private String createTime;
+    //更新时间
+    private String updateTime;
+    //物模型名称
+    private String modelName;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/NxDsLogEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/NxDsLogEntity.java
new file mode 100644
index 0000000..b175838
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/ds/NxDsLogEntity.java
@@ -0,0 +1,14 @@
+package com.rootcloud.domain.entity.ds;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("NX_DS_LOG")
+public class NxDsLogEntity {
+    @TableId
+    private String nxDsLogId;
+    private String logContent;
+    private String logType;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/sp/NxTriggerConditionEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/sp/NxTriggerConditionEntity.java
new file mode 100644
index 0000000..94f3454
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/sp/NxTriggerConditionEntity.java
@@ -0,0 +1,67 @@
+package com.rootcloud.domain.entity.sp;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName NxTiggerCondition
+ * @Description 触发条件实体
+ * @Author w-liuyi01
+ * @Date 2022/4/28 16:07
+ * @Version 1.0
+ */
+@Data
+@ToString
+@TableName("nx_trigger_condition")
+public class NxTriggerConditionEntity implements Serializable {
+
+    @TableId
+    private String nxTriggerConditionId;
+
+    @ApiModelProperty("服务计划ID")
+    private String servicePlanId;
+
+    @ApiModelProperty("触发类型")
+    private String triggerCondition;
+
+    @ApiModelProperty("条件")
+    private String conditionTj;
+
+    @ApiModelProperty("条件值")
+    private String conditionValue;
+
+    @ApiModelProperty("触发类型名称")
+    private String triggerConditionName;
+
+    @ApiModelProperty("条件名称")
+    private String conditionTjName;
+
+    @ApiModelProperty("条件值名称")
+    private String conditionValueName;
+
+    @ApiModelProperty("设置值")
+    private String setValue;
+
+    @ApiModelProperty("设置值的名称")
+    private String setValueName;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+    @ApiModelProperty("数据单位")
+    private String dataUnit;
+
+    /**
+     * 这里更新策略需要添加空值，需要设置null值
+     */
+    @ApiModelProperty("平台报警规则id")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String alarmTypeId;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/sp/NxUserInfoEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/sp/NxUserInfoEntity.java
new file mode 100644
index 0000000..5a9049e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/sp/NxUserInfoEntity.java
@@ -0,0 +1,86 @@
+package com.rootcloud.domain.entity.sp;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName NxUserInfo
+ * @Description 推送消息用户
+ * @Author w-liuyi01
+ * @Date 2022/4/28 15:59
+ * @Version 1.0
+ */
+@Data
+@ToString
+@TableName("nx_user_info")
+public class NxUserInfoEntity implements Serializable {
+
+    @TableId
+    private String nxUserInfoId;
+
+    @ApiModelProperty("服务计划ID")
+    private String servicePlanId;
+
+    @ApiModelProperty("部门ID")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String departmentId;
+
+    @ApiModelProperty("用户ID")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String userId;
+
+    @ApiModelProperty("角色ID")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String roleId;
+
+    @ApiModelProperty("部门ID名称")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String departmentIdName;
+
+    @ApiModelProperty("用户ID名称")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String userIdName;
+
+    @ApiModelProperty("角色ID名称")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String roleIdName;
+
+    @ApiModelProperty("是否外部提醒（1：勾选外部提醒）")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String externalReminders;
+
+
+    @ApiModelProperty("站内信提醒（1：勾选站内信提醒）")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String stationReminders;
+
+
+    @ApiModelProperty("邮件提醒（1：勾选邮件提醒）")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String emailReminders;
+
+    @ApiModelProperty("短信提醒（1：勾选短信提醒）")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String smsReminders;
+
+
+    @ApiModelProperty("消息模板类型")
+    private String infoType;
+
+    @ApiModelProperty("消息模板内容")
+    private String infoContent;
+
+    @ApiModelProperty("消息模板Id")
+    private String  infoXxmbid;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/sp/ServicePlanEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/sp/ServicePlanEntity.java
new file mode 100644
index 0000000..22c8d14
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/sp/ServicePlanEntity.java
@@ -0,0 +1,136 @@
+package com.rootcloud.domain.entity.sp;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName ServicePlanEntity
+ * @Description 服务计划实体
+ * @Author w-liuyi01
+ * @Date 2022/4/28 15:37
+ * @Version 1.0
+ */
+@Data
+@ToString
+@TableName("service_plan")
+public class ServicePlanEntity implements Serializable {
+
+    @TableId
+    private String servicePlanId;
+
+    @ApiModelProperty("设备编码")
+    private String  deviceCode;
+
+    @ApiModelProperty("计划名称")
+    private String  planName;
+
+    @ApiModelProperty("计划类型")
+    private String  planType;
+
+    @ApiModelProperty("设备类型")
+    private String  deviceType;
+
+    @ApiModelProperty("设备型号")
+    private String  deviceSbxh;
+
+    @ApiModelProperty("设备类型名称")
+    private String  deviceTypeName;
+
+    @ApiModelProperty("设备型号名称")
+    private String dviceModelName;
+
+    @ApiModelProperty("计划周期【1：日2：周3：月4：年】")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer  planCycle;
+
+    @ApiModelProperty("计划间隔")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer  planInterval;
+
+    @ApiModelProperty("计划状态【0：待启动1：进行中2：已完成3：已暂停】")
+    private Integer  planStatus;
+
+    @ApiModelProperty("计划状态:0删除 ")
+    private String syStatus;
+
+    @ApiModelProperty("创建时间")
+    private String  createTime;
+
+    @ApiModelProperty("计划时间段开始时间")
+    private String  planStartTime;
+
+    @ApiModelProperty("计划时间段结束时间")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String  planEndTime;
+
+    @ApiModelProperty("是否超时【0：未超时 1：已超时】")
+    private Integer  isTimeout;
+
+    @ApiModelProperty("提醒方式【0：邮件1：短信 2：站内信")
+    private String  planRemindWay;
+
+    @ApiModelProperty("完成时间节点【几天内】")
+    private Integer  finishTimeNode;
+
+    @ApiModelProperty("保养")
+    private String  maintainContent;
+
+    @ApiModelProperty("起停状态0停止1启动")
+    private Integer  isStart;
+
+    @ApiModelProperty("处理状态【0.不需要处理，1.需要处理】")
+    private Integer detailStatus;
+
+    @ApiModelProperty("下一个周期时间")
+    private String nextCycleTime;
+
+    @ApiModelProperty("计划类型名称")
+    private String planTypeName;
+
+    @ApiModelProperty("计划周期名称")
+    private String planCycleName;
+
+    @ApiModelProperty("计划状态名称")
+    private String planStatusName;
+
+    @ApiModelProperty("是否超时名称")
+    private String isTimeoutName;
+
+    @ApiModelProperty("提醒方式名称")
+    private String planRemindWayName;
+
+    @ApiModelProperty("保养内容名称")
+    private String maintainContentName;
+
+    @ApiModelProperty("保养类型：一级保养、二级保养、三级保养、专项保养")
+    private String maintenanceType;
+
+    @ApiModelProperty("最新触发时间")
+    private String latestTriggerTime;
+
+    @ApiModelProperty("是否解决")
+    private String planSfjj;
+
+    @ApiModelProperty("临时触发时间")
+    private String  planLscfsj;
+
+    @ApiModelProperty("租户id")
+    private String  syZhid;
+
+    @ApiModelProperty("设备ID")
+    private String  deviceId;
+
+    @ApiModelProperty("提前触发日期")
+    private String planTqcfrq;
+
+    @ApiModelProperty("暂停日期")
+    private String planZtrq;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/sp/ServicePlanHistoryEntity.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/sp/ServicePlanHistoryEntity.java
new file mode 100644
index 0000000..74f43da
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/entity/sp/ServicePlanHistoryEntity.java
@@ -0,0 +1,36 @@
+package com.rootcloud.domain.entity.sp;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * @author lujiumin
+ * @date 2023/1/31
+ * 描述：
+ */
+@Data
+@ToString
+@TableName("service_plan_history")
+public class ServicePlanHistoryEntity implements Serializable {
+
+    @TableId
+    private String id;
+
+    @ApiModelProperty("内容")
+    private String  content;
+
+    @ApiModelProperty("计划id")
+    private String  servicePlanId;
+
+    @ApiModelProperty("操作人")
+    private String  operator;
+
+    @ApiModelProperty("操作时间")
+    private String operatorTime;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/CarouselMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/CarouselMapper.java
new file mode 100644
index 0000000..c86ac96
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/CarouselMapper.java
@@ -0,0 +1,15 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.CarouselEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author w-yanxiang
+ * @Date 2022/6/16 10:17
+ * @Version 1.0
+ * @Description
+ */
+@Mapper
+public interface CarouselMapper extends BaseMapper<CarouselEntity> {
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/CommonMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/CommonMapper.java
new file mode 100644
index 0000000..13d2df2
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/CommonMapper.java
@@ -0,0 +1,25 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.DemoEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: xingjingying
+ */
+@Mapper
+public interface CommonMapper extends BaseMapper {
+
+    int getTableColumn(String tableName, String column);
+
+
+    //通过租户id,查询4.0 clientid
+    Map<String,String> getRootClient(@Param("syZhid") String syZhid);
+
+
+    List<Map<String,String>> getRootClientList();
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/DemoMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/DemoMapper.java
new file mode 100644
index 0000000..ec36826
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/DemoMapper.java
@@ -0,0 +1,19 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.DemoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/5/25
+ */
+@Mapper
+public interface DemoMapper extends BaseMapper<DemoEntity> {
+
+    DemoEntity getDemo();
+
+    void insertData1();
+    void insertData2();
+    void insertData3();
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/DeviceMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/DeviceMapper.java
new file mode 100644
index 0000000..0e1a254
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/DeviceMapper.java
@@ -0,0 +1,56 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.dto.*;
+import com.rootcloud.domain.entity.device.DeviceEntity;
+import com.rootcloud.domain.vo.PrinterEfficiencyWorkVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 14:13
+ */
+@Mapper
+public interface DeviceMapper extends BaseMapper<DeviceEntity> {
+
+    public List<DeviceDTO> findAll();
+
+    List<DeviceSpecialDTO> findSpecialAll();
+
+
+    public List<DeviceWorkTimeDTO> findAllWithMonthWorkTime(@Param("deviceId") String deviceId, @Param("searchDate") Date searchDate);
+
+    public List<DeviceWorkTimeDTO> findAllWithMonthWorkBetweenTime(@Param("deviceId") String deviceId, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+    public List<DeviceWorkTimeDTO> findAllWithDayWorkTime(@Param("deviceId") String deviceId, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+    public List<NxDeviceDTO> findCameraList(@Param("no") String no, @Param("name") String name, @Param("type") String type,@Param("startNo") Integer startNo,@Param("endNo") Integer endNo);
+    public List<CameraDTO> selectCameras(@Param("deviceId") String deviceId);
+
+    public Integer findCameraCount(@Param("no") String no, @Param("name") String name, @Param("type") String type);
+
+
+    List<DeviceDTO> findAllByUserId(@Param("userIds") String userIds);
+
+    List<Map<String,String>> statisticsDeviceTimesMonth(Map<String,Object> month);
+
+    int clearDeviceTimesDay(Map<String,Object> map);
+
+    int batchAddDeviceTimesDay(Map<String,Object> map);
+
+    //统计月时长
+
+    List<Map<String,String>> getDeviceTimesMonth(Map<String,Object> map);
+    int updateDeviceTimesMonth(Map<String,Object> map);
+
+    //统计月时长
+    int insertDeviceTimesMonth(Map<String,Object> map);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/JeSysUsermsgMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/JeSysUsermsgMapper.java
new file mode 100644
index 0000000..ad7d5e3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/JeSysUsermsgMapper.java
@@ -0,0 +1,7 @@
+package com.rootcloud.domain.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface JeSysUsermsgMapper {
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/MessageModelMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/MessageModelMapper.java
new file mode 100644
index 0000000..c53211f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/MessageModelMapper.java
@@ -0,0 +1,12 @@
+package com.rootcloud.domain.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface MessageModelMapper {
+    int getFwjhCount(List<String> ids);
+
+    void delMessageModel(List<String> ids);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/ModelPropertyMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/ModelPropertyMapper.java
new file mode 100644
index 0000000..3ab4fcd
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/ModelPropertyMapper.java
@@ -0,0 +1,48 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.base.ModelColor;
+import com.rootcloud.domain.entity.base.ModelPropertyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author ruixiang.feng
+ * @ClassName
+ * @Description
+ * @date 2022/4/15 10:55
+ */
+@Mapper
+public interface ModelPropertyMapper extends BaseMapper<ModelPropertyEntity> {
+    List<ModelPropertyEntity> getWorkingCondition(HashMap req);
+
+    List<String> getWorkingTitle(HashMap req);
+
+    List<ModelPropertyEntity> getGroupAtt(HashMap<String, String> req);
+
+    void delWorkingCondition(HashMap<String, String> req);
+
+    List<ModelPropertyEntity> getGroupAttData(HashMap<String, String> req);
+
+    List<ModelColor> getColor();
+
+    void batchinsert(List<ModelPropertyEntity> modelPropertyEntitieList);
+
+    List<ModelPropertyEntity> queryWorkingCondition(HashMap<String, String> req);
+
+    void deleteByIds(List<String> idList);
+
+    void deleteByCode(@Param("propertyTagCode")String propertyTagCode,@Param("notDeleteTitle")String notDeleteTitle);
+
+
+    String  selectUnitByModelId(@Param("propertyId") String propertyId, @Param("modelId")String modelId);
+
+    List<ModelPropertyEntity> getmodelPropertyBySbxh(List<String> sbxh);
+
+    void del(ModelPropertyEntity modelPropertyEntity1);
+
+    String selectUuidByModelId(@Param("propertyId") String propertyId, @Param("modelId")String modelId);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/MyAdviceMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/MyAdviceMapper.java
new file mode 100644
index 0000000..6bd905f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/MyAdviceMapper.java
@@ -0,0 +1,7 @@
+package com.rootcloud.domain.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MyAdviceMapper {
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/MyMessageMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/MyMessageMapper.java
new file mode 100644
index 0000000..fac0cc0
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/MyMessageMapper.java
@@ -0,0 +1,7 @@
+package com.rootcloud.domain.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MyMessageMapper {
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NetworkMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NetworkMapper.java
new file mode 100644
index 0000000..a51607e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NetworkMapper.java
@@ -0,0 +1,14 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.NetworkEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/5/25
+ */
+@Mapper
+public interface NetworkMapper extends BaseMapper<NetworkEntity> {
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NetworkUserMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NetworkUserMapper.java
new file mode 100644
index 0000000..d8a6e7f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NetworkUserMapper.java
@@ -0,0 +1,14 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.NetworkUserEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/5/25
+ */
+@Mapper
+public interface NetworkUserMapper extends BaseMapper<NetworkUserEntity> {
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxDeviceCameraMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxDeviceCameraMapper.java
new file mode 100644
index 0000000..000bbb6
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxDeviceCameraMapper.java
@@ -0,0 +1,16 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.device.NxDeviceCameraEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 14:13
+ */
+@Mapper
+public interface NxDeviceCameraMapper extends BaseMapper<NxDeviceCameraEntity> {
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxDeviceLocationMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxDeviceLocationMapper.java
new file mode 100644
index 0000000..237df95
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxDeviceLocationMapper.java
@@ -0,0 +1,22 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.device.NxDeviceLocationEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 14:13
+ */
+@Mapper
+public interface NxDeviceLocationMapper extends BaseMapper<NxDeviceLocationEntity> {
+
+    @Select("select a.DEVICE_ID,a.TIME,LONGITUDE ,LATITUDE from nx_device_location a inner join ( select  DEVICE_ID,MAX(time) TIME from nx_device_location   where LONGITUDE is not null   group by DEVICE_ID  ) b on a.DEVICE_ID = b.DEVICE_ID and a.TIME = b.TIME ")
+    List<NxDeviceLocationEntity> findAllDeviceLocation();
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxDeviceMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxDeviceMapper.java
new file mode 100644
index 0000000..d6da2b3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxDeviceMapper.java
@@ -0,0 +1,26 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.device.NxDeviceEntity;
+import com.rootcloud.vo.order.DeviceDataVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 14:13
+ */
+@Mapper
+public interface NxDeviceMapper extends BaseMapper<NxDeviceEntity> {
+
+    DeviceDataVo getJcxxByIds(@Param("ids") String ids);
+
+    String selectFwwdId(@Param("khid") String khid,@Param("zhId") String zhId);
+
+    List<DeviceDataVo> getKuDeviceList(@Param("userId") String userId);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxDsLogMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxDsLogMapper.java
new file mode 100644
index 0000000..b1da9a1
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxDsLogMapper.java
@@ -0,0 +1,9 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.ds.NxDsLogEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface NxDsLogMapper extends BaseMapper<NxDsLogEntity> {
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxOrderMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxOrderMapper.java
new file mode 100644
index 0000000..009e904
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxOrderMapper.java
@@ -0,0 +1,212 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.rootcloud.domain.dto.*;
+import com.rootcloud.domain.entity.*;
+import com.rootcloud.domain.entity.device.NxDeviceEntity;
+import com.rootcloud.domain.vo.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 宁夏_订单
+ * 
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-05-07 13:41:38
+ */
+@Mapper
+public interface NxOrderMapper extends BaseMapper<NxOrderEntity> {
+
+    List<NxOrderEntity> getOrderByEngineer(String fwryYhxm);
+
+    List<EngineerModel> getEngineer();
+
+    List<PendingOrderModel> pendingOrder();
+
+    /**
+     * 订单分页
+     * 
+     * @param page
+     *            分页对象
+     * @param serviceType
+     *            服务类型
+     * @param orderStatus
+     *            订单状态
+     * @return 分页的数据
+     */
+    IPage<OrderVO> orderPage(IPage<OrderVO> page, @Param("serviceType") String serviceType,
+                             @Param("orderStatus") String orderStatus);
+
+    /**
+     * 订单详情
+     * 
+     * @param orderId
+     *            订单主键
+     * @return 详情数据
+     */
+    OrderInfoVO orderInfo(@Param("orderId") String orderId);
+
+    int equipmentOrderNum(String orderDeviceCode);
+
+
+    /**
+     * 通过工程师和预约时间 来查询是否有任务
+     * @param engineerId
+     * @param bookingTime
+     * @return
+     */
+    List<NxOrderEntity> selectByEngineer(@Param("engineerId")String engineerId,@Param("bookingTime")String bookingTime);
+
+    /**
+     * 判断工程师未来7填是否空闲/繁忙
+     * @param engineerId
+     * @return
+     */
+    int selectByEngineerBusyness(@Param("engineerId")String engineerId);
+
+    List<FwryDTO> getNxgxJcdaFwryList(FwryDTO reqDto);
+
+    Integer delFwry(String nxgxJcdaFwryId);
+
+
+    /**
+     * 根据任务计划主键查询订单
+     * @param servicePlanId
+     * @return
+     */
+    NxOrderEntity selectByServicePlanId(@Param("servicePlanId")String servicePlanId,@Param("time")String time);
+
+    void updateNxgxJcdaFwryByUserId(HashMap req);
+
+    List<NxOrderEntity> getOrderByEngineerId(String userId);
+
+    List<FwryDTO> getNxgxJcdaFwryByUserId(String userId);
+
+    Integer getOrderNum(HashMap<String, String> req);
+
+    JeCoreEnduserEntity getCoreEnduserByUsrId(String userId);
+
+    List<KhglDTO> getKhBykhdzs(String[] split);
+
+    List<NxDeviceEntity> getNxDeviceEntity(Map<String, Object> req);
+    int getNxDeviceEntityCount(Map<String, Object> req);
+
+    NetworkEntity getfwwd(FwryDTO fwryDTO);
+
+    List<NxDeviceEntity> getNxDeviceEntityList(Map<String, Object> req);
+    int getNxDeviceEntityListCount(Map<String, Object> req);
+
+    ServiceViewResultModel getPhotoByUserId(String userId);
+
+    List<PendingOrderModel> getServiceView(HashMap req);
+
+    List<NxOrderEntity> getServiceViewBySbbm(HashMap req);
+
+    String getUserInfo(String userId);
+
+
+    List<NxOrderEntity> orderStatusStatistic(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("orderStatus")String orderStatus,@Param("userIds") String userIds,@Param("wdUserId") String wdUserId);
+
+
+    OrderStatusStatistic orderCount(@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("userIds") String userIds, @Param("wdUserId") String wdUserId);
+
+
+    DeviceStatusStatistic deviceStatusStatistic(@Param("userIds") String userIds);
+
+
+    List<Outlets> outletsStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime, @Param("wdUserId") String wdUserId);
+
+
+    List<OrderStatistic> orderStatisticByDay(@Param("syzhid")String syzhid,@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("userIds") String userIds, @Param("wdUserId") String wdUserId);
+
+
+    List<OrderStatistic> orderStatisticByDayMonth(@Param("syzhid")String syzhid,@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("userIds") String userIds, @Param("wdUserId") String wdUserId);
+
+
+    List<PersonnelStatistic>  checkPersonStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime, @Param("wdUserId") String wdUserId,@Param("sortType") String sortType,@Param("serviceType") String serviceType,@Param("sortReverseOrder") String sortReverseOrder,@Param("orderStatus") String orderStatus,@Param("syZhid") String syZhid);
+
+    /**
+     * 工作实长重写 ，需加上协助人员
+     * @param startTime
+     * @param endTime
+     * @param wdUserId
+     * @param serviceType
+     * @param sortReverseOrder
+     * @param orderStatus
+     * @param syZhid
+     * @return
+     */
+     List<PersonnelStatistic>  getGzsc(@Param("startTime")String startTime, @Param("endTime")String endTime, @Param("wdUserId") String wdUserId,@Param("serviceType") String serviceType,@Param("sortReverseOrder") String sortReverseOrder,@Param("orderStatus") String orderStatus,@Param("syZhid") String syZhid);
+
+     List<PersonnelStatistic> getGcsIds(@Param("startTime")String startTime, @Param("endTime")String endTime, @Param("wdUserId") String wdUserId,@Param("serviceType") String serviceType,@Param("syZhid") String syZhid);
+     BigDecimal getGcsGzsc(@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("serviceType") String serviceType,@Param("syZhid") String syZhid,@Param("gcsId") String gcsId);
+
+     List<FaultNumber>  faultStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("userIds") String userIds, @Param("wdUserId") String wdUserId);
+
+
+    List<PartsFaultNumber>  partsFaultStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime, @Param("wdUserId") String wdUserId,@Param("serviceType") String serviceType);
+
+
+
+    List<FittingsSales> saleFittingsStatistic(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("wdUserId") String wdUserId,@Param("businessType") String businessType);
+
+
+
+    List<CustomerSales> saleCustomerStatistic(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("userIds") String userIds,@Param("businessType") String businessType);
+
+
+
+    List<NxOrderEntity>  selectByUserId(@Param("zhId")String zhId,@Param("userId")String userId,@Param("type")String type,@Param("startNo") Integer startNo,@Param("endNo") Integer endNo);
+
+    Integer countByUserId(@Param("zhId")String zhId,@Param("userId")String userId, @Param("type")String type);
+
+    String  getContentByMbId(@Param("mbId")String mbId);
+
+
+
+    List<ContractEntity>  jsGetByUserId(@Param("userIds")String userIds);
+
+
+    List<ContractEntity>  fwGetByUserId(@Param("userIds")String userIds);
+
+
+    void mesSfjj(String orderId);
+
+    void eqMesSfjj(String id);
+
+    void htSerMesSfjj(String id);
+
+    void jsSerMesSfjj(String id);
+
+    List<String> getKmcList(HashMap<String, String> req);
+
+    List<NxSparePartEntity> getSpartPartList(HashMap<String, Object> req);
+
+    Integer countSpartPartList(HashMap<String, Object> req);
+
+    List<NxOrderEntity> getOrderTypeNum(String userId);
+    List<NxOrderEntity> getOrderTypeNum2(String userId);
+
+    List<NxOrderEntity> getOrderTypeNumByCustomer(Map<String,Object> query);
+
+    //List<KhVO> getKuList(Map<String,Object> query);
+    //List<KhVO> getKuList(@Param("userId") String userId);
+
+    List<DeviceVO> getKuDeviceList(Map<String,Object> query);
+    /**
+     * 修改订单审核时间，完工时间，指派工程师时间
+     */
+    void updateOrderShsj();
+    void updateOrderWgsj();
+    void updateOrderZpgcssj();
+
+    /*******************生成订单模块*********************/
+    Integer getOrderCount(@Param("date") String date);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxPlpzMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxPlpzMapper.java
new file mode 100644
index 0000000..dcf5493
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxPlpzMapper.java
@@ -0,0 +1,15 @@
+package com.rootcloud.domain.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.Map;
+
+
+@Mapper
+public interface NxPlpzMapper extends BaseMapper {
+
+    int getCountServiceItem(Map<String,String> map);
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxTodoLibraryMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxTodoLibraryMapper.java
new file mode 100644
index 0000000..9052dde
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxTodoLibraryMapper.java
@@ -0,0 +1,27 @@
+package com.rootcloud.domain.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.rootcloud.domain.entity.NxTodoLibrary;
+import com.rootcloud.vo.todo.TodoVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 宁夏_待办库 Mapper 接口
+ * </p>
+ *
+ * @author yangyijun
+ * @since 2022-05-27
+ */
+@Mapper
+public interface NxTodoLibraryMapper extends BaseMapper<NxTodoLibrary> {
+
+
+    IPage<TodoVo> getPage(IPage<TodoVo> page, @Param("queryData") String queryData,@Param("userId") String userId,@Param("syZhid") String syZhid);
+
+    IPage<TodoVo> getPageNew(IPage<TodoVo> page, @Param("queryData") String queryData,@Param("userId") String userId,@Param("syZhid") String syZhid);
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxTriggerConditionMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxTriggerConditionMapper.java
new file mode 100644
index 0000000..b27dad7
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxTriggerConditionMapper.java
@@ -0,0 +1,13 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.sp.NxTriggerConditionEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface NxTriggerConditionMapper extends BaseMapper<NxTriggerConditionEntity> {
+
+    void batchInsert(List<NxTriggerConditionEntity> list);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxUserInfoMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxUserInfoMapper.java
new file mode 100644
index 0000000..5092d22
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxUserInfoMapper.java
@@ -0,0 +1,28 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.sp.NxUserInfoEntity;
+import com.rootcloud.vo.service.NxUserInfoVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface NxUserInfoMapper extends BaseMapper<NxUserInfoEntity> {
+
+
+    String queryUserIdsByDeptId(@Param("deptList") List<String> deptList);
+
+
+    String getRoleName(@Param("roleList") List<String> roleList);
+
+
+    String getDeptName(@Param("deptList") List<String> deptList);
+
+
+    String getUserName(@Param("userList") List<String> userList);
+
+
+    NxUserInfoVo selectBySeviceCode(@Param("deviceCode") String deviceCode,@Param("syZhid") String syZhid);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxZskFaultCodeMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxZskFaultCodeMapper.java
new file mode 100644
index 0000000..1fad536
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxZskFaultCodeMapper.java
@@ -0,0 +1,28 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.rootcloud.domain.entity.NxZskFaultCodeEntity;
+import com.rootcloud.vo.faultcode.FaultCodeVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author:xxxxx
+ * @create: 2022-05-07 15:08
+ * @Description: 故障等级mapper
+ */
+@Mapper
+public interface NxZskFaultCodeMapper extends BaseMapper<NxZskFaultCodeEntity> {
+
+
+    IPage<FaultCodeVo> getPage(IPage<FaultCodeVo> page, @Param("queryData") String queryData, @Param("faultcodeSblxcode") String faultcodeSblxcode);
+
+    //@Param("level") String level,@Param("sbxhId") String sbxhId
+    List<String> getCodes(Map<String,Object> maps);
+
+    String getSbxh(@Param("id")String id);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxgxJcdaFwryMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxgxJcdaFwryMapper.java
new file mode 100644
index 0000000..4ea78f3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/NxgxJcdaFwryMapper.java
@@ -0,0 +1,13 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.entity.NetworkUserEntity;
+
+/**
+ * @Author w-yanxiang
+ * @Date 2022/6/14 9:27
+ * @Version 1.0
+ * @Description 网点服务人员信息表
+ */
+public interface NxgxJcdaFwryMapper extends BaseMapper<NetworkUserEntity> {
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/ServicePlanMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/ServicePlanMapper.java
new file mode 100644
index 0000000..7717231
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/ServicePlanMapper.java
@@ -0,0 +1,167 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.common.enums.ServicePlanEnums;
+import com.rootcloud.domain.ao.ServicePlanCalendarNewAO;
+import com.rootcloud.domain.dto.ConditionModel;
+import com.rootcloud.domain.entity.NxZskFaultCodeEntity;
+import com.rootcloud.domain.ao.ServicePlanParamsAO;
+import com.rootcloud.domain.entity.sp.ServicePlanEntity;
+import com.rootcloud.vo.service.MaintenanceListVo;
+import com.rootcloud.vo.service.OutletsVO;
+import com.rootcloud.vo.service.ServicePlanInfoVO;
+import com.rootcloud.vo.service.ServicePlanVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface ServicePlanMapper extends BaseMapper<ServicePlanEntity> {
+    /**
+     * 根据故障码查询等级和设备型号
+     * 
+     * @param codes
+     *            故障码
+     * @return 等级和设备型号
+     */
+    List<NxZskFaultCodeEntity> selectAlarmLevel(@Param("codes") List<String> codes);
+
+    /**
+     * 查询所有满足条件的触发条件
+     * 
+     * @param date
+     *            时间yyyy-MM-dd
+     * @param planStatus
+     *            计划状态
+     * @param triggerType
+     *            触发类型
+     * @param detailStatus
+     *            是否执行
+     * @param alarmTypeId
+     *            报警类型Id
+     * @return 触发条件
+     */
+    List<ConditionModel> findConditionList(@Param("date") String date, @Param("planStatus") Integer planStatus,
+        @Param("triggerType") String triggerType, @Param("detailStatus") Integer detailStatus,
+        @Param("alarmTypeId") String alarmTypeId);
+
+    /**
+     * 根据计划ID修改执行状态
+     * 
+     * @param planIds
+     *            计划ID
+     * @param status
+     *            状态码 1.可执行； 0.不可执行
+     */
+    void updateDetailStatusByPlanIds(@Param("planIds") List<String> planIds, @Param("status") Integer status);
+
+    /**
+     * 修改状态
+     * 
+     * @param planIds
+     *            计划主键
+     * @param planStatus
+     *            计划状态
+     * @param detailStatus
+     *            执行状态
+     */
+    void updateStatus(@Param("planIds") List<String> planIds, @Param("planStatus") ServicePlanEnums.PlanStatus planStatus,
+        @Param("detailStatus") Integer detailStatus);
+
+    /**
+     * 查询触发任务是系统时间的
+     * 
+     * @return
+     */
+    List<ServicePlanVo> selectSysTimeList();
+
+    /**
+     * 通过条件查询计划任务
+     *
+     * @param planParamsAO
+     * @return
+     */
+    List<ServicePlanEntity> selectListByParams(@Param("planParamsAO") ServicePlanParamsAO planParamsAO);
+
+    /**
+     * 查询十点需要发送消息的服务计划数据
+     * 
+     * @return
+     */
+    List<ServicePlanEntity> selectScheduledTasksList();
+
+
+    /**
+     * 根据保养内容名称查询保养信息
+     * @param maintainContentName
+     * @return
+     */
+    List<MaintenanceListVo> selectListByName(@Param("maintainContentName") String maintainContentName);
+
+    List<MaintenanceListVo> selectListByName2(@Param("maintainContentName") String maintainContentName,@Param("maintainContent") String maintainContent);
+
+
+    List<Map> selectListXMBY(@Param("code") String code,@Param("syZhid") String syZhid);
+
+    int insertXmbynr(@Param("list") List<Map> xmbynr,@Param("nxOrderId") String nxOrderId);
+
+
+    List<String> getCustomerAndRoles(@Param("customerId") String customerId,@Param("syZhid") String syZhid);
+
+
+
+    List<ServicePlanEntity>  selectByUserId(@Param("userId") String userId,@Param("startNo")Integer startNo,@Param("endNo")Integer endNo);
+
+    Integer  countByUserId(@Param("userId") String userId);
+
+    void eqMesSfjj(String id);
+
+
+
+    List<ServicePlanInfoVO> selectByParams(@Param("servicePlanCalendarNewAO") ServicePlanCalendarNewAO servicePlanCalendarNewAO);
+
+
+    Integer queryLgortsByCode(@Param("configCode") String configCode);
+
+
+    String queryStringByCode(@Param("configCode") String configCode);
+
+
+    String selectOutletsIdByCustomerId(@Param("customerId") String customerId, @Param("syZhid") String syZhid);
+
+
+    OutletsVO returnUserNames(@Param("wdId") String wdId);
+
+
+    List<Map<String,String>> getTodoLibrary(Map param);
+
+    List<Map<String,String>> getPlanExsitOrder(Map param);
+
+    //获取是否派工标识
+    Map<String,String> getIslcpzb(String syZhid);
+
+    /**
+     * 查询触发任务是系统时间的
+     *
+     * @return
+     */
+    List<ServicePlanVo> selectExecutedServicePlan(@Param("thatDay") String thatDay);
+
+    List<ServicePlanVo> selectExecutedServicePlanByPlanId(@Param("planId") String planId);
+
+    List<ServicePlanEntity> selectData();
+
+    void updateData(@Param("id") String id,@Param("date") String date);
+
+    Integer checkOrder(@Param("servicePlanId") String servicePlanId,@Param("date") String date);
+
+    Integer checkOrderCount(@Param("servicePlanId") String servicePlanId,@Param("startDate") String startDate,@Param("endDate") String endDate);
+
+    String lastServicePlanOrderStatus(@Param("servicePlanId") String servicePlanId);
+
+    void updateServicePlanStatus(@Param("id") String id,@Param("date") String date,@Param("status") String status,@Param("ztrq") String ztrq);
+
+    void updateTqcfrq(@Param("id") String id,@Param("date") String date);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/SpareFilerMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/SpareFilerMapper.java
new file mode 100644
index 0000000..5624123
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/SpareFilerMapper.java
@@ -0,0 +1,53 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.dto.NxSparePartVo;
+import com.rootcloud.domain.entity.NxPartFileEntity;
+import com.rootcloud.domain.entity.NxSparePartEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Mapper
+public interface SpareFilerMapper extends BaseMapper<NxPartFileEntity> {
+
+
+    List<NxSparePartVo> getSparePart(String orderId);
+
+    String getSparePartBySbbm(NxSparePartVo e);
+
+    NxSparePartVo getSparePartBySbbmAndStatus(@Param("partSbbm") String partSbbm, @Param("partBjbm") String partBjbm, @Param("partAzwh") String partAzwh);
+
+    void updateSparePart(NxSparePartVo e);
+
+    void updateNxSparePartGzsc(NxSparePartVo e);
+
+    void insertSparePart(NxSparePartVo e);
+
+    void importSparePart(NxSparePartVo e);
+
+    List<NxSparePartVo> getSparePartByAzwh(NxSparePartVo e);
+
+    void updateNxSparePart(NxSparePartVo e1);
+
+    String getxtmkBypjbm(NxSparePartVo e);
+
+
+    String getxtmkBypjbm2(NxSparePartVo e);
+
+    List<NxSparePartVo> getOrderData(@Param("sbId") String sbId, @Param("partId") String partId);
+
+
+    List<NxSparePartVo> getSparePartBySbbmAndPjbm(NxSparePartVo e);
+
+    List<NxSparePartEntity> getDataByPartSbidAndPartBjbm(Map<String, Object> maps);
+
+    List<NxSparePartEntity> getDataByPartSbidAndPartBjbmAndPartAzrq(Map<String, Object> maps);
+
+    String getWorkingHours(@Param("partSbid") String partSbid, @Param("partAzrq") String partAzrq, @Param("partGhrq") String partGhrq);
+
+    void updateData(@Param("nxSparePartId") String nxSparePartId, @Param("partGhrq") String partGhrq, @Param("partGzsc") String partGzsc);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/SparePartMapper.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/SparePartMapper.java
new file mode 100644
index 0000000..d495252
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/SparePartMapper.java
@@ -0,0 +1,24 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.dto.NxSparePartVo;
+import com.rootcloud.domain.entity.NxSparePartEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+@Mapper
+public interface SparePartMapper extends BaseMapper<NxSparePartEntity> {
+
+    /**
+     * 补充租户id
+     */
+    void updateZhid();
+    List<NxSparePartVo> selectNoSyncPart();
+    void updateWorkTime(@Param("id") String nxSparePartId);
+    void updateWorkTime2(@Param("id") String nxSparePartId, @Param("gzsc") BigDecimal partGzsc);
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/TechnicalTaskDAO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/TechnicalTaskDAO.java
new file mode 100644
index 0000000..86966f2
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/TechnicalTaskDAO.java
@@ -0,0 +1,22 @@
+package com.rootcloud.domain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rootcloud.domain.vo.TechnicalTaskVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TechnicalTaskDAO {
+
+    int addTechnicalTaskData(TechnicalTaskVO vo);
+
+    List<TechnicalTaskVO> findTechnicalTaskList(TechnicalTaskVO vo);
+
+    List<TechnicalTaskVO> findTechnicalTaskList2(@Param("tenantId") String tenantId,
+                                                 @Param("customerCode") String customerCode,@Param("deviceCode") String deviceCode);
+    int updateTechnicalTaskStatus(TechnicalTaskVO vo);
+
+    int updateTechnicalTask(TechnicalTaskVO vo);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/UserRoleDao.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/UserRoleDao.java
new file mode 100644
index 0000000..d33b450
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/mapper/UserRoleDao.java
@@ -0,0 +1,12 @@
+package com.rootcloud.domain.mapper;
+
+import com.rootcloud.domain.vo.UserRoleVO;
+import org.apache.ibatis.annotations.Mapper;
+
+
+import java.util.List;
+
+@Mapper
+public interface UserRoleDao {
+    List<UserRoleVO> getUseListByRoleInfo(UserRoleVO vo);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/model/LappLiveCondition.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/model/LappLiveCondition.java
new file mode 100644
index 0000000..e713d82
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/model/LappLiveCondition.java
@@ -0,0 +1,36 @@
+package com.rootcloud.domain.model;
+
+import com.rootcloud.common.NotBlank;
+import com.rootcloud.common.Validate;
+import io.swagger.annotations.ApiModelProperty;
+
+@Validate
+public class LappLiveCondition {
+
+    /** 设备序列号 */
+    @ApiModelProperty(value = "设备序列号", required = true)
+    @NotBlank(message="设备序列号不可以为空")
+    private String deviceSerial;
+
+    /** 通道号 */
+    @ApiModelProperty(value = "通道号", required = true)
+    @NotBlank(message="通道号不能为空")
+    private String channelNo;
+
+    public String getDeviceSerial() {
+        return deviceSerial;
+    }
+
+    public void setDeviceSerial(String deviceSerial) {
+        this.deviceSerial = deviceSerial;
+    }
+
+    public String getChannelNo() {
+        return channelNo;
+    }
+
+    public void setChannelNo(String channelNo) {
+        this.channelNo = channelNo;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/model/WorkStatusMonitorModel.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/model/WorkStatusMonitorModel.java
new file mode 100644
index 0000000..de96757
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/model/WorkStatusMonitorModel.java
@@ -0,0 +1,34 @@
+package com.rootcloud.domain.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author LiPingAn 2022/4/18 15:36
+ * @version 1.0
+ **/
+@Data
+public class WorkStatusMonitorModel {
+
+    private String propertyId;
+    //属性名称
+    private String propertyName;
+    //属性数据类型
+    private String propertyDataType;
+    //属性值
+    private String propertyData;
+    //属性值单位
+    private String propertyDataUnit;
+    //物模型ID
+    private String modelId;
+    //属性标签
+    private String propertyTag;
+    //属性值对应颜色0
+    private String propertyColorFalse;
+    //属性值对应颜色1
+    private String propertyColorTrue;
+    //唯一的id
+    private String id;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/app/MyAdviceService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/app/MyAdviceService.java
new file mode 100644
index 0000000..e4fcbd4
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/app/MyAdviceService.java
@@ -0,0 +1,16 @@
+package com.rootcloud.domain.service.app;
+
+import com.github.pagehelper.PageInfo;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.PageRequest;
+import com.rootcloud.domain.entity.MyAdviceEntity;
+import com.rootcloud.vo.app.AdviceResultVo;
+
+import java.util.Map;
+
+public interface MyAdviceService {
+    JsonResult<PageInfo<MyAdviceEntity>> getMyAdvices(PageRequest pageRequest, String userId, String type);
+
+    void eqMesSfjj(String id, String type);
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/app/MyMessageService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/app/MyMessageService.java
new file mode 100644
index 0000000..cae0ba2
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/app/MyMessageService.java
@@ -0,0 +1,21 @@
+package com.rootcloud.domain.service.app;
+
+import com.github.pagehelper.PageInfo;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.PageRequest;
+import com.rootcloud.domain.entity.MyMessageEntity;
+import com.rootcloud.vo.app.MessageResultVo;
+
+import java.util.Map;
+
+public interface MyMessageService {
+    MessageResultVo getMyMessage(String userId, String type);
+
+    MessageResultVo getMyAlrmMessage(String userId, String type);
+
+    JsonResult<PageInfo<MyMessageEntity>> getOrderMessage(PageRequest pageRequest, String userId, String type);
+
+    void mesSfjj(String orderId);
+
+    void serMesSfjj(String id, String type);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/app/impl/MyAdviceServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/app/impl/MyAdviceServiceImpl.java
new file mode 100644
index 0000000..f2688b0
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/app/impl/MyAdviceServiceImpl.java
@@ -0,0 +1,123 @@
+package com.rootcloud.domain.service.app.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.PageInfo;
+import com.rootcloud.common.DateUtil;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.PageRequest;
+import com.rootcloud.common.enums.ServicePlanEnums;
+import com.rootcloud.config.auth.UserInfo;
+import com.rootcloud.domain.entity.MyAdviceEntity;
+import com.rootcloud.domain.entity.MyMessageEntity;
+import com.rootcloud.domain.entity.NxSparePartEntity;
+import com.rootcloud.domain.entity.ds.DeviceListEntity;
+import com.rootcloud.domain.mapper.NxOrderMapper;
+import com.rootcloud.domain.mapper.ServicePlanMapper;
+import com.rootcloud.domain.service.app.MyAdviceService;
+import com.rootcloud.domain.service.device.DeviceService;
+import com.rootcloud.domain.service.ds.DeviceListSyncService;
+import com.rootcloud.domain.service.fittings.SparePartService;
+import com.rootcloud.domain.service.gbsj.JeCoreEnduserService;
+import com.rootcloud.domain.service.sp.ServicePlanService;
+import com.rootcloud.vo.app.AdviceResultVo;
+import jline.internal.Log;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service("myAdviceServiceImpl")
+public class MyAdviceServiceImpl implements MyAdviceService {
+    @Resource(name = "servicePlanServiceImpl")
+    private ServicePlanService servicePlanService;
+    @Resource(name = "sparePartServiceImpl")
+    private SparePartService sparePartService;
+    @Resource(name = "deviceListSyncService2")
+    private DeviceListSyncService deviceListSyncService;
+    @Resource(name = "deviceServiceImpl")
+    private DeviceService deviceService;
+    @Resource(name = "endUserService")
+    private JeCoreEnduserService enduserService;
+    @Autowired
+    ServicePlanMapper servicePlanMapper;
+    @Resource
+    private NxOrderMapper nxOrderMapper;
+
+    @Override
+    public JsonResult<PageInfo<MyAdviceEntity>> getMyAdvices(PageRequest pageRequest, String userId, String type) {
+        int pageNum = pageRequest.getPage() == null ? 1 : pageRequest.getPage();
+        int pageSize = pageRequest.getSize() == null ? 10 : pageRequest.getSize();
+        int startIndex = (pageNum - 1) * pageSize;
+        Integer count = 0;
+        UserInfo userInfo = enduserService.getUser(userId);
+        AdviceResultVo adviceResultVo = new AdviceResultVo();
+        List<MyAdviceEntity> myAdviceEntityList = new ArrayList<>();
+
+        //todo 设备状态提醒通知
+/*        if(deviceListEntities.isEmpty()){
+            adviceResultVo.setAdviceEntityList(myAdviceEntityList);
+            adviceResultVo.setAdviceCount(String.valueOf(myAdviceEntityList.size()));
+            return adviceResultVo;
+        }*/
+        //保养提醒
+        List<MyAdviceEntity> planList = new ArrayList<>();
+        if (ServicePlanEnums.MessageType.MAINTENANCE_REMINDERS.getCode().equals(type) || StringUtils.isBlank(type)) {
+            planList = servicePlanService.getmMaintainPlanService(userId, startIndex, pageSize);
+            //count+=servicePlanMapper.countByUserId(userId);
+            List<MyAdviceEntity> planListCount = servicePlanService.getmMaintainPlanService(userId, 0, 10000000);
+            if (planListCount != null && planListCount.size() > 0) {
+                count += planListCount.size();
+            }
+        }
+        //配件寿命预警提醒
+        List<MyAdviceEntity> partList = new ArrayList<>();
+        if (ServicePlanEnums.MessageType.SPARE_PARTS_LIFE_WARNING_REMINDER.getCode().equals(type) || StringUtils.isBlank(type)) {
+            //根据用户id获取所归属的设备信息
+            List<DeviceListEntity> deviceListEntities = deviceListSyncService.queryDeviceList(userId);
+            //Log.info("查询通知用户ID：" + userId + "设备数量：" + deviceListEntities.size());
+            if (!deviceListEntities.isEmpty()) {
+                partList = sparePartService.getWarnedSparePart(deviceListEntities, startIndex, pageSize, userInfo.getTenantId());
+                List<String> deviceCodes = deviceListEntities.stream().map(DeviceListEntity::getNxJcxxSblbId).collect(Collectors.toList());
+
+                HashMap<String, Object> req = new HashMap<>();
+                req.put("startTime", DateUtil.format(DateUtil.rollDay(new Date(), -3)));
+                req.put("endTime", DateUtil.format(new Date()));
+                req.put("deviceCodes", deviceCodes);
+                count += nxOrderMapper.countSpartPartList(req);
+            }
+        }
+        if (StringUtils.isBlank(type)) {
+            myAdviceEntityList.addAll(planList);
+            myAdviceEntityList.addAll(partList);
+        } else {
+            if (ServicePlanEnums.MessageType.MAINTENANCE_REMINDERS.getCode().equals(type)) {
+                myAdviceEntityList.addAll(planList);
+            }
+            if (ServicePlanEnums.MessageType.SPARE_PARTS_LIFE_WARNING_REMINDER.getCode().equals(type)) {
+                myAdviceEntityList.addAll(partList);
+//                Log.info("最终备件寿命预警消息",JSON.toJSON(partList));
+            }
+        }
+
+        PageInfo<MyAdviceEntity> pageInfo = new PageInfo<>(myAdviceEntityList);
+        pageInfo.setPageNum(pageNum);
+        pageInfo.setPageSize(pageSize);
+        pageInfo.setTotal(count);
+        return JsonResult.success(pageInfo);
+    }
+
+    @Override
+    public void eqMesSfjj(String id, String type) {
+        if (ServicePlanEnums.MessageType.MAINTENANCE_REMINDERS.getCode().equals(type)) {
+            servicePlanService.eqMesSfjj(id);
+        }
+        if (ServicePlanEnums.MessageType.SPARE_PARTS_LIFE_WARNING_REMINDER.getCode().equals(type)) {
+            sparePartService.eqMesSfjj(id);
+        }
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/app/impl/MyMessageServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/app/impl/MyMessageServiceImpl.java
new file mode 100644
index 0000000..a3a63fd
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/app/impl/MyMessageServiceImpl.java
@@ -0,0 +1,195 @@
+package com.rootcloud.domain.service.app.impl;
+
+import com.github.pagehelper.PageInfo;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.PageRequest;
+import com.rootcloud.common.constant.RoleIdConstant;
+import com.rootcloud.common.enums.ServicePlanEnums;
+import com.rootcloud.config.auth.UserInfo;
+import com.rootcloud.domain.entity.MyMessageEntity;
+import com.rootcloud.domain.entity.SiteDTO;
+import com.rootcloud.domain.entity.ds.DeviceListEntity;
+import com.rootcloud.domain.mapper.NxOrderMapper;
+import com.rootcloud.domain.service.app.MyMessageService;
+import com.rootcloud.domain.service.device.DeviceAlarmService;
+import com.rootcloud.domain.service.ds.DeviceListSyncService;
+import com.rootcloud.domain.service.gbsj.JeCoreEnduserService;
+import com.rootcloud.domain.service.order.OrderService;
+import com.rootcloud.vo.app.MessageResultVo;
+import jline.internal.Log;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Service("myMessageServiceImpl")
+public class MyMessageServiceImpl implements MyMessageService {
+    @Resource(name = "deviceListSyncService2")
+    private DeviceListSyncService deviceListSyncService;
+    @Resource(name="deviceAlarmServiceImpl")
+    private DeviceAlarmService deviceAlarmService;
+    @Resource(name = "orderServiceImpl")
+    private OrderService orderService;
+    @Resource(name = "endUserService")
+    private JeCoreEnduserService enduserService;
+    @Autowired
+    private NxOrderMapper nxOrderMapper;
+
+    /**
+     * 获取合同及结算消息通知
+     * @param userId
+     * @param type
+     * @return
+     */
+    @Override
+    public MessageResultVo getMyMessage(String userId,String type) {
+        MessageResultVo messageResultVo = new MessageResultVo();
+        List<MyMessageEntity> messageEntityList = new ArrayList<>();
+        //根据角色获取合同结算通知
+        UserInfo userInfo = enduserService.getUser(userId);
+        String roleIds = userInfo.getRoleIds();
+        String userIds = null;
+        List<String> userIdList = new ArrayList<>();
+//        Log.info("登录用户权限 ==>{}",roleIds);
+        if (roleIds.contains(RoleIdConstant.KHLD) || roleIds.contains(RoleIdConstant.KH)){
+            //userIdList.add(userId);
+            String custom = enduserService.getCustomsByUserId(userId);
+            if(StringUtils.isNotBlank(custom)){
+                userIdList.add(custom);
+            }
+        }
+        if (roleIds.contains(RoleIdConstant.FWJL)){
+            SiteDTO siteByUserId = enduserService.getSiteByUserId(userId);
+            if(!ObjectUtils.isEmpty(siteByUserId)){
+                String[] strings = siteByUserId.getServiceArea().split(",");
+                for (int i = 0; i < strings.length; i++) {
+                    String areaName = strings[i];
+                    String customs = enduserService.getCustomsBySiteAreaName(areaName);
+                    if(StringUtils.isNotBlank(customs)){
+                        userIdList.add(customs);
+                    }
+                }
+            }
+        }
+        if(roleIds.contains(RoleIdConstant.SHLD) || roleIds.contains(RoleIdConstant.GLY)){
+            userIdList = new ArrayList<>();
+        }
+        if(userIdList.size()>0){
+            userIds = String.join(",", userIdList);
+        }
+
+
+        //合同及结算消息通知
+        List<MyMessageEntity> jsMessages = new ArrayList<>();
+        List<MyMessageEntity> fwMessages = new ArrayList<>();
+        jsMessages = orderService.jsGetByUserId(userIds);
+        fwMessages = orderService.fwGetByUserId(userIds);
+
+        messageEntityList.addAll(jsMessages);
+        messageEntityList.addAll(fwMessages);
+
+//        Log.info("查询结果messageEntityList ==>{}",JSON.toJSONString(messageEntityList));
+        messageResultVo.setMessageCount(String.valueOf(messageEntityList.size()));
+        messageResultVo.setMessageEntityList(messageEntityList);
+        return messageResultVo;
+    }
+
+    /**
+     * 获取报警故障信息
+     * @param userId
+     * @return
+     */
+    @Override
+    public MessageResultVo getMyAlrmMessage(String userId, String type) {
+        MessageResultVo messageResultVo = new MessageResultVo();
+        List<MyMessageEntity> messageEntityList = new ArrayList<>();
+
+        //根据用户id获取所归属的设备信息
+        List<DeviceListEntity> deviceListEntities = deviceListSyncService.queryDeviceList(userId);
+        //Log.info("获取到设备ID："+JSON.toJSONString(lista));
+        //报警信息
+        List<MyMessageEntity> alarmMessages = new ArrayList<>();
+        List<MyMessageEntity> alarmMes = new ArrayList<>();
+        if(!deviceListEntities.isEmpty()) {
+            alarmMes = deviceAlarmService.queryAlarmMessages(deviceListEntities);
+            alarmMessages.addAll(alarmMes);
+           /* List<List<DeviceListEntity>> lists = splitListByCount(deviceListEntities, 50);
+            Log.info("获取lists ==>{}",lists.size());
+            for (List<DeviceListEntity> list:lists) {
+                alarmMes = deviceAlarmService.queryAlarmMessages(list);
+                alarmMessages.addAll(alarmMes);
+            }*/
+        }
+
+        messageEntityList.addAll(alarmMessages);
+        Log.info("查询结果messageEntityList ==>{}",messageEntityList.size());
+        messageResultVo.setMessageCount(String.valueOf(messageEntityList.size()));
+        if(ServicePlanEnums.MessageType.FAULT_ALARM.getCode().equals(type)){
+            messageResultVo.setMessageEntityList(messageEntityList);
+        }
+
+        return messageResultVo;
+    }
+
+    @Override
+    public JsonResult<PageInfo<MyMessageEntity>> getOrderMessage(PageRequest pageRequest, String userId, String type) {
+        int pageNum = pageRequest.getPage() == null ? 1 : pageRequest.getPage();
+        int pageSize = pageRequest.getSize() == null ? 10 : pageRequest.getSize();
+        int startIndex  = (pageNum -1 ) * pageSize;
+        //根据角色获取合同结算通知
+        UserInfo userInfo = enduserService.getUser(userId);
+        MessageResultVo messageResultVo = new MessageResultVo();
+        List<MyMessageEntity> orderMessages = orderService.selectByUserId(userInfo.getTenantId(),userId,type,startIndex,pageSize);
+        messageResultVo.setMessageCount(String.valueOf(orderMessages.size()));
+        messageResultVo.setMessageEntityList(orderMessages);
+
+        Integer count = nxOrderMapper.countByUserId(userInfo.getTenantId(),userId,type);
+
+        PageInfo<MyMessageEntity> pageInfo = new PageInfo<>(orderMessages);
+        pageInfo.setPageNum(pageNum);
+        pageInfo.setPageSize(pageSize);
+        pageInfo.setTotal(count);
+
+        return JsonResult.success(pageInfo);
+    }
+
+    @Override
+    public void mesSfjj(String orderId) {
+        orderService.mesSfjj(orderId);
+    }
+
+    @Override
+    public void serMesSfjj(String id, String type) {
+        //合同或清算 0：合同，1：结算
+        if("0".equals(type)){
+            orderService.htSerMesSfjj(id);
+        }else{
+            orderService.jsSerMesSfjj(id);
+        }
+    }
+
+    public List<List<DeviceListEntity>> splitListByCount(List<DeviceListEntity> list,int count) {
+        List<List<DeviceListEntity>> listAll = new ArrayList<>();
+        int size = list.size();
+        if(size > count){
+            int absInt = Math.abs(size/count);
+            if(size - absInt * count > 0){
+                listAll.add(list.subList(absInt*count,size));
+            }
+            for (int i =1;i<absInt+1;i++){
+                listAll.add(list.subList((i-1)*count,i*count));
+            }
+        }else{
+            listAll.add(list);
+        }
+        return  listAll;
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/auth/RootCloudAuthService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/auth/RootCloudAuthService.java
new file mode 100644
index 0000000..75f38b2
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/auth/RootCloudAuthService.java
@@ -0,0 +1,58 @@
+package com.rootcloud.domain.service.auth;
+
+
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.OAuthResult;
+
+import java.util.Map;
+
+/**
+ * 认证授权
+ */
+
+public interface RootCloudAuthService {
+
+    /**
+     * ouath2.0 passsword 验证方式
+     *
+     * @param username
+     * @param desEncrypt
+     * @return
+     */
+    public OAuthResult login(String username, String desEncrypt, String code);
+    public String getUserProfile(String accessToken);
+    public String publicKey();
+    public String logout(String accessToken);
+    /**
+     * 客户端模式认证
+     *
+     * @return
+     */
+
+    public OAuthResult clientCredentials() ;
+
+    /**
+     * 刷新token
+     *
+     * @param refreshToken
+     * @return
+     */
+
+    public OAuthResult refreshAccessToken(String refreshToken) ;
+
+    public OAuthResult switchTenant(String tenantId, String accessToken);
+
+    /**
+     * 获取验证码 逻辑：当用户在小程序页面输入手机号点击获取验证码，判断该用户是否存在。如果存在，直接后端调用应用大师发送验证码接口
+     * 如果不存在，后端调用应用大师注册用户接口，先注册用户再调发送验证码接口
+     * @return
+     */
+    JsonResult<Object> getCode(Map<String, Object> param);
+
+    JsonResult<Object> findPassWord(Map<String, Object> param);
+
+    JsonResult<Object> modifyPassWord(Map<String, Object> param);
+
+    //更新邮箱
+    JsonResult<Object> updateEmail(Map<String, Object> param);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/auth/RootCloudAuthServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/auth/RootCloudAuthServiceImpl.java
new file mode 100644
index 0000000..3e7b4ac
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/auth/RootCloudAuthServiceImpl.java
@@ -0,0 +1,464 @@
+package com.rootcloud.domain.service.auth;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.rootcloud.common.*;
+import com.rootcloud.common.constant.Properties;
+import com.rootcloud.common.enums.HttpRequestMethedEnum;
+import com.rootcloud.domain.dao.JeCoreEnduserDao;
+import com.rootcloud.domain.entity.JeCoreEnduserEntity;
+import com.rootcloud.domain.mapper.CommonMapper;
+import com.rootcloud.domain.service.gbsj.JeCoreEnduserService;
+import jline.internal.Log;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+
+import javax.annotation.Resource;
+import java.util.Base64.Encoder;
+import java.util.Base64.Decoder;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 认证授权
+ */
+@Component("cloudAuthService")
+public class RootCloudAuthServiceImpl implements RootCloudAuthService {
+
+    private final Logger logger = LoggerFactory.getLogger(RootCloudAuthServiceImpl.class);
+
+    @Autowired
+    private OAuth2Properties auth2Properties;
+
+    private static final String ROOT_CLOUD_CODE = "code";
+
+    @Autowired
+    Request request;
+
+    @Autowired
+    Properties wfProperties;
+
+    @Resource(name = "endUserService")
+    private JeCoreEnduserService enduserService;
+
+    @Autowired
+    JeCoreEnduserDao enduserDao;
+
+    @Autowired
+    private CommonMapper commonMapper;
+
+
+    /**
+     * ouath2.0 passsword 验证方式
+     *
+     * @param username
+     * @param desEncrypt
+     * @return
+     */
+    @Override
+    public OAuthResult login(String username, String desEncrypt, String code) {
+        //判断用户是否为平行租户账户
+        LambdaQueryWrapper<JeCoreEnduserEntity> mpeWrapper = new LambdaQueryWrapper<JeCoreEnduserEntity>();
+        mpeWrapper.eq(JeCoreEnduserEntity::getBackusercode,username);
+        mpeWrapper.like(JeCoreEnduserEntity::getUserid, "~");
+        mpeWrapper.last("limit 1");
+        List<JeCoreEnduserEntity> one = enduserDao.selectList(mpeWrapper);
+        if (one != null&&one.size()>0&&!username.contains("@")) {
+            String url = auth2Properties.getWebClientConfiguration().getServerApiPrefix() + "/account-manage/v1/auth/login";
+            Map<String, String> map = getClientInfo("password");
+            //20221109 替换用户当前租户下CLIENT_ID和CLIENT_SECRET
+            Map<String,String> rootClient = commonMapper.getRootClient(one.get(0).getZhid());
+            if(rootClient!=null) {
+                if(StringUtils.isNotEmpty(rootClient.get("CLIENT_ID"))&&StringUtils.isNotEmpty(rootClient.get("CLIENT_SECRET"))){
+                    map.put("client_id",rootClient.get("CLIENT_ID"));
+                    map.put("client_secret",rootClient.get("CLIENT_SECRET"));
+                }
+            }
+            map.put("username", username);
+            map.put("password", desEncrypt);
+            Log.info("登录" + map);
+            JSONObject res = request.requestPost(url, map);
+            if (res != null) {
+                return solveToken(res);
+            }
+        }
+        //PingAn.Li 新增当根云用户无法登陆时，去登录应用大师
+        String jpLoginUrl = wfProperties.getWfHost() + "/rbac/login/login";
+        String encodeUserName = "";
+        String encodePassword = "";
+        try {
+            Encoder encoder = Base64.getEncoder();
+//            encodeUserName = new BASE64Encoder().encode(new BASE64Encoder().encode(username.getBytes("UTF-8")).getBytes("UTF-8"));
+            encodeUserName = encoder.encodeToString(encoder.encodeToString(username.getBytes("UTF-8")).getBytes("UTF-8"));
+            encodePassword = encoder.encodeToString(encoder.encodeToString(desEncrypt.getBytes("UTF-8")).getBytes("UTF-8"));
+//            encodePassword = new BASE64Encoder().encode(new BASE64Encoder().encode(desEncrypt.getBytes("UTF-8")).getBytes("UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/x-www-form-urlencoded");
+        String body = "u=" + encodeUserName + "&p=" + encodePassword+ "&loginType=MAPP";
+        if(StringUtils.isNotEmpty(code)){
+            body+="&code=" + code;
+        }
+        HttpEntity<String> requestJp = new HttpEntity<>(body, headers);
+//        RestTemplate restTemplate = new RestTemplate();
+//        ResponseEntity<String> entity = restTemplate.postForEntity(jpLoginUrl, requestJp, String.class);
+        ResponseEntity<String> entity = request.requestForJP(jpLoginUrl, requestJp);
+        JSONObject jpRes = JSONObject.parseObject(entity.getBody());
+        Log.info("登录返回值:" + jpRes);
+        if (jpRes != null && jpRes.getBoolean("success")) {
+            return solveTokenByJP(jpRes);
+        } else if (jpRes != null && ("WARNLOCKED".equals(jpRes.getString("code"))||"WARNCODE".equals(jpRes.getString("code")))) {
+            OAuthResult result = new OAuthResult("");
+            result.setCode("WARNLOCKED");
+            result.setValue(jpRes.getString("obj"));
+            result.setMessage(jpRes.getString("message"));
+            return result;
+        }
+        return null;
+    }
+
+    @Override
+    public String getUserProfile(String accessToken) {
+        if (null == accessToken || "".equals(accessToken)) {
+            return "";
+        }
+        String[] splitToken = accessToken.split("\\.");
+        byte[] bt = Base64.getUrlDecoder().decode(splitToken[1]);
+        JSONObject jsonObject = JSONObject.parseObject(bt, JSONObject.class);
+        return jsonObject.getJSONObject("user").getString("id");
+    }
+
+
+    @Override
+    public String publicKey() {
+        String url = auth2Properties.getWebClientConfiguration().getServerApiPrefix() + "/system/public-key";
+        return request.requestCasGet(url, null).getString("publicKey");
+    }
+
+    @Override
+    public String logout(String accessToken) {
+        if (accessToken.length() < 60) {
+            String jpLoginUrl = wfProperties.getWfHost() + "/je/j_spring_security_logout";
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("authorization", accessToken);
+            HttpEntity<String> requestJp = new HttpEntity<>(null, headers);
+            try {
+                ResponseEntity<String> response = request.requestForJP(jpLoginUrl, requestJp);
+                String body=response.getBody();
+                Log.info("退出登录je/j_spring_security_logout返回值："+body);
+            } catch (Exception e) {
+                logger.error("退出登录异常：", e);
+            }
+        } else {
+            String url = auth2Properties.getWebClientConfiguration().getServerApiPrefix() + "/account-manage/v1/auth/logout";
+            MultiValueMap<String, String> headers = iamAuthorization(accessToken);
+            Map<String, String> map = new HashMap<>();
+            try {
+                JSONObject  jsonResult =request.request(url, HttpMethod.POST, headers, map);
+                Log.info("退出登录account-manage/v1/auth/logout返回值："+jsonResult.toJSONString());
+
+            } catch (Exception e) {
+                logger.error("退出登录异常：", e);
+            }
+        }
+        return null;
+    }
+
+
+    /**
+     * 客户端模式认证
+     *
+     * @return
+     */
+    @Override
+    public OAuthResult clientCredentials() {
+        String url = auth2Properties.getWebClientConfiguration().getServerApiPrefix() + "/openapi/v1/auth/login";
+        Map<String, String> map = getClientInfo("client_credentials");
+        if (StringUtils.isBlank(auth2Properties.getWebClientConfiguration().getPhoenixClientId())) {
+            return null;
+        }
+        map.put("client_id", auth2Properties.getWebClientConfiguration().getPhoenixClientId());
+        map.put("client_secret", auth2Properties.getWebClientConfiguration().getPhoenixSecret());
+        JSONObject res = request.requestPost(url, map);
+        if (res == null) {
+            return null;
+        }
+
+        return solveToken(res);
+    }
+
+    /**
+     * 刷新token
+     *
+     * @param refreshToken
+     * @return
+     */
+    @Override
+    public OAuthResult refreshAccessToken(String refreshToken) {
+        String url = auth2Properties.getWebClientConfiguration().getServerApiPrefix() + "/openapi/v1/auth/login";
+        Map<String, String> map = getClientInfo("refresh_token");
+        map.put("refresh_token", refreshToken);
+        JSONObject res = request.requestPost(url, map);
+        if (res == null) {
+            return null;
+        }
+
+        return solveToken(res);
+    }
+
+    @Override
+    public OAuthResult switchTenant(String tenantId, String accessToken) {
+        String url = auth2Properties.getWebClientConfiguration().getServerApiPrefix() + "/openapi/v1/auth/change-active-organization";
+        Map<String, String> map = new HashMap<>(1);
+        map.put("organization", tenantId);
+        JSONObject res = null;
+        try {
+            MultiValueMap<String, String> headers = iamAuthorization(accessToken);
+            res = request.request(url, HttpMethod.POST, headers, map);
+        } catch (Exception e) {
+            logger.error("切换租户异常：", e);
+        }
+        if (res == null) {
+            return null;
+        }
+        return solveToken(res);
+    }
+
+    private MultiValueMap<String, String> iamAuthorization(String accessToken) {
+        MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
+        headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE);
+        headers.add(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_UTF8_VALUE);
+        headers.add("authorization", String.format("Bearer %s", accessToken));
+        return headers;
+    }
+
+    private OAuthResult solveToken(JSONObject res) {
+        // String accessToken = res.getString("access_token");
+        //String refreshToken = res.getString("refresh_token");
+        OAuthResult oAuth2AccessToken = new OAuthResult(res);
+        oAuth2AccessToken.setAdditionalInformation(new HashMap<>(1));
+
+        if (res.getString(ROOT_CLOUD_CODE) != null) {
+            oAuth2AccessToken.getAdditionalInformation().put(ROOT_CLOUD_CODE, res.getString(ROOT_CLOUD_CODE));
+            oAuth2AccessToken.setValue(res.getString(Request.X_ROOTCLOUD_SETPW_TOKEN));
+        }
+
+        return oAuth2AccessToken;
+    }
+
+    private OAuthResult solveTokenByJP(JSONObject res) {
+        OAuthResult oAuth2AccessToken = new OAuthResult(res.getString("obj"));
+        oAuth2AccessToken.setAdditionalInformation(new HashMap<>(1));
+        if (res.getString(ROOT_CLOUD_CODE) != null) {
+            oAuth2AccessToken.getAdditionalInformation().put(ROOT_CLOUD_CODE, res.getString(ROOT_CLOUD_CODE));
+            oAuth2AccessToken.setValue(res.getString(Request.X_ROOTCLOUD_SETPW_TOKEN));
+        }
+        return oAuth2AccessToken;
+    }
+
+    private Map<String, String> getClientInfo(String grantType) {
+        Map<String, String> map = new HashMap<>(6);
+        map.put("client_id", auth2Properties.getWebClientConfiguration().getClientId());
+        map.put("client_secret", auth2Properties.getWebClientConfiguration().getSecret());
+        map.put("grant_type", grantType);
+        return map;
+    }
+
+
+    /**
+     * 获取验证码 逻辑：当用户在小程序页面输入手机号点击获取验证码，判断该用户是否存在。如果存在，直接后端调用应用大师发送验证码接口
+     * 如果不存在，后端调用应用大师注册用户接口，先注册用户再调发送验证码接口
+     *
+     * @return
+     */
+    @Override
+    public JsonResult<Object> getCode(Map<String, Object> param) {
+
+        String phone = param.get("phoneNumber").toString();
+        String cz ="LOGIN";
+        if(param.get("cz")!=null){
+            cz = param.get("cz").toString();
+        }
+        String type ="PHONE";
+        if(param.get("type")!=null){
+            type = param.get("type").toString();
+        }
+        //验证码路径
+        String jpLoginUrl = wfProperties.getWfHost() + "/rbac/login/sendRandom";
+        //用户注册路径
+        String registerUserUrl = wfProperties.getWfHost() + "/je/rbac/user/registerUser";
+        //判断当前用户存不存在
+        boolean flag = enduserService.getBackusercode(phone);
+        if (flag) {
+            //20221015 如果移动端发送验证码则直接返回
+            if ("MRZ".equals(cz)){
+                if ("PHONE".equals(type)) {
+                    return JsonResult.failed("500", "该手机号已被其他用户使用!");
+                } else if ("EMAIL".equals(type)) {
+                    return JsonResult.failed("500", "该邮箱已被其他用户使用!");
+                }
+            }
+            //存在，直接调用应用大师获取验证码
+            Map<String, String> maps = new HashMap<>();
+            maps.put("email", phone);
+            maps.put("type", type);
+            maps.put("cz", cz);
+            String str = HttpUtils.post(jpLoginUrl, maps);
+            return JsonResult.success(str);
+        } else {
+            //20221015 直接发送验证码不注册
+            Map<String, String> maps = new HashMap<>();
+            maps.put("email", phone);
+            maps.put("type", type);
+            maps.put("cz", cz);
+            String strs = HttpUtils.post(jpLoginUrl, maps);
+            return JsonResult.successOK(strs,"发送成功");
+            //20221031 注释自动注册账户逻辑
+//            String roleCode = enduserService.getDataByKey("ROLECODE");
+//            String deptCode = enduserService.getDataByKey("DEPTCODE");
+//            String pwd = enduserService.getDataByKey("PASSWORD");
+//            String str = "ROLECODE=" + roleCode + "&DEPTCODE=" + deptCode + "&USERNAME=" + phone + "&PASSWORD=" + pwd + "&BACKUSERCODE=" + phone;
+//            //注册
+//            String res = HttpClientUtil.getPostRaw(registerUserUrl, str);
+//            logger.info("注册结果：{}", res);
+//            JSONObject object = JSONObject.parseObject(res);
+//            if (object.containsKey("code")) {
+//                String code = object.getString("code");
+//                if (code.equals("1000")) {
+//                    //发送验证码
+//                    Map<String, String> maps = new HashMap<>();
+//                    maps.put("email", phone);
+//                    maps.put("type", type);
+//                    maps.put("cz", cz);
+//                    String strs = HttpUtils.post(jpLoginUrl, maps);
+//                    return JsonResult.successOK(strs,"发送成功");
+//                }
+//            }
+
+        }
+        //return JsonResult.failed("500","发送失败");
+    }
+
+    @Override
+    public JsonResult<Object> findPassWord(Map<String, Object> param) {
+        Map<String, String> header = new HashMap<>();
+        String modifyPwUrl = wfProperties.getWfHost() + "/rbac/login/modifyPw";
+        String type ="PHONE";
+        if(param.get("type")!=null){
+            type = param.get("type").toString();
+        }
+        Map<String,String> sendParam = new HashMap<>();
+        sendParam.put("code",param.get("validateCode").toString());
+        sendParam.put("type",type);
+        sendParam.put("d","");
+        sendParam.put("u",param.get("mobile").toString());
+        sendParam.put("p",param.get("password").toString());
+
+        Log.info("找回密码参数"+param);
+        String strs = HttpClientUtil.postForm(modifyPwUrl, sendParam,header);
+        Log.info("找回密码："+strs);
+
+        JSONObject object = JSONObject.parseObject(strs);
+        if (object.containsKey("code")) {
+            String code = object.getString("code");
+            if (code.equals("1000")) {
+                return JsonResult.successOK(strs,"重置成功");
+            }
+        }
+        return JsonResult.failed("500","找回失败");
+
+    }
+
+    @Override
+    public JsonResult<Object> modifyPassWord(Map<String, Object> param) {
+        Map<String, String> header = new HashMap<>();
+        header.put("authorization",param.get("Authorization").toString());
+        String type ="PHONE";
+        if(param.get("type")!=null){
+            type = param.get("type").toString();
+        }
+        //验证-验证码url
+        String validateUrl = wfProperties.getWfHost() + "/rbac/login/validateRandom";
+        Map<String,String> validateMap = new HashMap();
+        validateMap.put("email",param.get("mobileEmail").toString());
+        validateMap.put("type",type);
+        validateMap.put("cz",param.get("cz").toString());
+        validateMap.put("code",param.get("vcCode").toString());
+        Log.info("修改密码-验证码,参数"+validateMap+header);
+        String validatestr = HttpClientUtil.postForm(validateUrl, validateMap,header);
+
+        Log.info("修改密码-验证码返回值："+validatestr);
+        JSONObject object = JSONObject.parseObject(validatestr);
+        if (object.containsKey("code")) {
+            String code = object.getString("code");
+            if (!code.equals("1000")) {
+                String message =object.getString("message");
+                return JsonResult.failed("500",message);
+            }
+        }
+        Map<String, String> modifyPwparam = new HashMap<>();
+        modifyPwparam.put("o",param.get("oldPwd").toString());
+        modifyPwparam.put("n",param.get("newPwd").toString());
+        modifyPwparam.put("newPw2",param.get("newPwd").toString());
+        String modifyPwUrl = wfProperties.getWfHost() + "/je/rbac/user/modifyPassWord";
+        Log.info("修改密码-提交参数"+modifyPwparam);
+        String strs = HttpClientUtil.postForm(modifyPwUrl, modifyPwparam, header);
+        Log.info("修改密码返回值："+strs);
+
+        JSONObject object1 = JSONObject.parseObject(strs);
+        if (object1.containsKey("success")) {
+            String code = object1.getString("success");
+            if (code.equals("true")) {
+                return JsonResult.successOK(strs,"修改成功");
+            }
+        }
+        return JsonResult.failed("500","修改失败");
+    }
+
+    @Override
+    public JsonResult<Object> updateEmail(Map<String, Object> param) {
+        Map<String, String> header = new HashMap<>();
+        String modifyEmailUrl = wfProperties.getWfHost() + "/rbac/login/modifyEmail";
+        String type ="EMAIL";
+        if(param.get("type")!=null){
+            type = param.get("type").toString();
+        }
+        Map<String,String> sendParam = new HashMap<>();
+        sendParam.put("code",param.get("code").toString());
+        sendParam.put("type",type);
+        sendParam.put("u",param.get("u").toString());
+        sendParam.put("e",param.get("e").toString());
+
+        Log.info("修改邮箱参数"+param);
+        String strs = HttpClientUtil.postForm(modifyEmailUrl, sendParam,header);
+        Log.info("修改邮箱："+strs);
+
+        JSONObject object = JSONObject.parseObject(strs);
+        if (object.containsKey("code")) {
+            String code = object.getString("code");
+            if (code.equals("1000")) {
+                return JsonResult.successOK(strs,"修改成功");
+            }
+        }
+        return JsonResult.failed("500","修改失败");
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/auth/UserService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/auth/UserService.java
new file mode 100644
index 0000000..f08bd56
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/auth/UserService.java
@@ -0,0 +1,20 @@
+package com.rootcloud.domain.service.auth;
+
+import com.rootcloud.domain.dao.JeCoreEnduserDao;
+import com.rootcloud.domain.entity.JeCoreEnduserEntity;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class UserService {
+    @Autowired
+    JeCoreEnduserDao jeCoreEnduserDao;
+
+    public List<JeCoreEnduserEntity> getUserListByRole(String role,String zhid) {
+       return  jeCoreEnduserDao.getUserListByRole(role,zhid);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/DeviceAlarmService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/DeviceAlarmService.java
new file mode 100644
index 0000000..66693fd
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/DeviceAlarmService.java
@@ -0,0 +1,51 @@
+package com.rootcloud.domain.service.device;
+
+import com.rootcloud.domain.entity.MyMessageEntity;
+import com.rootcloud.domain.entity.ds.DeviceListEntity;
+import com.rootcloud.vo.rest.AppDeviceAlarmParam;
+import com.rootcloud.vo.rest.DeviceAlarmParam;
+
+import java.util.List;
+import java.util.Map;
+
+public interface DeviceAlarmService {
+    /**
+     * pc端规则报警查询接口
+     * @param deviceAlarmParam
+     * @return
+     */
+    Map<String,Object> getDeviceRuleAlarmInfo(DeviceAlarmParam deviceAlarmParam);
+
+    /**
+     * pc端故障码报警查询接口
+     * @param deviceAlarmParam
+     * @return
+     */
+    Map<String,Object> getDeviceCodeAlarmInfo(DeviceAlarmParam deviceAlarmParam);
+
+    /**
+     * app端规则报警查询接口
+     */
+    Map<String,Object> getDeviceRuleAlarmCount(AppDeviceAlarmParam appDeviceAlarmParam);
+
+    /**
+     * app端故障码报警查询接口
+     */
+    Map<String,Object> getDeviceCodeAlarmCount(AppDeviceAlarmParam appDeviceAlarmParam);
+
+    /**
+     * app端ALL查询接口
+     */
+    Map<String,Object> getDeviceAllAlarmCount(AppDeviceAlarmParam appDeviceAlarmParam);
+
+    /**
+     * 根据设备ID查询故障码报警和规则报警条数
+     */
+    Integer getDeviceAlarmCount(String deviceId,String startTime,String endTime);
+
+    /**
+     * 查询报警推送app的消息
+     */
+    List<MyMessageEntity> queryAlarmMessages(List<DeviceListEntity> deviceListEntities);
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/DeviceService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/DeviceService.java
new file mode 100644
index 0000000..415e34e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/DeviceService.java
@@ -0,0 +1,63 @@
+package com.rootcloud.domain.service.device;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.domain.dto.DeviceDTO;
+import com.rootcloud.domain.dto.DeviceSpecialDTO;
+import com.rootcloud.domain.entity.device.DeviceEntity;
+import com.rootcloud.vo.device.DeviceMonthWorkTimeStatistics;
+import com.rootcloud.vo.device.DeviceVO;
+import com.rootcloud.vo.device.DeviceView;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 14:07
+ */
+public interface DeviceService extends IService<DeviceEntity> {
+    /**
+     * 设备总览
+     * @return
+     */
+    public JsonResult<DeviceView> display();
+
+    /**
+     * 获取这边信息，年度月工时折现图
+     * @return
+     */
+    public JsonResult<DeviceVO> getDeviceInfoWithMonthWorkTimeLineChart(String deviceId);
+
+    /**
+     * 获取设备月工时统计
+     * @return
+     */
+    public JsonResult<DeviceMonthWorkTimeStatistics> getMonthWorkTimeStatistics(String deviceId, Date searchDate);
+
+
+    /**
+     * 服务计划查询所有设备编码
+     * @return
+     */
+    List<DeviceSpecialDTO> selectAllDevice();
+
+
+    /**
+     * 通过设备编码返回地址
+     * @param sblbSbbm
+     * @return
+     */
+    String returnAddress(String sblbSbbm);
+
+
+    /**
+     * 通过角色查询设备
+     * @return
+     */
+    List<DeviceDTO> deviceDTOListByRole();
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/FaultCodeService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/FaultCodeService.java
new file mode 100644
index 0000000..f98ef95
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/FaultCodeService.java
@@ -0,0 +1,41 @@
+package com.rootcloud.domain.service.device;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.entity.NxZskFaultCodeEntity;
+import com.rootcloud.vo.faultcode.FaultCodeDetailVo;
+import com.rootcloud.vo.faultcode.FaultCodeVo;
+
+import java.util.List;
+
+/**
+ * @author:xxxxx
+ * @create: 2022-05-07 15:16
+ * @Description: 故障码服务接口
+ */
+public interface FaultCodeService extends IService<NxZskFaultCodeEntity> {
+    List<NxZskFaultCodeEntity> queryFaultCodes(String level,String sbxhId);
+    List<NxZskFaultCodeEntity> queryFaultCodesOfApp(List<String> levels,String codeName,String code);
+    List<NxZskFaultCodeEntity> queryFaultCodesOfMessage(List<String> levels);
+
+
+    /**
+     * 分页查询知识库
+     * @param page
+     * @param size
+     * @param queryData
+     * @param faultcodeSblxcode
+     * @return
+     */
+    IPage<FaultCodeVo> getPage(int page, int size,String queryData, String faultcodeSblxcode);
+
+
+    /**
+     * 通过知识库主键查询详情
+     * @param nxZskFaultcodeId
+     * @return
+     */
+    FaultCodeDetailVo selectById(String nxZskFaultcodeId);
+
+    List<NxZskFaultCodeEntity> selectData(String syZhid,List<String> list);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/LappLiveService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/LappLiveService.java
new file mode 100644
index 0000000..d33a29a
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/LappLiveService.java
@@ -0,0 +1,28 @@
+package com.rootcloud.domain.service.device;
+
+
+import com.rootcloud.common.JsonResult;
+
+public interface LappLiveService {
+
+    /**
+     * 打开直播功能,(获取直播地址的前提是打开直播功能)
+     * @param deviceSerial
+     * @param channelNo
+     * @return
+     * @throws Exception
+     */
+    public boolean openLive(String deviceSerial, String channelNo) throws Exception;
+
+    /**
+     * 获取直播地址,根据通道号和设备序列号
+     * @param deviceSerial
+     * @param channelNo
+     * @return
+     * @throws Exception
+     */
+    public JsonResult getLiveAddress(String deviceSerial, String channelNo) throws Exception;
+
+    public JsonResult getLeChengLiveAddress(String deviceSerial, String channelNo) throws Exception;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/NxDeviceService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/NxDeviceService.java
new file mode 100644
index 0000000..3f670a3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/NxDeviceService.java
@@ -0,0 +1,42 @@
+package com.rootcloud.domain.service.device;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.PageRequest;
+import com.rootcloud.domain.dto.CameraDTO;
+import com.rootcloud.domain.dto.NxDeviceDTO;
+import com.rootcloud.domain.entity.device.NxDeviceCameraEntity;
+import com.rootcloud.domain.entity.device.NxDeviceEntity;
+import com.rootcloud.vo.device.CameraParam;
+import com.rootcloud.vo.device.NxDeviceParam;
+import com.rootcloud.vo.order.DeviceDataVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 14:07
+ */
+public interface NxDeviceService extends IService<NxDeviceEntity> {
+
+    public JsonResult<PageInfo<NxDeviceDTO>> findList(PageRequest pageRequest, NxDeviceParam nxDeviceParam);
+
+    public JsonResult<Void> bindCamera(CameraParam cameraParam);
+
+
+    public JsonResult<Void> UnboundCamera(String cameraId);
+
+    List<NxDeviceCameraEntity> camerasByDeviceId(String deviceId);
+
+    DeviceDataVo getJcxxByIds(String ids);
+
+    String selectFwwdId(String khid,String zhId);
+
+    List<DeviceDataVo> getKuDeviceList(String userId);
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/DeviceAlarmServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/DeviceAlarmServiceImpl.java
new file mode 100644
index 0000000..879b761
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/DeviceAlarmServiceImpl.java
@@ -0,0 +1,1059 @@
+package com.rootcloud.domain.service.device.impl;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpStatus;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.rootcloud.common.DateUtil;
+import com.rootcloud.common.ResourceUtil;
+import com.rootcloud.common.TokenUtil;
+import com.rootcloud.common.enums.ServicePlanEnums;
+import com.rootcloud.common.enums.StatusCodeEnum;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.config.exception.BusinessException;
+import com.rootcloud.domain.entity.MyMessageEntity;
+import com.rootcloud.domain.entity.NxTodoLibrary;
+import com.rootcloud.domain.entity.NxZskFaultCodeEntity;
+import com.rootcloud.domain.entity.device.NxDeviceEntity;
+import com.rootcloud.domain.entity.ds.DeviceListEntity;
+import com.rootcloud.domain.mapper.NxDeviceMapper;
+import com.rootcloud.domain.mapper.NxOrderMapper;
+import com.rootcloud.domain.mapper.NxZskFaultCodeMapper;
+import com.rootcloud.domain.service.device.DeviceAlarmService;
+import com.rootcloud.domain.service.device.FaultCodeService;
+import com.rootcloud.domain.service.todo.NxTodoLibraryService;
+import com.rootcloud.vo.resp.AppDeviceAlarmResp;
+import com.rootcloud.vo.resp.DeviceCodeAlarmModel;
+import com.rootcloud.vo.resp.DeviceRuleAlarmModel;
+import com.rootcloud.vo.rest.AppDeviceAlarmParam;
+import com.rootcloud.vo.rest.DeviceAlarmParam;
+import jline.internal.Log;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Service("deviceAlarmServiceImpl")
+@Slf4j
+public class DeviceAlarmServiceImpl implements DeviceAlarmService {
+    @Value(value = "${os.iam.domain}")
+    private String domain;
+    @Value(value = "${os.iam.superToken}")
+    private String superToken;
+    @Value(value = "${cms.rulealarm.uri}")
+    private String alaramUri;
+    @Value(value = "${cms.codealarm.uri}")
+    private String codeAlarmUri;
+
+    @Value(value = "${cms.codealarmget.uri}")
+    private String codeAlarmUriGet;
+
+    @Value(value = "${cms.eventtype.uri}")
+    private String eventTypeUri;
+
+
+    @Value(value = "${cms.codealarmbatch.uri}")
+    private String codeAlarmBatchUri;
+    @Autowired
+    private TokenUtil tokenUtil;
+    @Resource(name = "faultCodeServiceImpl")
+    private FaultCodeService faultCodeService;
+    @Resource(name = "nxTodoLibraryServiceImpl")
+    private NxTodoLibraryService nxTodoLibraryService;
+
+    @Autowired
+    private NxZskFaultCodeMapper nxZskFaultCodeMapper;
+
+    @Autowired
+    private NxDeviceMapper nxDeviceMapper;
+
+
+    @Resource
+    private RedisTemplate redisTemplate;
+
+    /**
+     * 规则报警查询接口
+     *
+     * @param deviceAlarmParam
+     * @return
+     */
+    @Override
+    public Map<String, Object> getDeviceRuleAlarmInfo(DeviceAlarmParam deviceAlarmParam) {
+        List<DeviceRuleAlarmModel> resultList = new ArrayList<>();
+        Map<String, Object> resultMap = new HashMap<>();
+        HttpRequest request = HttpRequest.get(domain + alaramUri);
+        //处理入参
+        Map<String, Object> map = handleRuleAlarmParam(deviceAlarmParam);
+        request.form(map);
+        request.header("Authorization", "Bearer " + tokenUtil.getToken());
+        request.header("accept", "application/json");
+        request.header("Content-Type", "application/json");
+        HttpResponse response = request.execute();
+        if (response.getStatus() != HttpStatus.HTTP_OK) {
+            log.error("调用平台接口出错" + response);
+            //throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),StatusCodeEnum.FAIL_CALL_INTERFACE.getMessage());
+            throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(), ResourceUtil.getI18nMessage("40000"));
+        }
+        String result = response.body();
+        JSONObject jsonObject = new JSONObject(result);
+        JSONObject metadata = (JSONObject) jsonObject.get("metadata");
+        String pageTotal = "0";
+        if (metadata != null) {
+            pageTotal = metadata.get("totalCount").toString();
+        }
+        JSONArray array = jsonObject.getJSONArray("payload");
+        /*Log.info("平台报警数据信息查询--->" + array);
+        Log.info("平台报警数据信息查询条数--->" + array.size());*/
+        array.stream().forEach(temp -> {
+            JSONObject obj = (JSONObject) temp;
+            DeviceRuleAlarmModel deviceAlarmModel = new DeviceRuleAlarmModel();
+            deviceAlarmModel.setAlarmTime(obj.get("createdTime").toString());
+            deviceAlarmModel.setAlarmCode(obj.get("alarmTopicId") == null ? "" : obj.get("alarmTopicId").toString());
+            deviceAlarmModel.setAlarmName(obj.get("alarmTopicName") == null ? "" : obj.get("alarmTopicName").toString());
+            deviceAlarmModel.setAlarmDesc(obj.get("subject").toString());
+            deviceAlarmModel.setAlarmLevel(obj.get("severityName").toString());
+            //状态处理 自动解除（inActiveTime！=null）手动解除(closed=true&&inActiveTime=null) 持续中（close=false&&inActiveTime=null）
+            if (obj.get("inActiveTime") != null) {
+                deviceAlarmModel.setAlarmStatus(ResourceUtil.getI18nMessage("60000"));
+            } else if ((boolean) obj.get("closed")) {
+                deviceAlarmModel.setAlarmStatus(ResourceUtil.getI18nMessage("60001"));
+            } else {
+                deviceAlarmModel.setAlarmStatus(ResourceUtil.getI18nMessage("60002"));
+            }
+            resultList.add(deviceAlarmModel);
+        });
+        resultMap.put("pageTotal", pageTotal);
+        resultMap.put("deviceAlarmModels", resultList);
+        return resultMap;
+    }
+
+    /**
+     * 故障码报警接口查询
+     *
+     * @param deviceAlarmParam
+     * @return
+     */
+    @Override
+    public Map<String, Object> getDeviceCodeAlarmInfo(DeviceAlarmParam deviceAlarmParam) {
+        //获取设备型号
+        String sbxh = nxZskFaultCodeMapper.getSbxh(deviceAlarmParam.getSbxhId());
+        //Log.info("参数sbxh-->" + sbxh);
+        List<DeviceCodeAlarmModel> list = new ArrayList<>();
+        Map<String, Object> resultMap = new HashMap<>();
+
+        //通过redis去取该租户的事件id
+        String tenantid = UserContext.getTenantId();
+        String rediskey = tenantid + "_GZM:";
+        Object event = null;
+        String eventTypeId = "";
+        try {
+            event = redisTemplate.opsForValue().get(rediskey);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (event != null) {
+            eventTypeId = event.toString();
+        } else {
+            //redis取不到，进行接口查询
+            //通过租户id，查询eventtypeid
+            HttpRequest requestEvent = HttpRequest.get(domain + eventTypeUri);
+            Map<String, Object> mapEvent = new HashMap<>();
+            mapEvent.put("classId", 1);
+            mapEvent.put("eventType", "alarm");
+            mapEvent.put("scope", "TENANT");
+            mapEvent.put("type", "ALARM");
+            requestEvent.form(mapEvent);
+            requestEvent.header("Authorization", "Bearer " + tokenUtil.getToken());
+            requestEvent.header("accept", "application/json");
+            requestEvent.header("Content-Type", "application/json");
+            requestEvent.header("X-RCD-Tenant-Id", tenantid);
+            HttpResponse responseEvent = requestEvent.execute();
+            if (responseEvent.getStatus() != HttpStatus.HTTP_OK) {
+                log.error("调用平台接口出错" + responseEvent);
+                throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(), ResourceUtil.getI18nMessage("40000"));
+            }
+            String resultEvent = responseEvent.body();
+            JSONObject jsonObjectEvent = new JSONObject(resultEvent);
+            JSONArray arrayEvent = jsonObjectEvent.getJSONArray("payload");
+
+            if (arrayEvent == null || arrayEvent.size() == 0) {
+                // 新增eventtypeid 事件
+                HttpRequest addEvent = HttpRequest.post(domain + eventTypeUri);
+                mapEvent.clear();
+                mapEvent.put("alarmMode", "INTERVAL");
+                mapEvent.put("classDefine", "新增故障码事件");
+                mapEvent.put("classId", 1);
+                mapEvent.put("description", "description");
+                mapEvent.put("eventType", "alarm");
+                mapEvent.put("name", "新增故障码事件");
+                mapEvent.put("scope", "TENANT");
+                mapEvent.put("type", "ALARM");
+                List<Map<String, Object>> eventTypeList = new ArrayList<>();
+                eventTypeList.add(mapEvent);
+                addEvent.body(JSON.toJSONString(eventTypeList));
+                addEvent.header("Authorization", "Bearer " + tokenUtil.getToken());
+                addEvent.header("accept", "application/json");
+                addEvent.header("Content-Type", "application/json");
+                addEvent.header("X-RCD-Tenant-Id", tenantid);
+                Log.info("参数-->" + JSON.toJSONString(mapEvent));
+                HttpResponse responseAddEvent = addEvent.execute();
+                if (responseAddEvent.getStatus() != HttpStatus.HTTP_OK) {
+                    log.error("调用平台接口出错" + responseAddEvent);
+                    throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(), ResourceUtil.getI18nMessage("40000"));
+                }
+
+                String resultAddEvent = responseAddEvent.body();
+                JSONArray jsonAddEvent = new JSONArray(resultAddEvent);
+                if (jsonAddEvent != null && jsonAddEvent.size() > 0) {
+                    eventTypeId = jsonAddEvent.getJSONObject(0).getStr("eventTypeId");
+                }
+            } else {
+                eventTypeId = arrayEvent.getJSONObject(0).getStr("eventTypeId");
+            }
+
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(eventTypeId)) {
+                redisTemplate.opsForValue().set(rediskey, eventTypeId, 10, TimeUnit.DAYS);
+            }
+        }
+        HttpRequest request = HttpRequest.post(domain + codeAlarmUri);
+        Map<String, Object> map = handelCodeAlarmParam(deviceAlarmParam, sbxh);
+        map.put("eventTypeId", eventTypeId);
+        //Log.info("平台故障码报警查询参数-->" + JSON.toJSON(map));
+        //request.form(map);
+        request.body(JSON.toJSONString(map));
+        request.header("Authorization", "Bearer " + tokenUtil.getToken());
+        request.header("accept", "application/json");
+        request.header("Content-Type", "application/json");
+        HttpResponse response = request.execute();
+        if (response.getStatus() != HttpStatus.HTTP_OK) {
+            log.error("调用平台接口出错" + response);
+            //throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),StatusCodeEnum.FAIL_CALL_INTERFACE.getMessage());
+            throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(), ResourceUtil.getI18nMessage("40000"));
+        }
+        String result = response.body();
+        //Log.info("平台故障码报警返回数据-->" + result);
+        JSONObject jsonObject = new JSONObject(result);
+        JSONObject metadata = (JSONObject) jsonObject.get("metadata");
+        String pageTotal = "0";
+        if (metadata != null) {
+            pageTotal = metadata.get("totalCount").toString();
+        }
+        //获取故障码数据
+        List<NxZskFaultCodeEntity> faultCodeEntities = faultCodeService.queryFaultCodes(deviceAlarmParam.getSeverityLevel(), sbxh);
+        Map<String, NxZskFaultCodeEntity> collect = new HashMap<>();
+        faultCodeEntities.forEach(o -> {
+            String gzm = o.getFaultcodeGzm();
+            if (!collect.containsKey(gzm)) {
+                collect.put(gzm, o);
+            }
+        });
+        //Log.info("故障码数据-->" + collect);
+        //Map<String, NxZskFaultCodeEntity> collect = faultCodeEntities.stream().collect(Collectors.toMap(NxZskFaultCodeEntity::getFaultcodeGzm, Function.identity()));
+        JSONArray array = jsonObject.getJSONArray("payload");
+        //Log.info("平台故障码报警数据信息查询条数--->" + array.size());
+//        LambdaQueryWrapper<NxZskFaultCodeEntity> lambdaQueryWrapper = Wrappers.lambdaQuery(NxZskFaultCodeEntity.class);
+//        if(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(deviceAlarmParam.getSeverityLevel())){
+//            lambdaQueryWrapper.eq(NxZskFaultCodeEntity::getFaultcodeGzdjcode,deviceAlarmParam.getSeverityLevel());
+//        }
+        array.stream().forEach(temp -> {
+            JSONObject obj = (JSONObject) temp;
+           /* Log.info("返回数据-->" + obj);
+            Log.info("返回数据-->" + obj.get("code").toString());*/
+            //时间暂定上报时间  对应平台  originTs  解除时间createTs
+            Long times = (Long) obj.get("originTs");
+            //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            //故障描述，等级和设备型号从故障码库中读取，不读平台数据
+//            lambdaQueryWrapper.eq(NxZskFaultCodeEntity::getFaultcodeGzm,obj.get("code").toString()).last("limit 1");
+//            NxZskFaultCodeEntity code = faultCodeService.getOne(lambdaQueryWrapper);
+            NxZskFaultCodeEntity code = collect.get(obj.get("code").toString());
+            //Log.info("故障码数据-->" + code);
+            // 2022-12-16 增加设备型号匹配  传过来的sbxhId参数与故障码的型号id匹配
+            if (code != null) {
+                DeviceCodeAlarmModel deviceCodeAlarmModel = new DeviceCodeAlarmModel();
+                //deviceCodeAlarmModel.setAlarmTime(sdf.format(DateUtil.timestampToDate(times,"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")));
+                deviceCodeAlarmModel.setAlarmTime(sdf.format(DateUtil.timestampToDate(times, "yyyy-MM-dd HH:mm:ss")));
+                deviceCodeAlarmModel.setAlarmCode(obj.get("code") == null ? "" : obj.get("code").toString());
+                deviceCodeAlarmModel.setAlarmName(obj.get("alarmName") == null ? "" : obj.get("alarmName").toString());
+                deviceCodeAlarmModel.setAlarmDesc(code.getFaultcodeGzms());
+                deviceCodeAlarmModel.setAlarmLevel(code.getFaultcodeGzdj());
+                deviceCodeAlarmModel.setDeviceType(code.getFaultcodeSblx());
+                deviceCodeAlarmModel.setNxZskFaultcodeId(code.getNxZskFaultcodeId());
+                list.add(deviceCodeAlarmModel);
+            }
+//            else {
+//                DeviceCodeAlarmModel deviceCodeAlarmModel = new DeviceCodeAlarmModel();
+//                //deviceCodeAlarmModel.setAlarmTime(sdf.format(DateUtil.timestampToDate(times,"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")));
+//                deviceCodeAlarmModel.setAlarmTime(sdf.format(DateUtil.timestampToDate(times, "yyyy-MM-dd HH:mm:ss")));
+//                deviceCodeAlarmModel.setAlarmCode(obj.get("code").toString());
+//                list.add(deviceCodeAlarmModel);
+//            }
+//            faultCodeEntities.stream().forEach(code->{
+//                if(code.getFaultcodeGzm().equals(obj.get("code").toString())){
+//                    DeviceCodeAlarmModel deviceCodeAlarmModel = new DeviceCodeAlarmModel();
+//                    //deviceCodeAlarmModel.setAlarmTime(sdf.format(DateUtil.timestampToDate(times,"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")));
+//                    deviceCodeAlarmModel.setAlarmTime(sdf.format(DateUtil.timestampToDate(times, "yyyy-MM-dd HH:mm:ss")));
+//                    deviceCodeAlarmModel.setAlarmCode(obj.get("code").toString());
+//                    deviceCodeAlarmModel.setAlarmDesc(code.getFaultcodeGzms());
+//                    deviceCodeAlarmModel.setAlarmLevel(code.getFaultcodeGzdj());
+//                    deviceCodeAlarmModel.setDeviceType(code.getFaultcodeSblx());
+//                    deviceCodeAlarmModel.setNxZskFaultcodeId(code.getNxZskFaultcodeId());
+//                    list.add(deviceCodeAlarmModel);
+//                }
+//            });
+
+        });
+        resultMap.put("pageTotal", pageTotal);
+        resultMap.put("deviceAlarmModels", list);
+        return resultMap;
+    }
+
+    /**
+     * app端规则报警查询接口 只查待处理报警
+     *
+     * @param appDeviceAlarmParam
+     * @return
+     */
+    @Override
+    public Map<String, Object> getDeviceRuleAlarmCount(AppDeviceAlarmParam appDeviceAlarmParam) {
+        List<AppDeviceAlarmResp> resultList = new ArrayList<>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, Object> resultMap = new HashMap<>();
+        HttpRequest request = HttpRequest.get(domain + alaramUri);
+        //处理入参
+        Map<String, Object> map = appAlarmHandleParam(appDeviceAlarmParam);
+        request.form(map);
+        request.header("Authorization", "Bearer " + tokenUtil.getToken());
+        request.header("accept", "application/json");
+        request.header("Content-Type", "application/json");
+        HttpResponse response = request.execute();
+        if (response.getStatus() != HttpStatus.HTTP_OK) {
+            log.error("调用平台接口出错" + response);
+            //throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),StatusCodeEnum.FAIL_CALL_INTERFACE.getMessage());
+            throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(), ResourceUtil.getI18nMessage("40000"));
+        }
+        String result = response.body();
+        JSONObject jsonObject = new JSONObject(result);
+        JSONObject metadata = (JSONObject) jsonObject.get("metadata");
+        String pageTotal = "0";
+        if (metadata != null) {
+            pageTotal = metadata.get("totalCount").toString();
+        }
+        JSONArray array = jsonObject.getJSONArray("payload");
+        List<String> codes = new ArrayList<>();
+        List<Integer> pageTotals = new ArrayList<>();
+        array.stream().forEach(temp -> {
+            JSONObject obj = (JSONObject) temp;
+            String code = obj.get("alarmTopicName").toString();
+            //统计次数
+            if (codes.contains(code)) {
+                //更新已放入resultList中对象的次数和最大时间
+                resultList.stream().forEach(temp1 -> {
+                    //更新次数
+                    if (code.equals(temp1.getAlarmCode())) {
+                        temp1.setAlarmTimes(temp1.getAlarmTimes() + 1);
+                    }
+                    //更新最近时间
+                    if (DateUtil.getTimesByStringType(obj.get("activeTime").toString()) > (DateUtil.getTimesByStringType(temp1.getAlarmTime()))) {
+                        temp1.setAlarmTime(DateUtil.reverseHandlerTimeByType(obj.get("activeTime").toString()));
+
+                    }
+                });
+                //记录总共合并多少次，在总页数中减去该list的size等于实际总页数
+                pageTotals.add(1);
+            } else {
+                AppDeviceAlarmResp appDeviceAlarmResp = new AppDeviceAlarmResp();
+                appDeviceAlarmResp.setAlarmCode(obj.get("alarmTopicName").toString());
+                appDeviceAlarmResp.setAlarmDesc(obj.get("subject").toString());
+                appDeviceAlarmResp.setAlarmTimes(1);
+                appDeviceAlarmResp.setAlarmTime(DateUtil.reverseHandlerTimeByType(obj.get("activeTime").toString()));
+                appDeviceAlarmResp.setAlaramLevel(obj.get("severityName").toString());
+                resultList.add(appDeviceAlarmResp);
+            }
+            codes.add(code);
+        });
+        resultMap.put("pageTotal", resultList.size());
+        resultMap.put("deviceAlarmModels", resultList);
+        return resultMap;
+    }
+
+    /**
+     * app端故障码报警信息统计查询
+     *
+     * @param appDeviceAlarmParam
+     * @return
+     */
+
+    @Override
+    public Map<String, Object> getDeviceCodeAlarmCount(AppDeviceAlarmParam appDeviceAlarmParam) {
+        List<AppDeviceAlarmResp> list = new ArrayList<>();
+        Map<String, Object> resultMap = new HashMap<>();
+        HttpRequest request = HttpRequest.get(domain + codeAlarmUriGet);
+        Map<String, Object> map = appAlarmHandleParam(appDeviceAlarmParam);
+        request.form(map);
+        request.header("Authorization", "Bearer " + tokenUtil.getToken());
+        request.header("accept", "application/json");
+        request.header("Content-Type", "application/json");
+        HttpResponse response = request.execute();
+        if (response.getStatus() != HttpStatus.HTTP_OK) {
+            log.error("调用平台接口出错" + response);
+            //throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),StatusCodeEnum.FAIL_CALL_INTERFACE.getMessage());
+            throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(), ResourceUtil.getI18nMessage("40000"));
+        }
+        String result = response.body();
+        JSONObject jsonObject = new JSONObject(result);
+        JSONObject metadata = (JSONObject) jsonObject.get("metadata");
+      /*  String pageTotal="0";
+        if(metadata!=null){
+            pageTotal = metadata.get("totalCount").toString();
+        }*/
+        //app默认查紧急和重要
+        List<String> levels = new ArrayList<>();
+        List<Integer> pageTotals = new ArrayList<>();
+        levels.add("1");
+        levels.add("2");
+        List<NxZskFaultCodeEntity> faultCodeEntities = faultCodeService.queryFaultCodesOfApp(levels, appDeviceAlarmParam.getAlarmDesc(), appDeviceAlarmParam.getCode());
+        JSONArray array = jsonObject.getJSONArray("payload");
+        //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        List<String> codes = new ArrayList<>();
+        array.stream().forEach(temp -> {
+            JSONObject obj = (JSONObject) temp;
+            //统计次数和最近时间
+            String code = obj.get("code").toString();
+            //时间暂定上报时间  对应平台createTs
+            Long time = (Long) obj.get("createTs");
+            if (codes.contains(code)) {
+                //更新已放入resultList中对象的次数和最大时间
+                list.stream().forEach(temp1 -> {
+                    //更新次数
+                    if (code.equals(temp1.getAlarmCode())) {
+                        temp1.setAlarmTimes(temp1.getAlarmTimes() + 1);
+                    }
+                    //更新最近时间
+                    if (time > (DateUtil.getTimesByString(temp1.getAlarmTime()))) {
+                        temp1.setAlarmTime(sdf.format(DateUtil.timestampToDate(time, "yyyy-MM-dd HH:mm:ss")));
+                    }
+                });
+                //记录总共合并多少次，在总页数中减去该list的size等于实际总页数
+                pageTotals.add(1);
+            } else {
+                //故障描述，等级和设备型号从故障码库中读取，不读平台数据
+                faultCodeEntities.stream().forEach(tempCode -> {
+                    if (tempCode.getFaultcodeGzm().equals(obj.get("code").toString())) {
+                        AppDeviceAlarmResp appDeviceAlarmResp = new AppDeviceAlarmResp();
+                        appDeviceAlarmResp.setAlarmTime(sdf.format(DateUtil.timestampToDate(time, "yyyy-MM-dd HH:mm:ss")));
+                        appDeviceAlarmResp.setAlarmCode(obj.get("code").toString());
+                        appDeviceAlarmResp.setAlarmDesc(tempCode.getFaultcodeGzms());
+                        appDeviceAlarmResp.setAlaramLevel(tempCode.getFaultcodeGzdj());
+                        appDeviceAlarmResp.setAlarmTimes(1);
+                        list.add(appDeviceAlarmResp);
+                    }
+                });
+            }
+            codes.add(code);
+        });
+        resultMap.put("pageTotal", list.size());
+        resultMap.put("deviceAlarmModels", list);
+        return resultMap;
+    }
+
+
+    @Override
+    public Map<String, Object> getDeviceAllAlarmCount(AppDeviceAlarmParam appDeviceAlarmParam) {
+        List<AppDeviceAlarmResp> list = new ArrayList<>();
+        Map<String, Object> resultMap = new HashMap<>();
+        HttpRequest request = HttpRequest.get(domain + codeAlarmUriGet);
+        Map<String, Object> map = appAlarmHandleParam(appDeviceAlarmParam);
+        request.form(map);
+        request.header("Authorization", "Bearer " + tokenUtil.getToken());
+//        request.header("AuthHeaderAlias", tokenUtil.superToken());
+//        request.header("X-RCD-Tenant-Id",UserContext.getTenantId());
+        request.header("accept", "application/json");
+        request.header("Content-Type", "application/json");
+        HttpResponse response = request.execute();
+        if (response.getStatus() != HttpStatus.HTTP_OK) {
+            log.error("调用平台接口出错" + response);
+            //throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),StatusCodeEnum.FAIL_CALL_INTERFACE.getMessage());
+            throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(), ResourceUtil.getI18nMessage("40000"));
+        }
+        String result = response.body();
+        JSONObject jsonObject = new JSONObject(result);
+        JSONObject metadata = (JSONObject) jsonObject.get("metadata");
+      /*  String pageTotal="0";
+        if(metadata!=null){
+            pageTotal = metadata.get("totalCount").toString();
+        }*/
+        //app默认查紧急和重要
+        List<String> levels = new ArrayList<>();
+        List<Integer> pageTotals = new ArrayList<>();
+        levels.add("1");
+        levels.add("2");
+        List<NxZskFaultCodeEntity> faultCodeEntities = faultCodeService.queryFaultCodesOfApp(levels, appDeviceAlarmParam.getAlarmDesc(), appDeviceAlarmParam.getCode());
+        JSONArray array = jsonObject.getJSONArray("payload");
+        //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        List<String> codes = new ArrayList<>();
+        array.stream().forEach(temp -> {
+            JSONObject obj = (JSONObject) temp;
+            //统计次数和最近时间
+            String code = obj.get("code").toString();
+            //时间暂定上报时间  对应平台createTs
+            Long time = (Long) obj.get("createTs");
+            if (codes.contains(code)) {
+                //更新已放入resultList中对象的次数和最大时间
+                list.stream().forEach(temp1 -> {
+                    //更新次数
+                    if (code.equals(temp1.getAlarmCode())) {
+                        temp1.setAlarmTimes(temp1.getAlarmTimes() + 1);
+                    }
+                    //更新最近时间
+                    if (time > (DateUtil.getTimesByString(temp1.getAlarmTime()))) {
+                        temp1.setAlarmTime(sdf.format(DateUtil.timestampToDate(time, "yyyy-MM-dd HH:mm:ss")));
+                    }
+                });
+                //记录总共合并多少次，在总页数中减去该list的size等于实际总页数
+                pageTotals.add(1);
+            } else {
+                //故障描述，等级和设备型号从故障码库中读取，不读平台数据
+                faultCodeEntities.stream().forEach(tempCode -> {
+                    if (tempCode.getFaultcodeGzm().equals(obj.get("code").toString())) {
+                        AppDeviceAlarmResp appDeviceAlarmResp = new AppDeviceAlarmResp();
+                        appDeviceAlarmResp.setAlarmTime(sdf.format(DateUtil.timestampToDate(time, "yyyy-MM-dd HH:mm:ss")));
+                        appDeviceAlarmResp.setAlarmCode(obj.get("code").toString());
+                        appDeviceAlarmResp.setAlarmDesc(tempCode.getFaultcodeGzms());
+                        appDeviceAlarmResp.setAlaramLevel(tempCode.getFaultcodeGzdj());
+                        appDeviceAlarmResp.setAlarmTimes(1);
+                        list.add(appDeviceAlarmResp);
+                    }
+                });
+            }
+            codes.add(code);
+        });
+        resultMap.put("pageTotal", list.size());
+        resultMap.put("deviceAlarmModels", list);
+        return resultMap;
+    }
+
+
+    /**
+     * 故障码处理入参
+     *
+     * @param deviceAlarmParam
+     * @return
+     */
+    public Map<String, Object> handelCodeAlarmParam(DeviceAlarmParam deviceAlarmParam, String sbxh) {
+        Map<String, Object> map = new HashMap<>();
+        //待处理报警
+        if ("1".equals(deviceAlarmParam.getTag())) {
+            map.put("active", true);
+        } else {//历史报警
+            map.put("active", false);
+        }
+        List<String> thingIds = new ArrayList<>();
+        thingIds.add(deviceAlarmParam.getDeviceId());
+        map.put("thingIds", thingIds);
+        if (!StringUtils.isEmpty(deviceAlarmParam.getCode())) {
+            map.put("code", deviceAlarmParam.getCode());
+        } else {
+            if (!StringUtils.isEmpty(deviceAlarmParam.getSeverityLevel())) {
+                //按级别,设备型号查询
+                Map<String, Object> maps = new HashMap<>();
+                maps.put("level", deviceAlarmParam.getSeverityLevel());
+                maps.put("sbxh", sbxh);
+                List<String> codes = nxZskFaultCodeMapper.getCodes(maps);
+                map.put("codes", codes);
+            }
+
+        }
+        map.put("minActiveTs", DateUtil.getTimesByString(deviceAlarmParam.getTime().split("~")[0]));
+        map.put("maxActiveTs", DateUtil.getTimesByString(deviceAlarmParam.getTime().split("~")[1]));
+
+        //分页信息处理
+        map.put("_skip", deviceAlarmParam.getPageSize() * (deviceAlarmParam.getCurrentPage() - 1));
+        map.put("_limit", deviceAlarmParam.getPageSize());
+        //按时间降序
+        //map.put("sort",":[{\"field\":\"createdTime\",\"sortType\":\"DESC\"}]");
+        map.put("_includeMetadata", true);
+        return map;
+    }
+
+    /**
+     * 规则报警入参处理
+     */
+    public Map<String, Object> handleRuleAlarmParam(DeviceAlarmParam deviceAlarmParam) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("thingIds", "[\"" + deviceAlarmParam.getDeviceId() + "\"]");
+        //时间
+        if (!StringUtils.isEmpty(deviceAlarmParam.getTime())) {
+            String[] times = deviceAlarmParam.getTime().split("~");
+            map.put("startTime", DateUtil.handlerTime(times[0]));
+            map.put("endTime", DateUtil.handlerTime(times[1]));
+        }
+        if (!StringUtils.isEmpty(deviceAlarmParam.getSeverityLevel())) {
+            int[] level = {Integer.parseInt(deviceAlarmParam.getSeverityLevel())};
+            map.put("severityLevels", JSON.toJSON(level).toString());
+        }
+     /*   //报警级别
+        if(!StringUtils.isEmpty(deviceAlarmParam.getSeverityLevel())){
+            map.put("severityLevels", "["+deviceAlarmParam.getSeverityLevel()+"]");
+        }*/
+        //待处理报警只查持续中(close=false&&active=true)的，历史报警查所有状态的  俊全已确认
+        if ("1".equals(deviceAlarmParam.getTag())) {
+            map.put("closed", false);
+            map.put("active", true);
+        }
+        //分页信息处理
+        map.put("skip", deviceAlarmParam.getPageSize() * (deviceAlarmParam.getCurrentPage() - 1));
+        map.put("limit", deviceAlarmParam.getPageSize());
+        map.put("sort", "[{\"field\":\"createdTime\",\"sortType\":\"DESC\"}]");
+        map.put("includeMetadata", true);
+        log.info("请求入参==>{}", map.toString());
+        return map;
+    }
+
+    /**
+     * app端规则报警入参处理
+     */
+    public Map<String, Object> appAlarmHandleParam(AppDeviceAlarmParam appDeviceAlarmParam) {
+        Map<String, Object> map = new HashMap<>();
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(appDeviceAlarmParam.getStartTime())
+                && org.apache.commons.lang3.StringUtils.isNotBlank(appDeviceAlarmParam.getEndTime())) {
+            //规则报警
+            if ("1".equals(appDeviceAlarmParam.getAlarmType())) {
+                String stTime = DateUtil.handlerTime(appDeviceAlarmParam.getStartTime());
+                String enTime = DateUtil.handlerTime(appDeviceAlarmParam.getEndTime());
+                map.put("startTime", stTime);
+                map.put("endTime", enTime);
+            } else {
+                map.put("minActiveTs", DateUtil.getTimesByString(appDeviceAlarmParam.getStartTime()));
+                map.put("maxActiveTs", DateUtil.getTimesByString(appDeviceAlarmParam.getEndTime()));
+            }
+        }
+        //规则报警
+        if ("1".equals(appDeviceAlarmParam.getAlarmType())) {
+            //故障描述
+            if (org.apache.commons.lang.StringUtils.isNotBlank(appDeviceAlarmParam.getAlarmDesc())) {
+                map.put("subject", appDeviceAlarmParam.getAlarmDesc());
+            }
+            if (org.apache.commons.lang.StringUtils.isNotBlank(appDeviceAlarmParam.getCode())) {
+                map.put("alarmTopicName", appDeviceAlarmParam.getCode());
+            }
+            //map.put("subject",appDeviceAlarmParam.getAlarmDesc());
+            //map.put("alarmTopicName",appDeviceAlarmParam.getCode());
+            map.put("thingIds", "[\"" + appDeviceAlarmParam.getDeviceId() + "\"]");
+            map.put("severityLevels", "[1,2]");
+            //app只查待处理
+            map.put("closed", false);
+            map.put("active", true);
+            map.put("skip", appDeviceAlarmParam.getPageSize() * (appDeviceAlarmParam.getCurrentPage() - 1));
+            map.put("limit", appDeviceAlarmParam.getPageSize());
+            map.put("includeMetadata", true);
+            map.put("sort", "[{\"field\":\"createdTime\",\"sortType\":\"DESC\"}]");
+        }//故障码报警
+        else {
+            map.put("thingId", appDeviceAlarmParam.getDeviceId());
+            //map.put("code",appDeviceAlarmParam.getCode());
+            map.put("active", true);
+            map.put("_skip", appDeviceAlarmParam.getPageSize() * (appDeviceAlarmParam.getCurrentPage() - 1));
+            map.put("_limit", appDeviceAlarmParam.getPageSize());
+            map.put("_includeMetadata", true);
+        }
+        log.info("请求入参==>{}", map.toString());
+        return map;
+    }
+
+    /**
+     * 根据设备ID查询设备报警总数据（故障码+规则）
+     */
+    @Override
+    public Integer getDeviceAlarmCount(String deviceId, String startTime, String endTime) {
+        AppDeviceAlarmParam appDeviceAlarmParam = new AppDeviceAlarmParam();
+        appDeviceAlarmParam.setDeviceId(deviceId);
+        appDeviceAlarmParam.setStartTime(startTime);
+        appDeviceAlarmParam.setEndTime(endTime);
+        appDeviceAlarmParam.setCurrentPage(1);
+        appDeviceAlarmParam.setPageSize(10000);
+        appDeviceAlarmParam.setAlarmType("1");
+        Map<String, Object> deviceRuleAlarmCount = getDeviceRuleAlarmCount(appDeviceAlarmParam);
+        appDeviceAlarmParam.setAlarmType("2");
+        Map<String, Object> deviceCodeAlarmCount = getDeviceCodeAlarmCount(appDeviceAlarmParam);
+        Object pageTotal = deviceRuleAlarmCount.get("pageTotal");
+        Object pageTotal1 = deviceCodeAlarmCount.get("pageTotal");
+        int i = Integer.parseInt(pageTotal.toString()) + Integer.valueOf(pageTotal1.toString());
+        return i;
+        /*//规则报警
+        HttpRequest ruleAlarmRequest = HttpRequest.get(domain + alaramUri);
+        Map<String,Object> ruleAlarmMap = new HashMap<>();
+        ruleAlarmMap.put("thingIds", "[\""+deviceId+"\"]");
+        ruleAlarmMap.put("includeMetadata",true);
+        ruleAlarmMap.put("severityLevels","[1,2]");
+        if(org.apache.commons.lang3.StringUtils.isNotBlank(startTime)
+                && org.apache.commons.lang3.StringUtils.isNotBlank(endTime)){
+            String stTime = DateUtil.handlerTime(startTime);
+            String enTime = DateUtil.handlerTime(endTime);
+            ruleAlarmMap.put("startTime", stTime);
+            ruleAlarmMap.put("endTime", enTime);
+        }
+        //app只查待处理
+        ruleAlarmMap.put("closed",false);
+        ruleAlarmMap.put("active",true);
+        log.info("规则报警请求入参==>{}",ruleAlarmMap.toString());
+        ruleAlarmRequest.form(ruleAlarmMap);
+        ruleAlarmRequest.header("Authorization", "Bearer " + tokenUtil.getToken());
+        ruleAlarmRequest.header("accept", "application/json");
+        ruleAlarmRequest.header("Content-Type", "application/json");
+        HttpResponse ruleAlarmResponse = ruleAlarmRequest.execute();
+        if(ruleAlarmResponse.getStatus()!= HttpStatus.HTTP_OK){
+            log.error("调用平台接口出错"+ruleAlarmResponse);
+            throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),StatusCodeEnum.FAIL_CALL_INTERFACE.getMessage());
+        }
+        String ruleAlarmResult = ruleAlarmResponse.body();
+        JSONObject ruleAlarmJson = new JSONObject(ruleAlarmResult);
+        JSONObject ruleAlarmMetadata = (JSONObject)ruleAlarmJson.get("metadata");
+        Integer ruleAlarmCount=0;
+        if(ruleAlarmMetadata!=null){
+            ruleAlarmCount = Integer.parseInt(ruleAlarmMetadata.get("totalCount").toString());
+        }
+        //故障码报警
+        HttpRequest codeAlarmRequest = HttpRequest.get(domain + codeAlarmUri);
+        Map<String, Object> codeAlarmMap = new HashMap<>();
+        codeAlarmMap.put("thingId", deviceId);
+        codeAlarmMap.put("active",true);
+        codeAlarmMap.put("_includeMetadata",true);
+        if(org.apache.commons.lang3.StringUtils.isNotBlank(startTime)
+                && org.apache.commons.lang3.StringUtils.isNotBlank(endTime)){
+            codeAlarmMap.put("minActiveTs",DateUtil.getTimesByString(startTime));
+            codeAlarmMap.put("maxActiveTs",DateUtil.getTimesByString(endTime));
+        }
+        log.info("故障码报警请求入参==>{}",codeAlarmMap.toString());
+        codeAlarmRequest.form(codeAlarmMap);
+        codeAlarmRequest.header("Authorization", "Bearer " + tokenUtil.getToken());
+        codeAlarmRequest.header("accept", "application/json");
+        codeAlarmRequest.header("Content-Type", "application/json");
+        HttpResponse response = codeAlarmRequest.execute();
+        if(response.getStatus()!= HttpStatus.HTTP_OK){
+            log.error("调用平台接口出错"+response);
+            throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),StatusCodeEnum.FAIL_CALL_INTERFACE.getMessage());
+        }
+        String codeAlarmResult = response.body();
+        JSONObject codeAlarmJson = new JSONObject(codeAlarmResult);
+        JSONObject codeAlarmMetadata = (JSONObject)codeAlarmJson.get("metadata");
+        Integer codeAlarmCount=0;
+        if(codeAlarmMetadata!=null){
+            codeAlarmCount = Integer.parseInt(codeAlarmMetadata.get("totalCount").toString());
+        }
+
+        return ruleAlarmCount+codeAlarmCount;*/
+    }
+
+    @Override
+    public List<MyMessageEntity> queryAlarmMessages(List<DeviceListEntity> deviceListEntities) {
+        //4.0返回结果集
+        List<MyMessageEntity> resultList = new ArrayList<>();
+        //筛选代办库后结果集
+        List<MyMessageEntity> mlist = new ArrayList<>();
+        //筛选紧急数据
+        List<MyMessageEntity> jjlist = new ArrayList<>();
+        //需要获取掉哪些非4.0的数据   才能调用4.0接口，返回报设备不符
+        List<DeviceListEntity> filter_deviceListEntities = deviceListEntities.stream().filter(item -> "1".equals(item.getSblbLwztCode())).collect(Collectors.toList());
+        //规则报警
+        if (filter_deviceListEntities.size() > 0) {
+            List<String> sbbm = filter_deviceListEntities.stream().map(DeviceListEntity::getNxJcxxSblbId).collect(Collectors.toList());
+
+            //通过redis去取该租户的事件id
+            String tenantid = UserContext.getTenantId();
+            String rediskey = tenantid + "_GZM:";
+            Object event = null;
+            String eventTypeId = "";
+            try {
+                event = redisTemplate.opsForValue().get(rediskey);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            if (event != null) {
+                eventTypeId = event.toString();
+            } else {
+                //redis取不到，进行接口查询
+                //通过租户id，查询eventtypeid
+                HttpRequest requestEvent = HttpRequest.get(domain + eventTypeUri);
+                Map<String, Object> mapEvent = new HashMap<>();
+                mapEvent.put("classId", 1);
+                mapEvent.put("eventType", "alarm");
+                mapEvent.put("scope", "TENANT");
+                mapEvent.put("type", "ALARM");
+                mapEvent.put("X-RCD-Tenant-Id", tenantid);
+                requestEvent.form(mapEvent);
+                requestEvent.header("Authorization", "Bearer " + tokenUtil.getToken());
+                requestEvent.header("accept", "application/json");
+                requestEvent.header("Content-Type", "application/json");
+                HttpResponse responseEvent = requestEvent.execute();
+                if (responseEvent.getStatus() != HttpStatus.HTTP_OK) {
+                    log.error("调用平台接口出错" + responseEvent);
+                    throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(), ResourceUtil.getI18nMessage("40000"));
+                }
+                String resultEvent = responseEvent.body();
+                JSONObject jsonObjectEvent = new JSONObject(resultEvent);
+                JSONArray arrayEvent = jsonObjectEvent.getJSONArray("payload");
+                //查询不到eventtypeid
+                if (arrayEvent == null || arrayEvent.size() == 0) {
+                    // 新增eventtypeid 事件
+                    HttpRequest addEvent = HttpRequest.post(domain + eventTypeUri);
+                    mapEvent.clear();
+                    mapEvent.put("alarmMode", "INTERVAL");
+                    mapEvent.put("classDefine", "新增故障码事件");
+                    mapEvent.put("classId", 1);
+                    mapEvent.put("description", "description");
+                    mapEvent.put("eventType", "alarm");
+                    mapEvent.put("name", "新增故障码事件");
+                    mapEvent.put("scope", "TENANT");
+                    mapEvent.put("type", "ALARM");
+                    mapEvent.put("X-RCD-Tenant-Id", tenantid);
+                    List<Map<String, Object>> eventTypeList = new ArrayList<>();
+                    eventTypeList.add(mapEvent);
+                    addEvent.body(JSON.toJSONString(eventTypeList));
+                    addEvent.header("Authorization", "Bearer " + tokenUtil.getToken());
+                    addEvent.header("accept", "application/json");
+                    addEvent.header("Content-Type", "application/json");
+                    Log.info("参数-->" + JSON.toJSONString(mapEvent));
+                    HttpResponse responseAddEvent = addEvent.execute();
+                    if (responseAddEvent.getStatus() != HttpStatus.HTTP_OK) {
+                        log.error("调用平台接口出错" + responseAddEvent);
+                        throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(), ResourceUtil.getI18nMessage("40000"));
+                    }
+                    String resultAddEvent = responseAddEvent.body();
+                    JSONArray jsonAddEvent = new JSONArray(resultAddEvent);
+                    if (jsonAddEvent != null && jsonAddEvent.size() > 0) {
+                        eventTypeId = jsonAddEvent.getJSONObject(0).getStr("eventTypeId");
+                    }
+                } else {
+                    eventTypeId = arrayEvent.getJSONObject(0).getStr("eventTypeId");
+                }
+
+                if (org.apache.commons.lang3.StringUtils.isNotBlank(eventTypeId)) {
+                    redisTemplate.opsForValue().set(rediskey, eventTypeId, 3500, TimeUnit.SECONDS);
+                }
+            }
+
+            //故障码报警
+            HttpRequest codeAlarmRequest = HttpRequest.post(domain + codeAlarmBatchUri);
+            Map<String, Object> codeAlarmMap = new HashMap<>();
+            codeAlarmMap.put("eventTypeId", eventTypeId);
+            codeAlarmMap.put("thingIds", sbbm);
+            codeAlarmMap.put("level", 1);
+            codeAlarmMap.put("active", true);
+            codeAlarmMap.put("minActiveTs", (DateUtil.rollDay(new Date(), -3)).getTime());
+            codeAlarmMap.put("maxActiveTs", new Date().getTime());
+            codeAlarmRequest.form(codeAlarmMap);
+            codeAlarmRequest.header("Authorization", "Bearer " + tokenUtil.getToken());
+//        codeAlarmRequest.header("AuthHeaderAlias", tokenUtil.superToken());
+//        codeAlarmRequest.header("X-RCD-Tenant-Id",UserContext.getTenantId());
+            codeAlarmRequest.header("accept", "application/json");
+            codeAlarmRequest.header("Content-Type", "application/json");
+
+            String jsonString = JSON.toJSONString(codeAlarmMap);
+            //Log.info("【查询报警信息】请求参数 ==> {}", jsonString);
+            codeAlarmRequest.body(jsonString);
+            HttpResponse codeAlarmResponse = codeAlarmRequest.execute();
+            if (codeAlarmResponse.getStatus() != HttpStatus.HTTP_OK) {
+                log.error("调用平台接口出错" + codeAlarmResponse);
+                //throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),StatusCodeEnum.FAIL_CALL_INTERFACE.getMessage());
+                throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(), ResourceUtil.getI18nMessage("40000"));
+            }
+            String codeAlarmResult = codeAlarmResponse.body();
+            //Log.info("【查询报警信息】返回值 ==> {}", codeAlarmResult);
+            JSONObject codeAlarmJson = new JSONObject(codeAlarmResult);
+            JSONArray codeAlarmArray = codeAlarmJson.getJSONArray("payload");
+           /* List<String> levels = new ArrayList<>();
+            levels.add("1");
+            levels.add("2");
+            List<NxZskFaultCodeEntity> faultCodeEntities = faultCodeService.queryFaultCodesOfMessage(levels);*/
+            //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            codeAlarmArray.stream().forEach(temp -> {
+                JSONObject ruleAlarm = (JSONObject) temp;
+                MyMessageEntity myMessageEntity = new MyMessageEntity();
+                myMessageEntity.setMessageClass(ResourceUtil.getI18nMessage("60003"));
+                /*Optional<NxZskFaultCodeEntity> nxZskFaultCodeEntityOptional = faultCodeEntities.stream().filter(o -> Objects.equals(o.getFaultcodeGzm(),ruleAlarm.get("code").toString())).findFirst();
+                if(nxZskFaultCodeEntityOptional.isPresent()) { //判空
+                    NxZskFaultCodeEntity nxZskFaultCodeEntity = nxZskFaultCodeEntityOptional.get();
+                    myMessageEntity.setMessageName(nxZskFaultCodeEntity.getFaultcodeGzm());
+                    myMessageEntity.setMessageContent(nxZskFaultCodeEntity.getFaultcodeGzms());
+                    myMessageEntity.setGzdj(nxZskFaultCodeEntity.getFaultcodeGzdj());
+                }*/
+               /* faultCodeEntities.stream().forEach(temp1 -> {
+                    if (temp1.getFaultcodeGzm().equals(ruleAlarm.get("code").toString())) {
+                        myMessageEntity.setMessageName(temp1.getFaultcodeGzm());
+                        myMessageEntity.setMessageContent(temp1.getFaultcodeGzms());
+                    }
+                });*/
+                myMessageEntity.setMessageObjectCode(getDeviceCode(ruleAlarm.get("thingId").toString(), filter_deviceListEntities).getSblbSbbm());
+                myMessageEntity.setMessageObjectName(getDeviceCode(ruleAlarm.get("thingId").toString(), filter_deviceListEntities).getSblbSbmc());
+                myMessageEntity.setTypeCode(ServicePlanEnums.MessageType.FAULT_ALARM.getCode());
+                myMessageEntity.setAdviceCode(ServicePlanEnums.MessageCodeType.CONDITION_ALARM.getCode());
+                myMessageEntity.setSignData(getDeviceCode(ruleAlarm.get("thingId").toString(), filter_deviceListEntities).getSblbSbbm());
+                myMessageEntity.setSbxh(getDeviceCode(ruleAlarm.get("thingId").toString(), filter_deviceListEntities).getSblbSbxhCode());
+                myMessageEntity.setBjbm(ruleAlarm.get("code").toString());//报警编码
+                //myMessageEntity.setGzdj(ruleAlarm.get("level").toString());//故障等级
+                //20221031  根据故障码查询故障描述
+                /*LambdaQueryWrapper<NxZskFaultCodeEntity> nxzsOne = new LambdaQueryWrapper<>();
+                nxzsOne.eq(NxZskFaultCodeEntity::getFaultcodeGzm, myMessageEntity.getBjbm());
+                nxzsOne.eq(NxZskFaultCodeEntity::getSyZhid, tenantid);
+                List<NxZskFaultCodeEntity> nxZskFaultCodeEntityList = faultCodeService.list(nxzsOne);
+                if (nxZskFaultCodeEntityList.size() > 0) {
+                    NxZskFaultCodeEntity nxZskFaultCodeEntity = nxZskFaultCodeEntityList.get(0);
+                    if (nxZskFaultCodeEntity != null) {
+                        myMessageEntity.setMessageContent(nxZskFaultCodeEntity.getFaultcodeGzms());
+                    }
+                }*/
+                //String ts = ruleAlarm.get("ts").toString();
+                //long timeLong = Long.parseLong(ts);
+                myMessageEntity.setBjsj(ruleAlarm.get("ts").toString());//报警时间
+                resultList.add(myMessageEntity);
+                /*List<NxTodoLibrary> nxTodoLibraries = nxTodoLibraryService.selectBySign(myMessageEntity.getAdviceCode(), myMessageEntity.getSignData(), myMessageEntity.getMessageTime());
+                if (nxTodoLibraries.isEmpty()) {
+                    resultList.add(myMessageEntity);
+                }*/
+            });
+
+            //查询历史报警，满足24小时的数据
+            codeAlarmMap.clear();
+            codeAlarmMap.put("thingIds", sbbm);
+            codeAlarmMap.put("level", 1);
+            codeAlarmMap.put("active", false);
+            codeAlarmMap.put("minActiveTs", (DateUtil.rollDay(new Date(), -1)).getTime());
+            codeAlarmMap.put("maxActiveTs", new Date().getTime());
+            codeAlarmRequest.form(codeAlarmMap);
+            codeAlarmRequest.header("Authorization", "Bearer " + tokenUtil.getToken());
+            codeAlarmRequest.header("accept", "application/json");
+            codeAlarmRequest.header("Content-Type", "application/json");
+            jsonString = JSON.toJSONString(codeAlarmMap);
+            //Log.info("【查询历史报警信息】请求参数 ==> {}", jsonString);
+            //Log.info("【查询历史报警信息】请求开始时间 ==> {}", DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL));
+            codeAlarmRequest.body(jsonString);
+            codeAlarmResponse = codeAlarmRequest.execute();
+            if (codeAlarmResponse.getStatus() != HttpStatus.HTTP_OK) {
+                Log.error("调用平台接口出错" + codeAlarmResponse);
+                throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(), ResourceUtil.getI18nMessage("40000"));
+            }
+
+            String codeAlarmResult_h = codeAlarmResponse.body();
+            JSONObject codeAlarmJson_h = new JSONObject(codeAlarmResult_h);
+            JSONArray codeAlarmArray_h = codeAlarmJson_h.getJSONArray("payload");
+            //Log.info("【查询历史报警信息】请求结束时间 ==> {}", DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL));
+            codeAlarmArray_h.stream().forEach(temp -> {
+                JSONObject ruleAlarm = (JSONObject) temp;
+
+                MyMessageEntity myMessageEntity = new MyMessageEntity();
+                myMessageEntity.setMessageClass(ResourceUtil.getI18nMessage("60003"));
+                /*Optional<NxZskFaultCodeEntity> nxZskFaultCodeEntityOptional = faultCodeEntities.stream().filter(o -> Objects.equals(o.getFaultcodeGzm(),ruleAlarm.get("code").toString())).findFirst();
+                if(nxZskFaultCodeEntityOptional.isPresent()) { //判空
+                    NxZskFaultCodeEntity nxZskFaultCodeEntity = nxZskFaultCodeEntityOptional.get();
+                    myMessageEntity.setMessageName(nxZskFaultCodeEntity.getFaultcodeGzm());
+                    myMessageEntity.setMessageContent(nxZskFaultCodeEntity.getFaultcodeGzms());
+                    myMessageEntity.setGzdj(nxZskFaultCodeEntity.getFaultcodeGzdj());
+                }*/
+                /*faultCodeEntities.stream().forEach(temp1 -> {
+                    if (temp1.getFaultcodeGzm().equals(ruleAlarm.get("code").toString())) {
+                        myMessageEntity.setMessageName(temp1.getFaultcodeGzm());
+                        myMessageEntity.setMessageContent(temp1.getFaultcodeGzms());
+                    }
+                });*/
+                myMessageEntity.setMessageObjectCode(getDeviceCode(ruleAlarm.get("thingId").toString(), filter_deviceListEntities).getSblbSbbm());
+                myMessageEntity.setMessageObjectName(getDeviceCode(ruleAlarm.get("thingId").toString(), filter_deviceListEntities).getSblbSbmc());
+                myMessageEntity.setTypeCode(ServicePlanEnums.MessageType.FAULT_ALARM.getCode());
+                myMessageEntity.setAdviceCode(ServicePlanEnums.MessageCodeType.CONDITION_ALARM.getCode());
+                myMessageEntity.setSignData(getDeviceCode(ruleAlarm.get("thingId").toString(), filter_deviceListEntities).getSblbSbbm());
+                myMessageEntity.setBjbm(ruleAlarm.get("code").toString());//报警编码
+                //myMessageEntity.setGzdj(ruleAlarm.get("level").toString());//故障等级
+                myMessageEntity.setBjsj(ruleAlarm.get("ts").toString());//报警时间
+                myMessageEntity.setSbxh(getDeviceCode(ruleAlarm.get("thingId").toString(), filter_deviceListEntities).getSblbSbxhCode());
+                /*LambdaQueryWrapper<NxZskFaultCodeEntity> nxzsOne = new LambdaQueryWrapper<>();
+                nxzsOne.eq(NxZskFaultCodeEntity::getFaultcodeGzm, myMessageEntity.getBjbm());
+                nxzsOne.eq(NxZskFaultCodeEntity::getSyZhid, tenantid);
+                List<NxZskFaultCodeEntity> nxZskFaultCodeEntityList = faultCodeService.list(nxzsOne);
+                if (nxZskFaultCodeEntityList.size() > 0) {
+                    NxZskFaultCodeEntity nxZskFaultCodeEntity = nxZskFaultCodeEntityList.get(0);
+                    if (nxZskFaultCodeEntity != null) {
+                        myMessageEntity.setMessageContent(nxZskFaultCodeEntity.getFaultcodeGzms());
+                    }
+                }*/
+                resultList.add(myMessageEntity);
+                /*List<NxTodoLibrary> nxTodoLibraries = nxTodoLibraryService.selectBySign(myMessageEntity.getAdviceCode(), myMessageEntity.getSignData(), myMessageEntity.getMessageTime());
+                if (nxTodoLibraries.isEmpty()) {
+                    resultList.add(myMessageEntity);
+                }*/
+            });
+            //已存在代办库的数据不显示在页面
+            List<String> lists = resultList.stream().map(MyMessageEntity::getSignData).collect(Collectors.toList());
+            if (lists.size() > 0) {
+                List<String> signDatas = nxTodoLibraryService.selectByData(ServicePlanEnums.MessageCodeType.CONDITION_ALARM.getCode(), lists);
+                resultList.forEach(o -> {
+                    if (!signDatas.contains(o.getSignData())) {
+                        mlist.add(o);
+                    }
+                });
+            }
+            // 根据故障码查询故障描述
+            List<String> bjbmList = mlist.stream().map(MyMessageEntity::getBjbm).collect(Collectors.toList());
+            List<NxZskFaultCodeEntity> nxZskFaultCodeEntityList = faultCodeService.selectData(tenantid, bjbmList);
+            mlist.forEach(o -> {
+                Optional<NxZskFaultCodeEntity> infoOptional = nxZskFaultCodeEntityList.stream().
+                        filter(a -> (Objects.equals(a.getFaultcodeGzm(), o.getBjbm()) && Objects.equals(a.getFaultcodeSbxhid(),o.getSbxh()))).findFirst();
+                if (infoOptional.isPresent()) {
+                    NxZskFaultCodeEntity nxZskFaultCodeEntity = infoOptional.get();
+                    //只要紧急数据
+                    /*if ("1".equals(nxZskFaultCodeEntity.getFaultcodeGzdjcode())) {
+                        o.setMessageContent(nxZskFaultCodeEntity.getFaultcodeGzms());
+                        o.setMessageName(nxZskFaultCodeEntity.getFaultcodeGzm());
+                        o.setGzdj(nxZskFaultCodeEntity.getFaultcodeGzdj());
+                        jjlist.add(o);
+                    }*/
+                    o.setMessageContent(nxZskFaultCodeEntity.getFaultcodeGzms());
+                    o.setMessageName(nxZskFaultCodeEntity.getFaultcodeGzm());
+                    if(nxZskFaultCodeEntity.getFaultcodeGzdj().equals("紧急")) {
+                        o.setGzdj(nxZskFaultCodeEntity.getFaultcodeGzdj());
+                        jjlist.add(o);
+                    }
+                }
+            });
+            //Log.info("数据处理结束时间 ==> {}", DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL));
+            if (jjlist.size() > 0) {
+                jjlist.stream().sorted(Comparator.comparing(MyMessageEntity::getBjsj).reversed()).collect(Collectors.toList());
+            }
+        } else {
+            Log.error("调用平台接口出错，没有查询满足4.0设备的数据");
+            throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(), ResourceUtil.getI18nMessage("40000"));
+        }
+        return jjlist;
+    }
+
+    public DeviceListEntity getDeviceCode(String deviceId, List<DeviceListEntity> deviceListEntities) {
+        List<String> result = new ArrayList<>();
+        /*for (DeviceListEntity temp : deviceListEntities) {
+            if (deviceId.equals(temp.getNxJcxxSblbId())) {
+                result.add(temp.getSblbSbbm());
+                result.add(temp.getSblbSbmc());
+                break;
+            }
+        }*/
+        Optional<DeviceListEntity> info = deviceListEntities.stream().filter(o -> Objects.equals(o.getNxJcxxSblbId(), deviceId)).findFirst();
+        if (info.isPresent()) {
+            return info.get();
+        }
+        return null;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/DeviceServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/DeviceServiceImpl.java
new file mode 100644
index 0000000..b937aaa
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/DeviceServiceImpl.java
@@ -0,0 +1,679 @@
+package com.rootcloud.domain.service.device.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.common.DateUtil;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.ResourceUtil;
+import com.rootcloud.common.RootCloudOpenAPIUtil;
+import com.rootcloud.common.constant.DeviceConstant;
+import com.rootcloud.common.constant.RoleIdConstant;
+import com.rootcloud.common.enums.ServicePlanEnums;
+import com.rootcloud.common.enums.StatusCodeEnum;
+import com.rootcloud.common.util.GaoDeAPIUtils;
+import com.rootcloud.config.auth.LoginUserInfo;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.config.auth.UserInfo;
+import com.rootcloud.common.util.GaoDeAPIUtils;
+import com.rootcloud.domain.dto.DeviceDTO;
+import com.rootcloud.domain.dto.DeviceSpecialDTO;
+import com.rootcloud.domain.dto.DeviceWorkTimeDTO;
+import com.rootcloud.domain.entity.SiteDTO;
+import com.rootcloud.domain.entity.device.DeviceEntity;
+import com.rootcloud.domain.entity.device.NxDeviceEntity;
+import com.rootcloud.domain.entity.device.NxDeviceLocationEntity;
+import com.rootcloud.domain.mapper.DeviceMapper;
+import com.rootcloud.domain.mapper.NxDeviceLocationMapper;
+import com.rootcloud.domain.mapper.NxDeviceMapper;
+import com.rootcloud.domain.service.device.DeviceService;
+import com.rootcloud.domain.service.gbsj.JeCoreEnduserService;
+import com.rootcloud.domain.service.gkjk.NxJeDeviceService;
+import com.rootcloud.vo.device.*;
+import jline.internal.Log;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 14:18
+ */
+@Slf4j
+@Service("deviceServiceImpl")
+public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, DeviceEntity> implements DeviceService {
+
+
+    @Autowired
+    private DeviceMapper deviceMapper;
+
+    @Autowired
+    private NxDeviceMapper nxDeviceMapper;
+
+    @Autowired
+    private RootCloudOpenAPIUtil rootCloudOpenAPIUtil;
+
+    @Autowired
+    private GaoDeAPIUtils gaoDeAPIUtils;
+
+    @Autowired
+    private NxDeviceLocationMapper deviceLocationMapper;
+
+    @Resource(name = "nxJeDeviceServiceImpl")
+    private NxJeDeviceService deviceService;
+
+    @Resource(name = "endUserService")
+    private JeCoreEnduserService enduserService;
+
+    @Override
+    public JsonResult<DeviceView> display() {
+        DeviceView deviceView = new DeviceView();
+        //查询所有的设备信息
+        //设备详情：设备编号、地址详情、定位时间、在线时间、在线时长、设备别名、设备监控、设备在线状态
+        List<DeviceInfo> deviceInfoList = new ArrayList<>();
+
+        //查询设备位置
+        List<NxDeviceLocationEntity> allDeviceLocation = deviceLocationMapper.findAllDeviceLocation();
+        Map<String, NxDeviceLocationEntity> deviceLocationMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(allDeviceLocation)) {
+            deviceLocationMap = allDeviceLocation.stream().collect(Collectors.toMap(NxDeviceLocationEntity::getDeviceId, Function.identity()));
+        }
+
+        List<DeviceDTO> deviceDTOList = deviceDTOListByRole();
+        if (CollectionUtils.isEmpty(deviceDTOList)) {
+            return JsonResult.clientFailed(ResourceUtil.getI18nMessage("60004"));
+        }
+
+        List<String> pList = new ArrayList<>();
+        pList.add("SB_ZT_Running");
+        pList.add("SB_ZT_Ready");
+        pList.add("SB_ZT_alarm");
+        pList.add("__online__.connected");
+
+        Map<String, Map<String, Object>> combineResultMap = new HashMap();
+        Map<String, List<DeviceDTO>> collect = deviceDTOList.stream().filter(item->item.getModelId()!=null).collect(Collectors.groupingBy(DeviceDTO::getModelId));
+        for (String key:collect.keySet()) {
+            List<DeviceDTO> deviceDTOS = collect.get(key);
+            List<String> deviceIds  = deviceDTOS.stream().map(DeviceDTO::getId).collect(Collectors.toList());
+            Map<String, Map<String, Object>> workingMapByModelGroup = deviceService.getWorkingMapByModelGroup(key, deviceIds, pList);
+            combineResultMap.putAll(workingMapByModelGroup);
+        }
+
+        for (DeviceDTO deviceDTO : deviceDTOList){
+            DeviceInfo device = DeviceInfo.builder().build();
+            BeanUtils.copyProperties(deviceDTO, device);
+
+            //查询是否同步了地理位置
+            String gps = null;
+            NxDeviceLocationEntity nxDeviceLocationEntity = deviceLocationMap.get(deviceDTO.getId());
+            if (nxDeviceLocationEntity != null) {
+                gps = nxDeviceLocationEntity.getLongitude() + "," + nxDeviceLocationEntity.getLatitude();
+                device.setLocation(new String[]{String.valueOf(nxDeviceLocationEntity.getLongitude()), String.valueOf(nxDeviceLocationEntity.getLatitude())});
+            } else {
+                //处理经纬度
+                String location = deviceDTO.getLocation();
+                if (StringUtils.isNotBlank(location)) {
+                    gps = location;
+                    device.setLocation(location.split(","));
+                }
+            }
+
+            // 2024-9-26新需求 需要根据设备的坐标经纬度筛选，经纬度为空的设备不统计
+            if (device.getLocation() == null) {
+                continue;
+            }
+
+            //看在保修内还是保修外
+            if(StringUtils.isNotBlank(device.getDeviceStartTime())){
+                if(new SimpleDateFormat("yyyy-MM-dd").format(new Date()).compareTo(device.getDeviceStartTime())<=0){
+                    device.setWarrantyStatus("质保期内");
+                }else{
+                    device.setWarrantyStatus("质保期外");
+                }
+            }else{
+                device.setWarrantyStatus("质保期外");
+            }
+
+            // 2024-9-26新需求 先从数据库取设备的详细地址，取不到再通过经纬度解析
+            if(StringUtils.isNotBlank(deviceDTO.getAddress())){
+                device.setAddress(deviceDTO.getAddress());
+            } else if(StringUtils.isNotBlank(deviceDTO.getAddress2())){
+                device.setAddress(deviceDTO.getAddress2());
+            } else if(StringUtils.isNotBlank(gps)){
+                String address = null;
+                //获取经纬度返回地址
+                address = gaoDeAPIUtils.getAddressByJwd(gps);
+                device.setAddress(address);
+            }
+            if(combineResultMap.containsKey(deviceDTO.getId())){
+                Map<String, Object> stringObjectMap = combineResultMap.get(deviceDTO.getId());
+                if (!stringObjectMap.isEmpty()) {
+                    Map<String, Object> running = (Map) stringObjectMap.get("SB_ZT_Running");
+                    Map<String, Object> reading = (Map) stringObjectMap.get("SB_ZT_Ready");
+                    Map<String, Object> alarm = (Map) stringObjectMap.get("SB_ZT_alarm");
+                    Map<String, Object> online = (Map) stringObjectMap.get("__online__.connected");
+                    boolean flg = false;
+                    if (online != null && (boolean) online.get("value")) {
+                        this.setStatus(online, device);
+                        device.setStatus(DeviceConstant.ONLINE_STATUS_CODE);
+                        flg = true;
+                    }
+                    if (reading != null && (boolean) reading.get("value")) {
+                        this.setStatus(reading, device);
+                        device.setStatus(DeviceConstant.READY_STATUS_CODE);
+                        flg = true;
+                    }
+                    if (alarm != null && (boolean) alarm.get("value")) {
+                        this.setStatus(alarm, device);
+                        device.setStatus(DeviceConstant.ALARM_STATUS_CODE);
+                        flg = true;
+                    }
+                    if (running != null && (boolean) running.get("value")) {
+                        this.setStatus(running, device);
+                        device.setStatus(DeviceConstant.RUN_STATUS_CODE);
+                        flg = true;
+                    }
+                    if (online != null && !(boolean) online.get("value")) {
+                        this.setStatus(online, device);
+                        device.setStatus(DeviceConstant.OFFLINE_STATUS_CODE);
+                        flg = true;
+                    }
+                    if (!flg) {
+                        device.setStatus(DeviceConstant.OFFLINE_STATUS_CODE);
+                    }
+                }
+            }
+            deviceInfoList.add(device);
+        }
+
+       /* for (DeviceDTO deviceDTO : deviceDTOList) {
+            DeviceInfo device = DeviceInfo.builder().build();
+            BeanUtils.copyProperties(deviceDTO, device);
+            //查询是否同步了地理位置
+            String gps = null;
+            NxDeviceLocationEntity nxDeviceLocationEntity = deviceLocationMap.get(deviceDTO.getId());
+            if (nxDeviceLocationEntity != null) {
+                gps = nxDeviceLocationEntity.getLongitude() + "," + nxDeviceLocationEntity.getLatitude();
+                device.setLocation(new String[]{String.valueOf(nxDeviceLocationEntity.getLongitude()), String.valueOf(nxDeviceLocationEntity.getLatitude())});
+            } else {
+                //处理经纬度
+                String location = deviceDTO.getLocation();
+                if (StringUtils.isNotBlank(location)) {
+                    gps = location;
+                    device.setLocation(location.split(","));
+                }
+            }
+
+            //获取经纬度返回地址
+            if(StringUtils.isNotBlank(gps)){
+                String address = null;
+                address = gaoDeAPIUtils.getAddressByJwd(gps);
+                device.setAddress(address);
+            }
+            //判断是否为平台同步的设备: 物模型id不为空
+            if (StringUtils.isNotBlank(deviceDTO.getModelId())) {
+                List<String> paramsList = new ArrayList<>();
+//            设备running： SB_ZT_Running
+//            设备ready：SB_ZT_Ready
+//            设备alarm：SB_ZT_alarm
+//            在线 __online__.connected
+                paramsList.add("SB_ZT_Running");
+                paramsList.add("SB_ZT_Ready");
+                paramsList.add("SB_ZT_alarm");
+                paramsList.add("__online__.connected");
+                Map<String, Object> workingMap = deviceService.getRootcloudWorkingMap(device.getId(), paramsList);
+                if (!workingMap.isEmpty()) {
+                    Map<String, Object> running = (Map) workingMap.get("SB_ZT_Running");
+                    Map<String, Object> reading = (Map) workingMap.get("SB_ZT_Ready");
+                    Map<String, Object> alarm = (Map) workingMap.get("SB_ZT_alarm");
+                    Map<String, Object> online = (Map) workingMap.get("__online__.connected");
+                    boolean flg = false;
+                    if (online != null && (boolean) online.get("value")) {
+                        this.setStatus(online, device);
+                        device.setStatus(DeviceConstant.ONLINE_STATUS_CODE);
+                        flg = true;
+                    }
+                    if (running != null && (boolean) running.get("value")) {
+                        this.setStatus(running, device);
+                        device.setStatus(DeviceConstant.RUN_STATUS_CODE);
+                        flg = true;
+                    }
+                    if (alarm != null && (boolean) alarm.get("value")) {
+                        this.setStatus(alarm, device);
+                        device.setStatus(DeviceConstant.ALARM_STATUS_CODE);
+                        flg = true;
+                    }
+                    if (reading != null && (boolean) reading.get("value")) {
+                        this.setStatus(reading, device);
+                        device.setStatus(DeviceConstant.READY_STATUS_CODE);
+                        flg = true;
+                    }
+                    if(online != null && !(boolean) online.get("value")){
+                        this.setStatus(online, device);
+                        device.setStatus(DeviceConstant.OFFLINE_STATUS_CODE);
+                        flg = true;
+                    }
+                    if (!flg) {
+                        if (online != null) {
+                            this.setStatus(online, device);
+                        }
+                        device.setStatus(DeviceConstant.OFFLINE_STATUS_CODE);
+                    }
+                }
+            }
+            deviceInfoList.add(device);
+        }*/
+        deviceView.setDevices(deviceInfoList);
+        //统计总数、在线、离线、故障报警、在线率
+        this.setDeviceStatusStatistics(deviceView, deviceInfoList, deviceInfoList.size());
+        //工时统计：入云时间到昨天的24时的时间差
+        this.setDeviceWorkTimeStatistics(deviceView, deviceDTOList);
+        return JsonResult.success(deviceView);
+    }
+
+    private void setStatus(Map<String, Object> map, DeviceInfo device) {
+        String timeLocal = (String) map.get("timeLocal");
+        if (StringUtils.isNotBlank(timeLocal)) {
+            ZonedDateTime utcZoned = ZonedDateTime.parse(timeLocal);
+            ZoneId swissZone = ZoneId.of("Asia/Shanghai");
+            ZonedDateTime swissZoned = utcZoned.withZoneSameInstant(swissZone);
+            LocalDateTime localDate = swissZoned.toLocalDateTime();
+            device.setOnlineTime(DateUtil.dateToString(Date.from(localDate.atZone(ZoneId.systemDefault()).toInstant()), "YYYY-MM-dd HH:mm:ss"));
+        }
+        /*String timeCloud = (String) map.get("timeCloud");
+        if (StringUtils.isNotBlank(timeCloud)) {
+            ZonedDateTime utcZoned = ZonedDateTime.parse(timeCloud);
+            ZoneId swissZone = ZoneId.of("Asia/Shanghai");
+            ZonedDateTime swissZoned = utcZoned.withZoneSameInstant(swissZone);
+            LocalDateTime localDate = swissZoned.toLocalDateTime();
+            device.setCloudTime(DateUtil.dateToString(Date.from(localDate.atZone(ZoneId.systemDefault()).toInstant()), "YYYY-MM-dd HH:mm:ss"));
+        }*/
+    }
+
+    @Override
+    public JsonResult<DeviceVO> getDeviceInfoWithMonthWorkTimeLineChart(String deviceId) {
+        DeviceEntity deviceEntity = deviceMapper.selectById(deviceId);
+        if (deviceEntity == null) {
+            return JsonResult.clientFailed(StatusCodeEnum.DEVICE_NOT_EXIST.getMessage());
+        }
+        DeviceInfo deviceInfo = DeviceInfo.builder().id(deviceEntity.getNxJeDeviceId()).modelName(deviceEntity.getDeviceSbxhName()).typeName(deviceEntity.getDeviceSblxName()).address(deviceEntity.getDeviceSbxxdz()).code(deviceEntity.getDeviceSbbm()).name(deviceEntity.getDeviceSbmc()).status((deviceEntity.getDeviceStatusCode() == null || "".equals(deviceEntity.getDeviceStatusCode())) ? null : Integer.valueOf(deviceEntity.getDeviceStatusCode())).networkStatus((deviceEntity.getDeviceNetworkStatusCode() == null || "".equals(deviceEntity.getDeviceNetworkStatusCode())) ? null : Integer.valueOf(deviceEntity.getDeviceNetworkStatusCode())).build();
+        NxDeviceEntity nxDeviceEntity = nxDeviceMapper.selectById(deviceInfo.getId());
+
+        //查询设备位置
+        List<NxDeviceLocationEntity> allDeviceLocation = deviceLocationMapper.findAllDeviceLocation();
+        Map<String, NxDeviceLocationEntity> deviceLocationMap = new HashMap<>();
+        String gps = null;
+        if (CollectionUtils.isNotEmpty(allDeviceLocation)) {
+            deviceLocationMap = allDeviceLocation.stream().collect(Collectors.toMap(NxDeviceLocationEntity::getDeviceId, Function.identity()));
+        }
+        NxDeviceLocationEntity nxDeviceLocationEntity = deviceLocationMap.get(deviceId);
+        if (nxDeviceLocationEntity != null) {
+            gps = nxDeviceLocationEntity.getLongitude() + "," + nxDeviceLocationEntity.getLatitude();
+            deviceInfo.setLocation(new String[]{String.valueOf(nxDeviceLocationEntity.getLongitude()), String.valueOf(nxDeviceLocationEntity.getLatitude())});
+        }else{
+            gps = deviceEntity.getDeviceJwd();
+        }
+        // 2024-9-26新需求 先从数据库取设备的详细地址，取不到再通过经纬度解析
+        if(StringUtils.isNotBlank(deviceInfo.getAddress())){
+            deviceInfo.setAddress(deviceInfo.getAddress());
+        } else if(nxDeviceEntity != null && StringUtils.isNotBlank(nxDeviceEntity.getSblbSbxxdz())){
+            deviceInfo.setAddress(nxDeviceEntity.getSblbSbxxdz());
+        } else if(StringUtils.isNotBlank(gps)){
+            String address = null;
+            //获取经纬度返回地址
+            address = gaoDeAPIUtils.getAddressByJwd(gps);
+            deviceInfo.setAddress(address);
+        }
+        //判断是否为平台同步的设备: 物模型id不为空
+        if (StringUtils.isNotBlank(deviceEntity.getModelId())) {
+            List<String> paramsList = new ArrayList<>();
+//            设备running： SB_ZT_Running
+//            设备ready：SB_ZT_Ready
+//            设备alarm：SB_ZT_alarm
+//            在线 __online__.connected
+            paramsList.add("SB_ZT_Running");
+            paramsList.add("SB_ZT_Ready");
+            paramsList.add("SB_ZT_alarm");
+            paramsList.add("__online__.connected");
+            Map<String, Object> workingMap = deviceService.getRootcloudWorkingMap(deviceId, paramsList);
+
+            Map<String, Object> running = (Map) workingMap.get("SB_ZT_Running");
+            Map<String, Object> reading = (Map) workingMap.get("SB_ZT_Ready");
+            Map<String, Object> alarm = (Map) workingMap.get("SB_ZT_alarm");
+            Map<String, Object> online = (Map) workingMap.get("__online__.connected");
+            boolean flg = false;
+            if (online != null && (boolean) online.get("value")) {
+                this.setStatus(online, deviceInfo);
+                deviceInfo.setStatus(DeviceConstant.ONLINE_STATUS_CODE);
+                flg = true;
+            }
+            if (reading != null && (boolean) reading.get("value")) {
+                this.setStatus(reading, deviceInfo);
+                deviceInfo.setStatus(DeviceConstant.READY_STATUS_CODE);
+                flg = true;
+            }
+            if (alarm != null && (boolean) alarm.get("value")) {
+                this.setStatus(alarm, deviceInfo);
+                deviceInfo.setStatus(DeviceConstant.ALARM_STATUS_CODE);
+                flg = true;
+            }
+            if (running != null && (boolean) running.get("value")) {
+                this.setStatus(running, deviceInfo);
+                deviceInfo.setStatus(DeviceConstant.RUN_STATUS_CODE);
+                flg = true;
+            }
+            if(online != null && !(boolean) online.get("value")){
+                this.setStatus(online, deviceInfo);
+                deviceInfo.setStatus(DeviceConstant.OFFLINE_STATUS_CODE);
+                flg = true;
+            }
+            if (!flg) {
+                if (online != null) {
+                    this.setStatus(online, deviceInfo);
+                }
+                deviceInfo.setStatus(DeviceConstant.OFFLINE_STATUS_CODE);
+            }
+        }
+        //获取历史工况信息
+        String endDateString = DateUtil.format(new Date(), "YYYY-MM-01 00:00:00");
+        Date endDate = DateUtil.parse(endDateString);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(endDate);
+        calendar.add(Calendar.MONTH, -5);
+        Date startDate = calendar.getTime();
+        //查询工时
+        List<DeviceWorkTimeDTO> allWithWorkTime = deviceMapper.findAllWithMonthWorkBetweenTime(deviceId, startDate, endDate);
+        allWithWorkTime = allWithWorkTime.stream().filter(c -> c.getTime()!=null).filter(c -> c.getOnlinedTimes()!=null).collect(Collectors.toList());
+        //分组月工时
+        Map<String, DeviceWorkTimeDTO> timeDTOMap = allWithWorkTime.stream().collect(Collectors.toMap(itm -> DateUtil.format(itm.getTime(), "YYYY-MM"), Function.identity()));
+
+        List<Object> y = new ArrayList<>();
+        List<Object> xData = new ArrayList<>();
+        for (int i = 0; i < 6; i++) {
+            calendar.setTime(startDate);
+            calendar.add(Calendar.MONTH, i);
+            String key = DateUtil.format(calendar.getTime(), "YYYY-MM");
+            String xKey = DateUtil.format(calendar.getTime(), "MM");
+            if (!timeDTOMap.isEmpty() && timeDTOMap.get(key) != null && timeDTOMap.get(key).getOnlinedTimes()!=null) {
+                BigDecimal onlinedTimes = timeDTOMap.get(key).getOnlinedTimes();
+                BigDecimal value = onlinedTimes.setScale(2,RoundingMode.HALF_UP);
+                DecimalFormat decimalFormat = new DecimalFormat("0.00");
+                String strVal = decimalFormat.format(value.doubleValue());
+                value = new BigDecimal(strVal);
+                y.add(value);
+            } else {
+                y.add(0);
+            }
+            xData.add(xKey);
+        }
+        DeviceMonthWorkTimeLineChart deviceMonthWorkTimeLineChart = DeviceMonthWorkTimeLineChart.builder().build();
+        List<Object> data = new ArrayList<>();
+        data.add(y);
+        deviceMonthWorkTimeLineChart.setData(data);
+        deviceMonthWorkTimeLineChart.setXData(xData);
+
+        return JsonResult.success(DeviceVO.builder().deviceInfo(deviceInfo).deviceMonthWorkTimeLineChart(deviceMonthWorkTimeLineChart).build());
+    }
+
+    @Override
+    public JsonResult<DeviceMonthWorkTimeStatistics> getMonthWorkTimeStatistics(String deviceId, Date searchDate) {
+        DeviceMonthWorkTimeStatistics result = DeviceMonthWorkTimeStatistics.builder().build();
+
+        //获取月工时
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(searchDate);
+        int month = calendar.get(Calendar.MONTH) + 1;
+        int year = calendar.get(Calendar.YEAR);
+        Date date = DateUtil.parse(year + "-" + month + "-01" + " 00:00:00");
+        List<DeviceWorkTimeDTO> allWithMonthWorkTime = deviceMapper.findAllWithMonthWorkTime(deviceId, date);
+        if (CollectionUtils.isNotEmpty(allWithMonthWorkTime)) {
+            DeviceWorkTimeDTO deviceWorkTimeDTO = allWithMonthWorkTime.get(0);
+            //result.setTotal(deviceWorkTimeDTO.getOnlinedTimes().divide(new BigDecimal( 60 * 60), 1, RoundingMode.HALF_UP).intValue());
+            if(deviceWorkTimeDTO.getOnlinedTimes()!=null){
+                BigDecimal onlinedTimes = deviceWorkTimeDTO.getOnlinedTimes();
+                DecimalFormat decimalFormat = new DecimalFormat("0.00");
+                String strVal = decimalFormat.format(onlinedTimes.doubleValue());
+                result.setTotal(new BigDecimal(strVal));
+            }
+        }
+        //获取天工时
+        //获取昨天日期
+        calendar.setTime(searchDate);
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        Date yesterday = calendar.getTime();
+
+        List<DeviceWorkTimeDTO> allWithDayWorkTime = deviceMapper.findAllWithDayWorkTime(deviceId, yesterday, searchDate);
+        if (CollectionUtils.isNotEmpty(allWithDayWorkTime)) {
+            for (DeviceWorkTimeDTO deviceWorkTimeDTO : allWithDayWorkTime) {
+                if(deviceWorkTimeDTO.getTime()!=null){
+                    if (deviceWorkTimeDTO.getTime().getTime() == searchDate.getTime()) {
+                        //result.setTodayWorkTime(deviceWorkTimeDTO.getOnlinedTimes().divide(new BigDecimal( 60 * 60), 1, RoundingMode.HALF_UP).intValue());
+                        BigDecimal onlinedTimes = deviceWorkTimeDTO.getOnlinedTimes();
+                        DecimalFormat decimalFormat = new DecimalFormat("0.00");
+                        String strVal = decimalFormat.format(onlinedTimes.doubleValue());
+                        result.setTodayWorkTime(new BigDecimal(strVal));
+                    } else {
+                        //result.setYesterdayWorkTime(deviceWorkTimeDTO.getOnlinedTimes().divide(new BigDecimal( 60 * 60), 1, RoundingMode.HALF_UP).intValue());
+                        BigDecimal onlinedTimes = deviceWorkTimeDTO.getOnlinedTimes();
+                        DecimalFormat decimalFormat = new DecimalFormat("0.00");
+                        String strVal = decimalFormat.format(onlinedTimes.doubleValue());
+                        result.setYesterdayWorkTime(new BigDecimal(strVal));
+                    }
+                }
+            }
+        }
+        //当月：总工时、昨日、今日
+        return JsonResult.success(result);
+    }
+
+    @Override
+    public List<DeviceSpecialDTO> selectAllDevice() {
+        return deviceMapper.findSpecialAll();
+    }
+
+    @Override
+    public String returnAddress(String sblbSbbm) {
+        QueryWrapper<DeviceEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("DEVICE_SBBM",sblbSbbm);
+        List<DeviceEntity> deviceEntities = deviceMapper.selectList(queryWrapper);
+        if(!deviceEntities.isEmpty()){
+            DeviceEntity deviceEntity = deviceEntities.get(0);
+            //查询设备位置
+            List<NxDeviceLocationEntity> allDeviceLocation = deviceLocationMapper.findAllDeviceLocation();
+            Map<String, NxDeviceLocationEntity> deviceLocationMap = new HashMap<>();
+            if (CollectionUtils.isNotEmpty(allDeviceLocation)) {
+                deviceLocationMap = allDeviceLocation.stream().collect(Collectors.toMap(NxDeviceLocationEntity::getDeviceId, Function.identity()));
+            }
+            NxDeviceLocationEntity nxDeviceLocationEntity = deviceLocationMap.get(deviceEntities.get(0).getNxJeDeviceId());
+            System.out.print("deviceId:"+deviceEntities.get(0).getNxJeDeviceId());
+            if(!ObjectUtils.isEmpty(nxDeviceLocationEntity)){
+                if(nxDeviceLocationEntity.getLongitude() != null && nxDeviceLocationEntity.getLatitude() != null){
+                    String gps = nxDeviceLocationEntity.getLongitude() + "," + nxDeviceLocationEntity.getLatitude();
+                    log.info(deviceEntities.get(0).getNxJeDeviceId()+"gps:"+gps);
+                    System.out.print(deviceEntities.get(0).getNxJeDeviceId()+"gps:"+gps);
+                    String addressByJwd = gaoDeAPIUtils.getAddressByJwd(gps);
+                    return addressByJwd;
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public List<DeviceDTO> deviceDTOListByRole() {
+        LoginUserInfo current = UserContext.current();
+        log.info("登录用户Id ==>{}",current.getUserId());
+        UserInfo userInfo = enduserService.getUser(current.getUserId());
+        String roleIds = userInfo.getRoleIds();
+        String userIds = null;
+        log.info("登录用户权限 ==>{}",roleIds);
+        if(roleIds.contains(RoleIdConstant.GLY) || roleIds.contains(RoleIdConstant.SHLD)){
+            //管理员
+            return deviceMapper.findAll();
+        }
+        List<String> userIdList = new ArrayList<>();
+        if (roleIds.contains(RoleIdConstant.FWJL) || roleIds.contains(RoleIdConstant.GCS)){
+            SiteDTO siteByUserId = enduserService.getSiteByUserId(current.getUserId());
+            if(!ObjectUtils.isEmpty(siteByUserId)){
+                String[] strings = siteByUserId.getServiceArea().split(",");
+                for (int i = 0; i < strings.length; i++) {
+                    String areaName = strings[i];
+                    String customs = enduserService.getCustomsBySiteAreaName(areaName);
+                    if(StringUtils.isNotBlank(customs)){
+                        userIdList.add(customs);
+                    }
+                }
+            }
+        }else if (roleIds.contains(RoleIdConstant.KHLD) || roleIds.contains(RoleIdConstant.KH)){
+            String custom = enduserService.getCustomsByUserId(current.getUserId());
+            if(StringUtils.isNotBlank(custom)){
+                userIdList.add(custom);
+            }
+        }
+        if(userIdList.size()>0){
+            userIds = String.join(",", userIdList);
+            return deviceMapper.findAllByUserId(userIds);
+        }
+        return new ArrayList<DeviceDTO>();
+    }
+
+    private void setDeviceStatusStatistics(DeviceView deviceView, List<DeviceInfo> deviceInfoList, int totalCount) {
+        DeviceStatusStatistics deviceStatusStatistics = DeviceStatusStatistics.builder().build();
+        deviceStatusStatistics.setDeviceTotal(totalCount);
+        //计算在线设备数
+        Map<Integer, List<DeviceInfo>> deviceMap = deviceInfoList.stream().collect(Collectors.groupingBy(itm -> itm.getStatus() == null ? 0 : itm.getStatus()));
+        List<DeviceInfo> OffDeviceList = deviceMap.get(DeviceConstant.OFFLINE_STATUS_CODE);
+        List<DeviceInfo> faultDeviceList = deviceMap.get(DeviceConstant.ALARM_STATUS_CODE);
+        //计算百分比
+        int offCount = 0;
+        int faultCount = 0;
+        if (CollectionUtils.isNotEmpty(OffDeviceList)) {
+            offCount = OffDeviceList.size();
+        }
+        if (CollectionUtils.isNotEmpty(faultDeviceList)) {
+            faultCount = faultDeviceList.size();
+        }
+        if (CollectionUtils.isNotEmpty(OffDeviceList)) {
+            deviceStatusStatistics.setOnlineCount(totalCount - offCount);
+            BigDecimal total = new BigDecimal(totalCount);
+            BigDecimal onlineRate = new BigDecimal(totalCount - offCount).multiply(new BigDecimal(100)).divide(total, 2, RoundingMode.HALF_UP);
+            deviceStatusStatistics.setOnlineRate(onlineRate.floatValue());
+        } else {
+            deviceStatusStatistics.setOnlineRate(0f);
+        }
+        //获取故障设备数
+        //deviceStatusStatistics.setFault(rootCloudOpenAPIUtil.getCountUnclosedDevice());
+        deviceStatusStatistics.setFault(faultCount);
+        deviceStatusStatistics.setOfflineCount(offCount);
+        deviceView.setDeviceStatusStatistics(deviceStatusStatistics);
+    }
+
+    private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
+    private static final SimpleDateFormat stf = new SimpleDateFormat("yyyy-MM-dd");
+
+    private void setDeviceWorkTimeStatistics(DeviceView deviceView, List<DeviceDTO> deviceDTOList) {
+
+        List<DeviceWorkTimeStatistics> deviceWorkTimeStatistics = new ArrayList<>();
+        //获取去昨天24小时
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        Date startDate = calendar.getTime();
+        String yesterday = sdf.format(startDate);
+        Date yssterDate = null;
+        try {
+            yssterDate = DateUtils.parseDate(stf.format(new Date()) + " 00:00:00", "YYYY-MM-dd HH:mm:ss");
+        } catch (ParseException e) {
+            log.info("时间转换错误");
+        }
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime dateTime = LocalDateTime.parse(yesterday, formatter);
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        // 本月起始
+        Calendar thisMonthFirstDateCal = Calendar.getInstance();
+        thisMonthFirstDateCal.set(Calendar.DAY_OF_MONTH, 1);
+        String thisMonthFirstTime = format.format(thisMonthFirstDateCal.getTime()) + " 00:00:00";
+
+        //查询工时
+        List<DeviceWorkTimeDTO> allWithWorkTime = null;
+        try {
+            allWithWorkTime = deviceMapper.findAllWithMonthWorkTime(null, format.parse(thisMonthFirstTime));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        if (CollectionUtils.isNotEmpty(allWithWorkTime)) {
+            Map<String, List<DeviceWorkTimeDTO>> map = allWithWorkTime.stream().collect(Collectors.groupingBy(DeviceWorkTimeDTO::getDeviceId));
+            Set<String> deviceWithWorkTimeIds = map.keySet();
+            List<DeviceDTO> deviceDTOS = deviceDTOList.stream().filter(itm -> deviceWithWorkTimeIds.contains(itm.getId())).collect(Collectors.toList());
+            for (DeviceDTO itm : deviceDTOS) {
+                List<DeviceWorkTimeDTO> deviceWorkTimeDTOS = map.get(itm.getId());
+                BigDecimal totalTimeMS = new BigDecimal(0);
+                for(DeviceWorkTimeDTO dto : deviceWorkTimeDTOS){
+                    if(dto.getOnlinedTimes()!=null){
+                        totalTimeMS = totalTimeMS.add(dto.getOnlinedTimes());
+                    }
+                }
+                //减去昨天的
+                BigDecimal yesterDecimal = new BigDecimal(0);
+                if(yssterDate!=null){
+                    List<DeviceWorkTimeDTO> allWithDayWorkTime = deviceMapper.findAllWithDayWorkTime(itm.getId(), yssterDate, yssterDate);
+                    if (CollectionUtils.isNotEmpty(allWithDayWorkTime)) {
+                        for (DeviceWorkTimeDTO deviceWorkTimeDTO : allWithDayWorkTime) {
+                            if(deviceWorkTimeDTO.getTime()!=null &&deviceWorkTimeDTO.getOnlinedTimes()!=null){
+                                yesterDecimal = yesterDecimal.add(deviceWorkTimeDTO.getOnlinedTimes());
+                            }
+                        }
+                    }
+                }
+                totalTimeMS  = totalTimeMS.subtract(yesterDecimal).setScale(2, RoundingMode.HALF_UP);
+                DecimalFormat decimalFormat = new DecimalFormat("0.00");
+                String strVal = decimalFormat.format(totalTimeMS.doubleValue());
+                totalTimeMS = new BigDecimal(strVal);
+                //BigDecimal totalTimeMS = deviceWorkTimeDTOS.stream().map(DeviceWorkTimeDTO::getOnlinedTimes).reduce(BigDecimal.ZERO, BigDecimal::add);
+                //计算时间差
+                LocalDateTime endTime = LocalDateTime.parse(thisMonthFirstTime, formatter);
+//                LocalDateTime endTime = LocalDateTime.parse(itm.getCloudTime() != null ? itm.getCloudTime() : "2022-01-01 00:00:00", formatter);
+                long betweenMS = ChronoUnit.SECONDS.between(endTime, dateTime) ;
+                //BigDecimal rs = totalTimeMS.divide(new BigDecimal(betweenMS), 1, RoundingMode.HALF_UP).divide(new BigDecimal(  60 * 60), 2, RoundingMode.HALF_UP);
+                BigDecimal rs = totalTimeMS.multiply(new BigDecimal( 60 * 60 * 100)).divide(new BigDecimal(betweenMS), 2, RoundingMode.HALF_UP);
+
+                //计算时间差
+                DeviceWorkTimeStatistics device = DeviceWorkTimeStatistics.builder().name(itm.getCode()).workTotalTimeRate(rs).workTotalTime(totalTimeMS).build();
+                deviceWorkTimeStatistics.add(device);
+            }
+        }
+        //排序
+       /* Collections.sort(deviceWorkTimeStatistics, new Comparator<DeviceWorkTimeStatistics>() {
+            @Override
+            public int compare(DeviceWorkTimeStatistics device1, DeviceWorkTimeStatistics device2) {
+                return -device1.getWorkTotalTime().compareTo(device1.getWorkTotalTime());
+            }
+        });*/
+        List<DeviceWorkTimeStatistics> list = deviceWorkTimeStatistics.stream().sorted(
+                Comparator.comparing(DeviceWorkTimeStatistics::getWorkTotalTime).reversed()).collect(Collectors.toList());
+        deviceView.setDeviceWorkTimeStatistics(list);
+    }
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/FaultCodeServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/FaultCodeServiceImpl.java
new file mode 100644
index 0000000..a7e6fa1
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/FaultCodeServiceImpl.java
@@ -0,0 +1,101 @@
+package com.rootcloud.domain.service.device.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.domain.entity.NxZskFaultCodeEntity;
+import com.rootcloud.domain.mapper.NxZskFaultCodeMapper;
+import com.rootcloud.domain.service.device.FaultCodeService;
+import com.rootcloud.vo.faultcode.FaultCodeDetailVo;
+import com.rootcloud.vo.faultcode.FaultCodeVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.List;
+
+/**
+ * @author:xxxxx
+ * @create: 2022-05-07 15:18
+ * @Description: 故障码服务实现类
+ */
+@Service("faultCodeServiceImpl")
+public class FaultCodeServiceImpl extends ServiceImpl<NxZskFaultCodeMapper, NxZskFaultCodeEntity> implements FaultCodeService {
+
+    @Autowired
+    private NxZskFaultCodeMapper nxZskFaultCodeMapper;
+
+
+    @Override
+    public List<NxZskFaultCodeEntity> queryFaultCodes(String level, String sbxh) {
+        LambdaQueryWrapper<NxZskFaultCodeEntity> lambdaQueryWrapper = Wrappers.lambdaQuery(NxZskFaultCodeEntity.class);
+        //设备级别
+        if (StringUtils.isNotBlank(level)) {
+            lambdaQueryWrapper.eq(NxZskFaultCodeEntity::getFaultcodeGzdjcode, level);
+        }
+        //根据设备型号查询
+        if (StringUtils.isNotBlank(sbxh)) {
+            lambdaQueryWrapper.eq(NxZskFaultCodeEntity::getFaultcodeSbxhcode, sbxh);
+        }
+        return this.list(lambdaQueryWrapper);
+    }
+
+    @Override
+    public List<NxZskFaultCodeEntity> queryFaultCodesOfApp(List<String> levels, String codeName, String code) {
+        LambdaQueryWrapper<NxZskFaultCodeEntity> lambdaQueryWrapper = Wrappers.lambdaQuery(NxZskFaultCodeEntity.class);
+        if (StringUtils.isNotBlank(code)) {
+            lambdaQueryWrapper.like(NxZskFaultCodeEntity::getFaultcodeGzm, code);
+        }
+        if (StringUtils.isNotBlank(codeName)) {
+            lambdaQueryWrapper.eq(NxZskFaultCodeEntity::getFaultcodeGzms, codeName);
+        }
+        //app端固定查紧急和重要 1和2
+        lambdaQueryWrapper.in(NxZskFaultCodeEntity::getFaultcodeGzdjcode, levels);
+
+        return this.list(lambdaQueryWrapper);
+    }
+
+    @Override
+    public List<NxZskFaultCodeEntity> queryFaultCodesOfMessage(List<String> levels) {
+        LambdaQueryWrapper<NxZskFaultCodeEntity> lambdaQueryWrapper = Wrappers.lambdaQuery(NxZskFaultCodeEntity.class);
+        //app端固定查紧急和重要 1和2
+        lambdaQueryWrapper.in(NxZskFaultCodeEntity::getFaultcodeGzdjcode, levels);
+
+        return this.list(lambdaQueryWrapper);
+    }
+
+    @Override
+    public IPage<FaultCodeVo> getPage(int page, int size, String queryData, String faultcodeSblxcode) {
+        IPage<FaultCodeVo> iPage = new Page(page, size);
+        return nxZskFaultCodeMapper.getPage(iPage, queryData, faultcodeSblxcode);
+    }
+
+    @Override
+    public FaultCodeDetailVo selectById(String nxZskFaultcodeId) {
+        QueryWrapper<NxZskFaultCodeEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("NX_ZSK_FAULTCODE_ID", nxZskFaultcodeId);
+        NxZskFaultCodeEntity nxZskFaultCodeEntity = nxZskFaultCodeMapper.selectOne(queryWrapper);
+        FaultCodeDetailVo vo = new FaultCodeDetailVo();
+        if (!ObjectUtils.isEmpty(nxZskFaultCodeEntity)) {
+            BeanUtils.copyProperties(nxZskFaultCodeEntity, vo);
+        }
+        return vo;
+    }
+
+    @Override
+    public List<NxZskFaultCodeEntity> selectData(String syZhid, List<String> list) {
+        LambdaQueryWrapper<NxZskFaultCodeEntity> nxzsOne = new LambdaQueryWrapper<>();
+        if (list.size() > 0) {
+            nxzsOne.in(NxZskFaultCodeEntity::getFaultcodeGzm, list);
+        }
+        nxzsOne.eq(NxZskFaultCodeEntity::getSyZhid, syZhid);
+        List<NxZskFaultCodeEntity> nxZskFaultCodeEntityList = nxZskFaultCodeMapper.selectList(nxzsOne);
+        return nxZskFaultCodeEntityList;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/LappLiveSetviceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/LappLiveSetviceImpl.java
new file mode 100644
index 0000000..eeeee4e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/LappLiveSetviceImpl.java
@@ -0,0 +1,297 @@
+package com.rootcloud.domain.service.device.impl;
+
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.LappLiveClient;
+import com.rootcloud.common.constant.JsonResultStatusBpm;
+import com.rootcloud.common.constant.LappLiveConstant;
+import com.rootcloud.common.live.CacheMap;
+import com.rootcloud.common.live.CacheMap2;
+import com.rootcloud.common.net.JsonHelper;
+import com.rootcloud.domain.service.device.LappLiveService;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service("appLiveSetvice")
+public class LappLiveSetviceImpl implements LappLiveService {
+
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    private LappLiveClient lappLiveClient;
+
+    @Override
+    public boolean openLive(String deviceSerial, String channelNo) throws Exception {
+
+        if (StringUtils.isBlank(deviceSerial) || StringUtils.isBlank(channelNo)) {
+            log.error("设备序列号和通道号不能为空");
+            return false;
+        }
+
+        // 从缓存中获取accessToken
+        String accessToken = this.getAccessToken();
+        String message = "";
+
+        try {
+            message = lappLiveClient.openLive(LappLiveConstant.OPEN_LIVE_URL, accessToken, deviceSerial, channelNo);
+            if (StringUtils.isBlank(message)) {
+                return false;
+            } else {
+                String code = JsonHelper.getJsonObject(message).get("code").toString();
+                String msg = JsonHelper.getJsonObject(message).get("msg").toString();
+                if ("200".equals(code)) {
+                    return true;
+                } else {
+                    log.error("打开直播地址失败,原因:{}", msg);
+                    if ("10002".equals(code)) {
+                        log.error("token失效,将会重新获取");
+                        CacheMap.dataMap.remove("accessToken");
+                        return false;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.error("直播打开异常", e);
+            return false;
+        }
+
+        return false;
+    }
+
+    @Override
+    public JsonResult getLiveAddress(String deviceSerial, String channelNo) throws Exception {
+
+        if (StringUtils.isBlank(deviceSerial) || StringUtils.isBlank(channelNo)) {
+            log.error("设备序列号和通道号不能为空");
+            return null;
+        }
+        // 打开直播
+        boolean flag = this.openLive(deviceSerial, channelNo);
+        if (flag) {
+            String message = lappLiveClient.getLiveAddress(LappLiveConstant.GET_LIVE_URL, this.getAccessToken(),
+                    deviceSerial, channelNo);
+            String code = JsonHelper.getJsonObject(message).get("code").toString();
+            String msg = JsonHelper.getJsonObject(message).get("msg").toString();
+
+            List<Map<String, String>> resultList = new ArrayList<Map<String, String>>();
+            Map<String, String> map = new HashMap<String, String>();
+
+            // token失效时将会重新获取token
+            if ("10002".equals(code)) {
+                log.error("token失效,将会重新获取");
+                CacheMap.dataMap.remove("accessToken");
+                return null;
+            }
+
+            // 为200时表示请求成功
+            if ("200".equals(code)) {
+                // 解析参数
+                String result = JsonHelper.getJsonObject(message).get("data").toString();
+                log.info("地址信息:{}", result);
+                JSONArray jsonArray = JsonHelper.getJsonArray(result);
+                JSONObject jsonObject = jsonArray.getJSONObject(0);
+                String ret = jsonObject.getString("ret");
+                String desc = jsonObject.getString("desc");
+                String status = jsonObject.getString("status");
+                String exception = jsonObject.getString("exception");
+
+                // 200表示解析成功
+                if ("200".equals(ret) && "1".equals(status) && "0".equals(exception)) {
+                    String hls = jsonObject.getString("hls");
+                    String hlsHd = jsonObject.getString("hlsHd");
+                    String rtmp = jsonObject.getString("rtmp");
+                    String rtmpHd = jsonObject.getString("rtmpHd");
+                    map.put("hls", hls);
+                    map.put("hlsHd", hlsHd);
+                    map.put("rtmp", rtmp);
+                    map.put("rtmpHd", rtmpHd);
+                    map.put("deviceSerial", deviceSerial);
+                    map.put("channelNo", channelNo);
+                    resultList.add(map);
+                    return new JsonResult(JsonResultStatusBpm.RET_SUCCESS, resultList);
+                } else {
+                    log.error("解析直播地址有异常,解析信息:{},设备状态(1表示正常):{},异常信息(0表示没有异常):{}", desc, status, exception);
+                    log.error("设备状态:0-未使用或直播已关闭，1-使用中，2-已过期，3-直播已暂停");
+                    log.error("地址异常信息：0-正常，1-设备不在线，2-设备开启视频加密，3-设备删除，4-失效，5-未绑定，6-账户下流量已超出");
+                    return new JsonResult(JsonResultStatusBpm.RET_EXCEPTION, "解析直播地址有异常,请检查直播状态和设备状态");
+                }
+            } else {
+                log.error("请求获取直播地址失败,失败信息为:{}", msg);
+                return new JsonResult(JsonResultStatusBpm.RET_EXCEPTION, msg);
+            }
+        } else {
+            log.error("打开直播功能失败");
+            return new JsonResult(JsonResultStatusBpm.RET_EXCEPTION, "打开直播功能失败,请检查参数否正确 或重新进行该操作!");
+        }
+    }
+
+    public String getAccessToken() throws Exception {
+        String accessToken = "";
+        boolean flag = CacheMap.hasCache("accessToken");
+        if (flag) {
+            // 判断token时是否过期.
+            accessToken = CacheMap.get("accessToken");
+            if (StringUtils.isBlank(accessToken)) {
+                accessToken = lappLiveClient.getAccessToken();
+                CacheMap.put("accessToken", accessToken);
+            }
+        } else {
+            // 缓存中不存在token
+            accessToken = lappLiveClient.getAccessToken();
+            CacheMap.put("accessToken", accessToken);
+        }
+        return accessToken;
+    }
+
+
+    @Override
+    public JsonResult getLeChengLiveAddress(String deviceSerial, String channelNo) throws Exception {
+        List<Map<String, String>> resultList = new ArrayList<Map<String, String>>();
+        if (StringUtils.isBlank(deviceSerial) || StringUtils.isBlank(channelNo)) {
+            log.error("设备序列号和通道号不能为空");
+            return null;
+        }
+        if (true) {
+            String tokenString = this.getAccessTokenLeCheng();
+            if (tokenString == null) {
+                log.error("token失效,将会重新获取...");
+                CacheMap2.dataMap.remove("accessTokenLeCheng");
+                return null;
+            }
+            if(tokenString.equals("")){
+                log.error("token为空,开始重新获取...");
+                tokenString = this.getAccessTokenLeCheng2();
+            }
+            if(tokenString.equals("")){
+                log.error("token重新获取为空返回...");
+                return null;
+            }
+            log.error("LECHENG_URL:"+LappLiveConstant.LIVE_LECHENG_URL);
+            log.error("token:"+tokenString);
+            log.error("deviceSerial:"+deviceSerial+"|channelNo:"+channelNo+"|token:"+tokenString);
+            String message0 = lappLiveClient.getLiveAddressLeCheng0(LappLiveConstant.LIVE_LECHENG_URL, tokenString,
+                    deviceSerial, channelNo);
+            log.error("message0:"+message0);
+
+            String hls01 = JSONArray.fromObject(JsonHelper.getJsonObject(JsonHelper.getJsonObject(JsonHelper.getJsonObject(message0).get("result")).get("data")).get("streams")).getJSONObject(0).get("hls").toString();
+            String streamId01 = JSONArray.fromObject(JsonHelper.getJsonObject(JsonHelper.getJsonObject(JsonHelper.getJsonObject(message0).get("result")).get("data")).get("streams")).getJSONObject(0).get("streamId").toString();
+            String hls02 = JSONArray.fromObject(JsonHelper.getJsonObject(JsonHelper.getJsonObject(JsonHelper.getJsonObject(message0).get("result")).get("data")).get("streams")).getJSONObject(1).get("hls").toString();
+            String streamId02 = JSONArray.fromObject(JsonHelper.getJsonObject(JsonHelper.getJsonObject(JsonHelper.getJsonObject(message0).get("result")).get("data")).get("streams")).getJSONObject(1).get("streamId").toString();
+            log.error("hls01:"+hls01);
+            log.error("streamId01:"+streamId01);
+            log.error("hls02:"+hls02);
+            log.error("streamId02:"+streamId02);
+
+            Map<String, String> map = new HashMap<String, String>();
+            if (streamId01.equals("1") && streamId02.equals("0")) { //0:高清主码流；1:标清辅码流
+                map.put("hlsHd", hls02);
+                map.put("hls", hls01);
+            }
+            if (streamId01.equals("0") && streamId02.equals("1")) {
+                map.put("hlsHd", hls01);
+                map.put("hls", hls02);
+            }
+            map.put("rtmp", "");
+            map.put("rtmpHd", "");
+            map.put("deviceSerial", deviceSerial);
+            map.put("channelNo", channelNo);
+            resultList.add(map);
+            return new JsonResult(JsonResultStatusBpm.RET_SUCCESS, resultList);
+        } else {
+            log.error("打开直播功能失败");
+            return new JsonResult(JsonResultStatusBpm.RET_EXCEPTION, "打开直播功能失败,请检查参数否正确 或重新进行该操作!");
+        }
+    }
+
+    public String openLiveLeCheng(String deviceSerial, String channelNo) throws Exception {
+
+        if (StringUtils.isBlank(deviceSerial) || StringUtils.isBlank(channelNo)) {
+            log.error("设备序列号和通道号不能为空");
+            return "";
+        }
+        // 从缓存中获取accessToken
+        String accessToken = this.getAccessTokenLeCheng();
+        String message = "";
+        return accessToken;
+
+        /*
+        try {
+            message = lappLiveClient.openLive(LappLiveConstant.OPEN_LIVE_LECHENG_URL, accessToken, deviceSerial, channelNo);
+            if (StringUtils.isBlank(message)) {
+                return false;
+            } else {
+                String code = JsonHelper.getJsonObject(message).get("code").toString();
+                String msg = JsonHelper.getJsonObject(message).get("msg").toString();
+                if ("200".equals(code)) {
+                    return true;
+                } else {
+                    log.error("打开直播地址失败,原因:{}", msg);
+                    if("10002".equals(code)) {
+                        log.error("token失效,将会重新获取");
+                        CacheMap.dataMap.remove("accessToken");
+                        return false;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.error("直播打开异常", e);
+            return false;
+        }
+        return false;
+        */
+    }
+
+    public String getAccessTokenLeCheng() throws Exception {
+        String accessToken = "";
+        boolean flag = CacheMap2.hasCache("accessTokenLeCheng");
+        if (flag) {
+            try{
+                // 判断token时是否过期.
+                accessToken = CacheMap2.get("accessTokenLeCheng");
+                log.error("判断token时是否过期,accessToken:{}",accessToken);
+                if (StringUtils.isBlank(accessToken)) {
+                    accessToken = lappLiveClient.getAccessTokenLeCheng();
+                    log.error("token已过期重新获取,accessToken:{}",accessToken);
+                    CacheMap2.put("accessTokenLeCheng", accessToken);
+                }
+                else{
+                    log.error("token未过期,accessToken:{}",accessToken);
+                }
+            }catch(Exception ex){
+                log.error("getAccessTokenLeCheng1:{}",ex);
+            }
+        } else {
+            try{
+                // 缓存中不存在token
+                accessToken = lappLiveClient.getAccessTokenLeCheng();
+                log.error("缓存中不存在token重新获取,accessToken:{}",accessToken);
+                CacheMap2.put("accessTokenLeCheng", accessToken);
+            }catch (Exception ex){
+                log.error("getAccessTokenLeCheng2:{}",ex);
+            }
+        }
+        return accessToken;
+    }
+
+    public String getAccessTokenLeCheng2() throws Exception {
+        String accessToken = "";
+        try{
+            // 缓存中不存在token
+            accessToken = lappLiveClient.getAccessTokenLeCheng();
+            log.error("缓存中不存在token重新获取,accessToken:{}",accessToken);
+            CacheMap2.put("accessTokenLeCheng", accessToken);
+        }catch (Exception ex){
+            log.error("getAccessTokenLeCheng2:{}",ex);
+        }
+        return accessToken;
+    }
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/NxDeviceServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/NxDeviceServiceImpl.java
new file mode 100644
index 0000000..7276a84
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/device/impl/NxDeviceServiceImpl.java
@@ -0,0 +1,122 @@
+package com.rootcloud.domain.service.device.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageInfo;
+import com.rootcloud.common.JEUuidUtil;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.PageRequest;
+import com.rootcloud.domain.dto.CameraDTO;
+import com.rootcloud.domain.dto.NxDeviceDTO;
+import com.rootcloud.domain.entity.device.NxDeviceCameraEntity;
+import com.rootcloud.domain.entity.device.NxDeviceEntity;
+import com.rootcloud.domain.mapper.DeviceMapper;
+import com.rootcloud.domain.mapper.NxDeviceCameraMapper;
+import com.rootcloud.domain.mapper.NxDeviceMapper;
+import com.rootcloud.domain.service.device.NxDeviceService;
+import com.rootcloud.vo.device.CameraParam;
+import com.rootcloud.vo.device.NxDeviceParam;
+import com.rootcloud.vo.order.DeviceDataVo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 14:18
+ */
+@Slf4j
+@Service("nxDeviceServiceImpl")
+public class NxDeviceServiceImpl extends ServiceImpl<NxDeviceMapper, NxDeviceEntity> implements NxDeviceService {
+
+    @Autowired
+    private DeviceMapper deviceMapper;
+    @Autowired
+    private NxDeviceCameraMapper cameraMapper;
+
+    @Autowired
+    private NxDeviceMapper nxDeviceMapper;
+
+    @Override
+    public JsonResult<PageInfo<NxDeviceDTO>> findList(PageRequest pageRequest, NxDeviceParam nxDeviceParam) {
+        int pageNum = pageRequest.getPage() == null ? 1 : pageRequest.getPage();
+        int pageSize = pageRequest.getSize() == null ? 10 : pageRequest.getSize();
+        int startIndex = (pageNum - 1) * pageSize;
+
+        List<NxDeviceDTO> cameraList = deviceMapper.findCameraList(nxDeviceParam.getNo(), nxDeviceParam.getName(), nxDeviceParam.getType(), startIndex, pageSize);
+
+        if (CollectionUtils.isNotEmpty(cameraList)) {
+            cameraList.forEach(itm -> {
+                itm.setCameras(deviceMapper.selectCameras(itm.getDeviceId()));
+            });
+            cameraList.sort(Comparator.comparing(NxDeviceDTO::getDeviceId));
+            cameraList.forEach(itm -> {
+                itm.getCameras().sort(Comparator.comparing(CameraDTO::getOrderIndex));
+            });
+        }
+        Integer count = deviceMapper.findCameraCount(nxDeviceParam.getNo(), nxDeviceParam.getName(), nxDeviceParam.getType());
+
+        PageInfo<NxDeviceDTO> pageInfo = new PageInfo<>(cameraList);
+        pageInfo.setPageNum(pageNum);
+        pageInfo.setPageSize(pageSize);
+        pageInfo.setTotal(count);
+        return JsonResult.success(pageInfo);
+    }
+
+    @Override
+    public JsonResult<Void> bindCamera(CameraParam cameraParam) {
+        NxDeviceCameraEntity cameraEntity = new NxDeviceCameraEntity();
+        BeanUtils.copyProperties(cameraParam, cameraEntity);
+        if (StringUtils.isNotBlank(cameraParam.getId())) {
+            cameraEntity.setNxJcxxSblbCameraId(cameraParam.getId());
+            cameraMapper.updateById(cameraEntity);
+        } else {
+            cameraEntity.setNxJcxxSblbCameraId(JEUuidUtil.uuid());
+            cameraMapper.insert(cameraEntity);
+        }
+        return JsonResult.success();
+    }
+
+    @Override
+    public JsonResult<Void> UnboundCamera(String cameraId) {
+        cameraMapper.deleteById(cameraId);
+        return JsonResult.success();
+    }
+
+    @Override
+    public List<NxDeviceCameraEntity> camerasByDeviceId(String deviceId) {
+        LambdaQueryWrapper<NxDeviceCameraEntity> cameraWrapper = new LambdaQueryWrapper<>();
+        cameraWrapper.eq(NxDeviceCameraEntity::getDeviceId, deviceId);
+        cameraWrapper.orderByAsc(NxDeviceCameraEntity::getOrderIndex);
+        List<NxDeviceCameraEntity> nxDeviceCameraEntities = cameraMapper.selectList(cameraWrapper);
+        return nxDeviceCameraEntities;
+    }
+
+    @Override
+    public DeviceDataVo getJcxxByIds(String ids) {
+        return nxDeviceMapper.getJcxxByIds(ids);
+    }
+
+    @Override
+    public String selectFwwdId(String khid,String zhId) {
+        return nxDeviceMapper.selectFwwdId(khid,zhId);
+    }
+
+
+    @Override
+    public List<DeviceDataVo> getKuDeviceList(String userId) {
+        return nxDeviceMapper.getKuDeviceList(userId);
+    }
+
+}
+
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/DeviceListSyncService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/DeviceListSyncService.java
new file mode 100644
index 0000000..2b29ed2
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/DeviceListSyncService.java
@@ -0,0 +1,22 @@
+package com.rootcloud.domain.service.ds;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.entity.ds.DeviceListEntity;
+
+import java.util.List;
+
+public interface DeviceListSyncService  extends IService<DeviceListEntity> {
+    /**
+     * mq同步4.0设备到设备列表中
+     * @param entity
+     * @param action
+     */
+    void updateDeviceListData(DeviceListEntity entity, String action);
+
+    /**
+     * 根据客户ID查询设备信息
+     * @param userId
+     * @return
+     */
+    List<DeviceListEntity> queryDeviceList(String userId);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/DeviceSyncService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/DeviceSyncService.java
new file mode 100644
index 0000000..0c01f30
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/DeviceSyncService.java
@@ -0,0 +1,10 @@
+package com.rootcloud.domain.service.ds;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.entity.ds.DeviceSyncEntity;
+
+public interface DeviceSyncService extends IService<DeviceSyncEntity> {
+    void syncDeviceData();
+    void updateDeviceData(DeviceSyncEntity entity,String action);
+    //void updataDeviceData(DeviceSyncEntity entity);
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/ModelPropertySyncService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/ModelPropertySyncService.java
new file mode 100644
index 0000000..4daeac1
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/ModelPropertySyncService.java
@@ -0,0 +1,35 @@
+package com.rootcloud.domain.service.ds;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.entity.ds.ModelPropertySyncEntity;
+
+import java.util.List;
+
+public interface ModelPropertySyncService extends IService<ModelPropertySyncEntity> {
+    void syncModelPropertyData(String clientId,String clientSecret);
+
+    List<String> queryPropertysByModelId(String modelId);
+
+    void updateModelProperty(List<ModelPropertySyncEntity> entitys);
+
+    void delModelProperty(ModelPropertySyncEntity entity);
+
+    /**
+     * 根据modelId查询属性列表
+     *
+     * @param modelId
+     *            modelId
+     * @return 列表数据
+     */
+    List<ModelPropertySyncEntity> queryListByModelId(String modelId);
+
+    /**
+     * 根据modelId和属性Id查询属性
+     *
+     * @param modelId
+     *            modelId
+     * @param propertyId 属性ID
+     * @return 属性数据
+     */
+    ModelPropertySyncEntity queryByModelIdAndPropertyId(String modelId, String propertyId);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/ModelSyncService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/ModelSyncService.java
new file mode 100644
index 0000000..60df5dd
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/ModelSyncService.java
@@ -0,0 +1,11 @@
+package com.rootcloud.domain.service.ds;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.entity.ds.ModelEntity;
+
+import java.util.List;
+
+public interface ModelSyncService extends IService<ModelEntity> {
+    void syncModelData(String clientId,String clientSecret);
+    List<ModelEntity> getModelList(String clientId,String clientSecret);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/NxDsLogService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/NxDsLogService.java
new file mode 100644
index 0000000..7625523
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/NxDsLogService.java
@@ -0,0 +1,8 @@
+package com.rootcloud.domain.service.ds;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.entity.ds.NxDsLogEntity;
+
+public interface NxDsLogService extends IService<NxDsLogEntity> {
+    void saveLog(NxDsLogEntity entity);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/DeviceListSyncServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/DeviceListSyncServiceImpl.java
new file mode 100644
index 0000000..7538739
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/DeviceListSyncServiceImpl.java
@@ -0,0 +1,95 @@
+package com.rootcloud.domain.service.ds.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.common.constant.RoleIdConstant;
+import com.rootcloud.config.auth.UserInfo;
+import com.rootcloud.domain.dao.ds.DeviceListMapper;
+import com.rootcloud.domain.entity.*;
+import com.rootcloud.domain.entity.ds.DeviceListEntity;
+import com.rootcloud.domain.mapper.NxOrderMapper;
+import com.rootcloud.domain.service.ds.DeviceListSyncService;
+import com.rootcloud.domain.service.gbsj.JeCoreEnduserService;
+import jline.internal.Log;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+@Service("deviceListSyncService2")
+public class DeviceListSyncServiceImpl extends ServiceImpl<DeviceListMapper, DeviceListEntity> implements DeviceListSyncService {
+
+    @Autowired
+    private DeviceListMapper deviceListMapper;
+
+    @Autowired
+    private NxOrderMapper nxOrderMapper;
+
+    @Resource(name = "endUserService")
+    private JeCoreEnduserService enduserService;
+
+    @Override
+    public void updateDeviceListData(DeviceListEntity entity, String action) {
+        //更新前先判断数据库数据是否存在设备
+        LambdaQueryWrapper<DeviceListEntity> lambdaQueryWrapper = Wrappers.lambdaQuery(DeviceListEntity.class);
+        lambdaQueryWrapper.eq(DeviceListEntity::getNxJcxxSblbId, entity.getNxJcxxSblbId());
+        List<DeviceListEntity> list = this.list(lambdaQueryWrapper);
+        if ("add".equals(action) && CollectionUtils.isEmpty(list)) {
+            this.save(entity);
+        } else if ("mod".equals(action) && !CollectionUtils.isEmpty(list)) {
+            this.updateById(entity);
+        } else if ("del".equals(action) && !CollectionUtils.isEmpty(list)) {
+            this.removeById(entity.getNxJcxxSblbId());
+        }
+    }
+
+    @Override
+    public List<DeviceListEntity> queryDeviceList(String userId) {
+        //网点的设备列表
+        JeCoreEnduserEntity user = nxOrderMapper.getCoreEnduserByUsrId(userId);
+        //一个人只能绑定一个服务网点，所以list里只有一个或者没有
+        List<FwryDTO> fwryList = nxOrderMapper.getNxgxJcdaFwryByUserId(userId);
+        List<DeviceListEntity> sblbList = new ArrayList<>();
+        UserInfo userInfo = enduserService.getUser(userId);
+        if (!org.apache.commons.collections.CollectionUtils.isEmpty(fwryList)) {
+            FwryDTO fwryDTO = fwryList.get(0);
+            //通过网点id获取服务网点信息
+            NetworkEntity networkEntity = nxOrderMapper.getfwwd(fwryDTO);
+            //获取网点下的服务区域
+            String[] split = networkEntity.getFwwdSsqy().split(",");
+            //通过网点的服务区域，去查询客户
+            List<KhglDTO> khglDTOList = nxOrderMapper.getKhBykhdzs(split);
+            //通过客户名称查询设备列表信息
+            //所有的设备列表信息
+            if (!org.apache.commons.collections.CollectionUtils.isEmpty(khglDTOList)) {
+                HashMap<String, String> req = new HashMap<>();
+                String khmc = "";
+                for (KhglDTO dto : khglDTOList) {
+                    khmc += "'" + dto.getKhglKhmc() + "',";
+                }
+                khmc = khmc.substring(0, khmc.length() - 1);
+                req.put("khmc", khmc);
+//                        Log.info("寿命预警工程师或服务经理查询客户名称:{}", khmc);
+                // List<NxDeviceEntity> sblbList = nxOrderMapper.getNxDeviceEntity(req);
+                if (StringUtils.isNotEmpty(khmc)) {
+                    sblbList = deviceListMapper.selectBykhmc(khmc, userInfo.getTenantId());
+                }
+            }
+        }
+
+        String roleIds = userInfo.getRoleIds();
+        if (roleIds.contains(RoleIdConstant.SHLD) || roleIds.contains(RoleIdConstant.GLY)) {
+            userId = null;
+        }
+        //客户管理下的设备列表
+        List<DeviceListEntity> deviceListEntities = deviceListMapper.selectByUserId(userId, userInfo.getTenantId());
+        sblbList.addAll(deviceListEntities);
+        return sblbList;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/DeviceSyncServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/DeviceSyncServiceImpl.java
new file mode 100644
index 0000000..9d9809d
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/DeviceSyncServiceImpl.java
@@ -0,0 +1,228 @@
+package com.rootcloud.domain.service.ds.impl;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpStatus;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.common.TokenUtil;
+import com.rootcloud.domain.dao.ds.DeviceSyncMapper;
+import com.rootcloud.domain.entity.ds.DeviceSyncEntity;
+import com.rootcloud.domain.service.ds.DeviceSyncService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service("deviceSyncService2")
+@Slf4j
+public class DeviceSyncServiceImpl extends ServiceImpl<DeviceSyncMapper, DeviceSyncEntity> implements DeviceSyncService {
+
+    @Value(value = "${os.iam.domain}")
+    private String domain;
+    @Value(value = "${os.iam.superToken}")
+    private String superToken;
+    @Value(value = "${cms.thing.uri}")
+    private String thingUri;
+    @Value(value = "${cms.thingstatus.uri}")
+    private String thingStatusUri;
+    @Autowired
+    private TokenUtil tokenUtil;
+
+    /**
+     * 同步物实例
+     */
+    @Override
+    public void syncDeviceData() {
+        //查询目前在库的物模型
+        LambdaQueryWrapper<DeviceSyncEntity> lambdaQueryWrapper = Wrappers.lambdaQuery(DeviceSyncEntity.class);
+        lambdaQueryWrapper.eq(DeviceSyncEntity::getDeviceSource,"1");
+        List<DeviceSyncEntity> list = this.list(lambdaQueryWrapper);
+        //判断在库的设备是否为空，为空直接同步全量数据
+        if (CollectionUtils.isEmpty(list)) {
+            this.saveBatch(getDeviceList());
+            return;
+        }
+        //不为空时先判断是否有增量数据，有先同步增量，再比较变更
+        List<DeviceSyncEntity> deviceList = getDeviceList();
+        sync(list, deviceList);
+    }
+
+    private void sync(List<DeviceSyncEntity> dbList, List<DeviceSyncEntity> interfaceList) {
+        List<DeviceSyncEntity> deleteList = new ArrayList<>(16);
+        List<DeviceSyncEntity> updateList = new ArrayList<>(16);
+        List<DeviceSyncEntity> addList = new ArrayList<>(16);
+        //更新的 集合
+        for (int i = 0; i < dbList.size(); i++) {
+            DeviceSyncEntity temp = dbList.get(i);
+            if (containsId(interfaceList, temp.getNxJeDeviceId())) {
+                updateList.add(temp);
+            }
+        }
+        //删除的集合
+        deleteList = dbList;
+        deleteList.removeAll(updateList);
+        //插入的集合
+        addList = interfaceList;
+        addList.removeAll(updateList);
+
+
+        //批量插入
+        this.saveBatch(addList);
+        //删除的
+        this.removeByIds(deleteList.stream().map(temp -> temp.getNxJeDeviceId()).collect(Collectors.toList()));
+
+        //更新的
+        updateList.stream().forEach(temp -> {
+            //通过ID 从接口的 集合中获取这条数据
+            for (int i = 0; i < interfaceList.size(); i++) {
+                DeviceSyncEntity temp2 = interfaceList.get(i);
+                if (temp.getNxJeDeviceId().equals(temp2.getNxJeDeviceId())) {
+                    //接口返回更新时间时更新最新设备信息到数据库
+                    if (temp2.getUpdateTime() != null) {
+                        BeanUtils.copyProperties(temp, temp2);
+                        this.updateById(temp);
+                    } else {
+                        continue;
+                    }
+                }
+            }
+        });
+    }
+
+    private boolean containsId(List<DeviceSyncEntity> modelEntityList, String deviceId) {
+        for (int i = 0; i < modelEntityList.size(); i++) {
+            DeviceSyncEntity temp = modelEntityList.get(i);
+            if (temp.getNxJeDeviceId().equals(deviceId)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 调用物实例查询接口获取设备信息
+     * @return
+     */
+    public List<DeviceSyncEntity> getDeviceList() {
+        List<DeviceSyncEntity> resultList = new ArrayList<>(16);;
+        String thingUrl = domain+thingUri;
+        HttpRequest thingRequest = HttpRequest.get(thingUrl);
+        String thingStatusUrl = domain+thingStatusUri;
+        HttpRequest thingStatusRequest = HttpRequest.get(thingStatusUrl);
+        String token = tokenUtil.getToken();
+        thingRequest.header("Authorization", "Bearer " + token);
+        thingStatusRequest.header("Authorization", "Bearer " + token);
+        HttpResponse thingResponse = thingRequest.execute();
+        if(thingResponse.getStatus()!= HttpStatus.HTTP_OK){
+            log.error("调用平台接口"+thingUrl+"返回"+thingResponse);
+        }
+        HttpResponse thingStatusResponse = thingStatusRequest.execute();
+        if(thingStatusResponse.getStatus()!= HttpStatus.HTTP_OK){
+            log.error("调用平台接口"+thingStatusUrl+"返回"+thingStatusResponse);
+        }
+        JSONObject thingJsonObj = new JSONObject(thingResponse.body());
+        JSONObject thingStatusJsonObj = new JSONObject(thingStatusResponse.body());
+        JSONArray thingArray = thingJsonObj.getJSONArray("payload");
+        JSONArray thingStatusArray = thingStatusJsonObj.getJSONArray("payload");
+        thingStatusArray.stream().forEach(temp->{
+            JSONObject obj = (JSONObject)temp;
+            DeviceSyncEntity deviceEntity = new DeviceSyncEntity();
+            deviceEntity.setNxJeDeviceId(obj.get("thingId").toString());
+            deviceEntity.setDeviceSbbm(obj.get("assetId").toString());
+            deviceEntity.setDeviceSbmc(obj.get("name").toString());
+            deviceEntity.setModelId(obj.get("modelId").toString());
+            //设备型号和设备类型给默认值
+            deviceEntity.setDeviceSblx("0000");
+            deviceEntity.setDeviceSblxName("4.0平台设备");
+            deviceEntity.setDeviceSbxh("yHG8OtzRKz3oEDhKZop");
+            deviceEntity.setDeviceSbxhName("4.0平台设备型号");
+            //来源1 代表来之平台
+            deviceEntity.setDeviceSource("1");
+            if(obj.get("country") != null){
+                deviceEntity.setDeviceSsgj(obj.get("country").toString());
+            }
+            if(obj.get("state") != null){
+                deviceEntity.setDeviceSssfmc(obj.get("state").toString());
+            }
+            if(obj.get("city") != null){
+                deviceEntity.setDeviceSscsmc(obj.get("city").toString());
+            }
+            if(obj.get("district") != null){
+                deviceEntity.setDeviceSsqxmc(obj.get("district").toString());
+            }
+            if(obj.get("longitude") != null){
+                deviceEntity.setDeviceJd(obj.get("longitude").toString());
+            }
+            if(obj.get("latitude") != null){
+                deviceEntity.setDeviceWd(obj.get("latitude").toString());
+            }
+            if(obj.get("online") != null){
+                boolean online = (boolean)obj.get("online");
+                if(online){
+                    deviceEntity.setDeviceNetworkStatusCode("1");
+                }else{
+                    deviceEntity.setDeviceNetworkStatusCode("0");
+                }
+
+            }
+   /*         if(temp.get("workingStatus") != null){
+                boolean workingStatus = (boolean)temp.get("workingStatus");
+                if(workingStatus){
+                    deviceEntity.setDeviceStatusCode("1");
+                }else {
+                    deviceEntity.setDeviceStatusCode("0");
+                }
+            }*/
+            thingArray.stream().forEach(temp1->{
+                JSONObject obj1 = (JSONObject) temp1;
+                if(obj.get("thingId").equals(obj1.get("thingId"))){
+                    JSONObject deviceInfo = new JSONObject(obj1.get("deviceInfo"));
+                    if(deviceInfo.get("manufacturer") != null){
+                        deviceEntity.setDeviceSskhmc(deviceInfo.get("manufacturer").toString());
+                    }
+                    if(deviceInfo.get("manufacturerTs") != null){
+                        deviceEntity.setDeviceSskh(deviceInfo.get("manufacturerTs").toString());
+                    }
+                    if(deviceInfo.get("modelTs") != null){
+                        deviceEntity.setDeviceSbxh(deviceInfo.get("modelTs").toString());
+                    }
+                    if(deviceInfo.get("model") != null){
+                        deviceEntity.setDeviceSbxhName(deviceInfo.get("model").toString());
+                    }
+                }
+            });
+            resultList.add(deviceEntity);
+        });
+        return resultList;
+    }
+
+    /**
+     * 新增物实例（mq读取数据）
+     */
+
+    @Override
+    public void updateDeviceData(DeviceSyncEntity entity,String action) {
+        //判断设备是否在设备台账已存在
+        LambdaQueryWrapper<DeviceSyncEntity> lambdaQueryWrapper = Wrappers.lambdaQuery(DeviceSyncEntity.class);
+        lambdaQueryWrapper.eq(DeviceSyncEntity::getNxJeDeviceId,entity.getNxJeDeviceId());
+        List<DeviceSyncEntity> list = this.list(lambdaQueryWrapper);
+        if("add".equals(action) && CollectionUtils.isEmpty(list)){
+            this.save(entity);
+        }else if("mod".equals(action) && !CollectionUtils.isEmpty(list)){
+            this.updateById(entity);
+        }else if("del".equals(action) && !CollectionUtils.isEmpty(list)){
+            this.removeById(entity.getNxJeDeviceId());
+        }
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/ModelPropertySyncServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/ModelPropertySyncServiceImpl.java
new file mode 100644
index 0000000..76b6238
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/ModelPropertySyncServiceImpl.java
@@ -0,0 +1,238 @@
+package com.rootcloud.domain.service.ds.impl;
+
+import cn.hutool.core.lang.UUID;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.common.TokenUtil;
+import com.rootcloud.domain.dao.ds.ModelPropertySyncMapper;
+import com.rootcloud.domain.entity.ds.ModelEntity;
+import com.rootcloud.domain.entity.ds.ModelPropertySyncEntity;
+import com.rootcloud.domain.service.ds.ModelPropertySyncService;
+import com.rootcloud.domain.service.ds.ModelSyncService;
+import jline.internal.Log;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Service("modelPropertySyncService2")
+@Slf4j
+public class ModelPropertySyncServiceImpl extends ServiceImpl<ModelPropertySyncMapper, ModelPropertySyncEntity> implements ModelPropertySyncService {
+    @Value(value = "${os.iam.domain}")
+    private String domain;
+    @Value(value = "${os.iam.superToken}")
+    private String superToken;
+    @Value(value = "${cms.modelproperty.uri}")
+    private String modelPropertyUri;
+    @Resource(name = "modelSyncService2")
+    private ModelSyncService modelSyncService;
+    @Autowired
+    private TokenUtil tokenUtil;
+    @Resource(name = "modelPropertySyncMapper")
+    private ModelPropertySyncMapper modelPropertySyncMapper;
+
+
+    /**
+     * 物模型数据通过监听平台mq消息同步，由于平台mq没有同步属性单位，临时方案改为调用平台接口同步属性单位
+     */
+    @Override
+    public void syncModelPropertyData(String clientId, String clientSecret) {
+        //查询目前在库的物模型
+        LambdaQueryWrapper<ModelPropertySyncEntity> lambdaQueryWrapper = Wrappers.lambdaQuery(ModelPropertySyncEntity.class);
+        List<ModelPropertySyncEntity> dbList = this.list(lambdaQueryWrapper);
+
+        //调用平台接口查询平台的物模型数据
+        List<ModelPropertySyncEntity> modelEntityList = getModelPropertys(clientId, clientSecret);
+        //只同步工况属性的单位
+        modelEntityList.stream().forEach(temp -> {
+                    for (ModelPropertySyncEntity dbTemp : dbList) {
+                        if (temp.getPropertyDataUnit() == null) {
+                            break;
+                        }
+                        if (temp.getModelId().equals(dbTemp.getModelId()) && temp.getPropertyId().equals(dbTemp.getPropertyId())) {
+                            dbTemp.setPropertyDataUnit(temp.getPropertyDataUnit());
+                        }
+                    }
+                }
+        );
+        this.updateBatchById(dbList);
+    }
+
+    @Override
+    public List<String> queryPropertysByModelId(String modelId) {
+        LambdaQueryWrapper<ModelPropertySyncEntity> queryWrapper = Wrappers.lambdaQuery(ModelPropertySyncEntity.class);
+        queryWrapper.eq(ModelPropertySyncEntity::getModelId, modelId);
+        List<ModelPropertySyncEntity> list = modelPropertySyncMapper.selectList(queryWrapper);
+        List<String> resultList = new ArrayList<>();
+        list.stream().forEach(temp -> {
+            resultList.add(temp.getPropertyId());
+        });
+        return resultList;
+    }
+
+
+    @Override
+    public List<ModelPropertySyncEntity> queryListByModelId(String modelId) {
+        return modelPropertySyncMapper.selectList(
+                Wrappers.lambdaQuery(ModelPropertySyncEntity.class).eq(ModelPropertySyncEntity::getModelId, modelId));
+    }
+
+    @Override
+    public ModelPropertySyncEntity queryByModelIdAndPropertyId(String modelId, String propertyId) {
+        return modelPropertySyncMapper.selectOne(Wrappers.lambdaQuery(ModelPropertySyncEntity.class)
+                .eq(ModelPropertySyncEntity::getModelId, modelId).eq(ModelPropertySyncEntity::getPropertyId, propertyId));
+    }
+
+    /**
+     * 数据同步，比较db查询到的dbList和接口返回的interfaceList，
+     * 只在dbList的做删除，只在interface的做新增，交集部分做变更
+     *
+     * @param dbList
+     * @param interfaceList
+     */
+    private void sync(List<ModelPropertySyncEntity> dbList, List<ModelPropertySyncEntity> interfaceList) {
+        List<ModelPropertySyncEntity> deleteList = new ArrayList<>(16);
+        List<ModelPropertySyncEntity> updateList = new ArrayList<>(16);
+        List<ModelPropertySyncEntity> addList = new ArrayList<>(16);
+        //更新的 集合
+        for (int i = 0; i < dbList.size(); i++) {
+            ModelPropertySyncEntity temp = dbList.get(i);
+            if (containsId(interfaceList, temp.getModelId())) {
+                updateList.add(temp);
+            }
+        }
+        //删除的集合
+        deleteList = dbList;
+        deleteList.removeAll(updateList);
+        //插入的集合
+        addList = interfaceList;
+        addList.removeAll(updateList);
+
+        //批量插入
+        this.saveBatch(addList);
+        //删除的
+        this.removeByIds(deleteList.stream().map(temp -> temp.getModelId()).collect(Collectors.toList()));
+
+        //更新的
+        updateList.stream().forEach(temp -> {
+            //通过ID 从接口的 集合中获取这条数据
+            for (int i = 0; i < interfaceList.size(); i++) {
+                ModelPropertySyncEntity temp2 = interfaceList.get(i);
+                if (temp.getModelId().equals(temp2.getModelId())) {
+                    BeanUtils.copyProperties(temp, temp2);
+                    this.updateById(temp);
+                }
+            }
+        });
+    }
+
+    private boolean containsId(List<ModelPropertySyncEntity> modelEntityList, String modelId) {
+        for (int i = 0; i < modelEntityList.size(); i++) {
+            ModelPropertySyncEntity temp = modelEntityList.get(i);
+            if (temp.getModelId().equals(modelId)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    //调用平台接口查询所有的物模型属性
+    public List<ModelPropertySyncEntity> getModelPropertys(String clientId, String clientSecret) {
+
+        //先查询物模型List
+        List<ModelEntity> modelList = modelSyncService.getModelList(clientId, clientSecret);
+
+        // modelList = modelList.subList(0,50);
+        List<ModelPropertySyncEntity> resultList = new ArrayList<>(16);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
+        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //根据物模型ID查询对应的属性list
+        modelList.stream().forEach(temp -> {
+            String uri = modelPropertyUri.replace("{modelId}", temp.getModelId());
+            HttpRequest request = HttpRequest.get(domain + uri);
+            request.header("Authorization", "Bearer " + tokenUtil.getToken(clientId, clientSecret));
+            try {
+                HttpResponse response = request.execute();
+                JSONObject jsonObject = new JSONObject(response.body());
+                JSONArray array = jsonObject.getJSONArray("payload");
+                if (Objects.isNull(array)) {
+                    log.error("JSONArray array = jsonObject.getJSONArray(\"payload\")为NULL");
+
+                } else {
+                    List<JSONObject> list = JSONUtil.toList(array.toString(), JSONObject.class);
+                    list.stream().forEach(jsonObj -> {
+                        ModelPropertySyncEntity modelPropertyEntity = new ModelPropertySyncEntity();
+                        modelPropertyEntity.setPropertyUuid(UUID.randomUUID().toString().substring(0, 10));
+                        modelPropertyEntity.setModelId(temp.getModelId());
+                        modelPropertyEntity.setPropertyId(jsonObj.get("name").toString());
+                        modelPropertyEntity.setPropertyName(jsonObj.get("displayName").toString());
+                        modelPropertyEntity.setPropertyDataType(jsonObj.get("propertyType").toString());
+
+                        if (jsonObj.get("unit") != null) {
+                            modelPropertyEntity.setPropertyDataUnit(jsonObj.get("unit").toString());
+                        }
+                        if (jsonObj.get("createdAt") != null) {
+                            String createTime = jsonObj.get("createdAt").toString();
+                            try {
+                                modelPropertyEntity.setCreateTime(sdf1.format(sdf.parse(createTime)));
+                            } catch (ParseException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                        resultList.add(modelPropertyEntity);
+
+                    });
+                }
+            } catch (Exception e) {
+                log.error("调用平台接口：" + domain + uri + "出错，异常信息：" + e);
+                e.printStackTrace();
+            }
+        });
+        return resultList;
+    }
+
+    @Override
+    public void updateModelProperty(List<ModelPropertySyncEntity> entitys) {
+        //根据物模型ID查询是否已同步过
+        if (!CollectionUtils.isEmpty(entitys)) {
+            ModelPropertySyncEntity modelPropertySync = entitys.get(0);
+            LambdaQueryWrapper<ModelPropertySyncEntity> queryWrapper = Wrappers.lambdaQuery(ModelPropertySyncEntity.class);
+            queryWrapper.eq(ModelPropertySyncEntity::getModelId, modelPropertySync.getModelId());
+            List<ModelPropertySyncEntity> resultList = this.list(queryWrapper);
+            //没有同步过该物模型，直接批量新增
+            if (CollectionUtils.isEmpty(resultList)) {
+                log.info("物模型触发批量新增" + entitys);
+                this.saveBatch(entitys);
+            } else {
+                //物模型已有时，可以先删除数据，同步最新的物模型数据
+                log.info("物模型触发修改" + entitys);
+                this.remove(queryWrapper);
+                this.saveBatch(entitys);
+            }
+        }
+    }
+
+
+    @Override
+    public void delModelProperty(ModelPropertySyncEntity entity) {
+        LambdaQueryWrapper<ModelPropertySyncEntity> queryWrapper = Wrappers.lambdaQuery(ModelPropertySyncEntity.class);
+        queryWrapper.eq(ModelPropertySyncEntity::getModelId, entity.getModelId());
+        this.remove(queryWrapper);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/ModelSyncServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/ModelSyncServiceImpl.java
new file mode 100644
index 0000000..3bdbd17
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/ModelSyncServiceImpl.java
@@ -0,0 +1,174 @@
+package com.rootcloud.domain.service.ds.impl;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.common.TokenUtil;
+import com.rootcloud.domain.dao.ds.ModelSyncMapper;
+import com.rootcloud.domain.entity.ds.ModelEntity;
+import com.rootcloud.domain.service.ds.ModelSyncService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * 同步模型
+ *
+ * @author lixiafen
+ * @date 2022-04-15 14:22:17
+ */
+@Service("modelSyncService2")
+@Slf4j
+public class ModelSyncServiceImpl extends ServiceImpl<ModelSyncMapper, ModelEntity> implements ModelSyncService {
+    @Value(value = "${os.iam.domain}")
+    private String domain;
+    @Value(value = "${os.iam.superToken}")
+    private String superToken;
+    @Value(value = "${cms.thingmodel.uri}")
+    private String thingModelUri;
+    @Autowired
+    private TokenUtil tokenUtil;
+
+    /**
+     * 同步物模型
+     */
+    @Override
+    public void syncModelData(String clientId,String clientSecret) {
+        //查询目前在库的物模型
+        LambdaQueryWrapper<ModelEntity> lambdaQueryWrapper = Wrappers.lambdaQuery(ModelEntity.class);
+        List<ModelEntity> list = this.list(lambdaQueryWrapper);
+        //判断在库的物模型是否为空，为空直接同步全量数据
+        if (CollectionUtils.isEmpty(list)) {
+            this.saveBatch(getModelList(clientId,clientSecret));
+            return;
+        }
+        //不为空时先判断是否有增量数据，有先同步增量，再比较变更
+        List<ModelEntity> modelEntityList = getModelList(clientId,clientSecret);
+        sync(list, modelEntityList);
+    }
+
+    private void sync(List<ModelEntity> dbList, List<ModelEntity> interfaceList) {
+        List<ModelEntity> deleteList = new ArrayList<>(16);
+        List<ModelEntity> updateList = new ArrayList<>(16);
+        List<ModelEntity> addList = new ArrayList<>(16);
+        //更新的 集合
+        for (int i = 0; i < dbList.size(); i++) {
+            ModelEntity temp = dbList.get(i);
+            if (containsId(interfaceList, temp.getModelId())) {
+                updateList.add(temp);
+            }
+        }
+        //删除的集合
+        deleteList = dbList;
+        deleteList.removeAll(updateList);
+        //插入的集合
+        addList = interfaceList;
+        addList.removeAll(updateList);
+
+
+        addList = addList.stream().filter(temp -> {
+            if ("16AKncuuPVs".equals(temp.getModelId())) {
+                return false;
+            }
+            return true;
+        }).collect(Collectors.toList());
+
+        //批量插入
+        this.saveBatch(addList);
+        //删除的
+        this.removeByIds(deleteList.stream().map(temp -> temp.getModelId()).collect(Collectors.toList()));
+
+        //更新的
+        updateList.stream().forEach(temp -> {
+            //通过ID 从接口的 集合中获取这条数据
+            for (int i = 0; i < interfaceList.size(); i++) {
+                ModelEntity temp2 = interfaceList.get(i);
+                if (temp.getModelId().equals(temp2.getModelId())) {
+                    if (temp.getUpdateTime() != temp2.getUpdateTime()) {
+                        BeanUtils.copyProperties(temp, temp2);
+                        this.updateById(temp);
+                    } else {
+                        continue;
+                    }
+                }
+            }
+        });
+    }
+
+    private boolean containsId(List<ModelEntity> modelEntityList, String modelId) {
+        for (int i = 0; i < modelEntityList.size(); i++) {
+            ModelEntity temp = modelEntityList.get(i);
+            if (temp.getModelId().equals(modelId)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public List<ModelEntity> getModelList(String clientId,String clientSecret) {
+        List<ModelEntity> resultList = new ArrayList<>();
+        String result = null;
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
+            SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String thingType = "device";
+            HttpRequest request = HttpRequest.get(domain + thingModelUri);
+            Map<String, Object> map = new HashMap<>(16);
+            map.put("thingType", thingType);
+            request.form(map);
+            request.header("Authorization", "Bearer " + tokenUtil.getToken(clientId,clientSecret));
+            request.header("accept", "application/json");
+            request.header("Content-Type", "application/json");
+
+            HttpResponse response = request.execute();
+            result = response.body();
+            JSONObject jsonObject = new JSONObject(result);
+            JSONArray array = jsonObject.getJSONArray("payload");
+            array.stream().forEach(temp->{
+                JSONObject obj = (JSONObject)temp;
+                ModelEntity modelEntity = new ModelEntity();
+                modelEntity.setModelId(obj.get("modelId").toString());
+                modelEntity.setModelName(obj.get("name").toString());
+       /*    if(obj.get("created") != null){
+               String created = obj.get("created").toString();
+               try {
+                   modelEntity.setCreateTime(sdf1.parse(sdf1.format(sdf.parse(created))));
+               } catch (ParseException e) {
+                   e.printStackTrace();
+               }
+           }
+           if(obj.get("updated") != null){
+               String updated = obj.get("updated").toString();
+               try {
+                   modelEntity.setCreateTime(sdf1.parse(sdf1.format(sdf.parse(updated))));
+               } catch (ParseException e) {
+                   e.printStackTrace();
+                   log.error("调用平台物模型接口："+domain + thingModelUri+"出错，异常信息："+e);
+               }
+           }*/
+                resultList.add(modelEntity);
+            });
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error("调用平台物模型接口："+domain + thingModelUri+"出错,返回信息："+result+"异常信息："+e);
+        }
+        //List<ModelEntity> list = JSONUtil.toList(array.toString(), ModelEntity.class);
+        return resultList;
+    }
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/NxDsLogServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/NxDsLogServiceImpl.java
new file mode 100644
index 0000000..3c93d42
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/NxDsLogServiceImpl.java
@@ -0,0 +1,15 @@
+package com.rootcloud.domain.service.ds.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.domain.entity.ds.NxDsLogEntity;
+import com.rootcloud.domain.mapper.NxDsLogMapper;
+import com.rootcloud.domain.service.ds.NxDsLogService;
+import org.springframework.stereotype.Service;
+
+@Service("nxDsLogServiceImpl")
+public class NxDsLogServiceImpl extends ServiceImpl<NxDsLogMapper, NxDsLogEntity> implements NxDsLogService {
+    @Override
+    public void saveLog(NxDsLogEntity entity) {
+        this.save(entity);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/SyncDeviceInfoService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/SyncDeviceInfoService.java
new file mode 100644
index 0000000..2c763cd
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/SyncDeviceInfoService.java
@@ -0,0 +1,153 @@
+package com.rootcloud.domain.service.ds.impl;
+
+import cn.hutool.json.JSONObject;
+import com.rabbitmq.client.Channel;
+import com.rootcloud.common.DateUtil;
+import com.rootcloud.common.DeflaterUtils;
+import com.rootcloud.domain.entity.ds.DeviceListEntity;
+import com.rootcloud.domain.entity.ds.DeviceSyncEntity;
+import com.rootcloud.domain.entity.ds.NxDsLogEntity;
+import com.rootcloud.domain.service.ds.DeviceListSyncService;
+import com.rootcloud.domain.service.ds.DeviceSyncService;
+import com.rootcloud.domain.service.ds.NxDsLogService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.UUID;
+
+@Component
+@Slf4j
+public class SyncDeviceInfoService {
+    @Resource(name = "nxDsLogServiceImpl")
+    NxDsLogService nxDsLogService;
+    @Resource(name = "deviceSyncService2")
+    DeviceSyncService deviceSyncService;
+    @Resource(name = "deviceListSyncService2")
+    DeviceListSyncService deviceListSyncService;
+
+    @RabbitListener(queues = "base.queue.nxgx.device")
+    public void onMessage(Message message, Channel channel) throws Exception {
+        try {
+            String body = new String(message.getBody(), "UTF-8");
+            JSONObject object = new JSONObject(body);
+
+            log.info("设备同步消息" + object);
+            if (object != null) {
+                String payload = object.get("payload").toString();
+                //取租户ID
+                String tenantId = object.get("tenantId").toString();
+                JSONObject jsonPayload = new JSONObject(payload);
+                String compressedContent = jsonPayload.get("compressedContent").toString();
+                // String modelType = jsonPayload.get("modelType").toString();
+                System.out.println(payload);
+                String unzipString = DeflaterUtils.unzipString(compressedContent);
+                JSONObject unzipJsonPayload = new JSONObject(unzipString);
+                jsonPayload.set("assetId", unzipJsonPayload.get("assetId"));
+                jsonPayload.set("tenantId", tenantId);
+                System.out.println(unzipString);
+                String action = object.get("action").toString();
+                //直接在平台订阅中过滤
+               /* if(!("device".equals(modelType) || "thing".equals(modelType))){
+                    return;
+                }*/
+                //新增设备
+                if ("createInstance".equals(action)) {
+                    updateDevice(jsonPayload, "add");
+                }
+                //更新设备 只关注物模型和物标识
+                if ("updateInstance".equals(action)) {
+                    updateDevice(jsonPayload, "mod");
+                }
+                //删除设备 更新设备的状态
+                if ("deleteInstance".equals(action)) {
+                    updateDevice(jsonPayload, "del");
+                }
+
+            }
+        } catch (Exception e) {
+            log.error("设备数据同步异常" + e);
+            NxDsLogEntity entity = new NxDsLogEntity();
+            entity.setNxDsLogId(UUID.randomUUID().toString().substring(0, 10));
+            entity.setLogContent(new String(message.getBody()));
+            entity.setLogType("things");
+            //nxDsLogService.saveLog(entity);
+            //throw e ;
+        }
+    }
+
+
+    /**
+     * 设备新增 变更  删除
+     */
+    public void updateDevice(JSONObject json, String action) {
+        if ("add".equals(action)) {
+            log.info("触发设备变更代码");
+            //同步设备台账
+            DeviceSyncEntity deviceSync = new DeviceSyncEntity();
+            deviceSync.setNxJeDeviceId(json.get("thingId").toString());
+            deviceSync.setDeviceSbbm(json.get("assetId").toString());
+            deviceSync.setDeviceSbmc(json.get("name").toString());
+            deviceSync.setDeviceSbxh("yHG8OtzRKz3oEDhKZop");
+            deviceSync.setDeviceSbxhName("4.0平台设备型号");
+            deviceSync.setDeviceSblx("0000");
+            deviceSync.setDeviceSblxName("4.0平台设备");
+            deviceSync.setDeviceSource("1");
+            deviceSync.setModelId(json.get("modelId").toString());
+            //平台同步过来的设备默认联网
+            deviceSync.setDeviceNetworkStatusCode("1");
+            deviceSync.setCreateTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+            //设置设备租户ID
+            deviceSync.setSyZhid(json.get("tenantId").toString());
+            deviceSyncService.updateDeviceData(deviceSync, action);
+            //同步设备列表
+            DeviceListEntity deviceList = new DeviceListEntity();
+            deviceList.setNxJcxxSblbId(json.get("thingId").toString());
+            deviceList.setSblbSbmc(json.get("name").toString());
+            deviceList.setSblbSbbm(json.get("assetId").toString());
+            deviceList.setSblbSbxhCode("yHG8OtzRKz3oEDhKZop");
+            deviceList.setSblbSbxhName("4.0平台设备型号");
+            deviceList.setSblbSblxCode("0000");
+            deviceList.setSblbSblxName("4.0平台设备");
+            //平台同步过来的设备默认联网 1
+            deviceList.setSblbLwztCode("1");
+            //平台设备1 自有设备0
+            deviceList.setSblbSbly("1");
+            //设置设备租户ID
+            deviceList.setSyZhid(json.get("tenantId").toString());
+            deviceListSyncService.updateDeviceListData(deviceList, action);
+        } else if ("mod".equals(action)) {
+            DeviceSyncEntity deviceSync = new DeviceSyncEntity();
+            deviceSync.setNxJeDeviceId(json.get("thingId").toString());
+            deviceSync.setModelId(json.get("modelId").toString());
+            deviceSync.setDeviceSbmc(json.get("name").toString());
+            deviceSync.setUpdateTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+            //设置设备租户ID
+            deviceSync.setSyZhid(json.get("tenantId").toString());
+            deviceSyncService.updateDeviceData(deviceSync, action);
+
+            DeviceListEntity deviceList = new DeviceListEntity();
+            deviceList.setNxJcxxSblbId(json.get("thingId").toString());
+            deviceList.setSblbSbmc(json.get("name").toString());
+            //设置设备租户ID
+            deviceList.setSyZhid(json.get("tenantId").toString());
+            deviceListSyncService.updateDeviceListData(deviceList, action);
+        } else {
+            DeviceSyncEntity deviceSync = new DeviceSyncEntity();
+            deviceSync.setNxJeDeviceId(json.get("thingId").toString());
+            //设置设备租户ID
+            deviceSync.setSyZhid(json.get("tenantId").toString());
+            deviceSyncService.updateDeviceData(deviceSync, action);
+
+            DeviceListEntity deviceList = new DeviceListEntity();
+            deviceList.setNxJcxxSblbId(json.get("thingId").toString());
+            //设置设备租户ID
+            deviceList.setSyZhid(json.get("tenantId").toString());
+            deviceListSyncService.updateDeviceListData(deviceList, action);
+        }
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/SyncModelProertySyncService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/SyncModelProertySyncService.java
new file mode 100644
index 0000000..309f04e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/ds/impl/SyncModelProertySyncService.java
@@ -0,0 +1,117 @@
+package com.rootcloud.domain.service.ds.impl;
+
+import cn.hutool.core.lang.UUID;
+import cn.hutool.json.JSONObject;
+import com.rabbitmq.client.Channel;
+import com.rootcloud.common.DateUtil;
+import com.rootcloud.common.DeflaterUtils;
+import com.rootcloud.domain.entity.ds.ModelPropertySyncEntity;
+import com.rootcloud.domain.entity.ds.NxDsLogEntity;
+import com.rootcloud.domain.mapper.ModelPropertyMapper;
+import com.rootcloud.domain.service.ds.ModelPropertySyncService;
+import com.rootcloud.domain.service.ds.NxDsLogService;
+import jline.internal.Log;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.logging.Logger;
+
+
+@Component
+@Slf4j
+public class SyncModelProertySyncService {
+    @Resource(name = "modelPropertySyncService2")
+    ModelPropertySyncService modelPropertySyncService;
+    @Resource(name = "nxDsLogServiceImpl")
+    NxDsLogService nxDsLogService;
+    @Autowired
+    private ModelPropertyMapper modelPropertyMapper;
+
+    @RabbitListener(queues = "base.queue.nxgx.model")
+    public void onMessage(Message message, Channel channel) throws Exception {
+        String body = new String(message.getBody(), "UTF-8");
+        //JSONObject object = null;
+        try {
+            Log.info("物模型变更消息队列" + body);
+            JSONObject object = new JSONObject(body);
+            String payload = object.get("payload").toString();
+            JSONObject jsonPayload = new JSONObject(payload);
+            String compressedContent = jsonPayload.get("compressedContent").toString();
+            String unzipString = DeflaterUtils.unzipString(compressedContent);
+            JSONObject unzipJson = new JSONObject(unzipString);
+            String action = object.get("action").toString();
+            //直接在平台订阅中过滤
+           /* String modelType = jsonPayload.get("modelType").toString();
+            //只同步设备和复合物
+            if("gateway".equals(modelType)){
+                return;
+            }*/
+            //物模型发布 新增和修改
+            if ("activateModel".equals(action)) {
+                log.info("触发了action");
+                updateModelProperty(unzipJson, "add");
+            }
+            //删除物模型
+            if ("deleteModel".equals(action)) {
+                updateModelProperty(unzipJson, "del");
+            }
+
+        } catch (Exception e) {
+            NxDsLogEntity entity = new NxDsLogEntity();
+            entity.setNxDsLogId(java.util.UUID.randomUUID().toString().substring(0, 10));
+            entity.setLogContent(new String(message.getBody()));
+            entity.setLogType("model");
+            //nxDsLogService.saveLog(entity);
+            Log.error("数据同步失败" + e.getMessage());
+            //channel.basicAck(1,true);
+            //throw e;
+        }
+    }
+
+
+    /**
+     * 设备新增 变更  删除
+     */
+    public void updateModelProperty(JSONObject json, String action) {
+        if ("add".equals(action)) {
+            List<ModelPropertySyncEntity> resultList = new ArrayList<>(16);
+            //同步工况属性
+            json.getJSONArray("schema").stream().forEach(temp -> {
+                JSONObject schema = new JSONObject(temp);
+                ModelPropertySyncEntity modelPropertySync = new ModelPropertySyncEntity();
+                modelPropertySync.setModelId(json.get("modelId").toString());
+                modelPropertySync.setModelName(json.get("name").toString());
+                String uuid = modelPropertyMapper.selectUuidByModelId(schema.get("propertyName").toString(), json.get("modelId").toString());
+                if (StringUtils.isEmpty(uuid)) {
+                    modelPropertySync.setPropertyUuid(UUID.randomUUID().toString().substring(0, 10));
+                } else {
+                    modelPropertySync.setPropertyUuid(uuid);
+                }
+                modelPropertySync.setPropertyId(schema.get("propertyName").toString());
+                modelPropertySync.setPropertyName(schema.get("displayName").toString());
+                modelPropertySync.setPropertyDataType(schema.get("type").toString());
+                if (schema.get("unit") != null) {
+                    modelPropertySync.setPropertyDataUnit(schema.get("unit").toString());
+                }
+                modelPropertySync.setCreateTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+                resultList.add(modelPropertySync);
+            });
+
+            modelPropertySyncService.updateModelProperty(resultList);
+        } else if ("del".equals(action)) {
+            ModelPropertySyncEntity modelPropertySync = new ModelPropertySyncEntity();
+            modelPropertySync.setModelId(json.get("modelId").toString());
+
+            modelPropertySyncService.delModelProperty(modelPropertySync);
+        }
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/FittingsService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/FittingsService.java
new file mode 100644
index 0000000..8914eed
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/FittingsService.java
@@ -0,0 +1,9 @@
+package com.rootcloud.domain.service.fittings;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.entity.NxFittingsListEntity;
+
+public interface FittingsService extends IService<NxFittingsListEntity> {
+
+    String getTotalPrice(String fittingsSellId);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/SpareFileService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/SpareFileService.java
new file mode 100644
index 0000000..3c03bc9
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/SpareFileService.java
@@ -0,0 +1,391 @@
+package com.rootcloud.domain.service.fittings;
+
+import cn.hutool.core.lang.UUID;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.rootcloud.common.DateUtil;
+import com.rootcloud.common.JEUuidUtil;
+import com.rootcloud.common.ResourceUtil;
+import com.rootcloud.config.exception.BusinessException;
+import com.rootcloud.domain.dao.PrinterHeadRecordDao;
+import com.rootcloud.domain.dto.NxSparePartVo;
+import com.rootcloud.domain.entity.NxPartFileEntity;
+import com.rootcloud.domain.entity.NxSparePartEntity;
+import com.rootcloud.domain.mapper.SpareFilerMapper;
+import com.rootcloud.domain.vo.PrinterHeadRecordVO;
+import jline.internal.Log;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Service
+@Slf4j
+public class SpareFileService {
+    @Autowired
+    SpareFilerMapper spareFilerMapper;
+
+    @Autowired
+    private PrinterHeadRecordDao recodeDao;
+    public Boolean importSparePart(List<NxSparePartVo> nxSparePartVos) {
+
+        if (nxSparePartVos == null || nxSparePartVos.size() == 0) {
+            throw new BusinessException("409", ResourceUtil.getI18nMessage("60025"));
+        }
+        if (nxSparePartVos.size() > 200) {
+            throw new BusinessException("409", ResourceUtil.getI18nMessage("60026") + "200");
+        }
+
+        for (int i = 0; i < nxSparePartVos.size(); i++) {
+            String invalidateData = invalidateData(nxSparePartVos.get(i));
+            if (!"success".equals(invalidateData)) {
+                throw new BusinessException("409", (i + 1) + ResourceUtil.getI18nMessage("60024") + invalidateData);
+            }
+
+//            NxSparePartVo sparePartBySbbmAndStatus = spareFilerMapper.getSparePartBySbbmAndStatus(nxSparePartVos.get(i).getPartSbbm(), nxSparePartVos.get(i).getPartBjbm());
+//            if (sparePartBySbbmAndStatus!=null && "正常".equals(nxSparePartVos.get(i).getPartBjzt())){
+//                sparePartBySbbmAndStatus.setPartGzsc(addGzsc(sparePartBySbbmAndStatus.getPartGzsc(),nxSparePartVos.get(i).getPartGzsc()));
+//                sparePartBySbbmAndStatus.setPartDrgzsc(nxSparePartVos.get(i).getPartGzsc());
+//                spareFilerMapper.updateNxSparePartGzsc(sparePartBySbbmAndStatus);
+//            }else {
+            LambdaQueryWrapper<NxPartFileEntity> npe = new LambdaQueryWrapper<NxPartFileEntity>();
+            npe.eq(NxPartFileEntity::getFilePjbm, nxSparePartVos.get(i).getPartBjbm());
+            npe.last("limit 1");
+            NxPartFileEntity one = spareFilerMapper.selectOne(npe);
+            if (one == null) {
+                throw new BusinessException("409", (i + 1) + ResourceUtil.getI18nMessage("60024") + ResourceUtil.getI18nMessage("60027"));
+            }
+            nxSparePartVos.get(i).setFilePjmc(one.getFilePjmc());
+            nxSparePartVos.get(i).setPartXtmk(one.getFileXtmk());
+            nxSparePartVos.get(i).setPartXtmkBm(one.getFileXtmkbm());
+            nxSparePartVos.get(i).setPartGgxh(one.getFileGgxh());
+            nxSparePartVos.get(i).setPartSm(String.valueOf(one.getFileLlsm() != null ? one.getFileLlsm() : 0));
+            nxSparePartVos.get(i).setPartSfgjbj(one.getFileSfsgjpj());
+            nxSparePartVos.get(i).setNxSparePartId(JEUuidUtil.uuid());
+            spareFilerMapper.importSparePart(nxSparePartVos.get(i));
+
+//            }
+        }
+        return true;
+    }
+
+    public String invalidateData(NxSparePartVo nspv) {
+
+        if (StringUtils.isBlank(nspv.getPartSbbm())) {
+            return ResourceUtil.getI18nMessage("60028");
+        }
+
+        if (StringUtils.isBlank(nspv.getPartAzwh())) {
+            return ResourceUtil.getI18nMessage("60029");
+        }
+
+        if (StringUtils.isBlank(nspv.getPartSn())) {
+            return ResourceUtil.getI18nMessage("60030");
+        }
+
+        if (StringUtils.isBlank(nspv.getPartAzrq())) {
+            return ResourceUtil.getI18nMessage("60031");
+        }
+
+        if (StringUtils.isBlank(nspv.getPartGhrq())) {
+            return ResourceUtil.getI18nMessage("60032");
+        }
+
+        if (StringUtils.isBlank(nspv.getPartSmyjz())) {
+            return ResourceUtil.getI18nMessage("60033");
+        }
+
+        if (StringUtils.isBlank(nspv.getPartBjzt())) {
+            return ResourceUtil.getI18nMessage("60034");
+        }
+
+        if (StringUtils.isBlank(nspv.getPartBjbm())) {
+            return ResourceUtil.getI18nMessage("60035");
+        }
+
+        return "success";
+    }
+
+
+    /**
+     * 工作时长相加
+     *
+     * @return
+     */
+    public String addGzsc(String math1, String math2) {
+        BigDecimal s1 = new BigDecimal(math1);
+        BigDecimal s2 = new BigDecimal(math2);
+        BigDecimal decimal = s1.add(s2);
+        return String.format("%.1f", decimal);
+    }
+
+    public String updateSparePart(String orderId) {
+        spareFilerMapper.getSparePart(orderId).forEach(e -> {
+            //1 是关键配件，0否
+            if ("1".equals(e.getPartSfgjbj())) {
+                //通过配件编码在配件档案中查询系统模块编码 jsq 打印头
+                String xtmkbm = spareFilerMapper.getxtmkBypjbm(e);
+                if (StringUtils.isNotBlank(xtmkbm)) {
+                    if ("jsq".equals(xtmkbm)) {//打印头模块
+                        //加一层判断逻辑,若设备长期不联网(>60天)认为是长期不联网设备则进行同步(打印头自动更新暂时停掉，已有自动检测更新任务了)
+                        PrinterHeadRecordVO v1 = new PrinterHeadRecordVO();
+                        v1.setTenantId(e.getSyZhid()); //624e7ce1549c110050c5da47
+                        v1.setDeviceCode(e.getPartSbbm());
+                        v1.setThingId(e.getPartSbid());
+                        List<PrinterHeadRecordVO> recordList = recodeDao.printerHeadList(v1);
+                        boolean isValid = false;
+                        for(PrinterHeadRecordVO item:recordList){
+                            String updateTime = item.getUpdatetime();
+                            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                            LocalDate dateToCompare = LocalDate.parse(updateTime, formatter);
+                            LocalDate currentDate = LocalDate.now();
+                            long daysBetween = ChronoUnit.DAYS.between(dateToCompare, currentDate);
+                            // 判断是否是30天之前,长期离线设备
+                            if (daysBetween >= 30) {
+                                isValid = true;
+                                //System.out.println(updateTime + " 是60天之前的日期。");
+                            } else {
+                                //System.out.println(updateTime + " 不是60天之前的日期。");
+                            }
+                        }
+                        //SN序列号读数异常、错误的、未采集SN数据的 需要工单同步
+                        if(e.getSyZhid().equals("624e7ce1549c110050c5da47") && (e.getPartSbbm().equals("2218-3") || e.getPartSbbm().equals("2218-4")
+                                || e.getPartSbbm().equals("2218-5")|| e.getPartSbbm().equals("SDreamC")|| e.getPartSbbm().equals("SDreamD")
+                                || e.getPartSbbm().equals("Max-A")|| e.getPartSbbm().equals("Max-B")|| e.getPartSbbm().equals("Max-C")
+                                || e.getPartSbbm().equals("2215-4")|| e.getPartSbbm().equals("2215-7")|| e.getPartSbbm().equals("2215-8")
+                                || e.getPartSbbm().equals("2215-10")|| e.getPartSbbm().equals("2215-12")|| e.getPartSbbm().equals("2215-13")
+                                || e.getPartSbbm().equals("2215-14")|| e.getPartSbbm().equals("2215-16")|| e.getPartSbbm().equals("2215-17")
+                                || e.getPartSbbm().equals("2215-19")|| e.getPartSbbm().equals("2215-21")|| e.getPartSbbm().equals("2215-24")
+                                || e.getPartSbbm().equals("2215-27")
+
+                                || e.getPartSbbm().equals("1800-1")|| e.getPartSbbm().equals("1800-2")|| e.getPartSbbm().equals("1800-3")
+                                || e.getPartSbbm().equals("1800-4")|| e.getPartSbbm().equals("1800-5")|| e.getPartSbbm().equals("1800-6")
+                                || e.getPartSbbm().equals("1800-7")|| e.getPartSbbm().equals("1800-8")|| e.getPartSbbm().equals("1800-9")
+                                || e.getPartSbbm().equals("1800-12")|| e.getPartSbbm().equals("1800-13")|| e.getPartSbbm().equals("1800-15")
+                                || e.getPartSbbm().equals("1800-16")||  e.getPartSbbm().equals("1800-18")|| e.getPartSbbm().equals("1800-19")
+
+                                || e.getPartSbbm().equals("1800E-2")|| e.getPartSbbm().equals("1800E-3")|| e.getPartSbbm().equals("1800E-5")
+                                || e.getPartSbbm().equals("1800E-7")|| e.getPartSbbm().equals("1800E-9")|| e.getPartSbbm().equals("1800E-12")
+                                || e.getPartSbbm().equals("1800E-13")|| e.getPartSbbm().equals("1800E-14")|| e.getPartSbbm().equals("1800E-17")
+                                || e.getPartSbbm().equals("1800E-22")
+
+                                //1800B-1(山东浩信)、1800B-2（海斯特）、1800B-3(陕西鑫源) 联网
+                                || e.getPartSbbm().equals("1800B-4")|| e.getPartSbbm().equals("1800B-6")
+
+                                || e.getPartSbbm().equals("2500-2")|| e.getPartSbbm().equals("2500-3")
+                                || e.getPartSbbm().equals("2500-5")|| e.getPartSbbm().equals("2500-6")|| e.getPartSbbm().equals("2500-17")
+                                || e.getPartSbbm().equals("2500-18")|| e.getPartSbbm().equals("2500-19")|| e.getPartSbbm().equals("2500-20")
+                                || e.getPartSbbm().equals("2500-21")|| e.getPartSbbm().equals("2500-22")|| e.getPartSbbm().equals("2500-24")
+                                || e.getPartSbbm().equals("2500-25")|| e.getPartSbbm().equals("2500-26")|| e.getPartSbbm().equals("2500-27")
+                                || e.getPartSbbm().equals("2500-37")|| e.getPartSbbm().equals("2500-38")|| e.getPartSbbm().equals("2500-39")
+                                || e.getPartSbbm().equals("2500-42")|| e.getPartSbbm().equals("2500-43")|| e.getPartSbbm().equals("2500-44")
+                                || e.getPartSbbm().equals("2500-45")|| e.getPartSbbm().equals("2500-46")|| e.getPartSbbm().equals("2500-47")
+
+                                //南通三责精密陶瓷有限公司(211)
+                                || e.getPartSbbm().equals("2500-52")|| e.getPartSbbm().equals("2500C-1")|| e.getPartSbbm().equals("2500C-2")
+                                || e.getPartSbbm().equals("800G-1")|| e.getPartSbbm().equals("5000-1") || e.getPartSbbm().equals("5000-2")
+
+                                //安徽应流
+                                || e.getPartSbbm().equals("2500-54")|| e.getPartSbbm().equals("2500-55")|| e.getPartSbbm().equals("2500-56")
+                                || e.getPartSbbm().equals("2500-57")|| e.getPartSbbm().equals("2500-59")|| e.getPartSbbm().equals("2500-60")
+                                || e.getPartSbbm().equals("2500-61")|| e.getPartSbbm().equals("2500-63")
+                                || e.getPartSbbm().equals("2500-81")|| e.getPartSbbm().equals("2500-82")|| e.getPartSbbm().equals("2500-84")
+
+                                || e.getPartSbbm().equals("2500-64")|| e.getPartSbbm().equals("2500-65")|| e.getPartSbbm().equals("2500-66")
+                                || e.getPartSbbm().equals("2500-67") || e.getPartSbbm().equals("2500-68")
+                                || e.getPartSbbm().equals("2500-69") || e.getPartSbbm().equals("2500-70")|| e.getPartSbbm().equals("2500-71")
+                                || e.getPartSbbm().equals("2500-72")//六盘山
+                                || e.getPartSbbm().equals("2500-73")//北京星航
+                                || e.getPartSbbm().equals("2500-74")//那山（朝鲜）
+                                || e.getPartSbbm().equals("2500-83")//通裕重工
+                                //2500-87、88已联网 潍坊机床二厂
+
+                                || e.getPartSbbm().startsWith("4600")//1、2、3、4、5
+                                || e.getPartSbbm().startsWith("2800")//1、2、3、4
+                                || e.getPartSbbm().startsWith("2600B")//1、2、3、4、5、6、7、8、9、10、11、12、13
+                                || e.getPartSbbm().startsWith("300")//1、2、3、4
+                                || e.getPartSbbm().startsWith("500")//1、2、3
+                                //1200-5 已采集
+                                || e.getPartSbbm().equals("1200-1") || e.getPartSbbm().equals("1200-2") || e.getPartSbbm().equals("1200-3") || e.getPartSbbm().equals("1200-4")
+                                || e.getPartSbbm().startsWith("1000")
+                                || e.getPartSbbm().equals("AE1000A")
+                                || e.getPartSbbm().equals("800E-1")|| e.getPartSbbm().equals("800-1")|| e.getPartSbbm().equals("800-2")|| e.getPartSbbm().equals("800-3")
+                                //AJM金属机
+                                || e.getPartSbbm().equals("AJM160-1")|| e.getPartSbbm().equals("AJM160-2")|| e.getPartSbbm().equals("AJM160-3")|| e.getPartSbbm().equals("AJM160-4")
+                                || e.getPartSbbm().equals("AJM160-5")|| e.getPartSbbm().equals("AJM160-6")|| e.getPartSbbm().equals("AJM160-7")
+                                || e.getPartSbbm().equals("AJM500-1") || e.getPartSbbm().equals("AJM500-5") || e.getPartSbbm().equals("AJM500-10")
+                                || e.getPartSbbm().equals("AJM800-1")
+                        ))
+                            isValid = true;
+
+                        if(recordList.size() == 0)
+                            isValid = true; //未更新程序、未采集到打印头序列号的设备，需要做同步
+                        if(isValid) {  //长期不联网(>30天)认为是长期不联网则进行备件同步
+                            //配将状态 1 正常  2 更换
+                            //应该是判断当前位号下是否存在状态正常的记录，若存在，则修改旧记录状态(正常)为更换状态及更换时间，新增当前同步过来的备件记录(状态为正常、安装日期、更换日期、理论寿命等）；
+                            List<NxSparePartVo> NxSparePartVos = spareFilerMapper.getSparePartByAzwh(e);
+                            if (CollectionUtils.isNotEmpty(NxSparePartVos)) {
+                                NxSparePartVos.stream().forEach(e1 -> {
+                                    spareFilerMapper.updateNxSparePart(e1);
+                                });
+                                e.setNxSparePartId(UUID.randomUUID().toString().substring(0, 10));
+                                e.setPartGhrq(DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE));
+                                e.setPartAzrq(DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE));
+                                e.setPartSmyjz("10"); //200H 8.3天≈10天
+                                if(e.getPartGgxh().contains("QSWJM025630"))
+                                    e.setPartSm("396");
+                                if(e.getPartGgxh().contains("PQ系列"))
+                                    e.setPartSm("321");
+                                if(e.getPartGgxh().contains("SGAPH102480"))
+                                    e.setPartSm("306");
+                                if(e.getPartGgxh().contains("SGAPH102430"))
+                                    e.setPartSm("297");
+                                if(e.getPartGgxh().contains("喷头WX"))
+                                    e.setPartSm("90");
+                                if(e.getPartBz().equals(""))
+                                    e.setPartBz("人工更换");
+                                else
+                                    e.setPartBz("人工更换"+","+e.getPartBz());
+                                spareFilerMapper.insertSparePart(e);
+                            } else {
+                                e.setNxSparePartId(UUID.randomUUID().toString().substring(0, 10));
+                                e.setPartGhrq(DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE));
+                                e.setPartAzrq(DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE));
+                                e.setPartSmyjz("10"); //200H 8.3天≈10天
+                                if(e.getPartGgxh().contains("QSWJM025630"))
+                                    e.setPartSm("396");
+                                if(e.getPartGgxh().contains("PQ系列"))
+                                    e.setPartSm("321");
+                                if(e.getPartGgxh().contains("SGAPH102480"))
+                                    e.setPartSm("306");
+                                if(e.getPartGgxh().contains("SGAPH102430"))
+                                    e.setPartSm("297");
+                                if(e.getPartGgxh().contains("喷头WX"))
+                                    e.setPartSm("90");
+                                if(e.getPartBz().equals(""))
+                                    e.setPartBz("人工更换");
+                                else
+                                    e.setPartBz("人工更换"+","+e.getPartBz());
+                                spareFilerMapper.insertSparePart(e);
+                            }
+                        }
+                        /*
+                        //配将状态 1 正常  2 更换
+                        //应该是判断当前位号下是否存在状态正常的记录，若存在，则修改旧记录状态(正常)为更换状态及更换时间，新增当前同步过来的备件记录(状态为正常、安装日期、更换日期、理论寿命等）；
+                        List<NxSparePartVo> NxSparePartVos = spareFilerMapper.getSparePartByAzwh(e);
+                        if (CollectionUtils.isNotEmpty(NxSparePartVos)) {
+                            NxSparePartVos.stream().forEach(e1 -> {
+                                spareFilerMapper.updateNxSparePart(e1);
+                            });
+                            e.setNxSparePartId(UUID.randomUUID().toString().substring(0, 10));
+                            e.setPartGhrq(DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE));
+                            e.setPartAzrq(DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE));
+                            spareFilerMapper.insertSparePart(e);
+                        } else {
+                            e.setNxSparePartId(UUID.randomUUID().toString().substring(0, 10));
+                            e.setPartGhrq(DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE));
+                            e.setPartAzrq(DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE));
+                            spareFilerMapper.insertSparePart(e);
+                        }*/
+                    }
+                    else {
+                        //其他非打印头备件 通过设备编码和配件编码查询是否存在该配件
+                        String nxSparePartId = spareFilerMapper.getSparePartBySbbm(e);
+                        if (StringUtils.isNotEmpty(nxSparePartId)) {
+                            NxSparePartVo nxSparePartVo = new NxSparePartVo();
+                            nxSparePartVo.setNxSparePartId(nxSparePartId);
+                            spareFilerMapper.updateNxSparePart(nxSparePartVo);
+                            e.setNxSparePartId(UUID.randomUUID().toString().substring(0, 10));
+                            e.setPartGhrq(DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE));
+                            e.setPartAzrq(DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE));
+                            spareFilerMapper.insertSparePart(e);
+                        } else {
+                            e.setNxSparePartId(UUID.randomUUID().toString().substring(0, 10));
+                            e.setPartGhrq(DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE));
+                            e.setPartAzrq(DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE));
+                            spareFilerMapper.insertSparePart(e);
+                        }
+                    }
+                }
+            }
+        });
+        return null;
+    }
+
+    public void dealWith(String sbId,String partId) {
+        //维修订单关联NX_BGB_WXHJ  拿到租户id，设备编码，设备id，审核通过时间 和 NX_BGB_WXHJ 的 是关键配件 按照审核时间顺序
+        List<NxSparePartVo> list = spareFilerMapper.getOrderData(sbId,partId);
+        if (list.size() > 0) {
+            list.forEach(o -> {
+                //设置寿命预警值
+                if (StringUtils.isBlank(o.getPartSmyjz())) {
+                    o.setPartSmyjz("200");
+                }
+                Log.info("获取到数据：" + o);
+                //通过设备id + 配件编码查询NX_SPARE_PART 的设备id 和配件编码下是否有记录；如果无，则根据设备id + 配件编码+ 审核通过时间 新增一条记录，
+                Map<String, Object> maps = new HashMap<>();
+                maps.put("partSbid", o.getPartSbid());
+                maps.put("partAzrq", o.getOrderShtgsj());
+                maps.put("partAzwh", o.getPartAzwh());
+                List<NxSparePartEntity> lists = spareFilerMapper.getDataByPartSbidAndPartBjbm(maps);
+                Log.info("获取到数据lists：" + lists);
+                if (lists.size() > 0) {
+                    //存在数据
+                    //通过设备id + 配件编码+ 审核通过时间  查询NX_SPARE_PART 的设备id 和配件编码 +创建时间 匹配是否出现过，
+                    List<NxSparePartEntity> list2 = spareFilerMapper.getDataByPartSbidAndPartBjbmAndPartAzrq(maps);
+                    Log.info("获取到数据list2：" + list2);
+                    if (list2.size() == 0) {
+                        //没出现则添加计算时间和寿命 --取已有记录中最近时间的记录 ，此记录更换日期替换为 新插入记录订单的审核通过时间，
+                        //用安装时间和 更新时间去查询 设备运行时间表，统计出 安装时间到更新时间段内的运行时间，替换掉现有的历史 工作时长；
+                        //新增一条记录 ，需插入的订单审核通过时间 作为安装日期，当前日期为更新时间，用安装时间和 更新时间去查询 设备运行时间表，
+                        //统计出 安装时间到更新时间段内的运行时间，替换掉现有的历史 工作时长；
+                        NxSparePartEntity nxSparePartEntity = lists.get(0);
+                        Log.info("获取到数据nxSparePartEntity：" + nxSparePartEntity);
+                        //查询该配件工作时长
+                        String hours = spareFilerMapper.getWorkingHours(o.getPartSbid(), nxSparePartEntity.getPartAzrq(), o.getOrderShtgsj());
+                        Log.info("获取到数据hours：" + hours);
+                        spareFilerMapper.updateData(nxSparePartEntity.getNxSparePartId(), o.getOrderShtgsj(), hours);
+                        //新增
+                        //不存在数据，新增操作
+                        o.setNxSparePartId(UUID.randomUUID().toString().substring(0, 10));
+                        o.setPartAzrq(o.getOrderShtgsj());
+                        o.setPartGhrq(DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE));
+                        //查询配件工作时长
+                        String hours2 = spareFilerMapper.getWorkingHours(o.getPartSbid(), o.getPartAzrq(), o.getPartGhrq());
+                        Log.info("获取到数据hours2：" + hours2);
+                        o.setPartGzsc(hours2);
+                        Log.info("insertSparePart：" + o);
+                        spareFilerMapper.insertSparePart(o);
+                    }
+
+                } else {
+                    //不存在数据，新增操作
+                    o.setNxSparePartId(UUID.randomUUID().toString().substring(0, 10));
+                    o.setPartAzrq(o.getOrderShtgsj());
+                    o.setPartGhrq(DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE));
+                    //查询配件工作时长
+                    String hours = spareFilerMapper.getWorkingHours(o.getPartSbid(), o.getPartAzrq(), o.getPartGhrq());
+                    Log.info("获取到数据hours：" + hours);
+                    o.setPartGzsc(hours);
+                    Log.info("insertSparePart：" + o);
+                    spareFilerMapper.insertSparePart(o);
+                }
+            });
+        }
+    }
+
+
+    public void dealWithBySbId(String sbId) {
+
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/SparePartService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/SparePartService.java
new file mode 100644
index 0000000..a5d2ebf
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/SparePartService.java
@@ -0,0 +1,32 @@
+package com.rootcloud.domain.service.fittings;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.entity.MyAdviceEntity;
+import com.rootcloud.domain.entity.NxSparePartEntity;
+import com.rootcloud.domain.entity.ds.DeviceListEntity;
+
+import java.util.List;
+
+public interface SparePartService extends IService<NxSparePartEntity> {
+    /**
+     * 定时任务更新配件的寿命预警信息
+     */
+    void uptPartSmyj();
+
+    /**
+     * 根据设备信息查询已寿命预警的备件信息
+     * @param devices
+     * @param startNo
+     * @param endNo
+     * @return
+     */
+    List<MyAdviceEntity>  getWarnedSparePart (List<DeviceListEntity> devices,Integer startNo,Integer endNo,String zhid);
+
+    void eqMesSfjj(String id);
+
+    /**
+     * 自动填充租户ID
+     */
+    void paddingZhid();
+    void syncWorkingTime();
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/impl/FittingsServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/impl/FittingsServiceImpl.java
new file mode 100644
index 0000000..ddccf3c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/impl/FittingsServiceImpl.java
@@ -0,0 +1,31 @@
+package com.rootcloud.domain.service.fittings.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.domain.dao.FittingsListMapper;
+import com.rootcloud.domain.entity.NxFittingsListEntity;
+import com.rootcloud.domain.service.fittings.FittingsService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Service("fittingsServiceImpl")
+public class FittingsServiceImpl extends ServiceImpl<FittingsListMapper, NxFittingsListEntity> implements FittingsService {
+    @Override
+    public String getTotalPrice(String fittingsSellId) {
+       LambdaQueryWrapper<NxFittingsListEntity> lambdaQueryWrapper = Wrappers.lambdaQuery(NxFittingsListEntity.class);
+       lambdaQueryWrapper.eq(NxFittingsListEntity::getPjxspjlbglPjglwybs,fittingsSellId);
+       List<NxFittingsListEntity> list = this.list(lambdaQueryWrapper);
+       BigDecimal result = new BigDecimal("0.00");
+       if(!CollectionUtils.isEmpty(list)){
+           for(NxFittingsListEntity entity :list){
+               BigDecimal bigDecimal = new BigDecimal(entity.getPjxspjlbglCjxj());
+               result = result.add(bigDecimal);
+           }
+       }
+       return result.toString();
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/impl/SparePartServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/impl/SparePartServiceImpl.java
new file mode 100644
index 0000000..ec8ef13
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/fittings/impl/SparePartServiceImpl.java
@@ -0,0 +1,233 @@
+package com.rootcloud.domain.service.fittings.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.common.DateUtil;
+import com.rootcloud.common.ResourceUtil;
+import com.rootcloud.common.constant.TemplateConstant;
+import com.rootcloud.common.enums.ServicePlanEnums;
+import com.rootcloud.domain.dto.NxSparePartVo;
+import com.rootcloud.domain.entity.MyAdviceEntity;
+import com.rootcloud.domain.entity.NxSparePartEntity;
+import com.rootcloud.domain.entity.NxTodoLibrary;
+import com.rootcloud.domain.entity.ds.DeviceListEntity;
+import com.rootcloud.domain.mapper.NxOrderMapper;
+import com.rootcloud.domain.mapper.SpareFilerMapper;
+import com.rootcloud.domain.mapper.SparePartMapper;
+import com.rootcloud.domain.service.fittings.SparePartService;
+import com.rootcloud.domain.service.todo.NxTodoLibraryService;
+import jline.internal.Log;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service("sparePartServiceImpl")
+public class SparePartServiceImpl extends ServiceImpl<SparePartMapper, NxSparePartEntity> implements SparePartService {
+    @Resource
+    private NxOrderMapper nxOrderMapper;
+    @Resource(name = "nxTodoLibraryServiceImpl")
+    private NxTodoLibraryService nxTodoLibraryService;
+
+    @Resource
+    private SparePartMapper sparePartMapper;
+    @Autowired
+    SpareFilerMapper spareFilerMapper;
+
+    @Override
+    public void uptPartSmyj() {
+        List<NxSparePartEntity> udtList = new ArrayList<>();
+        BigDecimal sdf = new BigDecimal("0.00");
+        List<NxSparePartEntity> list = this.list();
+        if (list == null) {
+            return;
+        }
+        list.stream().forEach(temp -> {
+            BigDecimal workTimes = new BigDecimal(temp.getPartGzsc() == null ? 0 : temp.getPartGzsc());
+            if (temp.getPartSm() != null && temp.getPartSmyjz() != null) {
+                BigDecimal lifeTotalTimes = new BigDecimal(temp.getPartSm()).setScale(2, BigDecimal.ROUND_HALF_UP);
+                BigDecimal warnTimes = new BigDecimal(temp.getPartSmyjz()).setScale(2, BigDecimal.ROUND_HALF_UP);
+                String partYjsj = temp.getPartYjsj();
+                if (lifeTotalTimes.subtract(workTimes).compareTo(warnTimes) <= 0) {
+                    if (StringUtils.isBlank(partYjsj)) {
+                        NxSparePartEntity nxSparePartEntity = new NxSparePartEntity();
+                        nxSparePartEntity.setNxSparePartId(temp.getNxSparePartId());
+                        //0000代表该配件寿命预警，仅用于后端程序判断是否配件预警
+                        nxSparePartEntity.setPartYjzt("0000");
+                        nxSparePartEntity.setPartYjsj(DateUtil.format(new Date()));
+                        nxSparePartEntity.setPartSfjj("0");
+                        nxSparePartEntity.setPartSbbm(temp.getPartSbbm());
+                        nxSparePartEntity.setPartBjmc(temp.getPartBjmc());
+                        udtList.add(nxSparePartEntity);
+                    }
+                }
+            }
+        });
+        this.updateBatchById(udtList);
+    }
+
+    public static void main(String[] args) {
+        BigDecimal workTimes = new BigDecimal(4800);
+        BigDecimal lifeTotalTimes = new BigDecimal(5000);
+        BigDecimal warnTimes = new BigDecimal(200);
+        if (lifeTotalTimes.subtract(workTimes).compareTo(warnTimes) <= 0) {
+            System.out.println("aaa");
+        }
+    }
+
+    /**
+     * 添加分页参数
+     *
+     * @param devices
+     * @param startNo
+     * @param endNo
+     * @return
+     */
+    @Override
+    public List<MyAdviceEntity> getWarnedSparePart(List<DeviceListEntity> devices, Integer startNo, Integer endNo, String zhid) {
+        //获取模板
+        String contentData = nxOrderMapper.getContentByMbId(TemplateConstant.TEMPLATE_SPARE);
+        List<MyAdviceEntity> result = new ArrayList<>();
+        List<String> deviceCodes = devices.stream().map(DeviceListEntity::getNxJcxxSblbId).collect(Collectors.toList());
+
+        HashMap<String, Object> req = new HashMap<>();
+        req.put("startTime", DateUtil.format(DateUtil.rollDay(new Date(), -3)));
+        req.put("endTime", DateUtil.format(new Date()));
+        req.put("deviceCodes", deviceCodes);
+        req.put("startNo", startNo);
+        req.put("endNo", endNo);
+        req.put("zhid", zhid);
+//        Log.info("寿命预警通知查询前设备id"+ JSON.toJSONString(deviceCodes));
+        List<NxSparePartEntity> sparePartEntityList = nxOrderMapper.getSpartPartList(req);
+        //Log.info("获取配件数据："+sparePartEntityList.size());
+        /*LambdaQueryWrapper<NxSparePartEntity> lambdaQueryWrapper = Wrappers.lambdaQuery(NxSparePartEntity.class);
+        lambdaQueryWrapper.in(NxSparePartEntity::getPartSbid,deviceCodes)
+                .eq(NxSparePartEntity::getPartYjzt, "0000")
+                .and(wq -> {
+                    wq.ne(NxSparePartEntity::getPartSfjj, "1")
+                            .or().isNull(NxSparePartEntity::getPartSfjj);
+                })
+                //.ne(NxSparePartEntity::getPartSfjj,"1")
+                .between(NxSparePartEntity::getPartYjsj,DateUtil.format(DateUtil.rollDay(new Date(),-3)),DateUtil.format(new Date()))
+                .inSql(NxSparePartEntity::getPartSbbm,"select sblb_sbbm from nx_jcxx_sblb where nx_jcxx_sblb.nx_jcxx_sblb_id = nx_spare_part.part_sbid");
+        List<NxSparePartEntity> sparePartEntityList = this.list(lambdaQueryWrapper);*/
+        if (CollectionUtil.isEmpty(sparePartEntityList)) {
+            return result;
+        }
+        sparePartEntityList.stream().forEach(temp -> {
+            String content = contentData;
+            MyAdviceEntity myAdviceEntity = new MyAdviceEntity();
+            myAdviceEntity.setServicePlanId(temp.getNxSparePartId());//主键id
+            myAdviceEntity.setAdviceClass(ResourceUtil.getI18nMessage("60005")); //备件寿命预警提醒
+            myAdviceEntity.setAdviceTime(temp.getPartYjsj());
+            myAdviceEntity.setAdviceName(temp.getPartBjmc() + ResourceUtil.getI18nMessage("60006")); //喷头/QSWJM025630-BGS--0140F寿命提醒
+            myAdviceEntity.setAdvicObjectCode(temp.getPartSbbm());
+            //寿命预警计算四舍五入保留两位小数   20241012whl
+            //BigDecimal[] days = new BigDecimal(temp.getPartSm()).subtract(new BigDecimal(temp.getPartGzsc())).setScale(2, RoundingMode.HALF_UP).divideAndRemainder(new BigDecimal(24));
+            BigDecimal[] days = new BigDecimal(temp.getPartSm()).subtract(new BigDecimal(temp.getPartGzsc())).setScale(1, RoundingMode.HALF_UP).divideAndRemainder(new BigDecimal(1));
+            if (StringUtils.isNotBlank(content) && StringUtils.isNotEmpty(temp.getPartSbbm())) {
+                content = content.replace("【" + ResourceUtil.getI18nMessage("60007") + "】", temp.getPartSbbm());
+                myAdviceEntity.setAdviceContent(content);
+            } else {
+                //1800-7 寿命剩余时长 8.00天18.00小时 ->1800-7 寿命剩余时长 8.0天
+                //myAdviceEntity.setAdviceContent(temp.getPartSbbm() + ResourceUtil.getI18nMessage("60008") + days[0] + ResourceUtil.getI18nMessage("60009") + days[1] + ResourceUtil.getI18nMessage("60010"));
+                myAdviceEntity.setAdviceContent(temp.getPartSbbm() + ResourceUtil.getI18nMessage("60008") + days[0] + ResourceUtil.getI18nMessage("60009"));
+                String adviceContent = myAdviceEntity.getAdviceContent().replace("【" + ResourceUtil.getI18nMessage("60007") + "】", temp.getPartSbbm());
+                myAdviceEntity.setAdviceContent(adviceContent);
+
+                if (StringUtils.isNotEmpty(temp.getPartSbbm())) {
+                    //1800-7寿命剩余时长8.00天18.00小时安装位号23SN09723J05080->1800-7 寿命剩余时长 8.0天安装位号23,SN:09723J05080
+                    //myAdviceEntity.setAdviceContent(temp.getPartSbbm() + ResourceUtil.getI18nMessage("60016") + days[0] + ResourceUtil.getI18nMessage("60009") + days[1] + ResourceUtil.getI18nMessage("60010") + ResourceUtil.getI18nMessage("60017") + temp.getPartAzwh() + "SN" + temp.getPartSn());
+                    myAdviceEntity.setAdviceContent(temp.getPartSbbm() + ResourceUtil.getI18nMessage("60016") + days[0] + ResourceUtil.getI18nMessage("60009")  + ","+ResourceUtil.getI18nMessage("60017") + temp.getPartAzwh() + ",SN:" + temp.getPartSn());
+                    String adviceContent1 = myAdviceEntity.getAdviceContent().replace("【" + ResourceUtil.getI18nMessage("60007") + "】", temp.getPartSbbm());
+                    myAdviceEntity.setAdviceContent(adviceContent1);
+                } else {
+                    //1800-7寿命剩余时长8.00天18.00小时安装位号23SN09723J05080->1800-7 寿命剩余时长 8.0天安装位号23,SN:09723J05080
+                    //myAdviceEntity.setAdviceContent(ResourceUtil.getI18nMessage("60016") + days[0] + ResourceUtil.getI18nMessage("60009") + days[1] + ResourceUtil.getI18nMessage("60010") + ResourceUtil.getI18nMessage("60017") + temp.getPartAzwh() + "SN" + temp.getPartSn());
+                    myAdviceEntity.setAdviceContent(ResourceUtil.getI18nMessage("60016") + days[0] + ResourceUtil.getI18nMessage("60009") + ","+ResourceUtil.getI18nMessage("60017") + temp.getPartAzwh() + ",SN:" + temp.getPartSn());
+                }
+            }
+            if (StringUtils.isNotEmpty(temp.getPartSbbm())) {
+                myAdviceEntity.setAdviceObjectName(getDeviceName(temp, devices));
+            }
+            myAdviceEntity.setTypeCode(ServicePlanEnums.MessageType.SPARE_PARTS_LIFE_WARNING_REMINDER.getCode());
+            myAdviceEntity.setAdviceCode(ServicePlanEnums.MessageCodeType.SPARE_PARTS_LIFE.getCode());
+            myAdviceEntity.setSignData(temp.getNxSparePartId());
+            myAdviceEntity.setSn(temp.getPartSn());
+            myAdviceEntity.setPartAzwh(temp.getPartAzwh());
+            myAdviceEntity.setPartGzsc(temp.getPartGzsc().toString());//工作时长
+            myAdviceEntity.setPartXtmk(temp.getPartXtmk());//系统模块
+            myAdviceEntity.setPartBjmc(temp.getPartBjmc());//备件名称
+            List<NxTodoLibrary> nxTodoLibraries = nxTodoLibraryService.selectBySign(myAdviceEntity.getAdviceCode(), myAdviceEntity.getSignData(), myAdviceEntity.getAdviceTime());
+            if (nxTodoLibraries.isEmpty()) {
+                result.add(myAdviceEntity);
+            }
+        });
+        return result;
+    }
+
+    @Override
+    public void eqMesSfjj(String id) {
+        nxOrderMapper.eqMesSfjj(id);
+    }
+
+    /**
+     * 自动填充租户ID
+     */
+    @Override
+    public void paddingZhid() {
+        sparePartMapper.updateZhid();
+    }
+
+    @Override
+    public void syncWorkingTime() {
+        List<NxSparePartVo> list = sparePartMapper.selectNoSyncPart();
+        //1.先刷更换日期
+        if(CollectionUtil.isNotEmpty(list)){
+            list.stream().parallel().forEach(e->{
+                sparePartMapper.updateWorkTime(e.getNxSparePartId());
+                //sparePartMapper.updateWorkTime(e.getNxSparePartId(),new BigDecimal(StrUtil.isNotEmpty(workingHours)?workingHours:"0"));
+            });
+        }
+        //2.再刷运行时长
+        List<NxSparePartVo> list2 = sparePartMapper.selectNoSyncPart();
+        if(CollectionUtil.isNotEmpty(list2)){
+            list2.stream().parallel().forEach(e->{
+                //String workingHours = spareFilerMapper.getWorkingHours(e.getPartSbid(), e.getPartAzrq(), e.getPartGhrq());
+                //String days = workingHours==""?"0":String.format("%.1f",Double.valueOf(workingHours)/24); //20241012
+                LocalDate date1 = LocalDate.parse(e.getPartGhrq());
+                LocalDate date2 = LocalDate.parse(e.getPartAzrq());
+                long daysDiff = ChronoUnit.DAYS.between(date2, date1);
+                String days = String.valueOf(Math.abs(daysDiff));//自然天数 20241012
+                sparePartMapper.updateWorkTime2(e.getNxSparePartId(),new BigDecimal(StrUtil.isNotEmpty(days)?days:"0"));
+                //sparePartMapper.updateWorkTime(e.getNxSparePartId(),new BigDecimal(StrUtil.isNotEmpty(workingHours)?workingHours:"0"));
+            });
+        }
+    }
+
+
+    /**
+     * 根据设备编码获取设备名字
+     */
+    public String getDeviceName(NxSparePartEntity entity, List<DeviceListEntity> deviceListEntities) {
+        String result = "";
+        for (DeviceListEntity deviceListEntity : deviceListEntities) {
+            if (entity.getPartSbbm().equals(deviceListEntity.getSblbSbbm())) {
+                result = deviceListEntity.getSblbSbmc();
+                break;
+            }
+        }
+        return result;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/GbsjbService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/GbsjbService.java
new file mode 100644
index 0000000..52b321b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/GbsjbService.java
@@ -0,0 +1,20 @@
+package com.rootcloud.domain.service.gbsj;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.entity.GbsjbEntity;
+
+
+/**
+ * 过保商机表
+ *
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-04-12 14:22:17
+ */
+public interface GbsjbService extends IService<GbsjbEntity> {
+
+    boolean sendGbsjTipMsg();
+
+    void userUnlock();
+}
+
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/JeCoreEnduserService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/JeCoreEnduserService.java
new file mode 100644
index 0000000..14c0d42
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/JeCoreEnduserService.java
@@ -0,0 +1,45 @@
+package com.rootcloud.domain.service.gbsj;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.config.auth.LoginUserInfo;
+import com.rootcloud.domain.dto.EnterpriseInfoDTO;
+import com.rootcloud.domain.dto.UserRoleDeptDTO;
+import com.rootcloud.config.auth.UserInfo;
+import com.rootcloud.domain.entity.JeCoreEnduserEntity;
+import com.rootcloud.domain.entity.SiteDTO;
+
+
+/**
+ * 人员表
+ *
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-04-12 14:22:06
+ */
+public interface JeCoreEnduserService extends IService<JeCoreEnduserEntity> {
+
+
+    LoginUserInfo getUserInfo(String userId);
+
+    SiteDTO getSiteByUserId(String userId);
+
+    String getCustomsBySiteAreaName(String areaName);
+
+    String getCustomsByUserId(String userId);
+
+    EnterpriseInfoDTO getTenantInfo(String userId);
+
+    String getTenantInfoNOSQL(String userId);
+
+    UserRoleDeptDTO getUserLoginInfo(String userId);
+
+
+    UserInfo getUser(String userId);
+
+    boolean getBackusercode(String phone);
+
+    String getDataByKey(String key);
+
+}
+
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/JeCoreRoleService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/JeCoreRoleService.java
new file mode 100644
index 0000000..691c6cd
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/JeCoreRoleService.java
@@ -0,0 +1,19 @@
+package com.rootcloud.domain.service.gbsj;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.entity.JeCoreRoleEntity;
+
+import java.util.Map;
+
+/**
+ * 角色表
+ *
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-04-12 14:21:50
+ */
+public interface JeCoreRoleService extends IService<JeCoreRoleEntity> {
+
+}
+
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/JeCoreRoleUserService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/JeCoreRoleUserService.java
new file mode 100644
index 0000000..74202bb
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/JeCoreRoleUserService.java
@@ -0,0 +1,17 @@
+package com.rootcloud.domain.service.gbsj;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.entity.JeCoreRoleUserEntity;
+
+
+/**
+ * 
+ *
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-04-12 14:21:50
+ */
+public interface JeCoreRoleUserService extends IService<JeCoreRoleUserEntity> {
+
+}
+
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/ModelColorService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/ModelColorService.java
new file mode 100644
index 0000000..094221b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/ModelColorService.java
@@ -0,0 +1,16 @@
+package com.rootcloud.domain.service.gbsj;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.entity.base.ModelColor;
+
+import java.util.List;
+
+/**
+ * @author ruixiang.feng
+ * @ClassName
+ * @Description
+ * @date 2022/4/21 11:02
+ */
+public interface ModelColorService extends IService<ModelColor> {
+    List<ModelColor> getColor();
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/ModelPropertyService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/ModelPropertyService.java
new file mode 100644
index 0000000..b2bb195
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/ModelPropertyService.java
@@ -0,0 +1,27 @@
+package com.rootcloud.domain.service.gbsj;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.common.JsonPageResult;
+import com.rootcloud.domain.entity.base.ModelPropertyEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ruixiang.feng
+ * @ClassName
+ * @Description
+ * @date 2022/4/15 10:45
+ */
+public interface ModelPropertyService extends IService<ModelPropertyEntity> {
+
+    Map<String, List<ModelPropertyEntity>> getWorkingCondition(String deviceSblx, String deviceSbxh, String workingConditionType,String dataSource);
+
+    JsonPageResult updateWorkingCondition(List<ModelPropertyEntity> modelPropertyEntityList);
+
+    JsonPageResult delWorkingCondition(String propertyTag,String propertyDataType);
+
+    List<ModelPropertyEntity> getGroupAtt(String workingConditionType, String propertyTag,String deviceSblx, String deviceSbxh);
+
+    List<ModelPropertyEntity> getmodelPropertyBySbxh(List<String> sbxh);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/GbsjbServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/GbsjbServiceImpl.java
new file mode 100644
index 0000000..7272e50
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/GbsjbServiceImpl.java
@@ -0,0 +1,119 @@
+package com.rootcloud.domain.service.gbsj.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.common.HttpUtils;
+import com.rootcloud.common.JEUuidUtil;
+import com.rootcloud.common.ResourceUtil;
+import com.rootcloud.common.constant.Properties;
+import com.rootcloud.config.auth.LoginUserInfo;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.config.auth.UserInfo;
+import com.rootcloud.domain.dao.GbsjbDao;
+import com.rootcloud.domain.dao.JeCoreEnduserDao;
+import com.rootcloud.domain.dao.JeSysUsermsgDao;
+import com.rootcloud.domain.entity.GbsjbEntity;
+import com.rootcloud.domain.entity.JeSysUsermsgEntity;
+import com.rootcloud.domain.service.gbsj.GbsjbService;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+
+@Service("gbsjService")
+@Slf4j
+public class GbsjbServiceImpl extends ServiceImpl<GbsjbDao, GbsjbEntity> implements GbsjbService {
+
+    @Autowired
+    Properties wfProperties;
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    @Autowired
+    GbsjbDao gbsjbDao;
+
+    @Autowired
+    JeSysUsermsgDao jeSysUsermsgDao;
+    @Autowired
+    JeCoreEnduserDao jeCoreEnduserDao;
+    @Override
+    public boolean sendGbsjTipMsg() {
+        boolean flag = false;
+        //获取触发条件
+        Map<String, String> maps = gbsjbDao.selectOne();
+
+
+        //JP推送消息地址与接口路径
+        String host = wfProperties.getWfHost();
+        String url = Properties.dwr_sender_uri;
+
+
+        //根据通知角色找到对应需要通知的人
+        String userIds = gbsjbDao.queryUserIds(Arrays.asList(maps.get("CFTJPZB_TZDX").split(",")));
+
+        //组装请求调用JP的发起站内信接口
+        JSONObject params = new JSONObject();
+        params.put("userId", userIds);
+        params.put("title", ResourceUtil.getI18nMessage("60013"));
+        params.put("context", maps.get("CFTJPZB_TZNR"));
+        Map<String, String> headers = new HashMap<>();
+        try {
+            Map<String, String> querys = new HashMap<>();
+            HttpResponse response = HttpUtils.doPost(host + url, "", "post", headers, querys, params.toString());
+            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                flag = true;
+            }
+        } catch (Exception e) {
+            log.error("error", e);
+        }
+        String[] split = userIds.split(",");
+        for (String userId:split) {
+            JeSysUsermsgEntity usermsgEntity = new JeSysUsermsgEntity();
+            usermsgEntity.setUsermsgJsrId(userId);//接收人id
+            usermsgEntity.setUsermsgYd("0");//默认已读
+            usermsgEntity.setUsermsgNr(maps.get("CFTJPZB_TZNR"));//内容
+            usermsgEntity.setUsermsgBt(ResourceUtil.getI18nMessage("60013"));//标题
+            usermsgEntity.setUsermsgJssj(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()).toString());//接受时间
+            UserInfo user = jeCoreEnduserDao.getUser(userId);
+            usermsgEntity.setUsermsgJsrName(user.getUserName());//接收人姓名
+            usermsgEntity.setUsermsgMsgtypeName(ResourceUtil.getI18nMessage("60013"));//用户消息类型_NAME
+            usermsgEntity.setUsermsgMsgtypeCode("NX");//用户消息类型
+            usermsgEntity.setJeSysUsermsgId(JEUuidUtil.uuid());//主键
+            usermsgEntity.setSyCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()).toString());//创建时间
+            LoginUserInfo current = UserContext.current();
+            usermsgEntity.setSyCreateuser(current.getUserName());//当前登陆人姓名
+            jeSysUsermsgDao.insert(usermsgEntity);
+        }
+        return flag;
+    }
+
+    @Override
+    public void userUnlock() {
+        List<Map<String, String>> users = gbsjbDao.queryLockUser();
+        if (users != null && users.size() > 0) {
+            gbsjbDao.unLockUser();
+            for (Map<String,String> user : users) {
+                //清理用户所有登陆关键字
+                String[] fileds = new String[]{"USERID", "USERNAME", "BACKUSERCODE", "PHONE", "COMPANYEMAIL", "JOBNUM", "USERCARD"};
+                for (String filed : fileds) {
+                    if (StringUtils.isNotBlank(user.get(filed))) {
+                        String key = "__CODE__" + user.get(filed);
+                        redisTemplate.delete(user.get(filed));
+                        redisTemplate.delete(key);
+//                        UserErrorPwCacheManager.removeCache(user.getStr(filed));
+//                        UserErrorPwCacheManager.removeCache("__CODE__" + user.getStr(filed));
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/JeCoreEnduserServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/JeCoreEnduserServiceImpl.java
new file mode 100644
index 0000000..bf298ae
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/JeCoreEnduserServiceImpl.java
@@ -0,0 +1,87 @@
+package com.rootcloud.domain.service.gbsj.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.config.auth.LoginUserInfo;
+import com.rootcloud.config.auth.UserInfo;
+import com.rootcloud.domain.dao.JeCoreEnduserDao;
+import com.rootcloud.domain.dto.EnterpriseInfoDTO;
+import com.rootcloud.domain.dto.UserRoleDeptDTO;
+import com.rootcloud.domain.entity.JeCoreEnduserEntity;
+import com.rootcloud.domain.entity.SiteDTO;
+import com.rootcloud.domain.entity.base.ModelPropertyEntity;
+import com.rootcloud.domain.service.gbsj.JeCoreEnduserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("endUserService")
+public class JeCoreEnduserServiceImpl extends ServiceImpl<JeCoreEnduserDao, JeCoreEnduserEntity> implements JeCoreEnduserService {
+
+    @Autowired
+    JeCoreEnduserDao enduserDao;
+
+    @Override
+    public LoginUserInfo getUserInfo(String userId) {
+        return enduserDao.getUserInfo(userId);
+    }
+
+    @Override
+    public SiteDTO getSiteByUserId(String userId) {
+        return enduserDao.getSiteByUserId(userId);
+    }
+
+    @Override
+    public String getCustomsBySiteAreaName(String areaName) {
+        return enduserDao.getCustomsBySiteAreaName(areaName);
+    }
+
+
+    @Override
+    public String getCustomsByUserId(String userId) {
+        return enduserDao.getCustomByUserId(userId);
+    }
+
+    @Override
+    public EnterpriseInfoDTO getTenantInfo(String userId) {
+        return enduserDao.getTenantInfo(userId);
+    }
+
+    @Override
+    public String getTenantInfoNOSQL(String userId) {
+        return enduserDao.getTenantInfoNOSQL(userId);
+    }
+
+    @Override
+    public UserRoleDeptDTO getUserLoginInfo(String userId) {
+        return enduserDao.getUserLoginInfo(userId);
+    }
+
+    @Override
+    public UserInfo getUser(String userId) {
+        return enduserDao.getUser(userId);
+    }
+
+    /**
+     * @param key
+     * @return
+     */
+    @Override
+    public String getDataByKey(String key) {
+        return enduserDao.getDataByKey(key);
+    }
+
+    @Override
+    public boolean getBackusercode(String phone) {
+        //判断手机号码或者邮件
+        LambdaQueryWrapper<JeCoreEnduserEntity> mpeWrapper = new LambdaQueryWrapper<JeCoreEnduserEntity>();
+        mpeWrapper.eq(JeCoreEnduserEntity::getBackusercode,phone).or().eq(JeCoreEnduserEntity::getCompanyemail,phone);
+        List<JeCoreEnduserEntity> list = enduserDao.selectList(mpeWrapper);
+        if(list.size()>0){
+            return true;
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/JeCoreRoleServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/JeCoreRoleServiceImpl.java
new file mode 100644
index 0000000..2af0816
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/JeCoreRoleServiceImpl.java
@@ -0,0 +1,14 @@
+package com.rootcloud.domain.service.gbsj.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.domain.dao.JeCoreRoleDao;
+import com.rootcloud.domain.entity.JeCoreRoleEntity;
+import com.rootcloud.domain.service.gbsj.JeCoreRoleService;
+import org.springframework.stereotype.Service;
+
+
+@Service("roleService")
+public class JeCoreRoleServiceImpl extends ServiceImpl<JeCoreRoleDao, JeCoreRoleEntity> implements JeCoreRoleService {
+
+
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/JeCoreRoleUserServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/JeCoreRoleUserServiceImpl.java
new file mode 100644
index 0000000..b068016
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/JeCoreRoleUserServiceImpl.java
@@ -0,0 +1,13 @@
+package com.rootcloud.domain.service.gbsj.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.domain.entity.JeCoreRoleUserEntity;
+import com.rootcloud.domain.dao.JeCoreRoleUserDao;
+import com.rootcloud.domain.service.gbsj.JeCoreRoleUserService;
+import org.springframework.stereotype.Service;
+
+
+@Service("roleUserService")
+public class JeCoreRoleUserServiceImpl extends ServiceImpl<JeCoreRoleUserDao, JeCoreRoleUserEntity> implements JeCoreRoleUserService {
+
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/ModelColorServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/ModelColorServiceImpl.java
new file mode 100644
index 0000000..f898a16
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/ModelColorServiceImpl.java
@@ -0,0 +1,31 @@
+package com.rootcloud.domain.service.gbsj.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.domain.dao.ModelColorDao;
+import com.rootcloud.domain.entity.base.ModelColor;
+import com.rootcloud.domain.mapper.ModelPropertyMapper;
+import com.rootcloud.domain.service.gbsj.ModelColorService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author ruixiang.feng
+ * @ClassName
+ * @Description
+ * @date 2022/4/21 11:02
+ */
+@Service("colorService")
+@Slf4j
+public class ModelColorServiceImpl extends ServiceImpl<ModelColorDao, ModelColor> implements ModelColorService {
+
+    @Autowired
+    private ModelPropertyMapper modelPropertyMapper;
+
+    @Override
+    public List<ModelColor> getColor() {
+        return modelPropertyMapper.getColor();
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/ModelPropertyServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/ModelPropertyServiceImpl.java
new file mode 100644
index 0000000..c3dffc5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gbsj/impl/ModelPropertyServiceImpl.java
@@ -0,0 +1,144 @@
+package com.rootcloud.domain.service.gbsj.impl;
+
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.common.JsonPageResult;
+import com.rootcloud.domain.dao.ModelPropertyDao;
+import com.rootcloud.domain.entity.base.ModelPropertyEntity;
+import com.rootcloud.domain.mapper.ModelPropertyMapper;
+import com.rootcloud.domain.service.gbsj.ModelPropertyService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author ruixiang.feng
+ * @ClassName
+ * @Description
+ * @date 2022/4/15 10:46
+ */
+@Service("propertyService")
+@Slf4j
+public class ModelPropertyServiceImpl extends ServiceImpl<ModelPropertyDao, ModelPropertyEntity> implements ModelPropertyService {
+    @Autowired
+    private ModelPropertyMapper modelPropertyMapper;
+
+    protected static final String CODE_SUCCESS = "200";
+    private static final String CODE_CLIENT_ERROR = "500";
+    @Override
+    public Map<String, List<ModelPropertyEntity>> getWorkingCondition(String deviceSblx, String deviceSbxh, String workingConditionType,String dataSource) {
+        HashMap<String, String> req = new HashMap<>();
+        req.put("deviceSblx",deviceSblx);
+        req.put("deviceSbxh",deviceSbxh);
+        req.put("workingConditionType",workingConditionType);
+        req.put("dataSource",dataSource);
+        List<ModelPropertyEntity> workingCondition = modelPropertyMapper.getWorkingCondition(req);
+        Map<String, List<ModelPropertyEntity>> collect = workingCondition.stream().collect(Collectors.groupingBy(ModelPropertyEntity::getPropertyTag));
+        List<String> titles = modelPropertyMapper.getWorkingTitle(req);
+
+        LinkedHashMap<String, List<ModelPropertyEntity>> linkedHashMap = new LinkedHashMap<>();
+        titles.forEach(item->{
+            List<ModelPropertyEntity> list = collect.get(item);
+            if(list!=null){
+                linkedHashMap.put(item,collect.get(item));
+            }
+        });
+        return linkedHashMap;
+    }
+
+    @Override
+    @Transactional
+    public JsonPageResult updateWorkingCondition(List<ModelPropertyEntity> modelPropertyEntityList) {
+        JsonPageResult jsonPageResult = new JsonPageResult(CODE_SUCCESS);
+        if(modelPropertyEntityList.size() == 0){
+            jsonPageResult.setCode(CODE_CLIENT_ERROR);
+        }
+
+        Map<String, List<ModelPropertyEntity>> collect = modelPropertyEntityList.stream().collect(Collectors.groupingBy(ModelPropertyEntity::getPropertyTag));
+        for (String key:collect.keySet()) {
+            List<ModelPropertyEntity> modelPropertyEntitieList = collect.get(key);
+            List<ModelPropertyEntity> collect1 = modelPropertyEntitieList
+                    .stream().filter(e -> StringUtils.isNotBlank(e.getPropertyTagCode())).collect(Collectors.toList());
+            ModelPropertyEntity modelPropertyEntity = modelPropertyEntitieList.get(0);
+            if(collect1.size() == 0){ //全部都是新增
+                String uuid = UUID.randomUUID().toString().trim().replaceAll("-", "");
+                modelPropertyEntitieList.forEach(e->{
+                    e.setPropertyTagCode(uuid);
+                });
+                ModelPropertyEntity entity = new ModelPropertyEntity();
+                entity.setDataSource(modelPropertyEntity.getDataSource());
+                entity.setDeviceSblx(modelPropertyEntity.getDeviceSblx());
+                entity.setDeviceSbxh(modelPropertyEntity.getDeviceSbxh());
+                entity.setPropertyTag(modelPropertyEntity.getPropertyTag());
+                entity.setPropertyTagCode(modelPropertyEntity.getPropertyTagCode());
+                entity.setWorkingConditionType(modelPropertyEntity.getWorkingConditionType());
+                entity.setDataSjy(modelPropertyEntity.getDataSjy());
+                entity.setCreateTime(DateUtil.now());
+                entity.setUpdateTime(DateUtil.now());
+                modelPropertyEntitieList.add(entity);
+                modelPropertyMapper.batchinsert(modelPropertyEntitieList);
+            }else{//部分新增 部分修改
+                /*List<ModelPropertyEntity> modelPropertyEntities = queryWorkingCondition(collect1.get(0).getPropertyTag(), collect1.get(0).getWorkingConditionType());
+                if(modelPropertyEntities.size() > 0){
+                    List<String> idList = modelPropertyEntities.stream().map(e -> e.getId()).collect(Collectors.toList());
+                    modelPropertyMapper.deleteByIds(idList);
+                    //delWorkingCondition(collect1.get(0).getPropertyTagCode(),collect1.get(0).getWorkingConditionType());
+                }*/
+                //通过以后的数据标题code删除之前的数据
+                ModelPropertyEntity modelPropertyEntity1 = collect1.get(0);
+                modelPropertyMapper.deleteByCode(modelPropertyEntity1.getPropertyTagCode(),"1");
+                //modelPropertyMapper.del(modelPropertyEntity1);
+                //List<String> idList = modelPropertyEntitieList.stream().filter(e -> StringUtils.isNotEmpty(e.getId())).map(e -> e.getId()).collect(Collectors.toList());
+                //modelPropertyMapper.deleteByIds(idList);
+//                String uuid = UUID.randomUUID().toString().trim().replaceAll("-", "");
+                modelPropertyEntitieList.forEach(e->{
+                    e.setPropertyTagCode(modelPropertyEntity1.getPropertyTagCode());
+                });
+                modelPropertyMapper.batchinsert(modelPropertyEntitieList);
+            }
+        }
+
+        return jsonPageResult;
+    }
+
+    @Override
+    public JsonPageResult delWorkingCondition(String propertyTagCode,String workingConditionType) {
+        HashMap<String, String> req = new HashMap<>();
+        req.put("propertyTagCode",propertyTagCode);
+        req.put("workingConditionType",workingConditionType);
+        //modelPropertyMapper.delWorkingCondition(req);
+        modelPropertyMapper.deleteByCode(propertyTagCode,null);
+        return new JsonPageResult(CODE_SUCCESS);
+    }
+
+    public List<ModelPropertyEntity> queryWorkingCondition(String propertyTag,String workingConditionType) {
+        HashMap<String, String> req = new HashMap<>();
+        req.put("propertyTag",propertyTag);
+        req.put("workingConditionType",workingConditionType);
+        return modelPropertyMapper.queryWorkingCondition(req);
+    }
+
+    @Override
+    public List<ModelPropertyEntity> getGroupAtt(String workingConditionType, String propertyTagCode,String deviceSblx, String deviceSbxh) {
+        HashMap<String, String> req = new HashMap<>();
+        req.put("workingConditionType",workingConditionType);
+        req.put("propertyTagCode",propertyTagCode);
+        req.put("deviceSblx",deviceSblx);
+        req.put("deviceSbxh",deviceSbxh);
+        if(StringUtils.isNotEmpty(propertyTagCode)){
+            return modelPropertyMapper.getGroupAttData(req);
+        }
+        return modelPropertyMapper.getGroupAtt(req);
+    }
+
+    @Override
+    public List<ModelPropertyEntity> getmodelPropertyBySbxh(List<String> sbxh) {
+        return modelPropertyMapper.getmodelPropertyBySbxh(sbxh);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gkjk/NxJeDeviceService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gkjk/NxJeDeviceService.java
new file mode 100644
index 0000000..5272ed9
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gkjk/NxJeDeviceService.java
@@ -0,0 +1,147 @@
+package com.rootcloud.domain.service.gkjk;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.domain.ao.ExportHistorySituationAO;
+import com.rootcloud.domain.ao.HistorySituationAO;
+import com.rootcloud.domain.dto.DeviceVO;
+import com.rootcloud.domain.entity.NxJeDeviceEntity;
+import com.rootcloud.domain.model.WorkStatusMonitorModel;
+import com.rootcloud.vo.device.DeviceHistorySituationVO;
+import com.rootcloud.vo.device.DeviceStatusVO;
+import com.rootcloud.vo.device.DeviceTypeVO;
+import com.rootcloud.vo.resp.OtherDeviceResp;
+import com.rootcloud.vo.rest.DevicePropertyValueParam;
+import com.rootcloud.vo.rest.DeviceTrendParam;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 宁夏_设备台账
+ *
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-04-18 15:19:58
+ */
+public interface NxJeDeviceService extends IService<NxJeDeviceEntity> {
+
+    Map<String, List<WorkStatusMonitorModel>> queryWorkStatus(String deviceId);
+
+    Map<String, List<WorkStatusMonitorModel>> queryWorkStatus(String deviceId,String dataSjy);
+
+    Map<String, List<WorkStatusMonitorModel>> queryMonitoringData(String deviceId);
+    /**
+     * @Author w-liuyi01
+     * @Description //获取历史工况列表数据
+     * @Date 2022/4/20 15:42
+     **/
+    JsonResult<DeviceHistorySituationVO> queryHistorySituation(HistorySituationAO historySituationAO);
+
+
+    JsonResult<DeviceHistorySituationVO> exportQueryHistorySituation(ExportHistorySituationAO historySituationAO);
+
+    List<OtherDeviceResp> queryOtherDevices(String deviceId);
+
+    JSONObject queryWorkTrendData(DeviceTrendParam deviceTrendParam);
+
+    /**
+     * 查询所有的设备Id
+     *
+     * @return 设备Id列表
+     */
+    List<NxJeDeviceEntity> queryAllJeDevice();
+
+
+    /**
+     * 通过设别id 和工况码list返回对应的map
+     * @param deviceId
+     * @param paramsList
+     * @return
+     */
+    Map<String,Object> getWorkingMap(String deviceId,List<String> paramsList);
+
+
+    Map<String, Object> getRootcloudWorkingMap(String deviceId, List<String> paramsList);
+
+
+    /**
+     * 通过模型查询数据
+     * @param model
+     * @param deviceIds
+     * @param paramsList
+     * @return
+     */
+    Map<String,Map<String,Object>> getWorkingMapByModelGroup(String model,List<String> deviceIds, List<String> paramsList);
+
+
+    /**
+     * 通过设备Id 获取设备首页详情
+     * @param deviceId
+     * @return
+     */
+    DeviceTypeVO  getByDeviceId(String deviceId);
+
+
+    /**
+     * get
+     * @param deviceId
+     * @return
+     */
+    DeviceStatusVO getStatusByDeviceId(String deviceId);
+
+
+    /**
+     * 根据前台指定的工况和设备查询数据
+     */
+    Map<String,Object> queryPropertyValueByParam(DevicePropertyValueParam devicePropertyValueParam);
+
+    /**
+     * 查询设备状态
+     *
+     * @param queryData
+     *            查询条件(支持地点、状态、型号、名称)
+     * @param isCare
+     *            是否重要
+     * @param page
+     *            当前页
+     * @param size
+     *            每页显示数
+     * @param userId
+     * @return 分页数据
+     */
+    IPage<DeviceVO> devicePage(String queryData, String isCare, int page, int size, String userId,String syZhid);
+
+    /**
+     * 查询设备是否在线
+     * @param deviceNo 设备编码
+     * @return true是
+     */
+    Boolean queryOnlineStatus(String deviceNo);
+
+
+    /**
+     * 通过设备编码查询设备信息
+     * @param sbbm
+     * @return
+     */
+    NxJeDeviceEntity selectBySbbm(String sbbm);
+
+
+    /**
+     * 获取实时工况信息
+     * @param jeDeviceEntity
+     * @return
+     */
+    Map<String, List<WorkStatusMonitorModel>> getrealTimeWork(NxJeDeviceEntity jeDeviceEntity);
+
+
+    /**
+     * 修改入云时间
+     */
+    void updateOnlineTime(String deviceIds);
+
+}
+
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gkjk/impl/NxJeDeviceServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gkjk/impl/NxJeDeviceServiceImpl.java
new file mode 100644
index 0000000..82f59e9
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gkjk/impl/NxJeDeviceServiceImpl.java
@@ -0,0 +1,1331 @@
+package com.rootcloud.domain.service.gkjk.impl;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpStatus;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageInfo;
+import com.rootcloud.common.*;
+import com.rootcloud.common.enums.DeviceOnlineStatus;
+import com.rootcloud.common.enums.HttpRequestMethedEnum;
+import com.rootcloud.common.enums.ServicePlanEnums;
+import com.rootcloud.common.enums.StatusCodeEnum;
+import com.rootcloud.common.util.GaoDeAPIUtils;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.config.exception.BusinessException;
+import com.rootcloud.domain.ao.ExportHistorySituationAO;
+import com.rootcloud.domain.ao.HistorySituationAO;
+import com.rootcloud.domain.dao.gkjk.NxJeDeviceDao;
+import com.rootcloud.domain.dto.DeviceVO;
+import com.rootcloud.domain.entity.*;
+import com.rootcloud.domain.entity.base.ModelPropertyEntity;
+import com.rootcloud.domain.entity.device.NxDeviceEntity;
+import com.rootcloud.domain.entity.device.NxDeviceLocationEntity;
+import com.rootcloud.domain.mapper.ModelPropertyMapper;
+import com.rootcloud.domain.mapper.NxDeviceLocationMapper;
+import com.rootcloud.domain.mapper.NxDeviceMapper;
+import com.rootcloud.domain.mapper.NxOrderMapper;
+import com.rootcloud.domain.model.WorkStatusMonitorModel;
+import com.rootcloud.domain.service.device.DeviceAlarmService;
+import com.rootcloud.domain.service.ds.ModelPropertySyncService;
+import com.rootcloud.domain.service.gkjk.NxJeDeviceService;
+import com.rootcloud.vo.device.*;
+import com.rootcloud.vo.resp.OtherDeviceResp;
+import com.rootcloud.vo.rest.DevicePropertyValueParam;
+import com.rootcloud.vo.rest.DeviceTrendParam;
+import groovy.util.logging.Slf4j;
+import jline.internal.Log;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.map.HashedMap;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+
+@Service("nxJeDeviceServiceImpl")
+@Slf4j
+public class NxJeDeviceServiceImpl extends ServiceImpl<NxJeDeviceDao, NxJeDeviceEntity> implements NxJeDeviceService {
+
+
+    @Autowired
+    private GaoDeAPIUtils gaoDeAPIUtils;
+
+    @Autowired
+    private NxDeviceLocationMapper deviceLocationMapper;
+    @Autowired
+    private TokenUtil tokenUtil;
+    @Resource(name = "modelPropertySyncService2")
+    private ModelPropertySyncService modelPropertySyncService;
+
+    @Value("${os.iam.superToken}")
+    private String superToken;
+
+    @Value("${os.iam.domain}")
+    private String reqUrl;
+
+    @Value(value = "${cms.thingmodel.uri}")
+    private String thingModelUri;
+
+    @Value("${cms.propertystatus.uri}")
+    private String propertyStatusUrl;
+
+    @Value(value = "${os.iam.domain}")
+    private String domain;
+
+    @Value(value = "${cms.thing.uri}")
+    private String thingUri;
+
+    @Autowired
+    private ModelPropertyMapper modelPropertyMapper;
+
+    @Autowired
+    private NxJeDeviceDao nxJeDeviceDao;
+
+    @Resource(name = "deviceAlarmServiceImpl")
+    private DeviceAlarmService deviceAlarmService;
+
+    private final NxDeviceMapper nxDeviceMapper;
+    private final NxOrderMapper nxOrderMapper;
+
+    public NxJeDeviceServiceImpl(NxDeviceMapper nxDeviceMapper, NxOrderMapper nxOrderMapper) {
+        this.nxDeviceMapper = nxDeviceMapper;
+        this.nxOrderMapper = nxOrderMapper;
+    }
+
+    @Override
+    public Map<String, List<WorkStatusMonitorModel>> queryWorkStatus(String deviceId) {
+        return queryModelProperty(deviceId, false, null);
+    }
+
+    @Override
+    public Map<String, List<WorkStatusMonitorModel>> queryWorkStatus(String deviceId, String dataSjy) {
+        return queryModelProperty(deviceId, false, dataSjy);
+    }
+
+    @Override
+    public Map<String, List<WorkStatusMonitorModel>> queryMonitoringData(String deviceId) {
+        return queryModelProperty(deviceId, true, null);
+    }
+
+    @Override
+    public JsonResult queryHistorySituation(HistorySituationAO historySituationAO) {
+        //页数处理
+        Integer skip = historySituationAO.getPageSize() * (historySituationAO.getCurrentPage() - 1);
+        Integer limit = historySituationAO.getPageSize();
+
+//        Integer skip = historySituationAO.getCurrentPage();
+//        Integer limit = historySituationAO.getPageSize();
+        //根据设备id查询设备
+        /*NxJeDeviceEntity jeDeviceEntity = this.getById(historySituationAO.getDeviceId());
+        if (ObjectUtils.isEmpty(jeDeviceEntity)) {
+            //设备不存在
+            throw new BusinessException(StatusCodeEnum.DEVICE_NOT_EXIST.getRet(),StatusCodeEnum.DEVICE_NOT_EXIST.getMessage());
+        }*/
+        String stTime = DateUtil.handlerTime(historySituationAO.getStartTime());
+        String enTime = DateUtil.handlerTime(historySituationAO.getEndTime());
+        Map<String, Object> paramMap = new HashMap<>(16);
+        paramMap.put("startTime", stTime);
+        paramMap.put("endTime", enTime);
+        paramMap.put("skip",skip);
+        paramMap.put("limit",limit);
+        paramMap.put("sort","desc");
+        //调用第三方接口获取历史工况数据信息列表
+        List<DeviceHistorySituationVO> deviceHistorySituationVO = callHistoryInterface1(historySituationAO.getDeviceId(), null, paramMap);
+        Log.info("历史工况数据查询数据:"+deviceHistorySituationVO.size());
+        Map<String, Object> countMap = new HashMap<>(16);
+        countMap.put("startTime", stTime);
+        countMap.put("endTime", enTime);
+//        String[] properties = {"__cloud_time__"};
+        countMap.put("properties", "[\"__cloud_time__\"]");
+        //查询总条数
+        Integer count = queryHistoryCount(historySituationAO.getDeviceId(), null, countMap);
+        NxJeDeviceEntity jeDeviceEntity = this.getById(historySituationAO.getDeviceId());
+//        PageInfo<DeviceHistorySituationVO> deviceHistorySituationVOPageInfo = this.queryPageInfo(skip, limit, deviceHistorySituationVO);
+        Page<DeviceHistorySituationVO> page = new Page<DeviceHistorySituationVO>(skip, limit);
+        page.addAll(deviceHistorySituationVO);
+        page.setPages((count + limit - 1) / limit);
+        page.setTotal(count);
+        PageInfo<DeviceHistorySituationVO> deviceHistorySituationVOPageInfo = new PageInfo<DeviceHistorySituationVO>(page);
+        deviceHistorySituationVOPageInfo.getList().stream().forEach(item -> {
+            Map<String, List<WorkStatusMonitorModel>> work = new HashMap<>();
+            Map<String, List<WorkStatusMonitorModel>> noWork = new HashMap<>();
+            Map<String, List<WorkStatusMonitorModel>> groupMap = item.getGroupMap();
+            Map<String, List<WorkStatusMonitorModel>> stringListMap = getrealTimeWork(jeDeviceEntity);
+            for (String key : groupMap.keySet()) {
+                if (stringListMap.containsKey(key)) {
+                    work.put(key, groupMap.get(key));
+                } else {
+                    noWork.put(key, groupMap.get(key));
+                }
+            }
+            Map<String, Map<String, List<WorkStatusMonitorModel>>> groupByTypeMap = new HashMap<>();
+            for (String key : work.keySet()) {
+                //筛选实时工况中是否存在boolean类型数据
+                List<WorkStatusMonitorModel> workStatusMonitorModels = work.get(key).stream().filter(e ->
+                        Objects.equals("boolean", e.getPropertyDataType()) || Objects.equals("Boolean", e.getPropertyDataType()))
+                        .collect(Collectors.toList());
+                if (null != workStatusMonitorModels && workStatusMonitorModels.size() > 0) {
+                    //存在boolean类型，将其放到设备检测中
+                    noWork.put(key, workStatusMonitorModels);
+                    //过滤掉布尔类型，重新赋值实时工况
+                    List<WorkStatusMonitorModel> workStatusMonitorModels1 = work.get(key).stream().filter(e ->
+                            !Objects.equals("boolean", e.getPropertyDataType()) && !Objects.equals("Boolean", e.getPropertyDataType()))
+                            .collect(Collectors.toList());
+                    if (null != workStatusMonitorModels1 && workStatusMonitorModels1.size() > 0) {
+                        work.put(key, workStatusMonitorModels1);
+                    }
+                }
+            }
+         /*   for (String key:noWork.keySet()) {
+            /*for (String key:noWork.keySet()) {
+                //筛选设备检测中是否存在非boolean类型
+                List<WorkStatusMonitorModel> workStatusMonitorModels = noWork.get(key).stream().filter(e->
+                        !Objects.equals("boolean",e.getPropertyDataType()) && !Objects.equals("Boolean",e.getPropertyDataType()))
+                        .collect(Collectors.toList());
+                if(null != workStatusMonitorModels || workStatusMonitorModels.size() > 0){
+                    //存在非boolean类型，将其放到实时工况中
+                    work.put(key,workStatusMonitorModels);
+                    //重新赋值设备检测(去掉非布尔类型数值)
+                    List<WorkStatusMonitorModel> workStatusMonitorModels1 = noWork.get(key).stream().filter(e->
+                            Objects.equals("boolean",e.getPropertyDataType()) || Objects.equals("Boolean",e.getPropertyDataType()))
+                            .collect(Collectors.toList());
+                    noWork.put(key,workStatusMonitorModels1);
+                }
+            }*/
+            groupByTypeMap.put(ResourceUtil.getI18nMessage("60011"), work);
+            groupByTypeMap.put(ResourceUtil.getI18nMessage("60012"), noWork);
+            item.setGroupByTypeMap(groupByTypeMap);
+        });
+        Log.info("历史工况数据最终返回数据:"+deviceHistorySituationVOPageInfo.getList().size());
+        return JsonResult.success(deviceHistorySituationVOPageInfo);
+    }
+
+    @Override
+    public JsonResult exportQueryHistorySituation(ExportHistorySituationAO historySituationAO) {
+        //根据设备id查询设备
+        NxJeDeviceEntity jeDeviceEntity = this.getById(historySituationAO.getDeviceId());
+        if (ObjectUtils.isEmpty(jeDeviceEntity)) {
+            //设备不存在
+            //throw new BusinessException(StatusCodeEnum.DEVICE_NOT_EXIST.getRet(), StatusCodeEnum.DEVICE_NOT_EXIST.getMessage());
+            throw new BusinessException(StatusCodeEnum.DEVICE_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("13506"));
+        }
+
+
+        String stTime = DateUtil.handlerTime(historySituationAO.getStartTime());
+        String enTime = DateUtil.handlerTime(historySituationAO.getEndTime());
+        Map<String, Object> paramMap = new HashMap<>(16);
+        paramMap.put("startTime", stTime);
+        paramMap.put("endTime", enTime);
+        paramMap.put("limit",6000);
+        paramMap.put("sort","desc");
+        paramMap.put("timeZone",historySituationAO.getTimeZone());
+        //调用第三方接口获取历史工况数据信息列表
+        List<DeviceHistorySituationVO> deviceHistorySituationVO = callHistoryInterface1(historySituationAO.getDeviceId(), jeDeviceEntity.getModelId(), paramMap);
+        Log.info("导出查询数据:"+deviceHistorySituationVO.size());
+
+        return JsonResult.success(deviceHistorySituationVO);
+    }
+
+
+    public static <T> PageInfo<T> queryPageInfo(int currentPage, int pageSize, List<T> list) {
+        int total = list.size();
+        if (total > pageSize) {
+            int toIndex = pageSize * currentPage;
+            if (toIndex > total) {
+                toIndex = total;
+            }
+            list = list.subList(pageSize * (currentPage - 1), toIndex);
+        }
+        Page<T> page = new Page<>(currentPage, pageSize);
+        page.addAll(list);
+        page.setPages((total + pageSize - 1) / pageSize);
+        page.setTotal(total);
+
+        PageInfo<T> pageInfo = new PageInfo<>(page);
+        return pageInfo;
+    }
+
+
+    @Override
+    public List<OtherDeviceResp> queryOtherDevices(String deviceId) {
+        LambdaQueryWrapper<NxJeDeviceEntity> lambdaQueryWrapper = Wrappers.lambdaQuery(NxJeDeviceEntity.class);
+        lambdaQueryWrapper.ne(NxJeDeviceEntity::getNxJeDeviceId, deviceId);
+        List<NxJeDeviceEntity> list = this.list();
+        List<OtherDeviceResp> resultList = new ArrayList<>(16);
+        list.stream().forEach(temp -> {
+            OtherDeviceResp otherDeviceResp = new OtherDeviceResp();
+            if (!deviceId.equals(temp.getNxJeDeviceId())) {
+                otherDeviceResp.setDeviceId(temp.getNxJeDeviceId());
+                otherDeviceResp.setDeviceSbbm(temp.getDeviceSbbm());
+                resultList.add(otherDeviceResp);
+            }
+        });
+        return resultList;
+    }
+
+    @Override
+    public JSONObject queryWorkTrendData(DeviceTrendParam deviceTrendParam) {
+        JSONObject resultJson = new JSONObject();
+        //stp1：先查询设备1的Y1和Y2数据
+        List<Map<String, Object>> device1 = queryDevicesData(deviceTrendParam.getDeviceId1(), deviceTrendParam);
+        resultJson.put("device1", device1);
+        //stp2：如果设备2不为空 查数据库modelProperty判断设备2是否有入参中传的工况属性
+        List<Map<String, Object>> device2 = new ArrayList<>();
+        if (StringUtils.isNotBlank(deviceTrendParam.getDeviceId2())) {
+            //判断设备2是否具有 Y1和Y2对应的工况属性
+            boolean result = hasSameProperty(deviceTrendParam);
+            if (result) {
+                device2 = queryDevicesData(deviceTrendParam.getDeviceId2(), deviceTrendParam);
+            }
+        }
+        //如果stp2有数据，做合并处理
+        if (device2 != null && device2.size() > 0) {
+            resultJson.put("device2", device2);
+        }
+
+        return resultJson;
+    }
+
+    @Override
+    public List<NxJeDeviceEntity> queryAllJeDevice() {
+        List<NxJeDeviceEntity> list = this.list(Wrappers.lambdaQuery(NxJeDeviceEntity.class).eq(NxJeDeviceEntity::getDeviceSource, 1));
+        return list;
+    }
+
+
+    @Override
+    public Map<String, Object> getWorkingMap(String deviceId, List<String> paramsList) {
+        Map<String, Object> resultMap = new HashMap<>();
+        NxJeDeviceEntity jeDeviceEntity = this.getById(deviceId);
+        if (jeDeviceEntity == null) {
+            //throw new BusinessException(StatusCodeEnum.DEVICE_NOT_EXIST.getRet(), StatusCodeEnum.DEVICE_NOT_EXIST.getMessage());
+            throw new BusinessException(StatusCodeEnum.DEVICE_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("13506"));
+        }
+        Map<String, Object> map = new HashMap<>();
+        JSONArray properties = JSONArray.parseArray(JSON.toJSONString(paramsList));
+        map.put("properties", properties.toString());
+        try {
+            HttpRequest request = HttpRequest.get(reqUrl + "/realtime-manage/v1/realtime/models/" + jeDeviceEntity.getModelId() + "/things/" + deviceId);
+            request.form(map);
+            request.header("Authorization", "Bearer " + tokenUtil.getToken());
+            request.header("accept", "application/json");
+            request.header("Content-Type", "application/json");
+            HttpResponse response = request.execute();
+            String result = response.body();
+//            Log.info("平台实时工况接口返回数据：{}", result);
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            JSONArray array = jsonObject.getJSONArray("payload");
+
+            if (array == null || array.size() == 0) {
+                //throw new BusinessException(StatusCodeEnum.DEVICE_WORK_STATUS_NOT_EXIST.getRet(), StatusCodeEnum.DEVICE_WORK_STATUS_NOT_EXIST.getMessage());
+                throw new BusinessException(StatusCodeEnum.DEVICE_WORK_STATUS_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("13508"));
+            }
+            JSONObject data = array.getJSONObject(0).getJSONObject("data");
+            Map<String, Object> params = JSONObject.parseObject(data.toJSONString(), new TypeReference<Map<String, Object>>() {
+            });
+            for (Map.Entry<String, Object> entry : params.entrySet()) {
+                Map<String, Object> value = (Map<String, Object>) entry.getValue();
+                for (Map.Entry<String, Object> mapResult : value.entrySet()) {
+                    if ("value".equals(mapResult.getKey())) {
+                        resultMap.put(entry.getKey(), mapResult.getValue());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.error("调用平台查询实时工况信息error", e);
+        }
+        return resultMap;
+    }
+
+    @Override
+    public Map<String, Object> getRootcloudWorkingMap(String deviceId, List<String> paramsList) {
+        NxJeDeviceEntity jeDeviceEntity = this.getById(deviceId);
+        if (jeDeviceEntity == null) {
+            //throw new BusinessException(StatusCodeEnum.DEVICE_NOT_EXIST.getRet(), StatusCodeEnum.DEVICE_NOT_EXIST.getMessage());
+            throw new BusinessException(StatusCodeEnum.DEVICE_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("13506"));
+        }
+        Map<String, Object> map = new HashMap<>();
+        JSONArray properties = JSONArray.parseArray(JSON.toJSONString(paramsList));
+        map.put("properties", properties.toString());
+        try {
+            HttpRequest request = HttpRequest.get(reqUrl + "/realtime-manage/v1/realtime/models/" + jeDeviceEntity.getModelId() + "/things/" + deviceId);
+            request.form(map);
+            request.header("Authorization", "Bearer " + tokenUtil.getToken());
+            request.header("accept", "application/json");
+            request.header("Content-Type", "application/json");
+            HttpResponse response = request.execute();
+            String result = response.body();
+//            Log.info("平台实时工况接口返回数据：{}", result);
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            JSONArray array = jsonObject.getJSONArray("payload");
+
+            if (array == null || array.size() == 0) {
+                return new HashMap<>();
+            }
+            JSONObject data = array.getJSONObject(0).getJSONObject("data");
+            Map<String, Object> params = JSONObject.parseObject(data.toJSONString(), new TypeReference<Map<String, Object>>() {
+            });
+            return params;
+        } catch (Exception e) {
+            log.error("调用平台查询实时工况信息error", e);
+        }
+        return null;
+    }
+
+    @Override
+    public Map<String, Map<String, Object>> getWorkingMapByModelGroup(String model, List<String> deviceIds, List<String> paramsList) {
+        Map<String, Map<String, Object>> resultMap = new HashedMap();
+        Map<String, Object> map = new HashMap<>();
+        JSONArray properties = JSONArray.parseArray(JSON.toJSONString(paramsList));
+        JSONArray deviceIdList = JSONArray.parseArray(JSON.toJSONString(deviceIds));
+        map.put("modelId", model);
+        map.put("properties", properties.toString());
+        map.put("thingIds", deviceIdList.toString());
+        try {
+            HttpRequest request = HttpRequest.get(reqUrl + "/realtime-manage/v1/realtime/models/" + model + "/things");
+            request.form(map);
+            //Log.info("请求4.0接口AccessToken:"+tokenUtil.getToken());
+            request.header("Authorization", "Bearer " + tokenUtil.getToken());
+            request.header("accept", "application/json");
+            request.header("Content-Type", "application/json");
+            HttpResponse response = request.execute();
+            String result = response.body();
+//            Log.info("平台实时工况接口返回数据：{}", result);
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            JSONArray array = jsonObject.getJSONArray("payload");
+            if (array == null || array.size() == 0) {
+                //throw new BusinessException(StatusCodeEnum.DEVICE_WORK_STATUS_NOT_EXIST.getRet(), StatusCodeEnum.DEVICE_WORK_STATUS_NOT_EXIST.getMessage());
+                throw new BusinessException(StatusCodeEnum.DEVICE_WORK_STATUS_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("13508"));
+            }
+            for (int i = 0; i < array.size(); i++) {
+                JSONObject data = array.getJSONObject(i).getJSONObject("data");
+                Object thingId = array.getJSONObject(i).get("thingId");
+                Map<String, Object> params = JSONObject.parseObject(data.toJSONString(), new TypeReference<Map<String, Object>>() {
+                });
+                /*Map<String,Object> childerMap = new HashMap<>();
+                for (Map.Entry<String, Object> entry : params.entrySet()) {
+                    Map<String, Object> value = (Map<String, Object>) entry.getValue();
+                    for (Map.Entry<String, Object> mapResult : value.entrySet()) {
+                        if ("value".equals(mapResult.getKey())) {
+                            childerMap.put(entry.getKey(), mapResult.getValue());
+                        }
+                    }
+                }*/
+                resultMap.put(String.valueOf(thingId), params);
+            }
+        } catch (Exception e) {
+            log.error("调用平台查询实时工况信息error", e);
+        }
+        return resultMap;
+    }
+
+
+    @Override
+    public DeviceTypeVO getByDeviceId(String deviceId) {
+        DeviceTypeVO deviceTypeVO = nxJeDeviceDao.getByDeviceId(deviceId);
+        if (ObjectUtils.isEmpty(deviceTypeVO)) {
+            //throw new BusinessException(StatusCodeEnum.DEVICE_NOT_EXIST.getRet(), StatusCodeEnum.DEVICE_NOT_EXIST.getMessage());
+            throw new BusinessException(StatusCodeEnum.DEVICE_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("13506"));
+        }
+        NxJeDeviceEntity jeDeviceEntity = this.getById(deviceId);
+        if (StringUtils.isNotBlank(deviceTypeVO.getOnlineTime())) {
+            String unit = "";
+            if (!ObjectUtils.isEmpty(jeDeviceEntity)) {
+                unit = modelPropertyMapper.selectUnitByModelId("HMI_TotalTimeCost", jeDeviceEntity.getModelId());
+            }
+            deviceTypeVO.setOnlineTime(deviceTypeVO.getOnlineTime() + " " + unit);
+        }
+        List<String> paramsList = new ArrayList<>();
+        //打印编号(任务名称)
+        paramsList.add("HMI_JobID");
+        //开始打印时间
+        paramsList.add("HMI_BeginTime");
+        //预计打印结束时间
+        paramsList.add("HMI_EndTime");
+        //打印耗时
+        paramsList.add("HMI_TotalTimeCost");
+        //当前打印层数
+        paramsList.add("HMI_CurPrintLayer");
+        //打印体积
+        paramsList.add("HMI_Volume");
+        //打印层厚
+        paramsList.add("HMI_Thickness");
+        //打印层耗时
+        paramsList.add("HMI_LayerCostTime");
+        //打印总层数
+        paramsList.add("HMI_TotalLayer");
+        //打印中
+        paramsList.add("SB_ZT_Running");
+        //待机
+        paramsList.add("SB_ZT_Ready");
+        //报警
+        paramsList.add("SB_ZT_alarm");
+        Map<String, Object> workingMap = getWorkingMap(deviceId, paramsList);
+        if (!workingMap.isEmpty()) {
+            for (Map.Entry<String, Object> entry : workingMap.entrySet()) {
+                if ("HMI_JobID".equals(entry.getKey())) {
+                    deviceTypeVO.setTaskName(String.valueOf(entry.getValue()));
+                }
+                if ("HMI_BeginTime".equals(entry.getKey())) {
+                    deviceTypeVO.setStartTime(String.valueOf(entry.getValue()));
+                }
+                if ("HMI_EndTime".equals(entry.getKey())) {
+                    deviceTypeVO.setEndTime(String.valueOf(entry.getValue()));
+                }
+                if ("HMI_TotalTimeCost".equals(entry.getKey())) {
+                    String value = String.valueOf(entry.getValue());
+                    DecimalFormat decimalFormat = new DecimalFormat("0.00");
+                    String strVal = decimalFormat.format(new BigDecimal(value));
+
+                    String unit = "";
+                    if (!ObjectUtils.isEmpty(jeDeviceEntity)) {
+                        unit = modelPropertyMapper.selectUnitByModelId("HMI_TotalTimeCost", jeDeviceEntity.getModelId());
+                    }
+                    deviceTypeVO.setPrintTime(strVal + " " + unit);
+                }
+                if ("HMI_CurPrintLayer".equals(entry.getKey())) {
+                    String value = String.valueOf(entry.getValue());
+                    DecimalFormat decimalFormat = new DecimalFormat("0.00");
+                    String strVal = decimalFormat.format(new BigDecimal(value));
+                    deviceTypeVO.setNowPrintLayer(strVal);
+                }
+                if ("HMI_Volume".equals(entry.getKey())) {
+                    String value = String.valueOf(entry.getValue());
+                    DecimalFormat decimalFormat = new DecimalFormat("0.00");
+                    String strVal = decimalFormat.format(new BigDecimal(value));
+
+                    String unit = "";
+                    if (!ObjectUtils.isEmpty(jeDeviceEntity)) {
+                        unit = modelPropertyMapper.selectUnitByModelId("HMI_Volume", jeDeviceEntity.getModelId());
+                    }
+                    deviceTypeVO.setPrintVolume(strVal + " " + unit);
+                }
+                if ("HMI_Thickness".equals(entry.getKey())) {
+                    String value = String.valueOf(entry.getValue());
+                    DecimalFormat decimalFormat = new DecimalFormat("0.00");
+                    String strVal = decimalFormat.format(new BigDecimal(value));
+
+                    String unit = "";
+                    if (!ObjectUtils.isEmpty(jeDeviceEntity)) {
+                        unit = modelPropertyMapper.selectUnitByModelId("HMI_Thickness", jeDeviceEntity.getModelId());
+                    }
+                    deviceTypeVO.setPrintLayer(strVal + " " + unit);
+                }
+                if ("HMI_LayerCostTime".equals(entry.getKey())) {
+                    deviceTypeVO.setPrintLayerTime(String.valueOf(entry.getValue()));
+                }
+                if ("HMI_TotalLayer".equals(entry.getKey())) {
+                    String value = String.valueOf(entry.getValue());
+                    DecimalFormat decimalFormat = new DecimalFormat("0.00");
+                    String strVal = decimalFormat.format(new BigDecimal(value));
+                    deviceTypeVO.setPrintAllLayer(strVal);
+                }
+            }
+            deviceTypeVO.setDeviceStatus(ServicePlanEnums.PrintStatus.OFFLINE.getCode());
+            if (StringUtils.isNotBlank(deviceTypeVO.getDeviceSource()) && ServicePlanEnums.CheckType.CHECK_TURE.getCode().equals(deviceTypeVO.getDeviceSource())) {
+                if (workingMap.containsKey("SB_ZT_alarm")) {
+                    deviceTypeVO.setAlarm((Boolean) workingMap.get("SB_ZT_alarm"));
+                }
+                if (workingMap.containsKey("SB_ZT_Ready")) {
+                    if ((Boolean) workingMap.get("SB_ZT_Ready")) {
+                        deviceTypeVO.setDeviceStatus(ServicePlanEnums.PrintStatus.STANDBY.getCode());
+                    }
+                }
+                if (workingMap.containsKey("SB_ZT_Running")) {
+                    if ((Boolean) workingMap.get("SB_ZT_Running")) {
+                        deviceTypeVO.setDeviceStatus(ServicePlanEnums.PrintStatus.PRINTING.getCode());
+                    }
+                }
+            }
+        }
+        return deviceTypeVO;
+    }
+
+    @Override
+    public DeviceStatusVO getStatusByDeviceId(String deviceId) {
+        DeviceStatusVO deviceStatusVO = new DeviceStatusVO();
+        NxJeDeviceEntity jeDeviceEntity = this.getById(deviceId);
+        if (jeDeviceEntity == null) {
+            //throw new BusinessException(StatusCodeEnum.DEVICE_NOT_EXIST.getRet(), StatusCodeEnum.DEVICE_NOT_EXIST.getMessage());
+            throw new BusinessException(StatusCodeEnum.DEVICE_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("13506"));
+        }
+        deviceStatusVO.setDeviceStatus(ServicePlanEnums.PrintStatus.OFFLINE.getCode());
+        if (StringUtils.isNotBlank(jeDeviceEntity.getDeviceSource()) && ServicePlanEnums.CheckType.CHECK_TURE.getCode().equals(jeDeviceEntity.getDeviceSource())) {
+            //在线
+            List<String> paramsList = new ArrayList<>();
+            //打印中
+            paramsList.add("SB_ZT_Running");
+            //待机
+            paramsList.add("SB_ZT_Ready");
+            //报警
+            paramsList.add("SB_ZT_alarm");
+            Map<String, Object> workingMap = getWorkingMap(deviceId, paramsList);
+            if (!workingMap.isEmpty()) {
+                if (workingMap.containsKey("SB_ZT_alarm")) {
+                    deviceStatusVO.setAlarm((Boolean) workingMap.get("SB_ZT_alarm"));
+                }
+                if (workingMap.containsKey("SB_ZT_Ready")) {
+                    if ((Boolean) workingMap.get("SB_ZT_Ready")) {
+                        deviceStatusVO.setDeviceStatus(ServicePlanEnums.PrintStatus.STANDBY.getCode());
+                    }
+                }
+                if (workingMap.containsKey("SB_ZT_Running")) {
+                    if ((Boolean) workingMap.get("SB_ZT_Running")) {
+                        deviceStatusVO.setDeviceStatus(ServicePlanEnums.PrintStatus.PRINTING.getCode());
+                    }
+                }
+            }
+        }
+        return deviceStatusVO;
+    }
+
+    @Override
+    public IPage<DeviceVO> devicePage(String queryData, String isCare, int page, int size, String userId,String syZhid) {
+
+        //查询设备位置
+        List<NxDeviceLocationEntity> allDeviceLocation = deviceLocationMapper.findAllDeviceLocation();
+        Map<String, NxDeviceLocationEntity> deviceLocationMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(allDeviceLocation)) {
+            deviceLocationMap = allDeviceLocation.stream().collect(Collectors.toMap(NxDeviceLocationEntity::getDeviceId, Function.identity()));
+        }
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<DeviceVO> pageParam =
+                new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page, size);
+        IPage<DeviceVO> result = pageParam;
+        // 在人员表中查询该员工的角色信息
+        JeCoreEnduserEntity user = nxOrderMapper.getCoreEnduserByUsrId(userId);
+        user.getRoleids();
+        if (user.getRolenames().contains("系统管理员") || user.getRolenames().contains("管理员") || user.getRolenames().contains("售后领导")) {
+            // 所有的设备列表信息
+            result = nxJeDeviceDao.devicePage(pageParam, queryData, isCare, null, null, UserContext.getTenantId());
+        } else if (user.getRolenames().contains("服务经理") || user.getRolenames().contains("工程师")) {
+            // 一个人只能绑定一个服务网点，所以list里只有一个或者没有
+            List<FwryDTO> fwryList = nxOrderMapper.getNxgxJcdaFwryByUserId(userId);
+            if (CollectionUtils.isEmpty(fwryList)) {
+                throw new BusinessException("500", "未在网点下查到该员工信息!");
+            }
+            FwryDTO fwryDTO = fwryList.get(0);
+            // 通过网点id获取服务网点信息
+            NetworkEntity networkEntity = nxOrderMapper.getfwwd(fwryDTO);
+            // 获取网点下的服务区域
+            String[] split = networkEntity.getFwwdSsqy().split(",");
+            // 通过网点的服务区域，去查询客户
+            List<KhglDTO> khglDTOList = nxOrderMapper.getKhBykhdzs(split);
+            // 通过客户名称查询设备列表信息
+            // 所有的设备列表信息
+            if (CollectionUtils.isEmpty(khglDTOList)) {
+                return pageParam;
+            }
+            StringBuilder khmc = new StringBuilder();
+            for (KhglDTO dto : khglDTOList) {
+                khmc.append("'").append(dto.getKhglKhmc()).append("',");
+            }
+            khmc = new StringBuilder(khmc.substring(0, khmc.length() - 1));
+            result = nxJeDeviceDao.devicePage(pageParam, queryData, isCare, khmc.toString(), null,UserContext.getTenantId());
+        } else if (user.getRolenames().contains("客户") || user.getRolenames().contains("客户领导")) {
+            HashMap<String, String> req = new HashMap<>();
+            req.put("userId",user.getUserid());
+            String join = "";
+            List<String> kmcList = nxOrderMapper.getKmcList(req);
+            if(kmcList.size()>0){
+                for (String khmc:kmcList) {
+                    join+="'"+khmc+"'"+",";
+                }
+                join =  join.substring(0,join.length()-1);
+            }
+            result = nxJeDeviceDao.devicePage(pageParam, queryData, isCare, join, null,UserContext.getTenantId());
+        }
+        if (CollectionUtils.isNotEmpty(result.getRecords())) {
+            Map<String, NxDeviceLocationEntity> finalDeviceLocationMap = deviceLocationMap;
+            result.getRecords().forEach(v -> {
+                DeviceOnlineStatus status = DeviceOnlineStatus.getByCode(v.getStatusCode());
+                if (status != null) {
+                    v.setStatusDesc(status.getDesc());
+                }
+                NxDeviceLocationEntity nxDeviceLocationEntity = finalDeviceLocationMap.get(v.getDeviceId());
+                if (nxDeviceLocationEntity != null) {
+                    String gps = nxDeviceLocationEntity.getLongitude() + "," + nxDeviceLocationEntity.getLatitude();
+                    //获取经纬度返回地址
+                    if(org.apache.commons.lang3.StringUtils.isNotBlank(gps)){
+                        v.setDeviceAddress(gaoDeAPIUtils.getAddressByJwd(gps));
+                    }
+                }
+
+            });
+        }
+        return result;
+    }
+
+
+    @Override
+    public Boolean queryOnlineStatus(String deviceNo) {
+        NxJeDeviceEntity entity = getOne(Wrappers.lambdaQuery(NxJeDeviceEntity.class).eq(NxJeDeviceEntity::getDeviceSbbm, deviceNo));
+        if (entity != null) {
+            List<String> list = new ArrayList<>();
+            list.add(DeviceOnlineStatus.ONLINE.getPropertyId());
+            Map<String, Object> workingMap = getWorkingMap(entity.getNxJeDeviceId(), list);
+            if (workingMap.containsKey(DeviceOnlineStatus.ONLINE.getPropertyId())) {
+                return (Boolean) workingMap.get(DeviceOnlineStatus.ONLINE.getPropertyId());
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public NxJeDeviceEntity selectBySbbm(String sbbm) {
+        QueryWrapper<NxJeDeviceEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("DEVICE_SBBM", sbbm);
+        queryWrapper.last("limit 1");
+        NxJeDeviceEntity nxJeDeviceEntity = nxJeDeviceDao.selectOne(queryWrapper);
+        return nxJeDeviceEntity;
+    }
+
+    @Override
+    public Map<String, List<WorkStatusMonitorModel>> getrealTimeWork(NxJeDeviceEntity jeDeviceEntity) {
+        LambdaQueryWrapper<ModelPropertyEntity> mpeWrapper = new LambdaQueryWrapper<>();
+        mpeWrapper.eq(ModelPropertyEntity::getDeviceSblx, jeDeviceEntity.getDeviceSblx());
+        mpeWrapper.ne(ModelPropertyEntity::getPropertyId, "");
+        mpeWrapper.isNotNull(ModelPropertyEntity::getPropertyId);
+        mpeWrapper.and(wq -> {
+            wq.eq(ModelPropertyEntity::getDeviceSbxh, jeDeviceEntity.getDeviceSbxh())
+                    .or().eq(ModelPropertyEntity::getDeviceSbxh, "-1");
+        });
+        mpeWrapper.ne(ModelPropertyEntity::getPropertyDataType, "boolean").ne(ModelPropertyEntity::getPropertyDataType, "Boolean");
+        List<ModelPropertyEntity> entities = modelPropertyMapper.selectList(mpeWrapper);
+        List<WorkStatusMonitorModel> models = entities.stream().map(v -> {
+            WorkStatusMonitorModel model = new WorkStatusMonitorModel();
+            BeanUtils.copyProperties(v, model);
+            return model;
+        }).collect(Collectors.toList());
+        return models.stream().collect(Collectors.groupingBy(WorkStatusMonitorModel::getPropertyTag));
+    }
+
+
+    @Override
+    public void updateOnlineTime(String deviceIds) {
+        //查询没有onlineTime的数据
+        QueryWrapper<NxJeDeviceEntity> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("DEVICE_SOURCE", "1");
+        if (StringUtils.isNotBlank(deviceIds)) {
+            List<String> stList = Arrays.asList(deviceIds.split(","));
+            queryWrapper.in("NX_JE_DEVICE_ID", stList);
+        }
+        List<NxJeDeviceEntity> nxJeDeviceEntities = nxJeDeviceDao.selectList(queryWrapper);
+        nxJeDeviceEntities.stream().forEach(item -> {
+            String thingUrl = domain + thingUri;
+            HttpRequest thingRequest = HttpRequest.get(thingUrl);
+            //处理入参
+            Map<String, Object> map = new HashMap<>();
+            map.put("thingId", item.getNxJeDeviceId());
+            thingRequest.form(map);
+            //Log.info("请求4.0接口AccessToken:"+tokenUtil.getToken());
+            thingRequest.header("Authorization", "Bearer " + tokenUtil.getToken());
+//            thingRequest.header("AuthHeaderAlias", tokenUtil.superToken());
+//            thingRequest.header("X-RCD-Tenant-Id",UserContext.getTenantId());
+            HttpResponse thingResponse = thingRequest.execute();
+            if (thingResponse.getStatus() != HttpStatus.HTTP_OK) {
+                log.error("调用平台接口" + thingUrl + "返回" + thingResponse);
+            }
+            cn.hutool.json.JSONObject thingJsonObj = new cn.hutool.json.JSONObject(thingResponse.body());
+            cn.hutool.json.JSONArray thingArray = thingJsonObj.getJSONArray("payload");
+            if (!thingArray.isEmpty()) {
+                Map<String, Object> obj = (Map<String, Object>) thingArray.get(0);
+                if (!ObjectUtils.isEmpty(obj)) {
+                    if (obj.get("created") != null) {
+                        String created = DateUtil.specialDate(String.valueOf(obj.get("created")));
+                        if (StringUtils.isNotBlank(created)) {
+                            if (StringUtils.isBlank(item.getCreateTime()) || !created.equals(item.getCreateTime())) {
+                                item.setCreateTime(created);
+                                NxJeDeviceEntity deviceEntity = new NxJeDeviceEntity();
+                                deviceEntity.setNxJeDeviceId(item.getNxJeDeviceId());
+                                deviceEntity.setCreateTime(created);
+                                nxJeDeviceDao.updateById(deviceEntity);
+                            }
+                        }
+                    }
+                }
+            }
+        });
+    }
+
+
+    /**
+     * 根据前端指定的设备和工况查询对应数据
+     *
+     * @return
+     */
+    @Override
+    public Map<String, Object> queryPropertyValueByParam(DevicePropertyValueParam devicePropertyValueParam) {
+        String deviceId = devicePropertyValueParam.getDeviceId();
+        List<String> propertyIds = devicePropertyValueParam.getPropertyIds();
+        NxJeDeviceEntity jeDeviceEntity = this.getById(deviceId);
+        if (jeDeviceEntity == null) {
+            //throw new BusinessException(StatusCodeEnum.DEVICE_NOT_EXIST.getRet(), StatusCodeEnum.DEVICE_NOT_EXIST.getMessage());
+            throw new BusinessException(StatusCodeEnum.DEVICE_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("13506"));
+        }
+        Map<String, Object> result = new HashMap<>();
+        result = getWorkingMap(deviceId, propertyIds);
+        //计算进度
+        if (result.containsKey("HMI_CurPrintLayer") && result.containsKey("HMI_TotalLayer")) {
+            BigDecimal curPrintLayer = new BigDecimal(result.get("HMI_CurPrintLayer").toString());
+            BigDecimal totalLayer = new BigDecimal(result.get("HMI_TotalLayer").toString());
+            if (totalLayer.compareTo(BigDecimal.ZERO) == 0) {
+                result.put("HMI_progress", "0%");
+            } else {
+                BigDecimal divide = curPrintLayer.divide(totalLayer, 4, RoundingMode.HALF_UP);
+                result.put("HMI_progress", divide.multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP) + "%");
+            }
+
+        }
+        //用砂量 A砂累计用量+B砂累计用量
+        if (result.containsKey("SB_MX_SandTotal_A") && result.containsKey("SB_MX_SandTotal_B")) {
+            Float sandTotalA = Float.valueOf(result.get("SB_MX_SandTotal_A").toString());
+            Float sandTotalB = Float.valueOf(result.get("SB_MX_SandTotal_B").toString());
+            result.put("SB_MX_SandTotal", sandTotalA + sandTotalB);
+        }
+
+
+        //增加单位
+        if (result.containsKey("HMI_TotalTimeCost")) {
+            String value = String.valueOf(result.get("HMI_TotalTimeCost"));
+            DecimalFormat decimalFormat = new DecimalFormat("0.00");
+            String strVal = decimalFormat.format(new BigDecimal(value));
+
+            String unit = "";
+            if (!ObjectUtils.isEmpty(jeDeviceEntity)) {
+                unit = modelPropertyMapper.selectUnitByModelId("HMI_TotalTimeCost", jeDeviceEntity.getModelId());
+            }
+            String hmi_totalTimeCost = strVal + " " + (StringUtils.isBlank(unit) ? "" : unit);
+            result.put("HMI_TotalTimeCost", hmi_totalTimeCost);
+        }
+        if (result.containsKey("HMI_Thickness")) {
+            String value = String.valueOf(result.get("HMI_Thickness"));
+            DecimalFormat decimalFormat = new DecimalFormat("0.00");
+            String strVal = decimalFormat.format(new BigDecimal(value));
+
+            String unit = "";
+            if (!ObjectUtils.isEmpty(jeDeviceEntity)) {
+                unit = modelPropertyMapper.selectUnitByModelId("HMI_Thickness", jeDeviceEntity.getModelId());
+            }
+            String HMI_Thickness = strVal + " " + (StringUtils.isBlank(unit) ? "" : unit);
+            result.put("HMI_Thickness", HMI_Thickness);
+        }
+        if (result.containsKey("HMI_Volume")) {
+            String value = String.valueOf(result.get("HMI_Volume"));
+            DecimalFormat decimalFormat = new DecimalFormat("0.00");
+            String strVal = decimalFormat.format(new BigDecimal(value));
+
+            String unit = "";
+            if (!ObjectUtils.isEmpty(jeDeviceEntity)) {
+                unit = modelPropertyMapper.selectUnitByModelId("HMI_Volume", jeDeviceEntity.getModelId());
+            }
+            String HMI_Volume = strVal + " " + (StringUtils.isBlank(unit) ? "" : unit);
+            result.put("HMI_Volume", HMI_Volume);
+        }
+        if (result.containsKey("SB_MX_SandTotal")) {
+            String value = String.valueOf(result.get("SB_MX_SandTotal"));
+            DecimalFormat decimalFormat = new DecimalFormat("0.00");
+            String strVal = decimalFormat.format(new BigDecimal(value));
+
+            String unit = "";
+            if (!ObjectUtils.isEmpty(jeDeviceEntity)) {
+                unit = modelPropertyMapper.selectUnitByModelId("SB_MX_SandTotal_A", jeDeviceEntity.getModelId());
+            }
+            String SB_MX_SandTotal_A = strVal + " " + (StringUtils.isBlank(unit) ? "" : unit);
+            result.put("SB_MX_SandTotal", SB_MX_SandTotal_A);
+        }
+        if (result.containsKey("SB_BinderCost")) {
+            String value = String.valueOf(result.get("SB_BinderCost"));
+            DecimalFormat decimalFormat = new DecimalFormat("0.00");
+            String strVal = decimalFormat.format(new BigDecimal(value));
+
+            String unit = "";
+            if (!ObjectUtils.isEmpty(jeDeviceEntity)) {
+                unit = modelPropertyMapper.selectUnitByModelId("SB_BinderCost", jeDeviceEntity.getModelId());
+            }
+            String SB_BinderCost = strVal + " " + (StringUtils.isBlank(unit) ? "" : unit);
+            result.put("SB_BinderCost", SB_BinderCost);
+        }
+        if (result.containsKey("SB_ActivatorCost")) {
+            String value = String.valueOf(result.get("SB_ActivatorCost"));
+            DecimalFormat decimalFormat = new DecimalFormat("0.00");
+            String strVal = decimalFormat.format(new BigDecimal(value));
+
+            String unit = "";
+            if (!ObjectUtils.isEmpty(jeDeviceEntity)) {
+                unit = modelPropertyMapper.selectUnitByModelId("SB_ActivatorCost", jeDeviceEntity.getModelId());
+            }
+            String SB_ActivatorCost = strVal + " " + (StringUtils.isBlank(unit) ? "" : unit);
+            result.put("SB_ActivatorCost", SB_ActivatorCost);
+        }
+
+        String startTime = null;
+        String endTime = null;
+        if (result.containsKey("HMI_BeginTime") && result.containsKey("HMI_EndTime")) {
+            startTime = String.valueOf(result.get("HMI_BeginTime"));
+            endTime = String.valueOf(result.get("HMI_EndTime"));
+        }
+
+
+        //封装报警条数
+        Integer count = deviceAlarmService.getDeviceAlarmCount(deviceId, startTime, endTime);
+        result.put("alarmCount", count);
+        return result;
+    }
+
+    /**
+     * 查询工况属性
+     *
+     * @param deviceId 设备id
+     * @param monitor  是否设备监测数据，设备监测数据只查询数据类型为boolean类型的数据
+     * @return 分组好的工况数据
+     */
+    Map<String, List<WorkStatusMonitorModel>> queryModelProperty(String deviceId, boolean monitor, String dataSjy) {
+        //根据设备id查询设备
+        NxJeDeviceEntity jeDeviceEntity = this.getById(deviceId);
+        if (jeDeviceEntity == null) {
+            //throw new BusinessException(StatusCodeEnum.DEVICE_NOT_EXIST.getRet(), StatusCodeEnum.DEVICE_NOT_EXIST.getMessage());
+            throw new BusinessException(StatusCodeEnum.DEVICE_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("13506"));
+        }
+        LambdaQueryWrapper<ModelPropertyEntity> mpeWrapper = new LambdaQueryWrapper<ModelPropertyEntity>();
+        if (StringUtils.isNotBlank(dataSjy) && "0".equals(dataSjy)) {
+            mpeWrapper.eq(ModelPropertyEntity::getDataSjy, dataSjy);
+        }
+        mpeWrapper.eq(ModelPropertyEntity::getDeviceSblx, jeDeviceEntity.getDeviceSblx());
+        mpeWrapper.ne(ModelPropertyEntity::getPropertyId, "");
+        mpeWrapper.isNotNull(ModelPropertyEntity::getPropertyId);
+        mpeWrapper.and(wq -> {
+            wq.eq(ModelPropertyEntity::getDeviceSbxh, jeDeviceEntity.getDeviceSbxh())
+                    .or().eq(ModelPropertyEntity::getDeviceSbxh, "-1");
+        });
+        //构建查询排序title条件
+        HashMap<String, String> req = new HashMap<>();
+        req.put("deviceSblx",jeDeviceEntity.getDeviceSblx());
+        req.put("deviceSbxh",jeDeviceEntity.getDeviceSbxh());
+        if (monitor) {
+            mpeWrapper.and(wq -> {
+                wq.eq(ModelPropertyEntity::getPropertyDataType, "boolean")
+                        .or().eq(ModelPropertyEntity::getPropertyDataType, "Boolean");
+            });
+            req.put("workingConditionType","2");
+        } else {
+            mpeWrapper.ne(ModelPropertyEntity::getPropertyDataType, "boolean").ne(ModelPropertyEntity::getPropertyDataType, "Boolean");
+            req.put("workingConditionType","1");
+        }
+        List<ModelPropertyEntity> entities = modelPropertyMapper.selectList(mpeWrapper);
+        this.callInterface(jeDeviceEntity.getNxJeDeviceId(), jeDeviceEntity.getModelId(), entities, monitor);
+        List<WorkStatusMonitorModel> models = entities.stream().map(v -> {
+            WorkStatusMonitorModel model = new WorkStatusMonitorModel();
+            BeanUtils.copyProperties(v, model);
+            return model;
+        }).collect(Collectors.toList());
+        Map<String, List<WorkStatusMonitorModel>> collect = models.stream().collect(Collectors.groupingBy(WorkStatusMonitorModel::getPropertyTag));
+
+        List<String> titles = modelPropertyMapper.getWorkingTitle(req);
+        LinkedHashMap<String, List<WorkStatusMonitorModel>> linkedHashMap = new LinkedHashMap<>();
+        titles.forEach(item->{
+            List<WorkStatusMonitorModel> list = collect.get(item);
+            if(list!=null){
+                linkedHashMap.put(item,collect.get(item));
+            }
+        });
+        return linkedHashMap;
+    }
+
+    /**
+     * 调用平台接口赋值实时工况数据
+     *
+     * @param deviceId 设备id
+     * @param modelId  模型id
+     * @param entities jp内部工况表数据
+     */
+    public void callInterface(String deviceId, String modelId, List<ModelPropertyEntity> entities, boolean monitor) {
+        Map<String, String> headers = new HashMap<>();
+        //Log.info("请求4.0接口AccessToken:"+tokenUtil.getToken());
+        headers.put("Authorization", "Bearer " + tokenUtil.getToken());
+        try {
+            String resp = HttpClientUtil.sendHttp(HttpRequestMethedEnum.HttpGet, reqUrl + "/realtime-manage/v1/realtime/models/" + modelId + "/things/" + deviceId, null, headers);
+            //Log.info("平台实时工况接口返回数据：{}", resp);
+            JSONObject jsonObject = JSONObject.parseObject(resp);
+            JSONArray array = jsonObject.getJSONArray("payload");
+
+            if (array == null || array.size() == 0) {
+                //throw new BusinessException(StatusCodeEnum.DEVICE_WORK_STATUS_NOT_EXIST.getRet(), StatusCodeEnum.DEVICE_WORK_STATUS_NOT_EXIST.getMessage());
+                throw new BusinessException(StatusCodeEnum.DEVICE_WORK_STATUS_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("13508"));
+            }
+            JSONObject data = array.getJSONObject(0).getJSONObject("data");
+
+            //接口数据赋值
+            entities.stream().peek(o -> {
+                if (!data.containsKey(o.getPropertyId())) {
+                    return;
+                }
+                if (("boolean".equals(o.getPropertyDataType()) || "Boolean".equals(o.getPropertyDataType())) && monitor) {
+                    if (data.getJSONObject(o.getPropertyId()).getBoolean("value")) {
+                        o.setPropertyData(o.getPropertyColorTrue());
+                    } else {
+                        o.setPropertyData(o.getPropertyColorFalse());
+                    }
+                } else {
+                    o.setPropertyData(data.getJSONObject(o.getPropertyId()).getString("value"));
+                }
+            }).collect(Collectors.toList());
+        } catch (Exception e) {
+            log.error("调用平台查询实时工况信息error", e);
+        }
+    }
+
+
+    /**
+     * 调用平台接口赋值历史工况数据
+     *
+     * @param deviceId 设备id
+     * @param modelId  模型id
+     * @param paramMap
+     */
+    public List<Map<String, Object>> callHistoryInterface(String deviceId, String modelId, Map<String, Object> paramMap) {
+
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        try {
+            HttpRequest request = HttpRequest.get(reqUrl + "historian-manage/v1/historian/models/" + modelId + "/things/" + deviceId);
+            request.form(paramMap);
+            //Log.info("请求4.0接口AccessToken:"+tokenUtil.getToken());
+            request.header("Authorization", "Bearer " + tokenUtil.getToken());
+//            request.header("AuthHeaderAlias", tokenUtil.superToken());
+//            request.header("X-RCD-Tenant-Id",UserContext.getTenantId());
+
+            request.header("accept", "application/json");
+            request.header("Content-Type", "application/json");
+            HttpResponse response = request.execute();
+            if (response.getStatus() != HttpStatus.HTTP_OK) {
+                log.error("调用平台接口出错" + response);
+                //throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(), StatusCodeEnum.FAIL_CALL_INTERFACE.getMessage());
+                throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(), ResourceUtil.getI18nMessage("40000"));
+            }
+            String result = response.body();
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            JSONArray array = jsonObject.getJSONArray("payload");
+            array.stream().forEach(temp -> {
+                JSONObject obj = (JSONObject) temp;
+                JSONArray array2 = obj.getJSONArray("rows");
+                array2.stream().forEach(temp1 -> {
+                    JSONArray array1 = obj.getJSONArray("columns");
+                    JSONArray array3 = (JSONArray) temp1;
+                    Map<String, Object> map = new HashMap<>();
+                    for (int i = 0; i < array1.size(); i++) {
+                        if ("time".equals(array1.get(i).toString())) {
+                            String date = array3.get(i).toString();
+                            map.put(array1.get(i).toString(), DateUtil.getDateByUct(date));
+                        } else {
+                            map.put(array1.get(i).toString(), array3.get(i));
+                        }
+                    }
+                    resultList.add(map);
+                });
+            });
+
+        } catch (Exception e) {
+            System.out.println("调用平台历史工况信息error");
+            log.error("查询历史工况数据报错" + e);
+        }
+        return resultList;
+
+    }
+
+    public Integer queryHistoryCount(String deviceId, String modelId, Map<String, Object> paramMap){
+        NxJeDeviceEntity jeDeviceEntity = this.getById(deviceId);
+        if (ObjectUtils.isEmpty(jeDeviceEntity)) {
+            return 0;
+        }
+        if (StringUtils.isBlank(modelId)) {
+            modelId = jeDeviceEntity.getModelId();
+        }
+        HttpRequest request = HttpRequest.get(reqUrl + "historian-manage/v1/historian/models/" + modelId + "/things/" + deviceId+"/count");
+        request.form(paramMap);
+        //Log.info("请求4.0接口AccessToken:"+ tokenUtil.getToken());
+        request.header("Authorization", "Bearer " + tokenUtil.getToken());
+        request.header("accept", "application/json");
+        request.header("Content-Type", "application/json");
+        HttpResponse response = request.execute();
+        String result = response.body();
+        Log.info("查询条数",result);
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        return jsonObject.getJSONObject("payload").getInteger("count");
+    }
+
+
+    public List<DeviceHistorySituationVO> callHistoryInterface1(String deviceId, String modelId, Map<String, Object> paramMap) {
+        List<DeviceHistorySituationVO> situationVOS = new ArrayList<>();
+        NxJeDeviceEntity jeDeviceEntity = this.getById(deviceId);
+        if (ObjectUtils.isEmpty(jeDeviceEntity)) {
+            return situationVOS;
+        }
+        if (StringUtils.isBlank(modelId)) {
+            modelId = jeDeviceEntity.getModelId();
+        }
+        LambdaQueryWrapper<ModelPropertyEntity> mpeWrapper = new LambdaQueryWrapper<ModelPropertyEntity>();
+        mpeWrapper.eq(ModelPropertyEntity::getDeviceSblx, jeDeviceEntity.getDeviceSblx());
+        mpeWrapper.ne(ModelPropertyEntity::getPropertyId, "");
+        mpeWrapper.isNotNull(ModelPropertyEntity::getPropertyId);
+        mpeWrapper.and(wq -> {
+            wq.eq(ModelPropertyEntity::getDeviceSbxh, jeDeviceEntity.getDeviceSbxh())
+                    .or().eq(ModelPropertyEntity::getDeviceSbxh, "-1");
+        });
+        List<ModelPropertyEntity> entities = modelPropertyMapper.selectList(mpeWrapper);
+
+        try {
+            HttpRequest request = HttpRequest.get(reqUrl + "historian-manage/v1/historian/models/" + modelId + "/things/" + deviceId);
+            request.form(paramMap);
+            //Log.info("请求4.0接口AccessToken:" + tokenUtil.getToken());
+            request.header("Authorization", "Bearer " + tokenUtil.getToken());
+            request.header("accept", "application/json");
+            request.header("Content-Type", "application/json");
+            HttpResponse response = request.execute();
+            String result = response.body();
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            JSONArray array = jsonObject.getJSONArray("payload");
+            array.stream().forEach(temp -> {
+                JSONObject obj = (JSONObject) temp;
+                List<Map<String, Object>> list = new ArrayList<>();
+//                List<BaseDeviceVO> baseDeviceVOS = new ArrayList<>();
+                JSONArray array2 = obj.getJSONArray("rows");
+                array2.stream().forEach(temp1 -> {
+                    JSONArray array1 = obj.getJSONArray("columns");
+                    JSONArray array3 = (JSONArray) temp1;
+                    Map<String, Object> map = new HashMap<>();
+                    for (int i = 0; i < array1.size(); i++) {
+                        map.put(array1.get(i).toString(), array3.get(i));
+                    }
+                    list.add(map);
+                });
+                for (int i = 0; i < list.size(); i++) {
+                    DeviceHistorySituationVO situationVO = new DeviceHistorySituationVO();
+                    situationVO.setDeviceId(obj.get("thingId").toString());
+                    situationVO.setModelId(obj.get("modelId").toString());
+                    if (!ObjectUtils.isEmpty(jeDeviceEntity)) {
+                        situationVO.setDeviceSbbm(jeDeviceEntity.getDeviceSbbm());
+                        situationVO.setDeviceSblxName(jeDeviceEntity.getDeviceSblxName() == null ? "" : jeDeviceEntity.getDeviceSblxName());
+                        situationVO.setDeviceSbmc(jeDeviceEntity.getDeviceSbmc());
+                        situationVO.setDeviceSbxhName(jeDeviceEntity.getDeviceSbxhName() == null ? "" : jeDeviceEntity.getDeviceSbxhName());
+                    }
+                    //时间格式化处理
+                   // situationVO.setUpdateTime(DateUtil.reverseHandlerTime(list.get(i).get("time").toString()));
+                    int timeZone = 0;
+                    if( paramMap.get("timeZone")!=null){
+                        timeZone = Integer.valueOf( paramMap.get("timeZone").toString());
+                    }
+                    situationVO.setUpdateTime(DateUtil.handlerTimeNoUTC(list.get(i).get("time").toString(),timeZone));
+                    situationVO.setMap(list.get(i));
+                    Map<String, Object> stringObjectMap = list.get(i);
+
+                    entities.stream().peek(o -> {
+                        for (int a = 0; a < stringObjectMap.size(); a++) {
+                            if (!(stringObjectMap).containsKey(o.getPropertyId())) {
+                                return;
+                            }
+
+                            if (!stringObjectMap.isEmpty() && stringObjectMap.get(o.getPropertyId()) != null) {
+                                o.setPropertyData((stringObjectMap).get(o.getPropertyId()).toString());
+                            }
+                        }
+                    }).collect(Collectors.toList());
+
+                    List<WorkStatusMonitorModel> models = entities.stream().map(v -> {
+                        WorkStatusMonitorModel model = new WorkStatusMonitorModel();
+                        BeanUtils.copyProperties(v, model);
+                        return model;
+                    }).collect(Collectors.toList());
+                    Map<String, List<WorkStatusMonitorModel>> collect = models.stream().collect(Collectors.groupingBy(WorkStatusMonitorModel::getPropertyTag));
+                    situationVO.setGroupMap(collect);
+                    situationVOS.add(situationVO);
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("调用平台历史工况信息error");
+        }
+        return situationVOS;
+
+    }
+
+    /**
+     * 查询设备1的工况数据
+     */
+    public List<Map<String, Object>> queryDevicesData(String deviceId, DeviceTrendParam deviceTrendParam) {
+        SimpleDateFormat stf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //拿到设备1的物模型
+        String modelId = queryModelIdByDeviceId(deviceId);
+        // String modelId = "197ZUeGcXkY";
+        //处理时间
+        String time = deviceTrendParam.getTime();
+        Map<String, Object> paramMap = new HashMap<>(16);
+        String[] times = time.split("~");
+        Long longTime = 0L;
+        //计算开始时间和结束时间之间
+        float v = 0;
+        try {
+            String date1 = times[0].replace("T"," ").replace("Z","");
+            String date2 = times[1].replace("T"," ").replace("Z","");
+            v = DateUtil.dayDiff(date1, date2);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+//        String startTime = DateUtil.handlerTime(times[0]);
+//        String endTime = DateUtil.handlerTime(times[1]);
+        paramMap.put("startTime", times[0]);
+        paramMap.put("endTime", times[1]);
+
+        JSONArray properties = new JSONArray();
+        if (StringUtils.isNotBlank(deviceTrendParam.getProperty1())) {
+            properties.add(deviceTrendParam.getProperty1());
+        }
+        if (StringUtils.isNotBlank(deviceTrendParam.getProperty2())) {
+            properties.add(deviceTrendParam.getProperty2());
+        }
+        if (StringUtils.isNotBlank(deviceTrendParam.getProperty3())) {
+            properties.add(deviceTrendParam.getProperty3());
+        }
+        if (StringUtils.isNotBlank(deviceTrendParam.getProperty4())) {
+            properties.add(deviceTrendParam.getProperty4());
+        }
+        paramMap.put("properties", properties.toString());
+        //limit默认一千，数据量太大时查不全，现按最大值处理
+        paramMap.put("limit", 100000);
+        //调接口查询工况数据
+        List<Map<String, Object>> listMap = callHistoryInterface(deviceId, modelId, paramMap);
+        List<Map<String, Object>> resultListMap = new ArrayList<>();
+        if (v > 1) {
+            if (!listMap.isEmpty() && listMap.size() > 0) {
+                Log.info("需要处理的times[0]:{}", times[0]);
+                SimpleDateFormat localDateTime = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+                SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                try {
+                    Date date = localDateTime.parse(times[0]);
+                    String strDate = dateTime.format(date);
+                    longTime = DateUtil.getTimesByString(strDate);
+                } catch (ParseException e) {
+                    Log.info("时间转换异常,times[0]:{},longTime:{}", times[0], longTime);
+                    e.printStackTrace();
+                }
+                Long finalLongTime = longTime;
+                float finalV = v;
+                listMap.stream().forEach(item -> {
+                    String resultTime = String.valueOf(item.get("time"));
+                    String flagTimeString = "0";
+                    if (resultListMap.size() > 1) {
+                        flagTimeString = String.valueOf(resultListMap.get(resultListMap.size() - 1).get("time"));
+                    } else {
+                        SimpleDateFormat originalFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+                        SimpleDateFormat targetFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        try {
+                            Date date = originalFormat.parse(times[0]);
+                            flagTimeString = targetFormat.format(date);
+                        } catch (ParseException e) {
+                            Log.info("时间转换异常,resultTime:{},flagTimeString:{}", resultTime, flagTimeString);
+                            e.printStackTrace();
+                        }
+                    }
+                    Long itemTime = 0L;
+                    Long flagTime = 0L;
+                    try {
+                        Log.info("queryDevicesData resultTime:{}, flagTimeString:{}", resultTime, flagTimeString);
+                        itemTime = stf.parse(resultTime).getTime();
+                        flagTime = DateUtil.getTimesByString(flagTimeString);
+                    } catch (ParseException e) {
+                        Log.info("时间转换异常,resultTime:{},flagTimeString:{},itemTime:{},flagTime:{}", resultTime, flagTimeString, itemTime, flagTime);
+                        //e.printStackTrace();
+                    }
+                    //当前元素大于已存最大时间差值
+                    Long chaTime = itemTime - flagTime;
+                    long l = itemTime - finalLongTime;
+                    if (finalV > 1 && finalV <= 7) {
+                        if (l % (2 * 60 * 1000) == 0 || l == 0 || chaTime > (2 * 60 * 1000)) {
+                            if (item.get("time") != null) {
+                                resultListMap.add(item);
+                            }
+                        }
+                    } else if (finalV > 7 && finalV <= 14) {
+                        if (l % (5 * 60 * 1000) == 0 || l == 0 || chaTime > (5 * 60 * 1000)) {
+                            if (item.get("time") != null) {
+                                resultListMap.add(item);
+                            }
+                        }
+                    } else if (finalV > 14 && finalV <= 21) {
+                        if (l % (15 * 60 * 1000) == 0 || l == 0 || chaTime > (15 * 60 * 1000)) {
+                            if (item.get("time") != null) {
+                                resultListMap.add(item);
+                            }
+                        }
+                    } else if (finalV > 21) {
+                        if (l % (20 * 60 * 1000) == 0 || l == 0 || chaTime > (20 * 60 * 1000)) {
+                            if (item.get("time")!=null) {
+                                resultListMap.add(item);
+                            }
+                        }
+                    }
+                });
+                resultListMap.remove(0);
+            }
+        } else {
+            return listMap;
+        }
+        return resultListMap;
+    }
+
+    /**
+     * 根据设备ID查询物模型ID
+     */
+    public String queryModelIdByDeviceId(String deviceId) {
+        String modelId = null;
+        NxJeDeviceEntity deviceEntity = this.getById(deviceId);
+
+        if (deviceEntity != null && StringUtils.isNotBlank(deviceEntity.getModelId())) {
+            modelId = deviceEntity.getModelId();
+        }
+        return modelId;
+    }
+
+    /**
+     * 判断设备2是否具有相同的工况数据
+     *
+     * @param deviceTrendParam
+     * @return
+     */
+    public boolean hasSameProperty(DeviceTrendParam deviceTrendParam) {
+        boolean result = false;
+        //根据设备查到物模型
+        NxJeDeviceEntity deviceEntity = this.getById(deviceTrendParam.getDeviceId2());
+        List<String> propertys = new ArrayList<>();
+        propertys.add(deviceTrendParam.getProperty1());
+        propertys.add(deviceTrendParam.getProperty2());
+        List<String> list = new ArrayList<>();
+        if (StringUtils.isNotBlank(deviceEntity.getModelId())) {
+            list = modelPropertySyncService.queryPropertysByModelId(deviceEntity.getModelId());
+        }
+        if (list.containsAll(propertys)) {
+            result = true;
+        }
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/message/MessageModelService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/message/MessageModelService.java
new file mode 100644
index 0000000..d460544
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/message/MessageModelService.java
@@ -0,0 +1,35 @@
+package com.rootcloud.domain.service.message;
+
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.domain.mapper.MessageModelMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ *
+ * @author ruixiang.feng
+ * @version 1.0
+ * @date 2022/4/27 10:30
+ */
+@Service
+@Slf4j
+public class MessageModelService {
+
+    @Autowired
+    private MessageModelMapper messageModelMapper;
+
+
+    public JsonResult<String> delMessageModel(List<String> ids) {
+        //判断服务计划是否绑定该模版配置
+        int count = messageModelMapper.getFwjhCount(ids);
+        if(count > 0){ //存在，不删除
+            return JsonResult.failed("500","该消息模板已经绑定服务计划！");
+        }
+        messageModelMapper.delMessageModel(ids);
+        return JsonResult.success();
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/network/NetworkService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/network/NetworkService.java
new file mode 100644
index 0000000..2aafb9d
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/network/NetworkService.java
@@ -0,0 +1,75 @@
+package com.rootcloud.domain.service.network;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.rootcloud.common.JEUuidUtil;
+import com.rootcloud.common.constant.BusinessConstant;
+import com.rootcloud.domain.dao.JeCoreEnduserDao;
+import com.rootcloud.domain.entity.JeCoreEnduserEntity;
+import com.rootcloud.domain.entity.NetworkUserEntity;
+import com.rootcloud.domain.entity.NxOrderEntity;
+import com.rootcloud.domain.mapper.NetworkUserMapper;
+import com.rootcloud.domain.mapper.NxOrderMapper;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/27 10:30
+ */
+@Service
+public class NetworkService {
+
+
+    @Autowired
+    private JeCoreEnduserDao jeCoreEnduserDao;
+    @Autowired
+    private NetworkUserMapper networkUserMapper;
+    @Autowired
+    private NxOrderMapper nxOrderMapper;
+
+    public void bindUser(String networkId, List<String> userId,String yhJs) {
+        List<JeCoreEnduserEntity> userList = jeCoreEnduserDao.selectList(new QueryWrapper<JeCoreEnduserEntity>().lambda().in(JeCoreEnduserEntity::getUserid, userId));
+        for (JeCoreEnduserEntity itm : userList) {
+            NetworkUserEntity networkUserEntity = new NetworkUserEntity();
+            networkUserEntity.setFwryWdid(networkId);
+            networkUserEntity.setUserid(itm.getUserid());
+            networkUserEntity.setNxgxJcdaFwryId(JEUuidUtil.uuid());
+            networkUserEntity.setFwryYx(itm.getCompanyemail());
+            networkUserEntity.setFwryYhxm(itm.getUsername());
+            //networkUserEntity.setFwrySjh(itm.getPhone());
+            networkUserEntity.setFwrySjh(itm.getBackusercode());
+            //networkUserEntity.setFwryJs(itm.getRolenames());
+            networkUserEntity.setFwryJs(yhJs);
+            networkUserEntity.setFwryJscode(itm.getRolecodes());
+            networkUserEntity.setFwrySsbm(itm.getDeptname());
+            // 关联订单 ，是否存在绑定的订单
+            //筛选    订单处于待报工、待审核，他就是忙碌的 其他状态的单，就是空闲
+            List<NxOrderEntity> collect = nxOrderMapper.getOrderByEngineerId(itm.getUserid()).stream().filter(NxOrderEntity -> "4".equals(NxOrderEntity.getOrderOrderstatusCode())
+                    || "5".equals(NxOrderEntity.getOrderOrderstatusCode())).collect(Collectors.toList());
+            if ("服务经理".equals(yhJs)){
+               /* networkUserEntity.setFwryZt("--");
+                networkUserEntity.setFwryZtcode(BusinessConstant.NETWORK_USER_STATUS_UNKNOWN);*/
+                networkUserEntity.setFwryZt("忙碌");
+                networkUserEntity.setFwryZtcode(BusinessConstant.NETWORK_USER_STATUS_BUSY);
+            }else{
+                if(CollectionUtils.isNotEmpty(collect)){
+                    networkUserEntity.setFwryZt("忙碌");
+                    networkUserEntity.setFwryZtcode(BusinessConstant.NETWORK_USER_STATUS_BUSY);
+                }else{
+                    networkUserEntity.setFwryZt("空闲");
+                    networkUserEntity.setFwryZtcode(BusinessConstant.NETWORK_USER_STATUS_FREE);
+                }
+            }
+
+            networkUserMapper.insert(networkUserEntity);
+        }
+
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/network/NetworkUserService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/network/NetworkUserService.java
new file mode 100644
index 0000000..c4286a4
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/network/NetworkUserService.java
@@ -0,0 +1,670 @@
+package com.rootcloud.domain.service.network;
+
+import cn.hutool.core.lang.hash.Hash;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.rootcloud.common.DateUtil;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.PageRequest;
+import com.rootcloud.common.constant.BusinessConstant;
+import com.rootcloud.common.constant.RoleIdConstant;
+import com.rootcloud.common.util.GaoDeAPIUtils;
+import com.rootcloud.config.auth.LoginUserInfo;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.config.auth.UserInfo;
+import com.rootcloud.domain.dao.JeCoreEnduserDao;
+import com.rootcloud.domain.dao.JeCoreRoleUserDao;
+import com.rootcloud.domain.dto.PendingOrderModel;
+import com.rootcloud.domain.dto.ServiceViewResultModel;
+import com.rootcloud.domain.entity.*;
+import com.rootcloud.domain.entity.device.NxDeviceEntity;
+import com.rootcloud.domain.dto.EngineerModel;
+import com.rootcloud.domain.entity.JeCoreEnduserEntity;
+import com.rootcloud.domain.entity.JeCoreRoleUserEntity;
+import com.rootcloud.domain.entity.NetworkUserEntity;
+import com.rootcloud.domain.entity.NxOrderEntity;
+import com.rootcloud.domain.entity.device.NxDeviceLocationEntity;
+import com.rootcloud.domain.entity.ds.NxDsLogEntity;
+import com.rootcloud.domain.mapper.NetworkUserMapper;
+import com.rootcloud.domain.mapper.NxDeviceLocationMapper;
+import com.rootcloud.domain.mapper.NxOrderMapper;
+import com.rootcloud.domain.mapper.NxgxJcdaFwryMapper;
+import com.rootcloud.domain.service.gbsj.JeCoreEnduserService;
+import com.rootcloud.vo.network.NetWorkUserWeekVO;
+import jline.internal.Log;
+import org.apache.commons.collections.CollectionUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/27 10:30
+ */
+@Service
+@Slf4j
+public class NetworkUserService {
+
+    @Resource
+    private NxgxJcdaFwryMapper nxgxJcdaFwryMapper;
+
+    @Autowired
+    private NetworkUserMapper networkUserMapper;
+
+    @Autowired
+    private JeCoreRoleUserDao jeCoreRoleUserDao;
+
+    @Autowired
+    private JeCoreEnduserDao jeCoreEnduserDao;
+
+    @Autowired
+    private NxOrderMapper nxOrderMapper;
+
+    @Autowired
+    JeCoreEnduserDao enduserDao;
+
+    @Autowired
+    NxDeviceLocationMapper nxDeviceLocationMapper;
+
+    @Autowired
+    private GaoDeAPIUtils gaoDeAPIUtils;
+
+    //图片预览请求地址
+    @Value("${image.preview_url:http://je-paas-frontend.uwb-dev.rootcloudapp.com/je/document/preview?fileKey=}")
+    private String previewUrl;
+
+    /**
+     * @param roleId 网点服务人员角色id
+     * @return
+     */
+    public List<JeCoreEnduserEntity> getList(String roleId) {
+        //所有用户
+        List<Object> userIds = jeCoreRoleUserDao.selectObjs(new QueryWrapper<JeCoreRoleUserEntity>().select("USERID").lambda().eq(JeCoreRoleUserEntity::getRoleid, roleId));
+        //已绑定的用户
+        List<NetworkUserEntity> networkUserList = networkUserMapper.selectList(new QueryWrapper<NetworkUserEntity>().lambda().in(NetworkUserEntity::getUserid, userIds));
+        //排除已绑定的用户
+        Set<String> exUsers = new HashSet<>();
+        if (CollectionUtils.isNotEmpty(networkUserList)) {
+            exUsers = networkUserList.stream().collect(Collectors.groupingBy(NetworkUserEntity::getUserid)).keySet();
+        }
+        //剩余用户id
+        List<Object> rsUserIds = new ArrayList<>();
+        for (Object userId : userIds) {
+            if (!exUsers.contains(userId)) {
+                rsUserIds.add(userId);
+            }
+        }
+        if (CollectionUtils.isNotEmpty(rsUserIds)) {
+            return jeCoreEnduserDao.selectList(
+                    new QueryWrapper<JeCoreEnduserEntity>().lambda()
+                            .in(JeCoreEnduserEntity::getUserid, rsUserIds)
+                            .eq(JeCoreEnduserEntity::getZhid, UserContext.getUserTenantId()));
+        }
+        return null;
+    }
+
+
+    /**
+     * 查询所有工程师前7天的订单状态
+     *
+     * @param roleId 网点服务人员角色id
+     * @return
+     */
+    public Page<NetWorkUserWeekVO> getWeekList(PageRequest pageRequest, String roleId) {
+        List<Object> userIds = new ArrayList<>();
+        LoginUserInfo loginUserInfo = UserContext.current();
+        //判断是管理角色---现有逻辑查询所有无需改动  还是网点角色 ---根据登录人所属网点查看对应工程师角色的数据
+        String checkUserIsRole = checkUserIsRole(loginUserInfo.getUserId());
+        log.info("getWeekList loginUserInfo--->[{}]  checkUserIsRole---->[{}]", JSONObject.toJSONString(loginUserInfo), checkUserIsRole);
+        if (checkUserIsRole.equals(BusinessConstant.CUSTOMER_ROLE_MANGE)) {
+            userIds = jeCoreRoleUserDao.selectObjs(new QueryWrapper<JeCoreRoleUserEntity>().select("USERID").lambda().eq(JeCoreRoleUserEntity::getRoleid, roleId));
+        }
+        if (checkUserIsRole.equals(BusinessConstant.CUSTOMER_ROLE_OUTLETS)) {
+            SiteDTO siteByUserId = jeCoreEnduserDao.getSiteByUserId(loginUserInfo.getUserId());
+            if (siteByUserId != null) {
+                userIds = nxgxJcdaFwryMapper.selectObjs(new QueryWrapper<NetworkUserEntity>().select("USERID").lambda().eq(NetworkUserEntity::getFwryWdid, siteByUserId.getSiteId()).like(NetworkUserEntity::getFwryJscode, roleId));
+            }
+        }
+        Log.info("getWeekList userIds--->[{}]" + JSONObject.toJSONString(userIds));
+
+        //所有用户
+        if (CollectionUtils.isNotEmpty(userIds)) {
+            List<NetWorkUserWeekVO> userList = new ArrayList<>();
+            Page<NetWorkUserWeekVO> rsPage = new Page<>();
+            Page<JeCoreEnduserEntity> page = new Page<>(pageRequest.getPage() == null ? 1 : pageRequest.getPage(), pageRequest.getSize() == null ? 5 : pageRequest.getSize());
+            Page<JeCoreEnduserEntity> userListPage = jeCoreEnduserDao.selectPage(page, new QueryWrapper<JeCoreEnduserEntity>().lambda().in(JeCoreEnduserEntity::getUserid, userIds));
+            List<JeCoreEnduserEntity> records = userListPage.getRecords();
+            for (JeCoreEnduserEntity record : records) {
+                NetWorkUserWeekVO netWorkUserWeekVO = new NetWorkUserWeekVO();
+                netWorkUserWeekVO.setName(record.getUsername());
+                String photo = record.getPhoto();
+                if (StringUtils.isNotBlank(photo)) {
+                    String fileKey = photo.split("\\*")[1];
+                    netWorkUserWeekVO.setImageUrl(previewUrl + fileKey);
+                }
+                netWorkUserWeekVO.setRemark("工程师");
+                List<String> weekStatus = returnWeekListNew(record.getUserid());
+                netWorkUserWeekVO.setNetworkUserStatusWeek(weekStatus);
+                userList.add(netWorkUserWeekVO);
+            }
+            BeanUtils.copyProperties(page, rsPage);
+            Collections.sort(userList, new Comparator<NetWorkUserWeekVO>() {
+                @Override
+                public int compare(NetWorkUserWeekVO p1, NetWorkUserWeekVO p2) {
+                    int p1_sum = p1.getNetworkUserStatusWeek().stream().mapToInt(Integer::parseInt).sum();
+                    int p2_sum = p2.getNetworkUserStatusWeek().stream().mapToInt(Integer::parseInt).sum();
+                    if (p1_sum >= p2_sum) {
+                        return -1;
+                    }
+                    return 1;
+                }
+            });
+            rsPage.setRecords(userList);
+            return rsPage;
+        }
+        return new Page<>();
+    }
+
+    public String checkUserIsRole(String userId) {
+        String roles = jeCoreEnduserDao.getRolesByUserId(userId);
+        if (StringUtils.isBlank(roles)) {
+            return BusinessConstant.CUSTOMER_ROLE_CUSTOMER;
+        }
+        if (roles.contains(RoleIdConstant.GLY) || roles.contains(RoleIdConstant.SHLD)) {
+            return BusinessConstant.CUSTOMER_ROLE_MANGE;
+        }
+        if (roles.contains(RoleIdConstant.FWJL) || roles.contains(RoleIdConstant.GCS)) {
+            return BusinessConstant.CUSTOMER_ROLE_OUTLETS;
+        }
+        return BusinessConstant.CUSTOMER_ROLE_CUSTOMER;
+    }
+
+
+    /**
+     * 获取每个工程师空闲/繁忙
+     *
+     * @param engineerId
+     * @return
+     */
+    public List<String> returnWeekListNew(String engineerId) {
+        int count = nxOrderMapper.selectByEngineerBusyness(engineerId);
+        //7天内的空闲/繁忙  0 空闲  1繁忙
+        LinkedHashMap<String, String> dateMap = new LinkedHashMap();
+        for (int i = 0; i < 7; i++) {
+            String afterDate = DateUtil.getDateStringAfter(new Date(), i);
+            if (count > 0) {
+                dateMap.put(afterDate, "1");
+            } else {
+                dateMap.put(afterDate, "0");
+            }
+        }
+        List<String> weekStatus = new ArrayList<>();
+        for (String key : dateMap.keySet()) {
+            weekStatus.add(dateMap.get(key));
+        }
+        return weekStatus;
+    }
+
+    public List<String> returnWeekList(String engineerId) {
+
+        String curDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+        List<NxOrderEntity> orderList = nxOrderMapper.selectByEngineer(engineerId, curDate);
+
+        //初始化日期,默认都是空闲  0 空闲  1繁忙
+        LinkedHashMap<String, String> dateMap = new LinkedHashMap();
+        for (int i = 0; i < 7; i++) {
+            String afterDate = DateUtil.getDateStringAfter(new Date(), i);
+            dateMap.put(afterDate, "0");
+        }
+
+        for (NxOrderEntity item : orderList) {
+            //只要当天订单状态是存在1，3，4就是繁忙，之后一周都是繁忙
+            String statusCode = item.getOrderOrderstatusCode();
+            if ("1".equals(statusCode) || "3".equals(statusCode) || "4".equals(statusCode)) {
+                dateMap.clear();
+                for (int i = 0; i < 7; i++) {
+                    String afterDate = DateUtil.getDateStringAfter(new Date(), i);
+                    dateMap.put(afterDate, "1");
+                }
+                break;
+            }
+
+//            String orderApplydate = item.getOrderApplydate();   //订单开始时间
+//            String orderShtgsj = item.getOrderShtgsj();    //审核通过时间
+//            String orderPlanendtime = item.getOrderPlanendtime();  // 订单结束时间
+//            //如果存在订单，结束时间小于=当天，还没有审核通过，之后7天都变成繁忙，退出标志。
+//            for (String key : dateMap.keySet()) {
+//                if(dateMap.get(key).equals("1")){
+//                    continue;
+//                }
+//                //区间的第一天，开始时间小于第一天，并且审核时间为空，当天变成繁忙
+//                if(orderPlanendtime.compareTo(curDate) <= 0 && StringUtils.isBlank(orderShtgsj)){
+//                    dateMap.put(curDate,"1");
+//                    continue;
+//                }
+//                //判断订单开始小于这个区间任意一天，订单结束时间大于这个区间任意一天
+//                if (orderApplydate.compareTo(key) <= 0 && orderPlanendtime.compareTo(key) >= 0) {
+//                    if(StringUtils.isNotBlank(orderShtgsj)){
+//                        if(orderShtgsj.compareTo(key)==0 ){
+//                            dateMap.put(key,"1");
+//                            break;
+//                        }
+//                    }else{
+//                        dateMap.put(key,"1");   //繁忙
+//                    }
+//
+//                }
+//            }
+        }
+
+        List<String> weekStatus = new ArrayList<>();
+        for (String key : dateMap.keySet()) {
+            weekStatus.add(dateMap.get(key));
+        }
+        return weekStatus;
+    }
+
+
+    public List<JeCoreEnduserEntity> findBindUser() {
+        List<NetworkUserEntity> networkUserList = networkUserMapper.selectList(new QueryWrapper<NetworkUserEntity>().lambda().select(NetworkUserEntity::getUserid));
+        if (CollectionUtils.isNotEmpty(networkUserList)) {
+            Set<String> userIds = networkUserList.stream().collect(Collectors.groupingBy(NetworkUserEntity::getUserid)).keySet();
+            return jeCoreEnduserDao.selectList(new QueryWrapper<JeCoreEnduserEntity>().lambda().in(JeCoreEnduserEntity::getUserid, userIds));
+        }
+        return new ArrayList<>();
+    }
+
+    /**
+     * 查询忙碌工程师和空闲工程师
+     *
+     * @return
+     */
+    public List<ServiceViewResultModel> engineerList() {
+        List<ServiceViewResultModel> resultList = new ArrayList<>();
+        //所有网点下的工程师
+        List<EngineerModel> networkUserList = nxOrderMapper.getEngineer();
+        //通过工程师查询名下的
+        networkUserList.forEach(e -> {
+            ServiceViewResultModel model = new ServiceViewResultModel();
+            model.setFwryYhxm(e.getFwryYhxm());//姓名
+            model.setFwrySjh(e.getFwrySjh());//手机号
+            model.setUserId(e.getUserId());//工程师id
+            // model.setPhoto(e.getPhoto());//头像
+            String orderAssignengineer = e.getFwryYhxm();
+            List<NxOrderEntity> orderList = nxOrderMapper.getOrderByEngineer(orderAssignengineer);
+            if (CollectionUtils.isNotEmpty(orderList)) {
+                NxOrderEntity nxOrderEntity = orderList.get(0);
+                //取订单经纬度，倒序排第一条就是最近的
+                model.setOrderNum(orderList.size());//订单数量
+                model.setOrderSignaddress(nxOrderEntity.getOrderSignaddress());//地址
+                model.setOrderSignaddressLongitude(nxOrderEntity.getOrderSignaddressLongitude());//签到经度
+                model.setOrderSignaddressDimension(nxOrderEntity.getOrderSignaddressDimension());//签到纬度
+                model.setOrderServiceaddressLongitude(nxOrderEntity.getOrderServiceaddressLongitude());//服务经度
+                model.setOrderServiceaddressDimension(nxOrderEntity.getOrderServiceaddressDimension());//服务纬度
+                model.setOrderWdjd(nxOrderEntity.getOrderWdjd());//网点经度
+                model.setOrderWdwd(nxOrderEntity.getOrderWdwd());//网点维度
+
+                //筛选    订单处于待报工、待审核，他就是忙碌的 其他状态的单，就是空闲
+                List<NxOrderEntity> collect = orderList.stream().filter(NxOrderEntity -> "4".equals(NxOrderEntity.getOrderOrderstatusCode())
+                        || "5".equals(NxOrderEntity.getOrderOrderstatusCode())).collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(collect)) {
+                    model.setStatus(1);
+                } else {
+                    model.setStatus(0);
+                }
+            } else {//工程师无订单
+                model.setOrderNum(0);
+                model.setStatus(0);
+                if (null != e.getFwwdWdjwd()) {
+                    String[] split = e.getFwwdWdjwd().split(",");
+                    model.setOrderSignaddressLongitude(split[0]);//经度
+                    model.setOrderSignaddressDimension(split[1]);//纬度
+                }
+            }
+            resultList.add(model);
+        });
+        for (ServiceViewResultModel model : resultList) {
+            ServiceViewResultModel dto = nxOrderMapper.getPhotoByUserId(model.getUserId());
+            if (null != dto) {
+                model.setPhoto(dto.getPhoto());
+            }
+        }
+
+        return resultList;
+    }
+
+    //待处理订单
+    public List<PendingOrderModel> pendingOrder() {
+        return nxOrderMapper.pendingOrder();
+    }
+
+    public int equipmentOrderNum(String orderDeviceCode) {
+        return nxOrderMapper.equipmentOrderNum(orderDeviceCode);
+    }
+
+    public List<FwryDTO> getNxgxJcdaFwryList(FwryDTO reqDto) {
+        List<FwryDTO> resultList = nxOrderMapper.getNxgxJcdaFwryList(reqDto);
+        if (null == reqDto.getFwryJscode() || reqDto.getFwryJscode().size() == 0) {
+            return resultList;
+        }
+        List<FwryDTO> fwryDTOS = new ArrayList<>();
+        for (FwryDTO fwryDTO : resultList) {
+            for (String jsCode : reqDto.getFwryJscode()) {
+                if (fwryDTO.getFwryJs().contains(jsCode)) {
+                    fwryDTOS.add(fwryDTO);
+                    break;
+                }
+            }
+        }
+        return fwryDTOS;
+    }
+
+    public Integer delFwry(String nxgxJcdaFwryId) {
+        return nxOrderMapper.delFwry(nxgxJcdaFwryId);
+    }
+
+    public FwryDTO updateNxgxJcdaFwry(FwryDTO reqDto) {
+        //获取网点下当前工程师角色是否有服务经理 如果是服务经理，则不修改状态
+        List<FwryDTO> fwryDtoList = nxOrderMapper.getNxgxJcdaFwryByUserId(reqDto.getUserId());
+
+        for (FwryDTO dto : fwryDtoList) {
+            if (!"服务经理".equals(dto.getFwryJs())) {
+                List<NxOrderEntity> collect = nxOrderMapper.getOrderByEngineerId(dto.getUserId()).stream().filter(NxOrderEntity -> "4".equals(NxOrderEntity.getOrderOrderstatusCode())
+                        || "5".equals(NxOrderEntity.getOrderOrderstatusCode())).collect(Collectors.toList());
+                HashMap<String, String> req = new HashMap<>();
+                req.put("userId", reqDto.getUserId());
+                if (CollectionUtils.isNotEmpty(collect)) {
+                    req.put("fwryZt", "忙碌");
+                    req.put("fwryZtCode", BusinessConstant.NETWORK_USER_STATUS_BUSY);
+                } else {
+                    req.put("fwryZt", "空闲");
+                    req.put("fwryZtCode", BusinessConstant.NETWORK_USER_STATUS_FREE);
+                }
+                nxOrderMapper.updateNxgxJcdaFwryByUserId(req);
+            }
+        }
+        return new FwryDTO();
+    }
+
+    public Integer getOrderNum(String startDate, String endDate) {
+        HashMap<String, String> req = new HashMap<>();
+        req.put("startDate", startDate);
+        req.put("endDate", endDate);
+        return nxOrderMapper.getOrderNum(req);
+    }
+
+    /**
+     * 用户查询自己的设备
+     *
+     * @param userId
+     * @param sblbSbbm
+     * @param nxJcxxSblbId
+     * @param pageSize
+     * @param pageNum
+     * @return
+     */
+    public JsonResult<Object> getSblbByUserId(String userId, String sblbSbbm, String nxJcxxSblbId, Integer pageSize, Integer pageNum) {
+        Log.info("userId：" + userId + "sblbSbbm：" + sblbSbbm + "nxJcxxSblbId：" + nxJcxxSblbId);
+        //返回map
+        Map<String, Object> result = new HashMap<>();
+        //在人员表中查询该员工的角色信息
+        JeCoreEnduserEntity user = nxOrderMapper.getCoreEnduserByUsrId(userId);
+        String roleIds = user.getRoleids();
+        if (StringUtils.isNotBlank(roleIds)) {
+            //根据id查询，单独写出来
+            if (StringUtils.isNotBlank(nxJcxxSblbId)) {
+                Map<String, Object> req = new HashMap<>();
+                req.put("id", nxJcxxSblbId);
+                req.put("size", 1);
+                req.put("page", 0);
+                List<NxDeviceEntity> sblbList = nxOrderMapper.getNxDeviceEntity(req);
+                result.put("total", sblbList.size());
+                result.put("list", sblbList);
+                return JsonResult.success(result);
+            }
+            //系统管理员，管理员，售后领导
+            if (roleIds.contains(RoleIdConstant.XTGLY) || roleIds.contains(RoleIdConstant.GLY) || roleIds.contains(RoleIdConstant.SHLD)) {
+                //所有的设备列表信息
+                Map<String, Object> req = new HashMap<>();
+                req.put("sblbSbbm", sblbSbbm);
+                req.put("size", pageSize);
+                req.put("page", (pageNum - 1) * pageSize);
+                List<NxDeviceEntity> sblbList = nxOrderMapper.getNxDeviceEntity(req);
+                int count = nxOrderMapper.getNxDeviceEntityCount(req);
+                result.put("total", count);
+                result.put("list", sblbList);
+                return JsonResult.success(result);
+            }
+            //服务经理，工程师
+            if (roleIds.contains(RoleIdConstant.FWJL) || roleIds.contains(RoleIdConstant.GCS)) {
+                //一个人只能绑定一个服务网点，所以list里只有一个或者没有
+                List<FwryDTO> fwryList = nxOrderMapper.getNxgxJcdaFwryByUserId(userId);
+                if (CollectionUtils.isEmpty(fwryList)) {
+                    return JsonResult.failed("500", "未在网点下查到该员工信息！");
+                }
+                FwryDTO fwryDTO = fwryList.get(0);
+                //通过网点id获取服务网点信息
+                NetworkEntity networkEntity = nxOrderMapper.getfwwd(fwryDTO);
+                //获取网点下的服务区域
+                String[] split = networkEntity.getFwwdSsqy().split(",");
+                //通过网点的服务区域，去查询客户
+                List<KhglDTO> khglDTOList = nxOrderMapper.getKhBykhdzs(split);
+                //通过客户名称查询设备列表信息
+                //所有的设备列表信息
+                if (CollectionUtils.isEmpty(khglDTOList)) {
+                    return JsonResult.success(null);
+                }
+                HashMap<String, Object> req = new HashMap<>();
+                String khmc = "";
+                for (KhglDTO dto : khglDTOList) {
+                    khmc += "'" + dto.getKhglKhmc() + "',";
+                }
+                khmc = khmc.substring(0, khmc.length() - 1);
+                req.put("khmc", khmc);
+                req.put("sblbSbbm", sblbSbbm);
+                Log.info("工程师或服务经理查询客户名称:{},设备编码:{}", khmc + "===============》" + sblbSbbm);
+                //设置分页
+                req.put("size", pageSize);
+                req.put("page", (pageNum - 1) * pageSize);
+                List<NxDeviceEntity> sblbList = nxOrderMapper.getNxDeviceEntity(req);
+                int count = nxOrderMapper.getNxDeviceEntityCount(req);
+                result.put("total", count);
+                result.put("list", sblbList);
+                return JsonResult.success(result);
+            }
+            //客户，客户领导
+            if (roleIds.contains(RoleIdConstant.KH) || roleIds.contains(RoleIdConstant.KHLD)) {
+                Map<String, Object> req = new HashMap<>();
+                req.put("userId", user.getUserid());
+                req.put("sblbSbbm", sblbSbbm);
+                req.put("size", pageSize);
+                req.put("page", (pageNum - 1) * pageSize);
+                List<NxDeviceEntity> sblbList = nxOrderMapper.getNxDeviceEntityList(req);
+                int count = nxOrderMapper.getNxDeviceEntityListCount(req);
+                result.put("total", count);
+                result.put("list", sblbList);
+                return JsonResult.success(result);
+            }
+        }
+        return JsonResult.success(null);
+    }
+
+    public JsonResult<List<PendingOrderModel>> getServiceView(String isService) {
+        if (StringUtils.isEmpty(isService)) {
+            return JsonResult.failed("500", "未传必要参数！");
+        }
+        HashMap<String, Object> req = new HashMap<>();
+        req.put("isService", isService);
+        LoginUserInfo current = UserContext.current();
+        if (null != current && StringUtils.isEmpty(current.getUserId())) {
+            return JsonResult.failed("500", "token异常！");
+        }
+        String userId = current.getUserId();
+        String userName = current.getUserName();
+        //Log.info("current.getUserName()查询到的userName：",userName);
+        if (StringUtils.isEmpty(userName)) {
+            //LoginUserInfo userInfo = enduserDao.getUserInfo(userId);
+            UserInfo user = enduserDao.getUser(userId);
+
+            userName = user.getUserName();
+        }
+
+
+        String roleids = nxOrderMapper.getUserInfo(userId);
+        if (roleids.contains(RoleIdConstant.GLY) || roleids.contains(RoleIdConstant.SHLD)) {
+            List<PendingOrderModel> resultList = nxOrderMapper.getServiceView(req);
+            return JsonResult.success(resultList);
+        }
+        if (roleids.contains(RoleIdConstant.KH) ||
+                roleids.contains(RoleIdConstant.KHLD)) {//客户或者客户领导
+            String khid = enduserDao.getCustomByUserId(userId);
+            List<String> khids = new ArrayList<String>();
+            khids.add(khid);
+            req.put("khids", khids);
+            List<PendingOrderModel> resultList = nxOrderMapper.getServiceView(req);
+            return JsonResult.success(resultList);
+        }
+        if (roleids.contains(RoleIdConstant.FWJL)) {//服务经理
+            String[] split = enduserDao.getSiteByUserId(userId).getServiceArea().split(",");
+            //通过网点的服务区域，去查询客户id
+            List<String> collect = nxOrderMapper.getKhBykhdzs(split).stream()
+                    .map(item -> {
+                        return item.getNxKhglId();
+                    })
+                    .collect(Collectors.toList());
+            req.put("khids", collect);
+            List<PendingOrderModel> resultList = nxOrderMapper.getServiceView(req);
+            return JsonResult.success(resultList);
+        }
+        if (roleids.contains(RoleIdConstant.GCS)) {//工程师
+            String[] split = enduserDao.getSiteByUserId(userId).getServiceArea().split(",");
+            //通过网点的服务区域，去查询客户id
+            List<String> collect = nxOrderMapper.getKhBykhdzs(split).stream()
+                    .map(item -> {
+                        return item.getNxKhglId();
+                    })
+                    .collect(Collectors.toList());
+            req.put("khids", collect);
+            //req.put("userId",userId);
+            req.put("userId", userName);
+            List<PendingOrderModel> resultList = nxOrderMapper.getServiceView(req);
+            return JsonResult.success(resultList);
+        }
+        return JsonResult.success(null);
+    }
+
+    public JsonResult<List<NxOrderEntity>> getServiceViewBySbbm(String sbbm, String isService) {
+        /*if(StringUtils.isEmpty(sbbm)){
+            return JsonResult.failed("500","未传必要参数设备编码！");
+        }*/
+        HashMap<String, Object> req = new HashMap<>();
+        req.put("sbbm", sbbm);
+        req.put("isService", isService);
+        LoginUserInfo current = UserContext.current();
+        if (null != current && StringUtils.isEmpty(current.getUserId())) {
+            return JsonResult.failed("500", "token异常！");
+        }
+        String userId = current.getUserId();
+        String userName = current.getUserName();
+        if (StringUtils.isEmpty(userName)) {
+            //LoginUserInfo userInfo = enduserDao.getUserInfo(userId);
+            UserInfo user = enduserDao.getUser(userId);
+            userName = user.getUserName();
+        }
+        String roleids = nxOrderMapper.getUserInfo(userId);
+        if (roleids.contains(RoleIdConstant.GLY) || roleids.contains(RoleIdConstant.SHLD)) {
+            List<NxOrderEntity> resultList = nxOrderMapper.getServiceViewBySbbm(req);
+            return JsonResult.success(resultList);
+        }
+        if (roleids.contains(RoleIdConstant.KH) ||
+                roleids.contains(RoleIdConstant.KHLD)) {//客户或者客户领导
+            String khid = enduserDao.getCustomByUserId(userId);
+            List<String> khids = new ArrayList<String>();
+            khids.add(khid);
+            req.put("khids", khids);
+            List<NxOrderEntity> resultList = nxOrderMapper.getServiceViewBySbbm(req);
+            return JsonResult.success(resultList);
+        }
+        if (roleids.contains(RoleIdConstant.FWJL)) {//服务经理
+            String[] split = enduserDao.getSiteByUserId(userId).getServiceArea().split(",");
+            //通过网点的服务区域，去查询客户id
+            List<String> collect = nxOrderMapper.getKhBykhdzs(split).stream()
+                    .map(item -> {
+                        return item.getNxKhglId();
+                    })
+                    .collect(Collectors.toList());
+            req.put("khids", collect);
+            List<NxOrderEntity> resultList = nxOrderMapper.getServiceViewBySbbm(req);
+
+            return JsonResult.success(resultList);
+        }
+        if (roleids.contains(RoleIdConstant.GCS)) {//工程师
+            String[] split = enduserDao.getSiteByUserId(userId).getServiceArea().split(",");
+            //通过网点的服务区域，去查询客户id
+            List<String> collect = nxOrderMapper.getKhBykhdzs(split).stream()
+                    .map(item -> {
+                        return item.getNxKhglId();
+                    })
+                    .collect(Collectors.toList());
+            req.put("khids", collect);
+            //req.put("userId",userId);
+            req.put("userId", userName);
+            List<NxOrderEntity> resultList = nxOrderMapper.getServiceViewBySbbm(req);
+            return JsonResult.success(resultList);
+        }
+        return JsonResult.success(null);
+    }
+
+    public JsonResult<List<NxDeviceLocationEntity>> getSbjwd(String deviceId) {
+        if (StringUtils.isNotEmpty(deviceId)) {
+            List<NxDeviceLocationEntity> collect = nxDeviceLocationMapper.findAllDeviceLocation()
+                    .stream().filter(e -> Objects.equals(deviceId, e.getDeviceId())).collect(Collectors.toList());
+            for (NxDeviceLocationEntity entity : collect) {
+                String gps = entity.getLongitude() + "," + entity.getLatitude();
+                String address = null;
+                address = gaoDeAPIUtils.getAddressByJwd(gps);
+                entity.setAddress(address);
+            }
+
+            return JsonResult.success(collect);
+        }
+        List<NxDeviceLocationEntity> allDeviceLocation = nxDeviceLocationMapper.findAllDeviceLocation();
+        for (NxDeviceLocationEntity entity : allDeviceLocation) {
+            String gps = entity.getLongitude() + "," + entity.getLatitude();
+            String address = null;
+            address = gaoDeAPIUtils.getAddressByJwd(gps);
+            entity.setAddress(address);
+        }
+        return JsonResult.success(allDeviceLocation);
+    }
+
+    public JsonResult<HashMap<String, Integer>> getServiceViewCount() {
+        HashMap<String, Integer> res = new HashMap<>();
+        res.put("fwz", 0);//服务中
+        res.put("dfw", 0);//待服务
+        res.put("dcl", 0);//待处理
+        List<NxOrderEntity> data = getServiceViewBySbbm(null, "2").getData();
+        if (CollectionUtils.isNotEmpty(data)) {
+            List<NxOrderEntity> dfw = data.stream().filter(e -> Objects.equals("1", e.getOrderOrderstatusCode()) || Objects.equals("3", e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> fwz = data.stream().filter(e -> Objects.equals("4", e.getOrderOrderstatusCode()) || Objects.equals("5", e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            res.put("fwz", fwz.size());//服务中
+            res.put("dfw", dfw.size());//待服务
+            res.put("dcl", data.size());//待处理
+        }
+        return JsonResult.success(res);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/order/OrderService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/order/OrderService.java
new file mode 100644
index 0000000..6f2e4c2
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/order/OrderService.java
@@ -0,0 +1,233 @@
+package com.rootcloud.domain.service.order;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.domain.ao.OrderDispatchForm;
+import com.rootcloud.domain.ao.ReportStatisticAO;
+import com.rootcloud.domain.dto.OrderVO;
+import com.rootcloud.domain.entity.MyMessageEntity;
+import com.rootcloud.domain.entity.NxOrderEntity;
+import com.rootcloud.domain.vo.*;
+import com.rootcloud.vo.order.OrderParam;
+import com.rootcloud.vo.order.OrderSignInParam;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 订单service
+ * </p>
+ * 
+ * @author HeJia
+ * @since 2022/5/17
+ */
+public interface OrderService extends IService<NxOrderEntity> {
+
+    /**
+     * 订单分页
+     *
+     * @param page
+     *            当前页
+     * @param size
+     *            每页显示数
+     * @param serviceType
+     *            服务类型
+     * @param orderStatus
+     *            订单状态
+     * @return 分页的数据
+     */
+    IPage<OrderVO> orderPage(int page, int size, String serviceType, String orderStatus);
+
+    /**
+     * 订单详情
+     *
+     * @param orderId
+     *            订单主键
+     * @return 详情数据
+     */
+    OrderVO orderInfo(String orderId);
+
+
+    /**
+     * 订单签到功能
+     * @param orderSignInParam
+     */
+    void orderSignIn(OrderSignInParam orderSignInParam);
+
+    /**
+     * 派工
+     * 
+     * @param form
+     *            请求参数
+     * @return true 成功
+     */
+    Boolean dispatch(OrderDispatchForm form);
+
+    /**
+     * 作废
+     * 
+     * @param orderId
+     *            订单主键
+     * @return true 成功
+     */
+    Boolean invalid(String orderId);
+
+    List orderProcess(String orderId);
+
+    /**
+     * 根据设备查询
+     */
+    //List<MyMessageEntity> queryOrderInfo(List<DeviceListEntity> deviceListEntities);
+
+
+    /**
+     * 根据参数查询订单汇总
+     * @param reportStatisticAO
+     * @return
+     */
+    OrderStatusStatistic orderStatusStatistic(ReportStatisticAO reportStatisticAO);
+
+
+    /**
+     * 查询设备状态汇总
+     * @return
+     */
+    DeviceStatusStatistic  deviceStatusStatistic();
+
+
+    /**
+     * 订单和设备状态查询
+     * @param reportStatisticAO
+     * @return
+     */
+    StatusVO  orderAndDeviceStatus(ReportStatisticAO reportStatisticAO);
+
+
+    /**
+     * 网点统计
+     * @param reportStatisticAO
+     * @return
+     */
+    List<Outlets>  regionStatistic(ReportStatisticAO reportStatisticAO);
+
+
+    /**
+     * 按照日期订单统计
+     * @param reportStatisticAO
+     * @return
+     */
+    List<OrderStatistic> orderStatisticByDay(ReportStatisticAO reportStatisticAO);
+
+
+    /**
+     * 人员统计所有查询
+     * @param reportStatisticAO
+     * @return
+     */
+    PersonAllStatistic checkPersonAllStatistic(ReportStatisticAO reportStatisticAO);
+
+
+    /**
+     * 查询人员统计数据
+     * @param reportStatisticAO
+     * @param sortType
+     * @return
+     */
+    List<PersonnelStatistic> checkPersonStatistic(ReportStatisticAO reportStatisticAO,String sortType);
+
+
+    /**
+     * 查询设备故障前十统计
+     * @param reportStatisticAO
+     * @return
+     */
+    List<FaultNumber> faultStatistic(ReportStatisticAO reportStatisticAO);
+
+
+    /**
+     * 配件故障统计
+     * @param reportStatisticAO
+     * @return
+     */
+    List<PartsFaultNumber> partsFaultStatistic(ReportStatisticAO reportStatisticAO);
+
+
+    /**
+     * 配件销售额统计
+     * @param reportStatisticAO
+     * @return
+     */
+    List<FittingsSales> saleFittingsStatistic(ReportStatisticAO reportStatisticAO);
+
+
+    /**
+     * 人员销售
+     * @param reportStatisticAO
+     * @return
+     */
+    List<CustomerSales> saleCustomerStatistic(ReportStatisticAO reportStatisticAO);
+
+
+    /**
+     * 通过用户id查询订单
+     * @param userId
+     * @param type
+     * @param startNo
+     * @param endNo
+     * @return
+     */
+    List<MyMessageEntity>  selectByUserId(String zhId,String userId,String type,Integer startNo,Integer endNo);
+
+
+    /**
+     *  结算合同到期查询
+     * @param userId
+     * @return
+     */
+    List<MyMessageEntity> jsGetByUserId(String userId);
+
+
+    /**
+     * 服务合同到期查询
+     * @param userId
+     * @return
+     */
+    List<MyMessageEntity>  fwGetByUserId(String userId);
+
+
+    /**
+     * 订单移入代办库
+     * @param orderId 订单id
+     */
+    void orderInsertLibrary(String orderId);
+    /**
+     * 订单消息已解决
+     * @param orderId
+     */
+    void mesSfjj(String orderId);
+
+    void htSerMesSfjj(String id);
+
+    void jsSerMesSfjj(String id);
+
+    HashMap getOrderTypeNum();
+
+    HashMap getOrderTypeNum2();
+
+    /**
+     * 修改订单审核时间，完工时间，指派工程师时间
+     */
+    void updateDate();
+
+    /**
+     * 创建订单
+     * @param param
+     * @return
+     */
+    JsonResult<Object> createOrder(OrderParam param)  throws Exception;
+    JsonResult<Object> createOrder2(OrderParam param)  throws Exception;
+    JsonResult<Object> createOrder3(OrderParam param)  throws Exception;
+    JsonResult<Object> createOrder4(OrderParam param)  throws Exception;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/order/OrderServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/order/OrderServiceImpl.java
new file mode 100644
index 0000000..4101964
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/order/OrderServiceImpl.java
@@ -0,0 +1,1945 @@
+package com.rootcloud.domain.service.order;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.common.*;
+import com.rootcloud.common.constant.Properties;
+import com.rootcloud.common.constant.RoleIdConstant;
+import com.rootcloud.common.constant.TemplateConstant;
+import com.rootcloud.common.enums.OrderEnums;
+import com.rootcloud.common.enums.ServicePlanEnums;
+import com.rootcloud.common.enums.StatusCodeEnum;
+import com.rootcloud.common.util.DateUtils;
+import com.rootcloud.common.util.OrderNumberUtils;
+import com.rootcloud.config.auth.LoginUserInfo;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.config.auth.UserInfo;
+import com.rootcloud.config.exception.BusinessException;
+import com.rootcloud.domain.ao.OrderDispatchForm;
+import com.rootcloud.domain.ao.ReportStatisticAO;
+import com.rootcloud.domain.dao.KhDao;
+import com.rootcloud.domain.dto.DeviceVO;
+import com.rootcloud.domain.dto.OrderVO;
+import com.rootcloud.domain.dto.UserRoleDeptDTO;
+import com.rootcloud.domain.entity.*;
+import com.rootcloud.domain.entity.device.NxDeviceEntity;
+import com.rootcloud.domain.entity.device.NxDeviceLocationEntity;
+import com.rootcloud.domain.mapper.*;
+import com.rootcloud.domain.service.auth.RootCloudAuthService;
+import com.rootcloud.domain.service.auth.RootCloudAuthServiceImpl;
+import com.rootcloud.domain.service.device.NxDeviceService;
+import com.rootcloud.domain.service.gbsj.JeCoreEnduserService;
+import com.rootcloud.domain.service.gkjk.NxJeDeviceService;
+import com.rootcloud.domain.service.network.NetworkUserService;
+import com.rootcloud.domain.service.todo.NxTodoLibraryService;
+import com.rootcloud.domain.vo.*;
+import com.rootcloud.vo.order.DeviceDataVo;
+import com.rootcloud.vo.order.OrderLcinfoParam;
+import com.rootcloud.vo.order.OrderParam;
+import com.rootcloud.vo.order.OrderSignInParam;
+import com.rootcloud.vo.service.OutletsVO;
+import jline.internal.Log;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 订单service实现类
+ * </p>
+ *
+ * @author HeJia
+ * @since 2022/5/17
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class OrderServiceImpl extends ServiceImpl<NxOrderMapper, NxOrderEntity> implements OrderService {
+
+    private final Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
+
+    @Resource(name = "nxJeDeviceServiceImpl")
+    private NxJeDeviceService nxJeDeviceService;
+
+    @Resource(name = "nxDeviceServiceImpl")
+    private NxDeviceService nxDeviceService;
+
+    @Autowired
+    private NxDeviceLocationMapper deviceLocationMapper;
+
+    @Resource(name = "endUserService")
+    private JeCoreEnduserService enduserService;
+
+    @Resource(name = "nxTodoLibraryServiceImpl")
+    private NxTodoLibraryService nxTodoLibraryService;
+
+    @Resource(name = "cloudAuthService")
+    private RootCloudAuthService rootCloudAuthService;
+
+    private final NxOrderMapper nxOrderMapper;
+
+    private final NxPlpzMapper nxPlpzMapper;
+
+    @Autowired
+    private final KhDao kuMapper;
+    @Autowired
+    Properties wfProperties;
+    @Autowired
+    private TechnicalTaskDAO technicalTaskDAO;
+    @Autowired
+    ServicePlanMapper servicePlanMapper;
+    private final NxDeviceMapper nxDeviceMapper;
+    private static double EARTH_RADIUS = 6378137;
+    private static double RAD = Math.PI / 180.0;
+    @Autowired
+    NetworkUserService networkUserService;
+
+    @Override
+    public IPage<OrderVO> orderPage(int page, int size, String serviceType, String orderStatus) {
+
+        LambdaQueryWrapper<NxOrderEntity> queryWrapper = Wrappers.lambdaQuery(NxOrderEntity.class)
+                .eq(StrUtil.isNotBlank(serviceType), NxOrderEntity::getOrderServicetypeCode, serviceType)
+                .eq(StrUtil.isNotBlank(orderStatus), NxOrderEntity::getOrderOrderstatusCode, orderStatus)
+                .orderByDesc(NxOrderEntity::getSyCreatetime);
+
+        Page<NxOrderEntity> result = this.page(new Page<>(page, size), queryWrapper);
+        Page<OrderVO> voPage = new Page<>();
+        BeanUtil.copyProperties(result, voPage);
+        return voPage;
+    }
+
+    @Override
+    public OrderVO orderInfo(String orderId) {
+        NxOrderEntity entity = Optional.ofNullable(getById(orderId)).orElse(new NxOrderEntity());
+        OrderVO vo = BeanUtil.copyProperties(entity, OrderVO.class);
+        if (StrUtil.isNotBlank(vo.getOrderDevicecode())) {
+            vo.setOnline(nxJeDeviceService.queryOnlineStatus(vo.getOrderDevicecode()));
+        }
+        return vo;
+    }
+
+    @Override
+    public Boolean dispatch(OrderDispatchForm form) {
+        NxOrderEntity entity = BeanUtil.copyProperties(form, NxOrderEntity.class);
+        entity.setOrderDispatchtime(DateUtil.now());
+        entity.setOrderOrderstatusCode(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getCode());
+        entity.setOrderOrderstatusName(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getDesc());
+        return this.updateById(entity);
+    }
+
+    @Override
+    public Boolean invalid(String orderId) {
+        NxOrderEntity entity = new NxOrderEntity();
+        entity.setNxOrderId(orderId);
+        entity.setOrderOrderstatusCode(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getCode());
+        entity.setOrderOrderstatusName(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getDesc());
+        return this.updateById(entity);
+    }
+
+    @Override
+    public List orderProcess(String orderId) {
+        NxOrderEntity entity = Optional.ofNullable(getById(orderId)).orElse(new NxOrderEntity());
+        List<HashMap> result = new ArrayList<HashMap>();
+
+        HashMap<String, Object> map1 = new HashMap<String, Object>();
+        map1.put("title", "派工信息");
+        map1.put("time", entity.getOrderDispatchtime());//派单时间
+        HashMap<String, String> map1a = new HashMap<String, String>();
+        map1a.put("orderAssignengineer", entity.getOrderAssignengineer());//指派工程师
+        map1a.put("orderAssistengineer", entity.getOrderAssistengineer());//协助工程师
+        map1a.put("orderPlanstarttime", entity.getOrderPlanstarttime());//计划开始时间
+        map1a.put("orderPlanendtime", entity.getOrderPlanendtime());//计划完成时间
+        map1.put("desc", map1a);
+        result.add(map1);
+
+        HashMap<String, Object> map2 = new HashMap<String, Object>();
+        map2.put("title", "已签到");
+        map2.put("time", entity.getOrderSigntime());//签到时间
+        HashMap<String, String> map2a = new HashMap<String, String>();
+        map2a.put("orderSignaddress", entity.getOrderSignaddress());//签到地址
+        map1.put("desc", map2a);
+        result.add(map2);
+
+        HashMap<String, Object> map3 = new HashMap<String, Object>();
+        map3.put("title", "报工信息");
+        HashMap<String, String> map3a = new HashMap<String, String>();
+        map3a.put("orderFaulttyprName", entity.getOrderFaulttyprName());//故障类型
+        map3a.put("orderCauseofissue", entity.getOrderCauseofissue());//故障原因
+        map3a.put("orderCauseofissuefile", entity.getOrderCauseofissuefile());//故障原因图片
+        map3a.put("orderSolution", entity.getOrderSolution());//解决方案
+        map3a.put("orderSolutionfile", entity.getOrderSolutionfile());//解决方案图片
+        map3a.put("orderSolutionfile", entity.getOrderSolutionfile());//解决方案图片
+        map3a.put("orderRemark", entity.getOrderRemark());//备注
+        map3a.put("orderRemarkfile", entity.getOrderRemarkfile());//备注图片
+        map3.put("desc", map3a);
+        result.add(map3);
+
+        HashMap<String, Object> map4 = new HashMap<String, Object>();
+        map4.put("title", "审核信息");
+        HashMap<String, String> map4a = new HashMap<String, String>();
+        if (entity.getOrderOrderstatusCode().equals("6") ||
+                entity.getOrderOrderstatusCode().equals("7")) {
+            map4a.put("syAudflag", "通过");
+        }
+        if (entity.getOrderOrderstatusCode().equals("8")) {
+            map4a.put("syAudflag", "拒绝");
+        }
+        map4.put("desc", map4a);
+        result.add(map4);
+        return result;
+    }
+
+    @Override
+    public OrderStatusStatistic orderStatusStatistic(ReportStatisticAO reportStatisticAO) {
+        LoginUserInfo current = UserContext.current();
+        SimpleDateFormat stf = new SimpleDateFormat("yyyy-MM-dd");
+        OrderStatusStatistic orderStatusStatistic = new OrderStatusStatistic();
+        String wdUserId = null;
+        String userIds = null;
+        List<String> list = new ArrayList<>();
+        UserInfo userInfo = enduserService.getUser(current.getUserId());
+        String roleIds = userInfo.getRoleIds();
+        if (roleIds.contains(RoleIdConstant.GLY) || roleIds.contains(RoleIdConstant.SHLD)) {
+            //管理员
+        } else if (roleIds.contains(RoleIdConstant.FWJL)) {
+            SiteDTO siteByUserId = enduserService.getSiteByUserId(current.getUserId());
+            if (!ObjectUtils.isEmpty(siteByUserId)) {
+                String[] strings = siteByUserId.getServiceArea().split(",");
+                for (int i = 0; i < strings.length; i++) {
+                    String areaName = strings[i];
+                    String customs = enduserService.getCustomsBySiteAreaName(areaName);
+                    if (StringUtils.isNotBlank(customs)) {
+                        list.add(customs);
+                    }
+                }
+            }
+            if (list.isEmpty()) {
+                return orderStatusStatistic;
+            }
+        } else {
+            return orderStatusStatistic;
+        }
+        String startTime = reportStatisticAO.getStartTime();
+        String endTime = reportStatisticAO.getEndTime();
+//        String orderStatus = reportStatisticAO.getType();
+        if (list.size() > 0) {
+            userIds = String.join(",", list);
+        }
+
+        orderStatusStatistic = nxOrderMapper.orderCount(startTime, endTime, userIds, wdUserId);
+
+
+        //今日新增
+        startTime = stf.format(new Date());
+        endTime = startTime;
+        List<NxOrderEntity> orderAdd = nxOrderMapper.orderStatusStatistic(startTime, endTime, null, userIds, wdUserId);
+
+        //今日完成
+//        orderStatus = ;
+        List<NxOrderEntity> oderFInish = nxOrderMapper.orderStatusStatistic(startTime, endTime, OrderEnums.OrderStatus.DONE.getCode(), userIds, wdUserId);
+
+        orderStatusStatistic.setTodayAdd(String.valueOf(orderAdd.size()));
+        orderStatusStatistic.setTodayFinish(String.valueOf(oderFInish.size()));
+
+        return orderStatusStatistic;
+    }
+
+    @Override
+    public DeviceStatusStatistic deviceStatusStatistic() {
+        LoginUserInfo current = UserContext.current();
+        DeviceStatusStatistic deviceStatusStatistic = new DeviceStatusStatistic();
+        String userIds = null;
+        List<String> list = new ArrayList<>();
+        UserInfo userInfo = enduserService.getUser(current.getUserId());
+        String roleIds = userInfo.getRoleIds();
+        if (roleIds.contains(RoleIdConstant.GLY) || roleIds.contains(RoleIdConstant.SHLD)) {
+            //管理员
+        } else if (roleIds.contains(RoleIdConstant.FWJL)) {
+            SiteDTO siteByUserId = enduserService.getSiteByUserId(current.getUserId());
+            if (!ObjectUtils.isEmpty(siteByUserId)) {
+                String[] strings = siteByUserId.getServiceArea().split(",");
+                for (int i = 0; i < strings.length; i++) {
+                    String areaName = strings[i];
+                    String customs = enduserService.getCustomsBySiteAreaName(areaName);
+                    if (StringUtils.isNotBlank(customs)) {
+                        list.add(customs);
+                    }
+                }
+            }
+            if (list.isEmpty()) {
+                return deviceStatusStatistic;
+            }
+        } else {
+            return deviceStatusStatistic;
+        }
+        if (list.size() > 0) {
+            userIds = String.join(",", list);
+        }
+        deviceStatusStatistic = nxOrderMapper.deviceStatusStatistic(userIds);
+        return deviceStatusStatistic;
+
+    }
+
+    @Override
+    public StatusVO orderAndDeviceStatus(ReportStatisticAO reportStatisticAO) {
+        OrderStatusStatistic orderStatusStatistic = orderStatusStatistic(reportStatisticAO);
+        DeviceStatusStatistic deviceStatusStatistic = deviceStatusStatistic();
+        StatusVO statusVO = new StatusVO();
+        statusVO.setOrderStatusStatistic(orderStatusStatistic);
+        statusVO.setDeviceStatusStatistic(deviceStatusStatistic);
+        return statusVO;
+    }
+
+    @Override
+    public List<Outlets> regionStatistic(ReportStatisticAO reportStatisticAO) {
+        LoginUserInfo current = UserContext.current();
+        String wdUserId = null;
+        UserInfo userInfo = enduserService.getUser(current.getUserId());
+        String roleIds = userInfo.getRoleIds();
+        if (roleIds.contains(RoleIdConstant.GLY) || roleIds.contains(RoleIdConstant.SHLD)) {
+            //管理员
+        } else if (roleIds.contains(RoleIdConstant.FWJL)) {
+            //返回网点人员
+            wdUserId = current.getUserId();
+        } else {
+            return new ArrayList<Outlets>();
+        }
+        String startTime = reportStatisticAO.getStartTime();
+        String endTime = reportStatisticAO.getEndTime();
+        List<Outlets> outlets = nxOrderMapper.outletsStatistic(startTime, endTime, wdUserId);
+        return outlets;
+    }
+
+    @Override
+    public List<OrderStatistic> orderStatisticByDay(ReportStatisticAO reportStatisticAO) {
+        LoginUserInfo current = UserContext.current();
+        String userIds = null;
+        List<String> list = new ArrayList<>();
+        UserInfo userInfo = enduserService.getUser(current.getUserId());
+        String roleIds = userInfo.getRoleIds();
+        if (roleIds.contains(RoleIdConstant.GLY) || roleIds.contains(RoleIdConstant.SHLD)) {
+            //管理员
+        } else if (roleIds.contains(RoleIdConstant.FWJL)) {
+            SiteDTO siteByUserId = enduserService.getSiteByUserId(current.getUserId());
+            if (!ObjectUtils.isEmpty(siteByUserId)) {
+                String[] strings = siteByUserId.getServiceArea().split(",");
+                for (int i = 0; i < strings.length; i++) {
+                    String areaName = strings[i];
+                    String customs = enduserService.getCustomsBySiteAreaName(areaName);
+                    if (StringUtils.isNotBlank(customs)) {
+                        list.add(customs);
+                    }
+                }
+            }
+            if (list.isEmpty()) {
+                return new ArrayList<OrderStatistic>();
+            }
+        } else {
+            return new ArrayList<OrderStatistic>();
+        }
+        String startTime = reportStatisticAO.getStartTime();
+        String endTime = reportStatisticAO.getEndTime();
+        if (list.size() > 0) {
+            userIds = String.join(",", list);
+        }
+        List<OrderStatistic> orderStatistics = new ArrayList<>();
+        if ("4".equals(reportStatisticAO.getType())) {
+            orderStatistics = nxOrderMapper.orderStatisticByDayMonth(UserContext.getTenantId(), startTime, endTime, userIds, null);
+        } else {
+            orderStatistics = nxOrderMapper.orderStatisticByDay(UserContext.getTenantId(), startTime, endTime, userIds, null);
+        }
+
+        return orderStatistics;
+    }
+
+
+    @Override
+    public PersonAllStatistic checkPersonAllStatistic(ReportStatisticAO reportStatisticAO) {
+        PersonAllStatistic personAllStatistic = new PersonAllStatistic();
+        if (reportStatisticAO.getSelectType().contains("orders")) {
+            List<PersonnelStatistic> orderNum = checkPersonStatistic(reportStatisticAO, "orderNum");
+            personAllStatistic.setOrders(orderNum);
+        }
+        if (reportStatisticAO.getSelectType().contains("appraises")) {
+            List<PersonnelStatistic> serviceNum = checkPersonStatistic(reportStatisticAO, "serviceNum");
+            personAllStatistic.setAppraises(serviceNum);
+        }
+        if (reportStatisticAO.getSelectType().contains("works")) {
+            /*List<PersonnelStatistic> workTimeNum = checkPersonStatistic(reportStatisticAO, "workTimeNum");
+            personAllStatistic.setWorks(workTimeNum);*/
+            List<PersonnelStatistic> workTimeNum = this.getGzsc(reportStatisticAO);
+            personAllStatistic.setWorks(workTimeNum);
+        }
+        /*if (reportStatisticAO.getSelectType().contains("test")) {
+            List<PersonnelStatistic> workTimeNum = this.getGzsc(reportStatisticAO);
+            personAllStatistic.setWorks(workTimeNum);
+        }*/
+        if (reportStatisticAO.getSelectType().contains("faultNumbers")) {
+            List<FaultNumber> faultNumbers = faultStatistic(reportStatisticAO);
+            personAllStatistic.setFaultNumbers(faultNumbers);
+        }
+        if (reportStatisticAO.getSelectType().contains("partsFaultNumbers")) {
+            List<PartsFaultNumber> partsFaultNumbers = partsFaultStatistic(reportStatisticAO);
+            personAllStatistic.setPartsFaultNumbers(partsFaultNumbers);
+        }
+        if (reportStatisticAO.getSelectType().contains("fittingsSales")) {
+            List<FittingsSales> fittingsSales = saleFittingsStatistic(reportStatisticAO);
+            personAllStatistic.setFittingsSales(fittingsSales);
+        }
+        if (reportStatisticAO.getSelectType().contains("customerSales")) {
+            List<CustomerSales> customerSales = saleCustomerStatistic(reportStatisticAO);
+            personAllStatistic.setCustomerSales(customerSales);
+        }
+        if (reportStatisticAO.getSelectType().contains("serviceItem")) {
+            //目前修改成10分制了
+            //需要查询出评价项个数了
+            int serviceItem = nxPlpzMapper.getCountServiceItem(null);
+            personAllStatistic.setServiceItem(serviceItem);
+        }
+        return personAllStatistic;
+    }
+
+
+    @Override
+    public List<PersonnelStatistic> checkPersonStatistic(ReportStatisticAO reportStatisticAO, String sortType) {
+        LoginUserInfo current = UserContext.current();
+        String wdUserId = null;
+        UserInfo userInfo = enduserService.getUser(current.getUserId());
+        String roleIds = userInfo.getRoleIds();
+        if (roleIds.contains(RoleIdConstant.GLY) || roleIds.contains(RoleIdConstant.SHLD)) {
+            //管理员
+        } else if (roleIds.contains(RoleIdConstant.FWJL)) {
+            //返回网点人员
+            wdUserId = current.getUserId();
+
+        } else {
+            return new ArrayList<>();
+        }
+        String serveType = reportStatisticAO.getServeType();
+        String startTime = reportStatisticAO.getStartTime();
+        String endTime = reportStatisticAO.getEndTime();
+        String orderStatus = reportStatisticAO.getOrderStatus();
+        String sortReverseOrder = reportStatisticAO.getSortReverseOrder();
+        String syZhid = UserContext.getUserTenantId();
+        List<PersonnelStatistic> personnelStatistics = nxOrderMapper.checkPersonStatistic(startTime, endTime, wdUserId, sortType, serveType, sortReverseOrder, orderStatus, syZhid);
+        return personnelStatistics;
+    }
+
+    /**
+     * 获取工作时长重写
+     *
+     * @param reportStatisticAO
+     * @return
+     */
+    private List<PersonnelStatistic> getGzsc(ReportStatisticAO reportStatisticAO) {
+        LoginUserInfo current = UserContext.current();
+        String wdUserId = null;
+        UserInfo userInfo = enduserService.getUser(current.getUserId());
+        String roleIds = userInfo.getRoleIds();
+        if (roleIds.contains(RoleIdConstant.GLY) || roleIds.contains(RoleIdConstant.SHLD)) {
+            //管理员
+        } else if (roleIds.contains(RoleIdConstant.FWJL)) {
+            //返回网点人员
+            wdUserId = current.getUserId();
+
+        } else {
+            return new ArrayList<>();
+        }
+        String serveType = reportStatisticAO.getServeType();
+        String startTime = reportStatisticAO.getStartTime();
+        String endTime = reportStatisticAO.getEndTime();
+        String orderStatus = reportStatisticAO.getOrderStatus();
+        String sortReverseOrder = reportStatisticAO.getSortReverseOrder();
+        String syZhid = UserContext.getUserTenantId();
+        //获取工程师和协助工程师
+        Set<String> gcsIdList = new HashSet<>();
+        List<PersonnelStatistic> gcsIds = nxOrderMapper.getGcsIds(startTime, endTime, wdUserId, serveType, syZhid);
+        if (gcsIds.size() > 0) {
+            gcsIds.forEach(o -> {
+                if (StringUtils.isNotBlank(o.getOrderAssistengineerid())) {
+                    if (o.getOrderAssistengineerid().contains(",")) {
+                        gcsIdList.addAll(Arrays.asList(o.getOrderAssistengineerid().split(",")));
+                    } else {
+                        gcsIdList.add(o.getOrderAssistengineerid());
+                    }
+                }
+                if (StringUtils.isNotBlank(o.getOrderAssignengineerid())) {
+                    if (o.getOrderAssignengineerid().contains(",")) {
+                        gcsIdList.addAll(Arrays.asList(o.getOrderAssignengineerid().split(",")));
+                    } else {
+                        gcsIdList.add(o.getOrderAssignengineerid());
+                    }
+                }
+            });
+        }
+        //循环查询工程师时长  enduserService
+        List<PersonnelStatistic> personnelStatistics = new ArrayList<>();
+        gcsIdList.forEach(o -> {
+            PersonnelStatistic personnelStatistic = new PersonnelStatistic();
+            personnelStatistic.setGcsId(o);
+            UserInfo u = enduserService.getUser(o);
+            if (u != null) {
+                personnelStatistic.setPersonName(u.getUserName());
+                //查询时长
+                BigDecimal b = nxOrderMapper.getGcsGzsc(startTime, endTime, serveType, syZhid, o);
+                personnelStatistic.setWorkTimeNum(b == null ? "0" : b.toString());
+                personnelStatistic.setSc(b == null ? new BigDecimal(0) : b); //2024-03-22 whl修复
+                personnelStatistics.add(personnelStatistic);
+            }
+
+        });
+        //排序
+        List<PersonnelStatistic> listSort = personnelStatistics.stream().sorted(Comparator.comparing(PersonnelStatistic::getSc).reversed().thenComparing(PersonnelStatistic::getSc)).collect(Collectors.toList());
+        return listSort;
+    }
+
+    @Override
+    public List<FaultNumber> faultStatistic(ReportStatisticAO reportStatisticAO) {
+        LoginUserInfo current = UserContext.current();
+        String wdUserId = null;
+        List<String> list = new ArrayList<>();
+        UserInfo userInfo = enduserService.getUser(current.getUserId());
+        String roleIds = userInfo.getRoleIds();
+        if (roleIds.contains(RoleIdConstant.GLY) || roleIds.contains(RoleIdConstant.SHLD)) {
+            //管理员
+        } else if (roleIds.contains(RoleIdConstant.FWJL)) {
+            //返回网点人员
+            wdUserId = current.getUserId();
+        } else {
+            return new ArrayList<FaultNumber>();
+        }
+        String startTime = reportStatisticAO.getStartTime();
+        String endTime = reportStatisticAO.getEndTime();
+        List<FaultNumber> faultNumbers = nxOrderMapper.faultStatistic(startTime, endTime, null, wdUserId);
+        return faultNumbers;
+    }
+
+    @Override
+    public List<PartsFaultNumber> partsFaultStatistic(ReportStatisticAO reportStatisticAO) {
+        LoginUserInfo current = UserContext.current();
+        String wdUserId = null;
+        UserInfo userInfo = enduserService.getUser(current.getUserId());
+        String roleIds = userInfo.getRoleIds();
+        if (roleIds.contains(RoleIdConstant.GLY) || roleIds.contains(RoleIdConstant.SHLD)) {
+            //管理员
+        } else if (roleIds.contains(RoleIdConstant.FWJL)) {
+            //返回网点人员
+            wdUserId = current.getUserId();
+        } else {
+            return new ArrayList<PartsFaultNumber>();
+        }
+        String serveType = reportStatisticAO.getServeType();
+        String startTime = reportStatisticAO.getStartTime();
+        String endTime = reportStatisticAO.getEndTime();
+        List<PartsFaultNumber> partsFaultNumbers = nxOrderMapper.partsFaultStatistic(startTime, endTime, wdUserId, serveType);
+        return partsFaultNumbers;
+    }
+
+    @Override
+    public List<FittingsSales> saleFittingsStatistic(ReportStatisticAO reportStatisticAO) {
+        LoginUserInfo current = UserContext.current();
+        String wdUserId = null;
+        UserInfo userInfo = enduserService.getUser(current.getUserId());
+        String roleIds = userInfo.getRoleIds();
+        if (roleIds.contains(RoleIdConstant.GLY) || roleIds.contains(RoleIdConstant.SHLD)) {
+            //管理员
+        } else if (roleIds.contains(RoleIdConstant.FWJL)) {
+            //返回网点人员
+            wdUserId = current.getUserId();
+        } else {
+            return new ArrayList<>();
+        }
+        String businessType = reportStatisticAO.getBusinessType();
+        String startTime = reportStatisticAO.getStartTime();
+        String endTime = reportStatisticAO.getEndTime();
+        List<FittingsSales> fittingsSales = nxOrderMapper.saleFittingsStatistic(startTime, endTime, wdUserId, businessType);
+        return fittingsSales;
+    }
+
+    @Override
+    public List<CustomerSales> saleCustomerStatistic(ReportStatisticAO reportStatisticAO) {
+        LoginUserInfo current = UserContext.current();
+        String userIds = null;
+        List<String> list = new ArrayList<>();
+        UserInfo userInfo = enduserService.getUser(current.getUserId());
+        String roleIds = userInfo.getRoleIds();
+        if (roleIds.contains(RoleIdConstant.GLY) || roleIds.contains(RoleIdConstant.SHLD)) {
+            //管理员
+        } else if (roleIds.contains(RoleIdConstant.FWJL)) {
+            SiteDTO siteByUserId = enduserService.getSiteByUserId(current.getUserId());
+            if (!ObjectUtils.isEmpty(siteByUserId)) {
+                String[] strings = siteByUserId.getServiceArea().split(",");
+                for (int i = 0; i < strings.length; i++) {
+                    String areaName = strings[i];
+                    String customs = enduserService.getCustomsBySiteAreaName(areaName);
+                    if (StringUtils.isNotBlank(customs)) {
+                        list.add(customs);
+                    }
+                }
+            }
+            if (list.isEmpty()) {
+                return new ArrayList<>();
+            }
+        }
+        String businessType = reportStatisticAO.getBusinessType();
+        String startTime = reportStatisticAO.getStartTime();
+        String endTime = reportStatisticAO.getEndTime();
+        if (list.size() > 0) {
+            userIds = String.join(",", list);
+        }
+        List<CustomerSales> customerSales = nxOrderMapper.saleCustomerStatistic(startTime, endTime, userIds, businessType);
+        return customerSales;
+    }
+
+
+    @Override
+    public List<MyMessageEntity> selectByUserId(String zhId, String userId, String type, Integer startNo, Integer endNo) {
+        //根据userId获取角色通过不同的角色来获取模板
+        UserInfo userInfo = enduserService.getUser(userId);
+        String roleIds = userInfo.getRoleIds();
+        String contentData = nxOrderMapper.getContentByMbId(TemplateConstant.TEMPLATE_ORDRE);
+        if (roleIds.contains(RoleIdConstant.GLY) || roleIds.contains(RoleIdConstant.SHLD) || roleIds.contains(RoleIdConstant.FWJL) || roleIds.contains(RoleIdConstant.GCS)) {
+            contentData = nxOrderMapper.getContentByMbId(TemplateConstant.TEMPLATE_AFTER_ORDRE);
+        }
+        //获取模板
+        List<MyMessageEntity> list = new ArrayList<>();
+        List<NxOrderEntity> nxOrderEntities = nxOrderMapper.selectByUserId(zhId, userId, type, startNo, endNo);
+        if (!nxOrderEntities.isEmpty()) {
+            String finalContentData = contentData;
+            nxOrderEntities.stream().forEach(item -> {
+                String content = finalContentData;
+                if (StringUtils.isNotBlank(content)) {
+                    content = content.replace("【订单状态】", item.getOrderOrderstatusName());
+                    content = content.replace("【用户名】", item.getOrderCustomerName());
+                    content = content.replace("【订单编号】", item.getOrderOrdernumber());
+                    content = content.replace("【状态】", item.getOrderOrderstatusName());
+                }
+
+                MyMessageEntity myMessageEntity = new MyMessageEntity();
+                myMessageEntity.setMessageClass("订单消息");
+                myMessageEntity.setMessageObjectCode(item.getOrderOrdernumber());
+                myMessageEntity.setMessageObjectName(item.getOrderOrderstatusName());
+                myMessageEntity.setMessageContent(content);
+                myMessageEntity.setMessageTime(item.getSyCreatetime());
+                myMessageEntity.setTypeCode(item.getOrderServicetypeCode());
+                myMessageEntity.setAdviceCode(ServicePlanEnums.MessageCodeType.ORDER_MESSAGE.getCode());
+                myMessageEntity.setSignData(item.getOrderOrdernumber());
+                myMessageEntity.setOrderAssignengineer(item.getOrderAssignengineer());//工程师
+                myMessageEntity.setOrderOrdernumber(item.getOrderOrdernumber());//订单编号
+                myMessageEntity.setOrderDemanddescription(item.getOrderDemanddescription());//需求描述
+                myMessageEntity.setOrderDevicename(item.getOrderDevicename());//设备名称
+                myMessageEntity.setOrderDevicecode(item.getOrderDevicecode());//设备编码
+                myMessageEntity.setNxOrderId(item.getNxOrderId());//订单id
+                //不排除待办库中存在订单
+                //List<NxTodoLibrary> nxTodoLibraries = nxTodoLibraryService.selectBySign(myMessageEntity.getAdviceCode(), myMessageEntity.getSignData(), myMessageEntity.getMessageTime());
+                //if(nxTodoLibraries.isEmpty()){
+                list.add(myMessageEntity);
+                //}
+            });
+        }
+        return list;
+    }
+
+    @Override
+    public List<MyMessageEntity> jsGetByUserId(String userId) {
+        List<MyMessageEntity> messageEntityList = new ArrayList<>();
+        //获取模板通知
+        String contentData = nxOrderMapper.getContentByMbId(TemplateConstant.TEMPLATE_JSHT);
+        List<ContractEntity> contractEntities = nxOrderMapper.jsGetByUserId(userId);
+        if (!contractEntities.isEmpty()) {
+            Log.info("contractEntities ==>{}", JSON.toJSONString(contractEntities));
+            String finalContentData = contentData;
+            contractEntities.stream().forEach(item -> {
+                String content = finalContentData;
+                if (StringUtils.isNotBlank(content)) {
+                    content = item.getXsjl() == null ? content : content.replace("【销售经理姓名】", item.getXsjl());
+                    content = item.getNumberCode() == null ? content : content.replace("【合同编码】", item.getNumberCode());
+                    content = item.getFwqkzje() == null ? content : content.replace("【服务欠缴总金额（元）】", item.getFwqkzje());
+                    // content = content.replace("【销售经理姓名】",item.getXsjl());
+                    //content = content.replace("【合同编码】",item.getNumberCode());
+                    //content = content.replace("【服务欠缴总金额（元）】",item.getFwqkzje());
+                }
+                MyMessageEntity myMessageEntity = new MyMessageEntity();
+                myMessageEntity.setId(item.getNxJsxxId());//id
+                myMessageEntity.setMesType("1");
+                myMessageEntity.setMessageClass("结算消息通知");
+                myMessageEntity.setMessageObjectCode(item.getNumberCode());
+                myMessageEntity.setMessageObjectName(item.getNumberName());
+                myMessageEntity.setMessageContent(content);
+                myMessageEntity.setMessageTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                myMessageEntity.setTypeCode(ServicePlanEnums.MessageType.CONTRACT_SETTLEMENT.getCode());
+                myMessageEntity.setAdviceCode(ServicePlanEnums.MessageCodeType.CONTRACTS_SETTLEMENTS.getCode());
+                myMessageEntity.setSignData(item.getNumberCode());
+                List<NxTodoLibrary> nxTodoLibraries = nxTodoLibraryService.selectBySign(myMessageEntity.getAdviceCode(), myMessageEntity.getSignData(), myMessageEntity.getMessageTime());
+                if (nxTodoLibraries.isEmpty()) {
+                    messageEntityList.add(myMessageEntity);
+                }
+            });
+        }
+        return messageEntityList;
+    }
+
+    @Override
+    public List<MyMessageEntity> fwGetByUserId(String userId) {
+        List<MyMessageEntity> messageEntityList = new ArrayList<>();
+        String contentData = nxOrderMapper.getContentByMbId(TemplateConstant.TEMPLATE_FWHT);
+        List<ContractEntity> contractEntities = nxOrderMapper.fwGetByUserId(userId);
+        if (!contractEntities.isEmpty()) {
+            String finalContentData = contentData;
+            Log.info("contractEntities ==>{}", JSON.toJSONString(contractEntities));
+            contractEntities.stream().forEach(item -> {
+                String content = finalContentData;
+                if (StringUtils.isNotBlank(content)) {
+                    content = item.getXsjl() == null ? content : content.replace("【销售经理姓名】", item.getXsjl());
+                    content = item.getNumberCode() == null ? content : content.replace("【合同编码】", item.getNumberCode());
+                    //content = content.replace("【销售经理姓名】",item.getXsjl());
+                    //content = content.replace("【合同编码】",item.getNumberCode());
+                }
+                MyMessageEntity myMessageEntity = new MyMessageEntity();
+                myMessageEntity.setMesType("0");
+                myMessageEntity.setId(item.getNxJsxxId());//id
+                myMessageEntity.setMessageClass("服务合同通知");
+                myMessageEntity.setMessageObjectCode(item.getNumberCode());
+                myMessageEntity.setMessageObjectName(item.getNumberName());
+                myMessageEntity.setMessageContent(content);
+                myMessageEntity.setMessageTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                myMessageEntity.setTypeCode(ServicePlanEnums.MessageType.CONTRACT_SETTLEMENT.getCode());
+                myMessageEntity.setAdviceCode(ServicePlanEnums.MessageCodeType.CONTRACTS_SETTLEMENTS.getCode());
+                myMessageEntity.setSignData(item.getNumberCode());
+                List<NxTodoLibrary> nxTodoLibraries = nxTodoLibraryService.selectBySign(myMessageEntity.getAdviceCode(), myMessageEntity.getSignData(), myMessageEntity.getMessageTime());
+                if (nxTodoLibraries.isEmpty()) {
+                    messageEntityList.add(myMessageEntity);
+                }
+            });
+        }
+        return messageEntityList;
+    }
+
+    @Override
+    public void orderInsertLibrary(String orderId) {
+        //根据userId获取角色通过不同的角色来获取模板
+        UserInfo userInfo = enduserService.getUser(UserContext.getUserId());
+        String roleIds = userInfo.getRoleIds();
+        String contentData = nxOrderMapper.getContentByMbId(TemplateConstant.TEMPLATE_ORDRE);
+        if (roleIds.contains(RoleIdConstant.GLY) || roleIds.contains(RoleIdConstant.SHLD) || roleIds.contains(RoleIdConstant.FWJL) || roleIds.contains(RoleIdConstant.GCS)) {
+            contentData = nxOrderMapper.getContentByMbId(TemplateConstant.TEMPLATE_AFTER_ORDRE);
+        }
+        NxOrderEntity orderEntity = nxOrderMapper.selectById(orderId);
+        String newContent = "";
+        if (StringUtils.isNotBlank(contentData)) {
+//            contentData = contentData.replace("【订单状态】",orderEntity.getOrderOrderstatusName());
+//            contentData = contentData.replace("【用户名】",orderEntity.getOrderCustomerName());
+//            contentData = contentData.replace("【订单编码】",orderEntity.getOrderOrdernumber());
+//            contentData = contentData.replace("【状态】",orderEntity.getOrderOrderstatusName());
+            newContent = contentData.replace("【订单状态】", orderEntity.getOrderOrderstatusName());
+        }
+        NxTodoLibrary library = new NxTodoLibrary();
+        library.setTitle("维修单消息");
+        library.setContent(newContent);
+        library.setDeviceName(orderEntity.getOrderDevicename());
+        library.setDeviceCode(orderEntity.getOrderDevicecode());
+        library.setNxOrderId(orderEntity.getNxOrderId());
+        //此处原逻辑未存在相关数据
+//        library.setOperation(myMessageEntity.getMessageName());
+        library.setTime(orderEntity.getSyCreatetime());
+        library.setSyCreatetime(com.rootcloud.common.DateUtil.format(new Date()));
+        library.setNxTodoLibraryId(UUID.randomUUID().toString().substring(0, 10));
+        library.setAdviceCode(ServicePlanEnums.MessageCodeType.REPAIR_ORDER_MESSAGE.getCode());
+        library.setTypeCode(orderEntity.getOrderServicetypeCode());
+        library.setSignData(orderEntity.getOrderOrdernumber());
+        library.setStatus("0");
+        library.setUserid(UserContext.getUserId());
+        library.setXqms(orderEntity.getOrderDemanddescription());//需求描述
+        nxTodoLibraryService.save(library);
+    }
+
+    @Override
+    public void mesSfjj(String orderId) {
+        nxOrderMapper.mesSfjj(orderId);
+    }
+
+    @Override
+    public void htSerMesSfjj(String id) {
+        nxOrderMapper.htSerMesSfjj(id);
+    }
+
+    @Override
+    public void jsSerMesSfjj(String id) {
+        nxOrderMapper.jsSerMesSfjj(id);
+    }
+
+    @Autowired
+    private UserRoleDao userRoleDao;
+
+    @Override
+    public HashMap getOrderTypeNum() {
+
+        String userId = UserContext.getUserId();
+        /*
+        String userTenantId = UserContext.getUserTenantId();
+//        String userId = "8gjvg0ngCHRLNlAE9xs"; //mJZM140P7O36xoVgdCm
+//        String userTenantId ="624e7ce1549c110050c5da47";
+        UserRoleVO v1 = new UserRoleVO();
+        v1.setUserId(userId);
+        v1.setTenantId(userTenantId);
+        List<UserRoleVO> rolesList = userRoleDao.getUseListByRoleInfo(v1); //查找客户领导、客户角色
+        String userName ="";
+        List<String> userNameList = new ArrayList<String>();
+        List<String> deviceCodeList = new ArrayList<>();
+        for (UserRoleVO roleinfo : rolesList)
+        {
+            userName= roleinfo.getUserName();
+        }
+        if(!userName.equals("")){
+            Map<String,Object> arm = new HashMap<>();
+            arm.put("userId", userId);
+            List<KhVO> kuList = kuMapper.getKuList(userId);
+            for (KhVO info : kuList){
+                userNameList.add(info.getUserName());
+            }
+            List<DeviceDataVo> deviceItemList = nxDeviceService.getKuDeviceList(userId);
+            for (DeviceDataVo info : deviceItemList){
+                deviceCodeList.add(info.getSblbSbbm());
+            }
+            Log.error("客户领导、客户角色,APP首页查询当前用户姓名:" +userName+"|userId:"+userId+"|userTenantId:"+userTenantId+"|informantList:"+userNameList.toString()
+            +"|deviceCodeList:"+deviceCodeList.toString());
+            Map<String,Object> query = new HashMap<>();
+            query.put("userId", userId);
+            query.put("informantList", userNameList);
+            query.put("zhid", userTenantId);
+            query.put("deviceCodeList",deviceCodeList);
+            List<NxOrderEntity> orderList = nxOrderMapper.getOrderTypeNumByCustomer(query);
+            List<NxOrderEntity> dpgOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> dqdOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_CHECK_IN.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> dbgOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_REPORTING.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> dshOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_REVIEW.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> dpjOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.TO_BE_RETURNED.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> ywcOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.DONE.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            HashMap<String, Integer> res = new HashMap<>();
+            res.put("dpg", dpgOrderList.size());
+            res.put("dqd", dqdOrderList.size());
+            res.put("dbg", dbgOrderList.size());
+            res.put("dsh", dshOrderList.size());
+            res.put("dpj", dpjOrderList.size());
+            res.put("ywc", ywcOrderList.size());
+            return res;
+        }
+        else
+        {
+            Log.error("非客户角色,APP首页查询当前用户userId:"+userId);
+            List<NxOrderEntity> orderList = nxOrderMapper.getOrderTypeNum(userId);
+            List<NxOrderEntity> dpgOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> dqdOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_CHECK_IN.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> dbgOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_REPORTING.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> dshOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_REVIEW.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> dpjOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.TO_BE_RETURNED.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> ywcOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.DONE.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            HashMap<String, Integer> res = new HashMap<>();
+            res.put("dpg", dpgOrderList.size());
+            res.put("dqd", dqdOrderList.size());
+            res.put("dbg", dbgOrderList.size());
+            res.put("dsh", dshOrderList.size());
+            res.put("dpj", dpjOrderList.size());
+            res.put("ywc", ywcOrderList.size());
+            return res;
+        }
+        */
+
+        List<NxOrderEntity> orderList = nxOrderMapper.getOrderTypeNum(userId);
+        List<NxOrderEntity> dpgOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+        List<NxOrderEntity> dqdOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_CHECK_IN.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+        List<NxOrderEntity> dbgOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_REPORTING.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+        List<NxOrderEntity> dshOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_REVIEW.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+        List<NxOrderEntity> dpjOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.TO_BE_RETURNED.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+        List<NxOrderEntity> ywcOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.DONE.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+        HashMap<String, Integer> res = new HashMap<>();
+        res.put("dpg", dpgOrderList.size());
+        res.put("dqd", dqdOrderList.size());
+        res.put("dbg", dbgOrderList.size());
+        res.put("dsh", dshOrderList.size());
+        res.put("dpj", dpjOrderList.size());
+        res.put("ywc", ywcOrderList.size());
+        return res;
+    }
+
+    @Override
+    public HashMap getOrderTypeNum2() {
+
+        String userId = UserContext.getUserId();
+        /*
+        String userTenantId = UserContext.getUserTenantId();
+//        String userId = "8gjvg0ngCHRLNlAE9xs"; //mJZM140P7O36xoVgdCm
+//        String userTenantId ="624e7ce1549c110050c5da47";
+        UserRoleVO v1 = new UserRoleVO();
+        v1.setUserId(userId);
+        v1.setTenantId(userTenantId);
+        List<UserRoleVO> rolesList = userRoleDao.getUseListByRoleInfo(v1); //查找客户领导、客户角色
+        String userName ="";
+        List<String> userNameList = new ArrayList<String>();
+        List<String> deviceCodeList = new ArrayList<>();
+        for (UserRoleVO roleinfo : rolesList)
+        {
+            userName= roleinfo.getUserName();
+        }
+        if(!userName.equals("")){
+            Map<String,Object> arm = new HashMap<>();
+            arm.put("userId", userId);
+            List<KhVO> kuList = kuMapper.getKuList(userId);
+            for (KhVO info : kuList){
+                userNameList.add(info.getUserName());
+            }
+            List<DeviceDataVo> deviceItemList = nxDeviceService.getKuDeviceList(userId);
+            for (DeviceDataVo info : deviceItemList){
+                deviceCodeList.add(info.getSblbSbbm());
+            }
+            Log.error("客户领导、客户角色,APP首页查询当前用户姓名:" +userName+"|userId:"+userId+"|userTenantId:"+userTenantId+"|informantList:"+userNameList.toString()
+            +"|deviceCodeList:"+deviceCodeList.toString());
+            Map<String,Object> query = new HashMap<>();
+            query.put("userId", userId);
+            query.put("informantList", userNameList);
+            query.put("zhid", userTenantId);
+            query.put("deviceCodeList",deviceCodeList);
+            List<NxOrderEntity> orderList = nxOrderMapper.getOrderTypeNumByCustomer(query);
+            List<NxOrderEntity> dpgOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> dqdOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_CHECK_IN.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> dbgOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_REPORTING.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> dshOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_REVIEW.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> dpjOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.TO_BE_RETURNED.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> ywcOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.DONE.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            HashMap<String, Integer> res = new HashMap<>();
+            res.put("dpg", dpgOrderList.size());
+            res.put("dqd", dqdOrderList.size());
+            res.put("dbg", dbgOrderList.size());
+            res.put("dsh", dshOrderList.size());
+            res.put("dpj", dpjOrderList.size());
+            res.put("ywc", ywcOrderList.size());
+            return res;
+        }
+        else
+        {
+            Log.error("非客户角色,APP首页查询当前用户userId:"+userId);
+            List<NxOrderEntity> orderList = nxOrderMapper.getOrderTypeNum(userId);
+            List<NxOrderEntity> dpgOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> dqdOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_CHECK_IN.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> dbgOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_REPORTING.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> dshOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_REVIEW.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> dpjOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.TO_BE_RETURNED.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            List<NxOrderEntity> ywcOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.DONE.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+            HashMap<String, Integer> res = new HashMap<>();
+            res.put("dpg", dpgOrderList.size());
+            res.put("dqd", dqdOrderList.size());
+            res.put("dbg", dbgOrderList.size());
+            res.put("dsh", dshOrderList.size());
+            res.put("dpj", dpjOrderList.size());
+            res.put("ywc", ywcOrderList.size());
+            return res;
+        }
+        */
+
+        List<NxOrderEntity> orderList = nxOrderMapper.getOrderTypeNum2(userId);
+        List<NxOrderEntity> dpgOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+        List<NxOrderEntity> dqdOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_CHECK_IN.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+        List<NxOrderEntity> dbgOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_REPORTING.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+        List<NxOrderEntity> dshOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.PENDING_REVIEW.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+        List<NxOrderEntity> dpjOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.TO_BE_RETURNED.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+        List<NxOrderEntity> ywcOrderList = orderList.stream().filter(e -> Objects.equals(OrderEnums.OrderStatus.DONE.getCode(), e.getOrderOrderstatusCode())).collect(Collectors.toList());
+        HashMap<String, Integer> res = new HashMap<>();
+        res.put("dpg", dpgOrderList.size());
+        res.put("dqd", dqdOrderList.size());
+        res.put("dbg", dbgOrderList.size());
+        res.put("dsh", dshOrderList.size());
+        res.put("dpj", dpjOrderList.size());
+        res.put("ywc", ywcOrderList.size());
+        return res;
+    }
+
+    /**
+     * 修改订单审核时间，完工时间，指派工程师时间
+     */
+    @Override
+    public void updateDate() {
+        nxOrderMapper.updateOrderShsj();
+        nxOrderMapper.updateOrderWgsj();
+        nxOrderMapper.updateOrderZpgcssj();
+    }
+
+    /**
+     * 创建订单
+     *
+     * @param param
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public JsonResult<Object> createOrder(OrderParam param) throws Exception {
+        String deviceIds = param.getDeviceIds();
+        if (StringUtils.isBlank(deviceIds)) {
+            return JsonResult.failed("450", "获取设备ID失败");
+        }
+        //查询设备信息，多个设备拼接
+        DeviceDataVo deviceDataVo = nxDeviceService.getJcxxByIds(deviceIds);
+        if (deviceDataVo == null) {
+            return JsonResult.failed("450", "获取设备信息失败");
+        }
+        //获取服务网点
+        //判断设备是否存在
+        NxDeviceEntity nxDeviceEntity = nxDeviceService.getById(Arrays.asList(deviceIds.split(",")).get(0));
+        if (nxDeviceEntity == null) {
+            return JsonResult.failed("450", "获取设备信息失败");
+        }
+        //获取服务网点id
+        String fwwdId = null;
+        String khid = nxDeviceEntity.getSblbKhid();
+        if (StringUtils.isNotBlank(khid)) {
+            fwwdId = nxDeviceService.selectFwwdId(khid, nxDeviceEntity.getSyZhid());
+        }
+        if (StringUtils.isBlank(fwwdId)) {
+            return JsonResult.failed("450", "获取服务网点失败");
+        }
+        //校验账号密码
+        OAuthResult login = rootCloudAuthService.login(param.getLoginName(), param.getLoginPassword(), null);
+        if (login == null) {
+            return JsonResult.failed("450", "获取登录信息失败");
+        }
+        //获取用户信息
+        LambdaQueryWrapper<JeCoreEnduserEntity> mpeWrapper = new LambdaQueryWrapper<JeCoreEnduserEntity>();
+        mpeWrapper.eq(JeCoreEnduserEntity::getBackusercode, param.getLoginName());
+        mpeWrapper.last("limit 1");
+        JeCoreEnduserEntity info = enduserService.getOne(mpeWrapper);
+        //创建订单实体类
+        NxOrderEntity order = new NxOrderEntity();
+        String orderId = JEUuidUtil.uuid();
+        order.setNxOrderId(orderId);
+        StringBuffer orderNum = new StringBuffer();
+        String currentDate = DateUtils.format(new Date(), DateUtils.C_DATA_PATTON_YYYYMMDD);
+        //根据服务类型创建订单编号
+        if ("001".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("R");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.REPAIR.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.REPAIR.getDesc());
+        } else if ("002".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("B");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.MAINTENANCE.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.MAINTENANCE.getDesc());
+        } else if ("003".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("H");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.HANDOVER.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.HANDOVER.getDesc());
+        } else if ("004".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("T");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.TRANSFORMATION.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.TRANSFORMATION.getDesc());
+        }
+        orderNum.append(OrderNumberUtils.generateOrderNumber());
+        order.setOrderOrdernumber(orderNum.toString());
+        order.setOrderSource("app");
+        order.setOrderDevicecode(deviceDataVo.getSblbSbbm());
+        order.setOrderDevicename(deviceDataVo.getSblbSbmc());
+        order.setOrderDevicetype(deviceDataVo.getSblbSblxName());
+        order.setOrderDevicemodel(deviceDataVo.getSblbSbxhName());
+        order.setOrderServiceaddress(deviceDataVo.getSblbSbxxdz());
+        order.setOrderServiceaddressLongitude(deviceDataVo.getSblbJd());
+        order.setOrderServiceaddressDimension(deviceDataVo.getSblbWd());
+        order.setOrderCustomerName(deviceDataVo.getSblbKhmc());
+        order.setOrderKhlxr(deviceDataVo.getSblbKhlxr());
+        order.setOrderContactway(deviceDataVo.getSblbLxfs());
+        order.setOrderCustomerId(deviceDataVo.getSblbKhid());
+        order.setOrderOrderstatusCode(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getCode());
+        order.setOrderOrderstatusName(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getDesc());
+        order.setSyCreatetime(DateUtils.format(new Date(), DateUtils.C_TIME_PATTON_DEFAULT));
+        order.setSyStatus("1");
+        order.setOrderApplydate(currentDate);
+        List<OrderLcinfoParam> list = new ArrayList<>();
+        OrderLcinfoParam orderLcinfoParam = new OrderLcinfoParam();
+        orderLcinfoParam.setId(1);
+        orderLcinfoParam.setName("已受理");
+        orderLcinfoParam.setUserName(info.getUsername());
+        orderLcinfoParam.setUserId(info.getUserid());
+        orderLcinfoParam.setIcon("sl_icon");
+        orderLcinfoParam.setEndDate(String.valueOf(com.rootcloud.common.DateUtil.getTimesByString(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()))));
+        list.add(orderLcinfoParam);
+        order.setOrderLcinfo(JSON.toJSONString(list).toString());
+        order.setSyZhid(info.getZhid());//设置租户ID
+        /*
+        order.setOrderWbjsrq(nxDeviceEntity.getSblbWbjsrq());
+        if (StringUtils.isNotBlank(nxDeviceEntity.getSblbWbjsrq())) {
+            if (new SimpleDateFormat("yyyy-MM-dd").format(new Date()).compareTo(nxDeviceEntity.getSblbWbjsrq()) <= 0) {
+                order.setOrderWarrantiesCode(ServicePlanEnums.CheckType.CHECK_TURE.getCode());
+                order.setOrderWarrantiesName(ServicePlanEnums.CheckType.CHECK_TURE.getDesc());
+            } else {
+                order.setOrderWarrantiesCode(ServicePlanEnums.CheckType.CHECK_FALSE.getCode());
+                order.setOrderWarrantiesName(ServicePlanEnums.CheckType.CHECK_FALSE.getDesc());
+            }
+            Log.info("Wbjsrq:"+nxDeviceEntity.getSblbWbjsrq()+">>"+"WarrantiesCode:"+ServicePlanEnums.CheckType.CHECK_TURE.getCode()+">>"+
+                    "WarrantiesName:"+ServicePlanEnums.CheckType.CHECK_TURE.getDesc());
+        }
+        */
+        nxOrderMapper.insert(order);
+        //流程引擎
+        if (StringUtils.isNotBlank(order.getOrderFwwdid())) {
+            //调用登录接口
+            /*String loginName = servicePlanMapper.queryStringByCode("loginName") == null ? "app_master_admin" : servicePlanMapper.queryStringByCode("loginName");
+            String loginPassword = servicePlanMapper.queryStringByCode("loginPassword") == null ? "Liu@123456" : servicePlanMapper.queryStringByCode("loginPassword");
+            OAuthResult login = rootCloudAuthService.login(loginName, loginPassword, null);*/
+            Log.info("OAuthResult:" + login + "loginName:" + param.getLoginName() + " loginPassword:" + param.getLoginPassword());
+            OutletsVO outletsVO = servicePlanMapper.returnUserNames(order.getOrderFwwdid());
+            String sponsorProcess = wfProperties.getWfHost() + "/je/jbpm/taskInfo/sponsorProcess";
+            Map<String, String> map = new HashMap();
+            map.put("pdid", "frx-ningxia-dingdan_22051015-7");
+            map.put("beanId", orderId);
+            map.put("currentTaskName", "");
+            map.put("submitComments", "订单待派工，请尽快处理");
+            map.put("targerTaskName", "是否派工");
+            map.put("targerTransition", "");
+            map.put("assigeeName", outletsVO.getUserNames());
+            map.put("assigeeId", outletsVO.getUserIds());
+            map.put("submitType", "to_submit");
+            Map<String, String> headers = new HashMap<>();
+             headers.put("authorization", login.getAccess_token());
+//             Log.info("authorization"+login.getAccess_token());
+//            headers.put("authorization", "Hpq9v3R1hoCTVTaVD0p");
+            headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+            Log.info(">>>>到这里了1:");
+            try {
+                Map<String, String> querys = new HashMap<>();
+                org.apache.http.HttpResponse post = HttpUtils.doPost(sponsorProcess, "", "post", headers, querys, map);
+                int statusCode = post.getStatusLine().getStatusCode();
+                String responseContent = EntityUtils.toString(post.getEntity(), "UTF-8");
+                Log.info("服务计划派工订单待派工状态码:" + statusCode + " 返回值：" + responseContent);
+                sponsorProcess = wfProperties.getWfHost() + "/je/jbpm/taskInfo/completeTask";
+                map.clear();
+                Log.info(">>>>到这里了2:");
+                JSONObject res = JSONObject.parseObject(responseContent);
+                Object obj = res.get("obj");
+                if (obj != null) {
+                    Log.info(">>>>到这里了3:");
+                    String taskId = ((JSONObject) obj).get("taskId").toString();
+                    map.put("taskId", taskId);
+                    map.put("pdid", "frx-ningxia-dingdan_22051015-7");
+                    map.put("beanId", orderId);
+                    map.put("submitComments", "同意");
+                    map.put("currentTaskName", "是否派工");
+                    map.put("targerTaskName", "待派工");
+                    map.put("targerTransition", "to_decision2");
+                    map.put("assigeeName", outletsVO.getUserNames());
+                    map.put("assigeeId", outletsVO.getUserIds());
+                    map.put("submitType", "to_submit");
+                    querys.clear();
+                    Log.info(">>>>到这里了4:");
+                    post = HttpUtils.doPost(sponsorProcess, "", "post", headers, querys, map);
+                    statusCode = post.getStatusLine().getStatusCode();
+                    Log.info(">>>>到这里了5:"+statusCode);
+                    Log.info("服务计划派同意派工状态码:" + statusCode);
+                } else {
+                    Log.error("服务计划派同意派工taskId获取不到");
+                    throw new Exception();
+                }
+            } catch (Exception e) {
+                Log.error("流程引擎错误" + e.getMessage());
+                e.printStackTrace();
+                throw new Exception();    //事务回滚
+            }
+        }
+        return JsonResult.success();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public JsonResult<Object> createOrder2(OrderParam param) throws Exception {
+        String deviceIds = param.getDeviceIds();
+        logger.info("deviceIds:"+deviceIds+"-----------------");
+        Log.info("deviceIds:"+deviceIds+"-----------------");
+        if (StringUtils.isBlank(deviceIds)) {
+            return JsonResult.failed("450", "获取设备ID失败");
+        }
+        //查询设备信息，多个设备拼接
+        DeviceDataVo deviceDataVo = nxDeviceService.getJcxxByIds(deviceIds);
+        logger.info("deviceDataVo:"+deviceDataVo+"-----------------");
+        Log.info("deviceDataVo:"+deviceDataVo+"-----------------");
+        if (deviceDataVo == null) {
+            return JsonResult.failed("450", "获取设备信息失败");
+        }
+        //获取服务网点
+        //判断设备是否存在
+        NxDeviceEntity nxDeviceEntity = nxDeviceService.getById(Arrays.asList(deviceIds.split(",")).get(0));
+        logger.info("nxDeviceEntity:"+nxDeviceEntity+"-----------------");
+        logger.info("SblbKhid:"+nxDeviceEntity.getSblbKhid()+"-----------------");
+        logger.info("SblbWbjsrq:"+nxDeviceEntity.getSblbWbjsrq()+"-----------------");
+        if (nxDeviceEntity == null) {
+            return JsonResult.failed("450", "获取设备信息失败");
+        }
+        //获取服务网点id
+        String fwwdId = null;
+        String khid = nxDeviceEntity.getSblbKhid();
+        if (StringUtils.isNotBlank(khid)) {
+            fwwdId = nxDeviceService.selectFwwdId(khid, nxDeviceEntity.getSyZhid());
+        }
+        logger.info("服务网点:"+fwwdId+"-----------------");
+        Log.info("服务网点:"+fwwdId+"-----------------");
+        if (StringUtils.isBlank(fwwdId)) {
+            return JsonResult.failed("450", "获取服务网点失败");
+        }
+        //校验账号密码
+        OAuthResult login = rootCloudAuthService.login(param.getLoginName(), param.getLoginPassword(), null);
+        if (login == null) {
+            return JsonResult.failed("450", "获取登录信息失败");
+        }
+        //获取用户信息
+        LambdaQueryWrapper<JeCoreEnduserEntity> mpeWrapper = new LambdaQueryWrapper<JeCoreEnduserEntity>();
+        mpeWrapper.eq(JeCoreEnduserEntity::getBackusercode, param.getLoginName());
+        mpeWrapper.last("limit 1");
+        JeCoreEnduserEntity info = enduserService.getOne(mpeWrapper);
+        //创建订单实体类
+        NxOrderEntity order = new NxOrderEntity();
+        String orderId = JEUuidUtil.uuid();
+        order.setNxOrderId(orderId);
+        StringBuffer orderNum = new StringBuffer();
+        String currentDate = DateUtils.format(new Date(), DateUtils.C_DATA_PATTON_YYYYMMDD);
+        //根据服务类型创建订单编号
+        if ("001".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("R");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.REPAIR.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.REPAIR.getDesc());
+        } else if ("002".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("B");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.MAINTENANCE.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.MAINTENANCE.getDesc());
+        } else if ("003".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("H");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.HANDOVER.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.HANDOVER.getDesc());
+        } else if ("004".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("T");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.TRANSFORMATION.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.TRANSFORMATION.getDesc());
+        }else if ("005".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("I");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.INSPECTION.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.INSPECTION.getDesc());
+        }
+        orderNum.append(OrderNumberUtils.generateOrderNumber());
+        order.setOrderOrdernumber(orderNum.toString());
+        order.setOrderSource("app");
+        order.setOrderDevicecode(deviceDataVo.getSblbSbbm());
+        order.setOrderDevicename(deviceDataVo.getSblbSbmc());
+        order.setOrderDevicetype(deviceDataVo.getSblbSblxName());
+        order.setOrderDevicemodel(deviceDataVo.getSblbSbxhName());
+        order.setOrderServiceaddress(deviceDataVo.getSblbSbxxdz());
+        order.setOrderServiceaddressLongitude(deviceDataVo.getSblbJd());
+        order.setOrderServiceaddressDimension(deviceDataVo.getSblbWd());
+        order.setOrderCustomerName(deviceDataVo.getSblbKhmc());
+        order.setOrderKhlxr(deviceDataVo.getSblbKhlxr());
+        order.setOrderContactway(deviceDataVo.getSblbLxfs());
+        order.setOrderCustomerId(deviceDataVo.getSblbKhid());
+        order.setOrderOrderstatusCode(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getCode());
+        order.setOrderOrderstatusName(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getDesc());
+        order.setSyCreatetime(DateUtils.format(new Date(), DateUtils.C_TIME_PATTON_DEFAULT));
+        order.setSyStatus("1");
+        order.setOrderApplydate(currentDate);
+        List<OrderLcinfoParam> list = new ArrayList<>();
+        OrderLcinfoParam orderLcinfoParam = new OrderLcinfoParam();
+        orderLcinfoParam.setId(1);
+        orderLcinfoParam.setName("已受理");
+        orderLcinfoParam.setUserName(info.getUsername());
+        orderLcinfoParam.setUserId(info.getUserid());
+        orderLcinfoParam.setIcon("sl_icon");
+        orderLcinfoParam.setEndDate(String.valueOf(com.rootcloud.common.DateUtil.getTimesByString(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()))));
+        list.add(orderLcinfoParam);
+        order.setOrderLcinfo(JSON.toJSONString(list).toString());
+        order.setSyZhid(info.getZhid());//设置租户ID
+
+        logger.info("服务需求:"+param.getOrderDemanddescription()+"-----------------");
+        Log.info("服务需求:"+param.getOrderDemanddescription()+"-----------------");
+        order.setOrderDemanddescription(param.getOrderDemanddescription()); //需求描述
+        order.setOrderFwwdid(fwwdId); //服务网点ID
+        //order.setSyCurrenttask("待派工");
+        logger.info("fwwdId:"+fwwdId+">>"+"Demanddescription:"+param.getOrderDemanddescription()+">>");
+        Log.info("fwwdId:"+fwwdId+">>"+"Demanddescription:"+param.getOrderDemanddescription()+">>");
+        if (nxDeviceEntity != null)
+        {
+            logger.info("Wbjsrq:"+nxDeviceEntity.getSblbWbjsrq()+">>"+"WarrantiesCode:"+ServicePlanEnums.CheckType.CHECK_TURE.getCode()+">>"+
+                    "WarrantiesName:"+ServicePlanEnums.CheckType.CHECK_TURE.getDesc());
+            order.setOrderWbjsrq(nxDeviceEntity.getSblbWbjsrq());
+            if (StringUtils.isNotBlank(nxDeviceEntity.getSblbWbjsrq())) {
+                if (new SimpleDateFormat("yyyy-MM-dd").format(new Date()).compareTo(nxDeviceEntity.getSblbWbjsrq()) <= 0) {
+                    order.setOrderWarrantiesCode(ServicePlanEnums.CheckType.CHECK_TURE.getCode());
+                    order.setOrderWarrantiesName(ServicePlanEnums.CheckType.CHECK_TURE.getDesc());
+                } else {
+                    order.setOrderWarrantiesCode(ServicePlanEnums.CheckType.CHECK_FALSE.getCode());
+                    order.setOrderWarrantiesName(ServicePlanEnums.CheckType.CHECK_FALSE.getDesc());
+                }
+            }
+        }
+        nxOrderMapper.insert(order);
+        logger.info("order:"+order);
+        logger.info("nxOrderMapper.insert 执行完成-----------------");
+        //流程引擎
+        if (StringUtils.isNotBlank(order.getOrderFwwdid())) {
+            //调用登录接口
+            /*String loginName = servicePlanMapper.queryStringByCode("loginName") == null ? "app_master_admin" : servicePlanMapper.queryStringByCode("loginName");
+            String loginPassword = servicePlanMapper.queryStringByCode("loginPassword") == null ? "Liu@123456" : servicePlanMapper.queryStringByCode("loginPassword");
+            OAuthResult login = rootCloudAuthService.login(loginName, loginPassword, null);*/
+            logger.info("OAuthResult:" + login + "loginName:" + param.getLoginName() + " loginPassword:" + param.getLoginPassword());
+            OutletsVO outletsVO = servicePlanMapper.returnUserNames(order.getOrderFwwdid());
+            String sponsorProcess = wfProperties.getWfHost() + "/je/jbpm/taskInfo/sponsorProcess";
+            Map<String, String> map = new HashMap();
+            map.put("pdid", "frx-ningxia-dingdan_22051015-7");
+            map.put("beanId", orderId);
+            map.put("currentTaskName", "");
+            map.put("submitComments", "订单待派工，请尽快处理");
+            map.put("targerTaskName", "是否派工");
+            map.put("targerTransition", "");
+            map.put("assigeeName", outletsVO.getUserNames());
+            map.put("assigeeId", outletsVO.getUserIds());
+            map.put("submitType", "to_submit");
+            Map<String, String> headers = new HashMap<>();
+             headers.put("authorization", login.getAccess_token());
+            // Log.info("authorization"+login.getAccess_token());
+//            headers.put("authorization", "Hpq9v3R1hoCTVTaVD0p");
+            headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+            logger.info(">>>>到这里了1:");
+            try {
+                Map<String, String> querys = new HashMap<>();
+                org.apache.http.HttpResponse post = HttpUtils.doPost(sponsorProcess, "", "post", headers, querys, map);
+                int statusCode = post.getStatusLine().getStatusCode();
+                String responseContent = EntityUtils.toString(post.getEntity(), "UTF-8");
+                logger.info("服务计划派工订单待派工状态码:" + statusCode + " 返回值：" + responseContent);
+                sponsorProcess = wfProperties.getWfHost() + "/je/jbpm/taskInfo/completeTask";
+                map.clear();
+                logger.info(">>>>到这里了2:");
+                JSONObject res = JSONObject.parseObject(responseContent);
+                Object obj = res.get("obj");
+                if (obj != null) {
+                    logger.info(">>>>到这里了3:");
+                    String taskId = ((JSONObject) obj).get("taskId").toString();
+                    map.put("taskId", taskId);
+                    map.put("pdid", "frx-ningxia-dingdan_22051015-7");
+                    map.put("beanId", orderId);
+                    map.put("submitComments", "同意");
+                    map.put("currentTaskName", "是否派工");
+                    map.put("targerTaskName", "待派工");
+                    map.put("targerTransition", "to_decision2");
+                    map.put("assigeeName", outletsVO.getUserNames());
+                    map.put("assigeeId", outletsVO.getUserIds());
+                    map.put("submitType", "to_submit");
+                    querys.clear();
+                    logger.info(">>>>到这里了4:");
+                    post = HttpUtils.doPost(sponsorProcess, "", "post", headers, querys, map);
+                    statusCode = post.getStatusLine().getStatusCode();
+                    logger.info(">>>>到这里了5:"+statusCode);
+                    logger.info("服务计划派同意派工状态码:" + statusCode);
+                } else {
+                    logger.error("服务计划派同意派工taskId获取不到");
+                    throw new Exception();
+                }
+            } catch (Exception e) {
+                logger.error("流程引擎错误" + e.getMessage());
+                e.printStackTrace();
+                throw new Exception();    //事务回滚
+            }
+        }
+        return JsonResult.success();
+    }
+
+    @Override
+    public JsonResult<Object> createOrder3(OrderParam param) throws Exception {
+        String deviceIds = param.getDeviceIds();
+        logger.info("deviceIds:"+deviceIds+"-----------------");
+        Log.info("deviceIds:"+deviceIds+"-----------------");
+        if (StringUtils.isBlank(deviceIds)) {
+            return JsonResult.failed("450", "获取设备ID失败");
+        }
+        //查询设备信息，多个设备拼接
+        DeviceDataVo deviceDataVo = nxDeviceService.getJcxxByIds(deviceIds);
+        logger.info("deviceDataVo:"+deviceDataVo+"-----------------");
+        Log.info("deviceDataVo:"+deviceDataVo+"-----------------");
+        if (deviceDataVo == null) {
+            return JsonResult.failed("450", "获取设备信息失败");
+        }
+        //获取服务网点
+        //判断设备是否存在
+        NxDeviceEntity nxDeviceEntity = nxDeviceService.getById(Arrays.asList(deviceIds.split(",")).get(0));
+        logger.info("nxDeviceEntity:"+nxDeviceEntity+"-----------------");
+        logger.info("SblbKhid:"+nxDeviceEntity.getSblbKhid()+"-----------------");
+        logger.info("SblbWbjsrq:"+nxDeviceEntity.getSblbWbjsrq()+"-----------------");
+        if (nxDeviceEntity == null) {
+            return JsonResult.failed("450", "获取设备信息失败");
+        }
+        //获取服务网点id
+        String fwwdId = null;
+        String khid = nxDeviceEntity.getSblbKhid();
+        if (StringUtils.isNotBlank(khid)) {
+            fwwdId = nxDeviceService.selectFwwdId(khid, nxDeviceEntity.getSyZhid());
+        }
+        logger.info("服务网点:"+fwwdId+"-----------------");
+        Log.info("服务网点:"+fwwdId+"-----------------");
+        if (StringUtils.isBlank(fwwdId)) {
+            return JsonResult.failed("450", "获取服务网点失败");
+        }
+        //校验账号密码
+        OAuthResult login = rootCloudAuthService.login(param.getLoginName(), param.getLoginPassword(), null);
+        if (login == null) {
+            return JsonResult.failed("450", "获取登录信息失败");
+        }
+        //获取用户信息
+        LambdaQueryWrapper<JeCoreEnduserEntity> mpeWrapper = new LambdaQueryWrapper<JeCoreEnduserEntity>();
+        mpeWrapper.eq(JeCoreEnduserEntity::getBackusercode, param.getLoginName());
+        mpeWrapper.last("limit 1");
+        JeCoreEnduserEntity info = enduserService.getOne(mpeWrapper);
+        //创建订单实体类
+        NxOrderEntity order = new NxOrderEntity();
+        String orderId = JEUuidUtil.uuid();
+        order.setNxOrderId(orderId);
+        StringBuffer orderNum = new StringBuffer();
+        String currentDate = DateUtils.format(new Date(), DateUtils.C_DATA_PATTON_YYYYMMDD);
+        //根据服务类型创建订单编号
+        if ("001".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("R");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.REPAIR.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.REPAIR.getDesc());
+        } else if ("002".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("B");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.MAINTENANCE.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.MAINTENANCE.getDesc());
+        } else if ("003".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("H");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.HANDOVER.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.HANDOVER.getDesc());
+        } else if ("004".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("T");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.TRANSFORMATION.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.TRANSFORMATION.getDesc());
+        }else if ("005".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("I");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.INSPECTION.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.INSPECTION.getDesc());
+        }
+        orderNum.append(OrderNumberUtils.generateOrderNumber());
+        order.setOrderOrdernumber(orderNum.toString());
+        order.setOrderSource("app");
+        order.setOrderDevicecode(deviceDataVo.getSblbSbbm());
+        order.setOrderDevicename(deviceDataVo.getSblbSbmc());
+        order.setOrderDevicetype(deviceDataVo.getSblbSblxName());
+        order.setOrderDevicemodel(deviceDataVo.getSblbSbxhName());
+        order.setOrderServiceaddress(deviceDataVo.getSblbSbxxdz());
+        order.setOrderServiceaddressLongitude(deviceDataVo.getSblbJd());
+        order.setOrderServiceaddressDimension(deviceDataVo.getSblbWd());
+        order.setOrderCustomerName(deviceDataVo.getSblbKhmc());
+        order.setOrderKhlxr(deviceDataVo.getSblbKhlxr());
+        order.setOrderContactway(deviceDataVo.getSblbLxfs());
+        order.setOrderCustomerId(deviceDataVo.getSblbKhid());
+        order.setOrderOrderstatusCode(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getCode());
+        order.setOrderOrderstatusName(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getDesc());
+        order.setSyCreatetime(DateUtils.format(new Date(), DateUtils.C_TIME_PATTON_DEFAULT));
+        order.setSyStatus("1");
+        order.setOrderApplydate(currentDate);
+        List<OrderLcinfoParam> list = new ArrayList<>();
+        OrderLcinfoParam orderLcinfoParam = new OrderLcinfoParam();
+        orderLcinfoParam.setId(1);
+        orderLcinfoParam.setName("已受理");
+        orderLcinfoParam.setUserName(info.getUsername());
+        orderLcinfoParam.setUserId(info.getUserid());
+        orderLcinfoParam.setIcon("sl_icon");
+        orderLcinfoParam.setEndDate(String.valueOf(com.rootcloud.common.DateUtil.getTimesByString(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()))));
+        list.add(orderLcinfoParam);
+        order.setOrderLcinfo(JSON.toJSONString(list).toString());
+        order.setSyZhid(info.getZhid());//设置租户ID
+
+        logger.info("服务需求:"+param.getOrderDemanddescription()+"-----------------");
+        Log.info("服务需求:"+param.getOrderDemanddescription()+"-----------------");
+        order.setOrderDemanddescription(param.getOrderDemanddescription()); //需求描述
+        order.setOrderFwwdid(fwwdId); //服务网点ID
+        //order.setSyCurrenttask("待派工");
+        logger.info("fwwdId:"+fwwdId+">>"+"Demanddescription:"+param.getOrderDemanddescription()+">>");
+        Log.info("fwwdId:"+fwwdId+">>"+"Demanddescription:"+param.getOrderDemanddescription()+">>");
+        /*
+        if (nxDeviceEntity != null)
+        {
+            logger.info("Wbjsrq:"+nxDeviceEntity.getSblbWbjsrq()+">>"+"WarrantiesCode:"+ServicePlanEnums.CheckType.CHECK_TURE.getCode()+">>"+
+                    "WarrantiesName:"+ServicePlanEnums.CheckType.CHECK_TURE.getDesc());
+            order.setOrderWbjsrq(nxDeviceEntity.getSblbWbjsrq());
+            if (StringUtils.isNotBlank(nxDeviceEntity.getSblbWbjsrq())) {
+                if (new SimpleDateFormat("yyyy-MM-dd").format(new Date()).compareTo(nxDeviceEntity.getSblbWbjsrq()) <= 0) {
+                    order.setOrderWarrantiesCode(ServicePlanEnums.CheckType.CHECK_TURE.getCode());
+                    order.setOrderWarrantiesName(ServicePlanEnums.CheckType.CHECK_TURE.getDesc());
+                } else {
+                    order.setOrderWarrantiesCode(ServicePlanEnums.CheckType.CHECK_FALSE.getCode());
+                    order.setOrderWarrantiesName(ServicePlanEnums.CheckType.CHECK_FALSE.getDesc());
+                }
+            }
+        }
+        */
+        order.setOrderWbjsrq("2023-10-14");
+        order.setOrderWarrantiesCode("1");
+        order.setOrderWarrantiesName("是");
+        order.setOrderDdms("1");//自动触发
+        nxOrderMapper.insert(order);
+        logger.info("order:"+order);
+        logger.info("nxOrderMapper.insert 执行完成-----------------");
+        //流程引擎
+        if (StringUtils.isNotBlank(order.getOrderFwwdid())) {
+            //调用登录接口
+            /*String loginName = servicePlanMapper.queryStringByCode("loginName") == null ? "app_master_admin" : servicePlanMapper.queryStringByCode("loginName");
+            String loginPassword = servicePlanMapper.queryStringByCode("loginPassword") == null ? "Liu@123456" : servicePlanMapper.queryStringByCode("loginPassword");
+            OAuthResult login = rootCloudAuthService.login(loginName, loginPassword, null);*/
+            logger.info("OAuthResult:" + login + "loginName:" + param.getLoginName() + " loginPassword:" + param.getLoginPassword());
+            OutletsVO outletsVO = servicePlanMapper.returnUserNames(order.getOrderFwwdid());
+            String sponsorProcess = wfProperties.getWfHost() + "/je/jbpm/taskInfo/sponsorProcess";
+            Map<String, String> map = new HashMap();
+            map.put("pdid", "frx-ningxia-dingdan_22051015-7");
+            map.put("beanId", orderId);
+            map.put("currentTaskName", "");
+            map.put("submitComments", "订单待派工，请尽快处理");
+            map.put("targerTaskName", "是否派工");
+            map.put("targerTransition", "");
+            map.put("assigeeName", outletsVO.getUserNames());
+            map.put("assigeeId", outletsVO.getUserIds());
+            map.put("submitType", "to_submit");
+            Map<String, String> headers = new HashMap<>();
+             headers.put("authorization", login.getAccess_token());
+            // Log.info("authorization"+login.getAccess_token());
+//            headers.put("authorization", "Hpq9v3R1hoCTVTaVD0p");
+            headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+            logger.info(">>>>到这里了1:");
+            try {
+                Map<String, String> querys = new HashMap<>();
+                org.apache.http.HttpResponse post = HttpUtils.doPost(sponsorProcess, "", "post", headers, querys, map);
+                int statusCode = post.getStatusLine().getStatusCode();
+                String responseContent = EntityUtils.toString(post.getEntity(), "UTF-8");
+                logger.info("服务计划派工订单待派工状态码:" + statusCode + " 返回值：" + responseContent);
+                sponsorProcess = wfProperties.getWfHost() + "/je/jbpm/taskInfo/completeTask";
+                map.clear();
+                logger.info(">>>>到这里了2:");
+                JSONObject res = JSONObject.parseObject(responseContent);
+                Object obj = res.get("obj");
+                if (obj != null) {
+                    logger.info(">>>>到这里了3:");
+                    String taskId = ((JSONObject) obj).get("taskId").toString();
+                    map.put("taskId", taskId);
+                    map.put("pdid", "frx-ningxia-dingdan_22051015-7");
+                    map.put("beanId", orderId);
+                    map.put("submitComments", "同意");
+                    map.put("currentTaskName", "是否派工");
+                    map.put("targerTaskName", "待派工");
+                    map.put("targerTransition", "to_decision2");
+                    map.put("assigeeName", outletsVO.getUserNames());
+                    map.put("assigeeId", outletsVO.getUserIds());
+                    map.put("submitType", "to_submit");
+                    querys.clear();
+                    logger.info(">>>>到这里了4:");
+                    post = HttpUtils.doPost(sponsorProcess, "", "post", headers, querys, map);
+                    statusCode = post.getStatusLine().getStatusCode();
+                    logger.info(">>>>到这里了5:"+statusCode);
+                    logger.info("服务计划派同意派工状态码:" + statusCode);
+                } else {
+                    logger.error("服务计划派同意派工taskId获取不到");
+                    throw new Exception();
+                }
+            } catch (Exception e) {
+                logger.error("流程引擎错误" + e.getMessage());
+                e.printStackTrace();
+                throw new Exception();    //事务回滚
+            }
+        }
+        return JsonResult.success();
+    }
+
+    @Override
+    public JsonResult<Object> createOrder4(OrderParam param) throws Exception {
+        String deviceIds = param.getDeviceIds();
+        //logger.info("deviceIds:"+deviceIds+"-----------------");
+        Log.info("deviceIds:"+deviceIds+"-----------------");
+        if (StringUtils.isBlank(deviceIds)) {
+            return JsonResult.failed("450", "获取设备ID失败");
+        }
+        //查询设备信息，多个设备拼接
+        DeviceDataVo deviceDataVo = nxDeviceService.getJcxxByIds(deviceIds);
+        //logger.info("deviceDataVo:"+deviceDataVo+"-----------------");
+        Log.info("deviceDataVo:"+deviceDataVo+"-----------------");
+        if (deviceDataVo == null) {
+            return JsonResult.failed("450", "获取设备信息失败");
+        }
+        //获取服务网点
+        //判断设备是否存在
+        NxDeviceEntity nxDeviceEntity = nxDeviceService.getById(Arrays.asList(deviceIds.split(",")).get(0));
+        //logger.info("nxDeviceEntity:"+nxDeviceEntity+"-----------------");
+        //logger.info("SblbKhid:"+nxDeviceEntity.getSblbKhid()+"-----------------");
+        //logger.info("SblbWbjsrq:"+nxDeviceEntity.getSblbWbjsrq()+"-----------------");
+        if (nxDeviceEntity == null) {
+            return JsonResult.failed("450", "获取设备信息失败");
+        }
+        //获取服务网点id
+        String fwwdId = null;
+        String khid = nxDeviceEntity.getSblbKhid();
+        if (StringUtils.isNotBlank(khid)) {
+            fwwdId = nxDeviceService.selectFwwdId(khid, nxDeviceEntity.getSyZhid());
+        }
+        //logger.info("服务网点:"+fwwdId+"-----------------");
+        Log.info("服务网点:"+fwwdId+"-----------------");
+        if (StringUtils.isBlank(fwwdId)) {
+            return JsonResult.failed("450", "获取服务网点失败");
+        }
+        //校验账号密码
+        OAuthResult login = rootCloudAuthService.login(param.getLoginName(), param.getLoginPassword(), null);
+        if (login == null) {
+            return JsonResult.failed("450", "获取登录信息失败");
+        }
+        //获取用户信息
+        LambdaQueryWrapper<JeCoreEnduserEntity> mpeWrapper = new LambdaQueryWrapper<JeCoreEnduserEntity>();
+        mpeWrapper.eq(JeCoreEnduserEntity::getBackusercode, param.getLoginName());
+        mpeWrapper.last("limit 1");
+        JeCoreEnduserEntity info = enduserService.getOne(mpeWrapper);
+        //创建订单实体类
+        NxOrderEntity order = new NxOrderEntity();
+        String orderId = JEUuidUtil.uuid();
+        order.setNxOrderId(orderId);
+        StringBuffer orderNum = new StringBuffer();
+        String currentDate = DateUtils.format(new Date(), DateUtils.C_DATA_PATTON_YYYYMMDD);
+        //根据服务类型创建订单编号
+        if ("001".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("R");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.REPAIR.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.REPAIR.getDesc());
+        } else if ("002".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("B");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.MAINTENANCE.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.MAINTENANCE.getDesc());
+        } else if ("003".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("H");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.HANDOVER.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.HANDOVER.getDesc());
+        } else if ("004".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("T");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.TRANSFORMATION.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.TRANSFORMATION.getDesc());
+        }else if ("005".equals(param.getOrderServicetypeCode())) {
+            orderNum.append("I");
+            order.setOrderServicetypeCode(ServicePlanEnums.MessageType.INSPECTION.getCode());
+            order.setOrderServicetypeName(ServicePlanEnums.MessageType.INSPECTION.getDesc());
+        }
+
+        //订单号重复问题处理 2024-11-05 commit
+        SimpleDateFormat sdff = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat sdff2 = new SimpleDateFormat("yyyyMMdd");
+        Date date = new Date();
+        Timestamp timestamp = new Timestamp(date.getTime());
+        sdff.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+        sdff2.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+        String formattedt1 = sdff.format(timestamp);
+        String formattedt2 = sdff2.format(timestamp);
+        String startDate = formattedt1 + " "+"00:00:00";
+        String endDate = formattedt1 + " "+"23:59:59";
+        HashMap<String, String> req = new HashMap<>();
+        req.put("startDate", startDate);
+        req.put("endDate", endDate);
+        int num = nxOrderMapper.getOrderNum(req);
+        Integer nums = num*100+ RandomUtil.randomInt(1,99);
+        orderNum.append(formattedt2);
+        orderNum.append(String.valueOf(nums));
+        //orderNum.append(OrderNumberUtils.generateOrderNumber());
+        order.setOrderOrdernumber(orderNum.toString());
+        order.setOrderSource("app");
+        order.setOrderDevicecode(deviceDataVo.getSblbSbbm());
+        order.setOrderDevicename(deviceDataVo.getSblbSbmc());
+        order.setOrderDevicetype(deviceDataVo.getSblbSblxName());
+        order.setOrderDevicemodel(deviceDataVo.getSblbSbxhName());
+        order.setOrderServiceaddress(deviceDataVo.getSblbSbxxdz());
+        order.setOrderServiceaddressLongitude(deviceDataVo.getSblbJd());
+        order.setOrderServiceaddressDimension(deviceDataVo.getSblbWd());
+        order.setOrderCustomerName(deviceDataVo.getSblbKhmc());
+        order.setOrderKhlxr(deviceDataVo.getSblbKhlxr());
+        order.setOrderContactway(deviceDataVo.getSblbLxfs());
+        order.setOrderCustomerId(deviceDataVo.getSblbKhid());
+        order.setOrderOrderstatusCode(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getCode());
+        order.setOrderOrderstatusName(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getDesc());
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+        String formattedDate = sdf.format(new Date());
+        order.setSyCreatetime(formattedDate);//创建时间 new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())
+
+        order.setSyStatus("1");
+        order.setOrderApplydate(currentDate);
+        List<OrderLcinfoParam> list = new ArrayList<>();
+        OrderLcinfoParam orderLcinfoParam = new OrderLcinfoParam();
+        orderLcinfoParam.setId(1);
+        orderLcinfoParam.setName("已受理");
+        orderLcinfoParam.setUserName(info.getUsername());
+        orderLcinfoParam.setUserId(info.getUserid());
+        orderLcinfoParam.setIcon("sl_icon");
+        orderLcinfoParam.setEndDate(String.valueOf(com.rootcloud.common.DateUtil.getTimesByString(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()))));
+        list.add(orderLcinfoParam);
+        order.setOrderLcinfo(JSON.toJSONString(list).toString());
+        order.setSyZhid(info.getZhid());//设置租户ID
+
+        //logger.info("服务需求:"+param.getOrderDemanddescription()+"--------logger---------");
+        Log.info("服务需求:"+param.getOrderDemanddescription()+"-------Log----------");
+        order.setOrderDemanddescription(param.getOrderDemanddescription()); //需求描述
+
+        QueryWrapper<NxDeviceEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("NX_JCXX_SBLB_ID", Arrays.asList(deviceIds.split(",")).get(0));
+        NxDeviceEntity nxDeviceEntity2 = nxDeviceMapper.selectOne(queryWrapper);
+        //根据customerId 查询  NX_KHGL
+        String wdId = servicePlanMapper.selectOutletsIdByCustomerId(nxDeviceEntity2.getSblbKhid(), nxDeviceEntity2.getSyZhid());
+        Log.info("自动触发派单获取服务网点ID-->" + wdId+"-----Log----");
+
+        if (StringUtils.isNotBlank(wdId)) {
+            order.setOrderFwwdid(wdId);
+        }
+        //order.setOrderFwwdid(fwwdId); //服务网点ID
+        //order.setSyCurrenttask("待派工");
+        //logger.info("服务网点fwwdId:"+fwwdId+">>"+"服务需求Demanddescription:"+param.getOrderDemanddescription()+">>----logger----");
+        Log.info("服务网点fwwdId:"+fwwdId+">>"+"服务需求Demanddescription:"+param.getOrderDemanddescription()+">>-------Log--------");
+        Log.info("维保结束日期Wbjsrq:"+nxDeviceEntity2.getSblbWbjsrq()+">>-------Log--------");
+        if (nxDeviceEntity2 != null)
+        {
+            order.setOrderWbjsrq(nxDeviceEntity2.getSblbWbjsrq());
+            if (StringUtils.isNotBlank(nxDeviceEntity2.getSblbWbjsrq())) {
+                if (new SimpleDateFormat("yyyy-MM-dd").format(new Date()).compareTo(nxDeviceEntity2.getSblbWbjsrq()) <= 0) {
+                    order.setOrderWarrantiesCode("1");
+                    order.setOrderWarrantiesName("是");
+                } else {
+                    order.setOrderWarrantiesCode("0");
+                    order.setOrderWarrantiesName("否");
+                }
+            }
+        }
+        order.setOrderDdms("1");//自动触发
+        nxOrderMapper.insert(order);
+        Log.info("order:"+order);
+        Log.info("nxOrderMapper.insert 执行完成-----------------");
+        //流程引擎
+        if (StringUtils.isNotBlank(order.getOrderFwwdid())) {
+            //调用登录接口
+            /*String loginName = servicePlanMapper.queryStringByCode("loginName") == null ? "app_master_admin" : servicePlanMapper.queryStringByCode("loginName");
+            String loginPassword = servicePlanMapper.queryStringByCode("loginPassword") == null ? "Liu@123456" : servicePlanMapper.queryStringByCode("loginPassword");
+            OAuthResult login = rootCloudAuthService.login(loginName, loginPassword, null);*/
+            Log.info("OAuthResult:" + login + "loginName:" + param.getLoginName() + " loginPassword:" + param.getLoginPassword());
+            OutletsVO outletsVO = servicePlanMapper.returnUserNames(order.getOrderFwwdid());
+            String sponsorProcess = wfProperties.getWfHost() + "/je/jbpm/taskInfo/sponsorProcess";
+            Map<String, String> map = new HashMap();
+            map.put("pdid", "frx-ningxia-dingdan_22051015-7");
+            map.put("beanId", orderId);
+            map.put("currentTaskName", "");
+            map.put("submitComments", "订单待派工，请尽快处理");
+            map.put("targerTaskName", "是否派工");
+            map.put("targerTransition", "");
+            map.put("assigeeName", outletsVO.getUserNames());
+            map.put("assigeeId", outletsVO.getUserIds());
+            map.put("submitType", "to_submit");
+            Map<String, String> headers = new HashMap<>();
+             headers.put("authorization", login.getAccess_token());
+            // Log.info("authorization"+login.getAccess_token());
+//            headers.put("authorization", "Hpq9v3R1hoCTVTaVD0p");
+            headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+            Log.info(">>>>到这里了1:");
+            try {
+                Map<String, String> querys = new HashMap<>();
+                org.apache.http.HttpResponse post = HttpUtils.doPost(sponsorProcess, "", "post", headers, querys, map);
+                int statusCode = post.getStatusLine().getStatusCode();
+                String responseContent = EntityUtils.toString(post.getEntity(), "UTF-8");
+                Log.info("服务计划派工订单待派工状态码:" + statusCode + " 返回值：" + responseContent);
+                sponsorProcess = wfProperties.getWfHost() + "/je/jbpm/taskInfo/completeTask";
+                map.clear();
+                Log.info(">>>>到这里了2:");
+                JSONObject res = JSONObject.parseObject(responseContent);
+                Object obj = res.get("obj");
+                if (obj != null) {
+                    Log.info(">>>>到这里了3:");
+                    String taskId = ((JSONObject) obj).get("taskId").toString();
+                    map.put("taskId", taskId);
+                    map.put("pdid", "frx-ningxia-dingdan_22051015-7");
+                    map.put("beanId", orderId);
+                    map.put("submitComments", "同意");
+                    map.put("currentTaskName", "是否派工");
+                    map.put("targerTaskName", "待派工");
+                    map.put("targerTransition", "to_decision2");
+                    map.put("assigeeName", outletsVO.getUserNames());
+                    map.put("assigeeId", outletsVO.getUserIds());
+                    map.put("submitType", "to_submit");
+                    querys.clear();
+                    Log.info(">>>>到这里了4:");
+                    post = HttpUtils.doPost(sponsorProcess, "", "post", headers, querys, map);
+                    statusCode = post.getStatusLine().getStatusCode();
+                    Log.info(">>>>到这里了5:"+statusCode);
+                    Log.info("服务计划派同意派工状态码:" + statusCode);
+
+                    //技改工单创建成aa功后，将orderId、orderNum.toString() 写入mes技改任务表，为报工节点的信息填报做数据填充用
+                    if ("004".equals(param.getOrderServicetypeCode())){
+                        TechnicalTaskVO v1 = new TechnicalTaskVO();
+                        v1.setId(param.getUid());
+                        v1.setOrderId(orderId);
+                        v1.setOrderNum(orderNum.toString());
+                        technicalTaskDAO.updateTechnicalTask(v1);
+                        Log.info("技改订单id、订单编码写入成功...");
+                    }
+                } else {
+                    Log.error("服务计划派同意派工taskId获取不到");
+                    throw new Exception();
+                }
+            } catch (Exception e) {
+                Log.error("流程引擎错误" + e.getMessage());
+                e.printStackTrace();
+                throw new Exception();    //事务回滚
+            }
+        }
+        return JsonResult.success();
+    }
+
+    @Override
+    public void orderSignIn(OrderSignInParam orderSignInParam) {
+        NxOrderEntity order = this.getOne((Wrappers.lambdaQuery(NxOrderEntity.class)
+                .eq(NxOrderEntity::getNxOrderId, orderSignInParam.getNxOrderId())));
+        if (ObjectUtils.isEmpty(order)) {
+            //throw new BusinessException(StatusCodeEnum.ORDER_NOT_EXIST.getRet(),StatusCodeEnum.ORDER_NOT_EXIST.getMessage());
+            throw new BusinessException(StatusCodeEnum.ORDER_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("15001"));
+        }
+        if (!OrderEnums.OrderStatus.PENDING_CHECK_IN.getCode().equals(order.getOrderOrderstatusCode())) {
+            //throw new BusinessException(StatusCodeEnum.SING_IN_ONLY_STATUS.getRet(),StatusCodeEnum.SING_IN_ONLY_STATUS.getMessage());
+            throw new BusinessException(StatusCodeEnum.SING_IN_ONLY_STATUS.getRet(), ResourceUtil.getI18nMessage("15002"));
+        }
+        String lng1 = order.getOrderServiceaddressLongitude();
+        String lat1 = order.getOrderServiceaddressDimension();
+        Log.info("经纬度1：" + lng1 + "," + lat1);
+        //查询设备位置
+        List<NxDeviceLocationEntity> allDeviceLocation = deviceLocationMapper.findAllDeviceLocation();
+        Map<String, NxDeviceLocationEntity> deviceLocationMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(allDeviceLocation)) {
+            deviceLocationMap = allDeviceLocation.stream().collect(Collectors.toMap(NxDeviceLocationEntity::getDeviceId, Function.identity()));
+        }
+        //查询设备 如果来自于4.0 取设备地址
+        NxJeDeviceEntity nxJeDeviceEntity = nxJeDeviceService.selectBySbbm(order.getOrderDevicecode());
+        if (!ObjectUtils.isEmpty(nxJeDeviceEntity)) {
+            if (StringUtils.isNotBlank(nxJeDeviceEntity.getDeviceSource()) && ServicePlanEnums.CheckType.CHECK_TURE.getCode().equals(nxJeDeviceEntity.getDeviceSource())) {
+                NxDeviceLocationEntity nxDeviceLocationEntity = deviceLocationMap.get(nxJeDeviceEntity.getNxJeDeviceId());
+                if (nxDeviceLocationEntity != null && nxDeviceLocationEntity.getLongitude() != null && nxDeviceLocationEntity.getLatitude() != null) {
+                    lng1 = String.valueOf(nxDeviceLocationEntity.getLongitude());
+                    lat1 = String.valueOf(nxDeviceLocationEntity.getLatitude());
+                    Log.info("经纬度2：" + lng1 + "," + lat1);
+                }
+            }
+        }
+//        Log.info("该设备经纬度==>{}",lng1+","+lat1);
+        String lng2 = orderSignInParam.getOrderSignaddressLongitude();
+        String lat2 = orderSignInParam.getOrderSignaddressDimension();
+//        Log.info("签到经纬度==>{}",lng2+","+lat2);
+        if (StringUtils.isNotBlank(lng1) && StringUtils.isNotBlank(lat1)
+                && StringUtils.isNotBlank(lng2) && StringUtils.isNotBlank(lat2)) {
+            double v = GetDistance(Double.parseDouble(lng1), Double.parseDouble(lat1), Double.parseDouble(lng2), Double.parseDouble(lat2));
+            Log.info("经纬度3：" + lng2 + "," + lat2);
+            if (v > 2000) {
+                //throw new BusinessException(StatusCodeEnum.SING_IN_NOT_PASS.getRet(),StatusCodeEnum.SING_IN_NOT_PASS.getMessage());
+                throw new BusinessException(StatusCodeEnum.SING_IN_NOT_PASS.getRet(), ResourceUtil.getI18nMessage("17001"));
+            }
+        } else {
+            if (StringUtils.isBlank(lng1) || StringUtils.isBlank(lat1)) {
+                throw new BusinessException(StatusCodeEnum.ABNORMAL_CHECK_IN.getRet(), ResourceUtil.getI18nMessage("60021"));
+            }
+            if (StringUtils.isBlank(lng2) || StringUtils.isBlank(lat2)) {
+                throw new BusinessException(StatusCodeEnum.GET_CURRENT_LOCATION_EXCEPTION.getRet(), ResourceUtil.getI18nMessage("60022"));
+            }
+        }
+        if (StringUtils.isBlank(orderSignInParam.getOrderSigntime())) {
+            orderSignInParam.setOrderSigntime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        }
+
+        String orderLcinfo = order.getOrderLcinfo();
+        List<OrderLcinfoParam> list = new ArrayList<>();
+        if (StringUtils.isNotBlank(orderLcinfo)) {
+            list = JSON.parseArray(orderLcinfo, OrderLcinfoParam.class);
+            if (!ObjectUtils.isEmpty(orderSignInParam.getOrderLcinfo())) {
+                list.add(orderSignInParam.getOrderLcinfo());
+            }
+        }
+
+        NxOrderEntity updateOrder = new NxOrderEntity();
+        BeanUtils.copyProperties(orderSignInParam, updateOrder);
+        updateOrder.setOrderLcinfo(JSON.toJSONString(list).toString());
+        updateOrder.setOrderOrderstatusCode(OrderEnums.OrderStatus.PENDING_REPORTING.getCode());
+        updateOrder.setOrderOrderstatusName(OrderEnums.OrderStatus.PENDING_REPORTING.getDesc());
+        nxOrderMapper.updateById(updateOrder);
+    }
+
+
+    /**
+     * 根据提供的两个经纬度计算距离(米)
+     *
+     * @param lng1 经度1
+     * @param lat1 纬度1
+     * @param lng2 经度2
+     * @param lat2 纬度2
+     * @return 距离（米）
+     */
+    public static double GetDistance(double lng1, double lat1, double lng2, double lat2) {
+        double radLat1 = lat1 * RAD;
+        double radLat2 = lat2 * RAD;
+        double a = radLat1 - radLat2;
+        double b = (lng1 - lng2) * RAD;
+        double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
+                Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
+        s = s * EARTH_RADIUS;
+        s = Math.round(s * 10000) / 10000;
+        return s;
+    }
+
+    /* @Override
+   public List<MyMessageEntity> queryOrderInfo(List<DeviceListEntity> deviceListEntities) {
+        List<MyMessageEntity> result = new ArrayList<>();
+        List<String> deviceCodes = deviceListEntities.stream().map(DeviceListEntity::getSblbSbbm).collect(Collectors.toList());
+        LambdaQueryWrapper<NxOrderEntity> orderEntityLambdaQueryWrapper =  Wrappers.lambdaQuery(NxOrderEntity.class);
+        List<String> fwjgs = new ArrayList<>();
+        fwjgs.add("2");
+        fwjgs.add("3");
+        //todo 目前根据产品之前的描述只查询维修单，且维修状态时未解决和部分解决的订单（订单状态为待审核）
+        orderEntityLambdaQueryWrapper.in(NxOrderEntity::getOrderDevicecode,deviceCodes)
+                .eq(NxOrderEntity::getOrderServicetypeCode,"1")
+                .eq(NxOrderEntity::getOrderOrderstatusCode,"5")
+                .in(NxOrderEntity::getOrderFwjg,fwjgs)
+                .between(NxOrderEntity::getOrderOrdertime, com.rootcloud.common.DateUtil.format(new Date()), com.rootcloud.common.DateUtil.format(com.rootcloud.common.DateUtil.rollDay(new Date(),-3)));
+        List<NxOrderEntity> orderEntities = this.list(orderEntityLambdaQueryWrapper);
+        if(CollectionUtil.isEmpty(orderEntities)){
+            return result;
+        }
+        orderEntities.stream().forEach(temp->{
+            MyMessageEntity myMessageEntity = new MyMessageEntity();
+            myMessageEntity.setMessageClass("服务结果提醒");
+            myMessageEntity.setMessageObjectCode(temp.getOrderDevicecode());
+            myMessageEntity.setMessageObjectName(temp.getOrderDevicename());
+            myMessageEntity.setMessageName("工单验收");
+            //产品经理确认让查服务计划中发送给用户的站内信消息
+            myMessageEntity.setMessageContent("您的工单"+temp.getNxOrderId()+"已完成请验收！");
+            //产品经理让取服务计划触发时间
+            myMessageEntity.setMessageTime(temp.getOrderSigntime());
+            result.add(myMessageEntity);
+        });
+        return result;
+    }*/
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/NxPartFileConfigService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/NxPartFileConfigService.java
new file mode 100644
index 0000000..bbc7c7c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/NxPartFileConfigService.java
@@ -0,0 +1,29 @@
+package com.rootcloud.domain.service.part;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.domain.entity.NxPartFileConfigEntity;
+
+import java.util.List;
+
+/**
+ * @author lujiumin
+ * @date 2022/10/13
+ * 描述：
+ */
+public interface NxPartFileConfigService extends IService<NxPartFileConfigEntity> {
+
+    /**
+     * 新增
+     * @param entity
+     */
+    JsonResult insertOrUpdate(NxPartFileConfigEntity entity);
+
+    /**
+     * 获取当前用户的租户id 配置的数据
+     * @return
+     */
+    JsonResult<NxPartFileConfigEntity> selectData();
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/NxPartFileService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/NxPartFileService.java
new file mode 100644
index 0000000..1daf64e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/NxPartFileService.java
@@ -0,0 +1,33 @@
+package com.rootcloud.domain.service.part;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.config.auth.LoginUserInfo;
+import com.rootcloud.domain.entity.NxPartFileEntity;
+
+import java.util.List;
+
+
+/**
+ * 宁夏_配件档案
+ *
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-05-11 20:12:35
+ */
+public interface NxPartFileService extends IService<NxPartFileEntity> {
+
+    NxPartFileEntity getByPartCode(String filePjbm, String fileCkbm, String fileKwbm, String syZhid);
+
+    int updateByPartCode(NxPartFileEntity record);
+
+    JsonResult updateCkmc(NxPartFileEntity record, LoginUserInfo current);
+
+    boolean syncPartData();
+
+    List<String> queryLgortCode();
+
+    boolean syncPartWareData();
+
+}
+
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/NxPartRespService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/NxPartRespService.java
new file mode 100644
index 0000000..c1a9281
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/NxPartRespService.java
@@ -0,0 +1,18 @@
+package com.rootcloud.domain.service.part;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.entity.NxPartRespEntity;
+
+import java.util.Map;
+
+/**
+ * 配件仓库维护
+ *
+ * @author lipingan
+ * @email lpa2273597772@163.com
+ * @date 2022-05-12 13:41:45
+ */
+public interface NxPartRespService extends IService<NxPartRespEntity> {
+
+}
+
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/PartTask.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/PartTask.java
new file mode 100644
index 0000000..db5ac50
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/PartTask.java
@@ -0,0 +1,82 @@
+package com.rootcloud.domain.service.part;
+
+import com.rootcloud.common.WebServiceClient;
+import com.rootcloud.common.net.NetworkHelper;
+import com.rootcloud.domain.entity.Part;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author Administrator
+ * 配件档案同步   库存数量、基本单位、实际价格
+ */
+@Component
+public class PartTask {
+    private static final Logger logger = LoggerFactory.getLogger(PartTask.class);
+
+    // 命名空间
+    public static final String ACTION = "http://sap.com/xi/WebService/soap1.1";
+    // 调用方法
+    public static final String METHODNAME = "ZMM_RP002";
+    //webservice地址
+    public static final String WSDLLOCATION = "http://61.133.215.5:50000/XISOAPAdapter/MessageServlet?senderParty=&senderService=BS_LIMS_PRD&receiverParty=&receiverService=&interface=SI_ZMM_RP002&interfaceNamespace=http://www.kocel.com/lims/zmm_rp002";
+
+//    @Autowired
+//	private PartMapper partMapper;
+
+//    @Autowired
+//	private SysConfigService sysConfigService;
+
+    private static final String CONFIG_TYPE = "icsm";
+    private static final String CONFIG_CODE = "S_WERKS";
+
+    @Autowired
+//    private SmsClient smsClient;
+
+//    private static final String DEFAULTSWERKS = "1100,11X0,1200,12X0,1300,13X0,1410,1420,1430,14X0,1500,15X0,1600,1610,1620,1630,1640,1650,1670,1680,1690,16A0,16B0,16C0,16K0,16L0,16M0,16N0,16P0,1700,1800,1900,19X0,2000,2100,2200,2300,3000,3100,3200,3300,3400";
+    private static final String DEFAULTSWERKS = "1100,11X0,1200,12X0,1300,13X0,1430,1500,15X0,1600,1610,1620,1630,1640,1650,1670,1680,1690,16A0,16B0,16C0,16K0,16L0,16M0,16N0,16P0,1700,1800,1900,19X0,2000,2100,2200,2300,3000,3100,3200,3300,3400";
+
+    private static final String DEFAULTSWERKS2 = "1430";
+
+    //验证是否为数字
+    public boolean isNumeric(String code) {
+        Pattern pat = Pattern.compile("[0-9]*");
+        Matcher isNum = pat.matcher(code);
+        if (!isNum.matches()) {
+            return false;
+        }
+        return true;
+    }
+
+    public static void main(String[] args) {
+        if (NetworkHelper.getInstance().isReachIp("61.133.215.5")) {
+            logger.debug("=======本机可以ping通ip：" + "61.133.215.5");
+        } else {
+            logger.debug("=======本机ping不通ip：" + "61.133.215.5");
+        }
+        if (NetworkHelper.getInstance().isReachNetworkInterfaces("61.133.215.5")) {
+            logger.debug("=======本机所有网卡可以ping通ip：" + "61.133.215.5");
+        } else {
+            logger.debug("=======本机所有网卡ping不通ip：" + "61.133.215.5");
+        }
+        String localIp = NetworkHelper.getInstance().getReachableIP("61.133.215.5", 50000);
+        if (!StringUtils.isBlank(localIp)) {
+            logger.debug("=======本机可以与ip：" + "61.133.215.5" + ",port:" + 50000 + "建立连接的IP：" + localIp);
+        } else {
+            logger.debug("=======本机不能与ip：" + "61.133.215.5" + ",port:" + 50000 + "建立连接的IP");
+        }
+
+        WebServiceClient client = new WebServiceClient(WSDLLOCATION, ACTION, METHODNAME, new HashMap<>(16));
+//        List<Part> partList = client.getPartData();
+//        System.out.println(partList);
+    }
+}
+
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/impl/NxPartFileConfigServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/impl/NxPartFileConfigServiceImpl.java
new file mode 100644
index 0000000..8f9202c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/impl/NxPartFileConfigServiceImpl.java
@@ -0,0 +1,94 @@
+package com.rootcloud.domain.service.part.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.config.auth.LoginUserInfo;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.domain.dao.part.NxPartFileConfigDao;
+import com.rootcloud.domain.dto.EnterpriseInfoDTO;
+import com.rootcloud.domain.entity.NxPartFileConfigEntity;
+import com.rootcloud.domain.service.gbsj.JeCoreEnduserService;
+import com.rootcloud.domain.service.part.NxPartFileConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author lujiumin
+ * @date 2022/10/13
+ * 描述：
+ */
+@Slf4j
+@Service("nxpartFileConfigService")
+public class NxPartFileConfigServiceImpl extends ServiceImpl<NxPartFileConfigDao, NxPartFileConfigEntity> implements NxPartFileConfigService {
+
+    @Autowired
+    private NxPartFileConfigDao nxPartFileConfigDao;
+
+    @Resource(name = "endUserService")
+    private JeCoreEnduserService enduserService;
+
+
+    /**
+     * 新增
+     *
+     * @param entity
+     */
+    @Override
+    public JsonResult insertOrUpdate(NxPartFileConfigEntity entity) {
+        try {
+            LoginUserInfo current = UserContext.current();
+            String zhid = current.getTenantId();  //需要进行租户ID过滤
+            if(StringUtils.isNotBlank(zhid)){
+                entity.setSyZhid(zhid);
+            }else{
+                EnterpriseInfoDTO dto = enduserService.getTenantInfo(current.getUserId());
+                entity.setSyZhid(dto.getTenantId());
+            }
+
+            //登记人
+            entity.setSyCreateuserid(current.getUserId());
+            entity.setSyCreatetime(DateUtil.formatDateTime(new Date()));
+            entity.setSyCreateusername(current.getUserName());
+            if (StringUtils.isBlank(entity.getNxPartFileConfigId())) {
+                //新增
+                entity.setNxPartFileConfigId(UUID.randomUUID().toString().replaceAll("-", ""));
+                nxPartFileConfigDao.insert(entity);
+            } else {
+                //修改
+                nxPartFileConfigDao.updateById(entity);
+            }
+            return JsonResult.success();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 根据租户id的配置
+     *
+     * @return
+     */
+    @Override
+    public JsonResult<NxPartFileConfigEntity> selectData() {
+        LoginUserInfo current = UserContext.current();
+        String zhid = current.getTenantId();  //需要进行租户ID过滤
+        if (StringUtils.isBlank(zhid)) {
+            EnterpriseInfoDTO dto = enduserService.getTenantInfo(current.getUserId());
+            zhid = dto.getTenantId();
+        }
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("SY_ZHID", zhid);
+        NxPartFileConfigEntity nxPartFileConfigEntity = nxPartFileConfigDao.selectOne(queryWrapper);
+        return JsonResult.success(nxPartFileConfigEntity);
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/impl/NxPartFileServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/impl/NxPartFileServiceImpl.java
new file mode 100644
index 0000000..978398f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/impl/NxPartFileServiceImpl.java
@@ -0,0 +1,294 @@
+package com.rootcloud.domain.service.part.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.util.StringUtil;
+import com.rootcloud.common.*;
+import com.rootcloud.config.auth.LoginUserInfo;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.domain.dao.part.NxPartFileDao;
+import com.rootcloud.domain.dto.EnterpriseInfoDTO;
+import com.rootcloud.domain.entity.JeCoreEnduserEntity;
+import com.rootcloud.domain.entity.NxPartFileConfigEntity;
+import com.rootcloud.domain.entity.NxPartFileEntity;
+import com.rootcloud.domain.entity.NxPartRespEntity;
+import com.rootcloud.domain.service.auth.UserService;
+import com.rootcloud.domain.service.gbsj.JeCoreEnduserService;
+import com.rootcloud.domain.service.part.NxPartFileConfigService;
+import com.rootcloud.domain.service.part.NxPartFileService;
+import com.rootcloud.domain.service.part.NxPartRespService;
+import jline.internal.Log;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+@Service("nxpartFileService")
+public class NxPartFileServiceImpl extends ServiceImpl<NxPartFileDao, NxPartFileEntity> implements NxPartFileService {
+
+    private static final Logger logger = LoggerFactory.getLogger(NxPartFileServiceImpl.class);
+
+    // 命名空间
+    public static final String ACTION = "http://sap.com/xi/WebService/soap1.1";
+    // 调用方法
+    public static final String METHODNAME = "ZDM_INVENTORYINF";
+    //webservice地址
+    public static final String WSDLLOCATION = "http://61.133.215.5:50000/XISOAPAdapter/MessageServlet?senderParty=&senderService=BS_LIMS_PRD&receiverParty=&receiverService=&interface=SI_ZDM_INVENTORY_Sender&interfaceNamespace=http://www.kocel.com/lims/zdm_inventoryinf";
+
+    //    private static final String DEFAULTSWERKS = "1100,11X0,1200,12X0,1300,13X0,1430,1500,15X0,1600,1610,1620,1630,1640,1650,1670,1680,1690,16A0,16B0,16C0,16K0,16L0,16M0,16N0,16P0,1700,1800,1900,19X0,2000,2100,2200,2300,3000,3100,3200,3300,3400";
+    private static final String DEFAULTSWERKS = "1430";
+
+    private static final String DEFAULTLGORT = "1004";
+
+    //配件预警通知角色
+    private static final String ROLE = "ROLE_2022070039";
+
+    @Autowired
+    NxPartFileDao nxPartFileDao;
+
+    @Autowired
+    UserService userService;
+
+    @Resource(name = "partRespService")
+    NxPartRespService partRespService;
+
+    @Autowired
+    SendMessageUtils sendMessageUtils;
+
+    @Resource(name = "nxpartFileConfigService")
+    private NxPartFileConfigService nxPartFileConfigService;
+
+    @Resource(name = "endUserService")
+    private JeCoreEnduserService enduserService;
+
+    @Override
+    public NxPartFileEntity getByPartCode(String filePjbm, String fileCkbm, String fileKwbm, String syZhid) {
+        return nxPartFileDao.getByPartCode(filePjbm, fileCkbm, fileKwbm, syZhid);
+    }
+
+    @Override
+    public int updateByPartCode(NxPartFileEntity record) {
+        return nxPartFileDao.updateByPartCode(record);
+    }
+
+    /**
+     * 更新配件仓库名称
+     *
+     * @param record
+     * @return
+     */
+    @Override
+    public JsonResult updateCkmc(NxPartFileEntity record, LoginUserInfo current) {
+        EnterpriseInfoDTO dto = enduserService.getTenantInfo(current.getUserId());
+        String zhid = dto.getTenantId();
+        record.setSyZhid(zhid);
+        Log.info("传参:" + record);
+        //获取该租户下的配置
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("sy_zhid", record.getSyZhid());
+        List<NxPartFileConfigEntity> list = nxPartFileConfigService.list(queryWrapper);
+        if (list.size() > 0) {
+            Log.info("同步配件信息开始...");
+            dataSync(list);
+            Log.info("同步配件信息结束...");
+        }
+        //修改仓库名称
+        Log.info("修改配件信息仓库名称开始...");
+        nxPartFileDao.updateCkmc(record);
+        Log.info("修改配件信息仓库名称结束...");
+        return JsonResult.success();
+    }
+
+
+    @Override
+    public boolean syncPartData() {
+        Log.info("同步配件信息开始...");
+        List<NxPartFileConfigEntity> list = nxPartFileConfigService.list();
+        if (list.size() > 0) {
+            dataSync(list);
+        }
+        Log.info("同步配件信息结束...");
+        return true;
+
+    }
+
+    /**
+     * 同步数据公共方法
+     *
+     * @param list
+     */
+    private void dataSync(List<NxPartFileConfigEntity> list) {
+        //拿到配件仓库对应的仓库名称
+        Map<String, String> preMap = queryPre();
+        Log.info("获取到租户配置数据：" + list.size());
+        for (int i = 0; i < list.size(); i++) {
+            NxPartFileConfigEntity o = list.get(i);
+            try {
+                //运维中心、泉州中心租户 采用新版ERP系统
+                if(o.getSyZhid().equals("624e7ce1549c110050c5da47")||o.getSyZhid().equals("647e8e8a40a0e4003fa75429"))
+                    continue;
+                Log.info("获取到数据：" + o.getSyZhid() + "，" + o.getConfigQqrc());
+                String configQqlj = StringUtils.isNotBlank(o.getConfigQqlj()) ? o.getConfigQqlj() : WSDLLOCATION;
+                String configQqrc = o.getConfigQqrc();
+                String configDyff = StringUtils.isNotBlank(o.getConfigDyff()) ? o.getConfigDyff() : METHODNAME;
+                String configMmkj = StringUtils.isNotBlank(o.getConfigMmkj()) ? o.getConfigMmkj() : ACTION;
+                if (StringUtils.isNotBlank(configQqrc)) {
+                    Map<String, String> params = null;
+                    try {
+                        params = JSON.parseObject(configQqrc, Map.class);
+                    } catch (Exception e) {
+                        logger.error("入参数据格式错误：{}", configQqrc);
+                        throw new RuntimeException(e);
+                    }
+                    //params.put("Z_WERKS", split[0]);
+                    //params.put("Z_LGORT", split[1]);
+                    if (params == null) {
+                        continue;
+                    }
+                    Log.info("正在启动SAP库同步，路径：" + configQqlj + "，命名空间：" + configMmkj + "，调用方法：" + configDyff + "，入参：" + params);
+                    WebServiceClient client = new WebServiceClient(configQqlj, configMmkj, configDyff, params);
+                    List<NxPartFileEntity> partList = client.getPartData();
+                    Log.info("接口返回数据条数：", partList.size());
+                    if (partList.size() > 0) {
+                        //重复的配件 把数量相加
+                        List<NxPartFileEntity> collect = partList.stream().collect(Collectors.toMap(NxPartFileEntity::getFilePjbm, a -> a, (o1, o2) -> {
+                            o1.setFileKcsl(o1.getFileKcsl().add(o2.getFileKcsl()));
+                            return o1;
+                        })).values().stream().collect(Collectors.toList());
+                        Log.info("合并后数据条数：", collect.size());
+                        for (NxPartFileEntity part : collect) {
+                            part.setSyCreatetime(DateUtil.getCurrentTime());
+                            NxPartFileEntity byPartCode = this.getByPartCode(part.getFilePjbm(), params.get("Z_WERKS"), params.get("Z_LGORT"), o.getSyZhid());
+                            //通过租户id实时查询仓库名称
+                            try {
+                                String fileCkbm = part.getFileCkbm();
+                                String fileKwbm = part.getFileKwbm();
+                                String syZhid = o.getSyZhid();
+                                LambdaQueryWrapper<NxPartRespEntity> npre = new LambdaQueryWrapper<>();
+                                npre.eq(NxPartRespEntity::getRespCkbm, fileCkbm);
+                                npre.eq(NxPartRespEntity::getRespKwbm, fileKwbm);
+                                npre.eq(NxPartRespEntity::getSyZhid, syZhid);
+                                NxPartRespEntity one = partRespService.getOne(npre);
+                                part.setFileCkmc(one.getRespCkmc());
+                            } catch (Exception e) {
+                                Log.info("查询仓库名称异常:" + e.getMessage());
+                                e.printStackTrace();
+                            }
+                            //                            if (StringUtil.isNotEmpty(preMap.get(part.getFileCkbm()))) {
+//                                part.setFileCkmc(preMap.get(part.getFileCkbm()));
+//                            }
+                            if (byPartCode != null) {
+                                part.setNxPartFileId(byPartCode.getNxPartFileId());
+                                part.setSyZhid(o.getSyZhid());
+                                this.updateByPartCode(part);
+                            } else {
+                                part.setSyZhid(o.getSyZhid());
+                                this.save(part);
+                            }
+                            nxPartFileDao.insertPartFile2(part);
+                            //判断是否是关键备件
+                            if (byPartCode != null && "1".equals(byPartCode.getFileSfsgjpj())) {
+                                if ((byPartCode.getFileKcsx() != 0 && byPartCode.getFileKcsl().intValue() > byPartCode.getFileKcsx()) || (byPartCode.getFileKcxx() != 0 && byPartCode.getFileKcsl().intValue() < byPartCode.getFileKcxx())) {//大于上限或小于下限
+                                    List<String> phones = userService.getUserListByRole(ROLE, o.getSyZhid()).stream().filter(e -> e.getBackusercode() != null)
+                                            .map(JeCoreEnduserEntity::getBackusercode).collect(Collectors.toList());
+                                    if (!CollectionUtils.isEmpty(phones)) {
+                                        Log.info("给" + phones + "发送短信!");
+                                        List<String> param = new ArrayList<>();
+                                        param.add(byPartCode.getFilePjbm());//配件编码
+                                        param.add(byPartCode.getFilePjmc());//配件名称
+                                        param.add(byPartCode.getFileKcsx().toString());//库存上限
+                                        param.add(byPartCode.getFileKcxx().toString());//库存下限
+                                        param.add(byPartCode.getFileKcsl().toString());//库存数量
+                                        //发送短信通知
+                                        sendMessageUtils.send(phones, param);
+                                    }
+                                }
+                            }
+                        }
+                        Log.info("租户ID：" + o.getSyZhid() + "，同步数据完成，同步数据：" + collect.size());
+                    }
+                }
+            } catch (Exception e) {
+                Log.info("租户ID：" + o.getSyZhid() + "，同步数据失败");
+                e.printStackTrace();
+            }
+
+        }
+    }
+
+    @Override
+    public List<String> queryLgortCode() {
+        return nxPartFileDao.queryLgortCode();
+    }
+
+    @Override
+    public boolean syncPartWareData() {
+        //获取的地方做了调整
+        List<NxPartFileConfigEntity> list = nxPartFileConfigService.list();
+        if (list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                NxPartFileConfigEntity o = list.get(i);
+                String configQqrc = o.getConfigQqrc();
+                if (StringUtils.isNotBlank(configQqrc)) {
+                    Map<String, String> params = null;
+                    try {
+                        params = JSON.parseObject(configQqrc, Map.class);
+                    } catch (Exception e) {
+                        logger.error("入参数据格式错误：{}", configQqrc);
+                        throw new RuntimeException(e);
+                    }
+                    if (params == null) {
+                        continue;
+                    }
+                    String Z_WERKS = params.get("Z_WERKS");
+                    String Z_LGORT = params.get("Z_LGORT");
+                    String syZhid = o.getSyZhid();
+                    LambdaQueryWrapper<NxPartRespEntity> npre = new LambdaQueryWrapper<>();
+                    npre.eq(NxPartRespEntity::getSyZhid, syZhid);
+                    NxPartRespEntity one = partRespService.getOne(npre);
+                    if (one != null) {
+                        one.setRespCkbm(Z_WERKS);
+                        one.setRespKwbm(Z_LGORT);
+                        partRespService.updateById(one);
+                    } else {
+                        NxPartRespEntity entity = new NxPartRespEntity();
+                        entity.setNxPartRespId(JEUuidUtil.uuid());
+                        entity.setRespCkbm(Z_WERKS);
+                        entity.setSyZhid(syZhid);
+                        //  entity.setRespCkmc(s);
+                        entity.setRespKwbm(Z_LGORT);
+                        entity.setSyCreatetime(DateUtil.getCurrentTime());
+                        entity.setSyCreateuser("system");
+                        partRespService.save(entity);
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    public Map<String, String> queryPre() {
+        Map<String, String> maps = new HashMap<>();
+        List<NxPartRespEntity> list = partRespService.list();
+        if (list.size() > 0) {
+            list.forEach(o -> {
+                maps.put(o.getRespCkbm(), o.getRespCkmc());
+            });
+        }
+        return maps;
+    }
+
+
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/impl/NxPartRespServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/impl/NxPartRespServiceImpl.java
new file mode 100644
index 0000000..dae6ff5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/part/impl/NxPartRespServiceImpl.java
@@ -0,0 +1,16 @@
+package com.rootcloud.domain.service.part.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.domain.dao.part.NxPartRespDao;
+import com.rootcloud.domain.entity.NxPartRespEntity;
+import com.rootcloud.domain.service.part.NxPartRespService;
+import org.springframework.stereotype.Service;
+import java.util.Map;
+
+
+
+@Service("partRespService")
+public class NxPartRespServiceImpl extends ServiceImpl<NxPartRespDao, NxPartRespEntity> implements NxPartRespService {
+
+
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/NxTriggerConditionService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/NxTriggerConditionService.java
new file mode 100644
index 0000000..7265ae1
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/NxTriggerConditionService.java
@@ -0,0 +1,50 @@
+package com.rootcloud.domain.service.sp;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.ao.TriggerConditionAO;
+import com.rootcloud.domain.entity.sp.NxTriggerConditionEntity;
+
+/**
+ * <p>
+ * 触发条件service
+ * </p>
+ *
+ * @author hejia
+ */
+public interface NxTriggerConditionService extends IService<NxTriggerConditionEntity> {
+
+    /**
+     * 添加触发条件
+     * 
+     * @param conditionAo
+     *            触发条件Ao
+     * @param planId
+     *            计划主键
+     * @param deviceNo
+     *            设备编号
+     */
+    void add(TriggerConditionAO conditionAo, String planId, String deviceNo);
+
+    /**
+     * 添加触发条件
+     *
+     * @param conditionAo
+     *            触发条件Ao
+     * @param planId
+     *            计划主键
+     * @param deviceNo
+     *            设备编号
+     * 
+     */
+    void update(TriggerConditionAO conditionAo, String planId, String deviceNo);
+
+    /**
+     * 通过服务计划主键删除触发条件
+     *
+     * @param servicePlanId
+     *            服务计划主键
+     * @param deviceNo
+     *            设备编码
+     */
+    void removeByPlanId(String servicePlanId, String deviceNo);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/NxUserInfoService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/NxUserInfoService.java
new file mode 100644
index 0000000..aed2ab1
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/NxUserInfoService.java
@@ -0,0 +1,86 @@
+package com.rootcloud.domain.service.sp;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.entity.sp.NxUserInfoEntity;
+import com.rootcloud.vo.service.NxUserInfoVo;
+
+import java.util.List;
+import java.util.Map;
+
+public interface NxUserInfoService extends IService<NxUserInfoEntity> {
+
+
+    /**
+     *  根据服务计划id设置提醒
+     * @param servicePlanId  服务服务计划id
+     */
+    void setReminders(String servicePlanId);
+
+
+    /**
+     * 发送站内信
+     * @param userIds
+     * @param title
+     * @param context
+     * @return
+     */
+    boolean sendStationReminders(String userIds,String title,String context);
+
+
+    /**
+     * 根据服务计划id 和设备编码查询详情
+     * @param servicePlanId
+     * @param serviceCode
+     * @return
+     */
+    NxUserInfoVo selectByServicePlanId(String servicePlanId,String serviceCode,String syZhid);
+
+
+    /**
+     * 删除提醒内容
+     * @param servicePlanId
+     * @return
+     */
+    int  deleteByServicePlanId(String servicePlanId);
+
+
+    /**
+     * 新增数据
+     * @param nxUserInfoEntity
+     * @return
+     */
+    int  saveNxUserInfo(NxUserInfoEntity nxUserInfoEntity);
+
+
+    /**
+     * 修改数据
+     * @param nxUserInfoEntity
+     * @return
+     */
+    int  updateNxUserInfo(NxUserInfoEntity nxUserInfoEntity);
+
+
+
+    boolean sendEmail(Map<String, Object> param);
+
+    /**
+     * 根据任务计划IDs查询计划信息
+     */
+    List<NxUserInfoEntity> queryUserInfoByPlanIds(List<String> servicePlanIds);
+
+
+    /**
+     * 通过计划任务获取模板内容
+     * @param servicePlanId
+     * @return
+     */
+    String  getTemplateContent(String servicePlanId);
+
+
+    /**
+     * 通过设备编码返回对应客户以及服务经理角色
+     * @param deviceCode
+     * @return
+     */
+    List<String> getCustomerAndRoles(String deviceCode);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/ServicePlanHistoryService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/ServicePlanHistoryService.java
new file mode 100644
index 0000000..e6e09ae
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/ServicePlanHistoryService.java
@@ -0,0 +1,13 @@
+package com.rootcloud.domain.service.sp;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.entity.sp.ServicePlanHistoryEntity;
+
+/**
+ * @author lujiumin
+ * @date 2023/1/31
+ * 描述：
+ */
+public interface ServicePlanHistoryService extends IService<ServicePlanHistoryEntity> {
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/ServicePlanService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/ServicePlanService.java
new file mode 100644
index 0000000..bfc6910
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/ServicePlanService.java
@@ -0,0 +1,162 @@
+package com.rootcloud.domain.service.sp;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.domain.ao.ServicePlanAO;
+import com.rootcloud.domain.ao.ServicePlanCalendarAO;
+import com.rootcloud.domain.ao.ServicePlanCalendarNewAO;
+import com.rootcloud.domain.entity.MyAdviceEntity;
+import com.rootcloud.domain.entity.ds.ModelPropertySyncEntity;
+import com.rootcloud.domain.entity.sp.ServicePlanEntity;
+import com.rootcloud.vo.device.ServicePlanCalendarList;
+import com.rootcloud.vo.device.ServicePlanCalendarVO;
+import com.rootcloud.vo.device.ServicePlanDetailVO;
+
+import java.util.List;
+
+public interface ServicePlanService extends IService<ServicePlanEntity> {
+    // 新增服务计划
+    JsonResult addPlan(ServicePlanAO planAO);
+
+    public JsonResult startServicePlan(String servicePlanId);
+
+    /**
+     * 根据设备编号查询工况条件
+     *
+     * @param deviceNo 设备编号
+     * @return 工况属性列表
+     */
+    List<ModelPropertySyncEntity> getWorkCondition(String deviceNo);
+
+    /**
+     * 根据设备编号查询ModelId
+     *
+     * @param deviceNo 设备编号
+     * @return modelId
+     */
+    String getModelIdByDeviceNo(String deviceNo);
+
+
+    /**
+     * 定时处理  设置了触发条件为系统时间的数据
+     */
+    void scheduledProcessing();
+
+    void scheduledProcessingNew(String thatDay, String planId);
+
+
+    /**
+     * 定时修改服务状态的任务
+     */
+    void updateStatusScheduled();
+
+
+    /**
+     * 更新服务计划状态
+     *
+     * @param servicePlanId     服务主键
+     * @param servicePlanStatus 状态
+     * @return
+     */
+    boolean updateServicePlanStatus(String servicePlanId, int triggerType, Integer servicePlanStatus, boolean tempTime, String thatDay);
+
+
+    /**
+     * 每天十点的定时任务
+     */
+    void execute();
+
+
+    /**
+     * 定时查询报警
+     */
+    void queryAlarmQz();
+
+
+    /**
+     * 查询详情
+     *
+     * @param servicePlanId
+     * @return
+     */
+    ServicePlanDetailVO selectDetailById(String servicePlanId);
+
+
+    /**
+     * 根据服务计划id删除服务计划
+     *
+     * @param servicePlanId
+     */
+    int deleteServicePlan(String servicePlanId);
+
+
+    /**
+     * 查询任务日历
+     *
+     * @param planCalendarAO
+     * @return
+     */
+    ServicePlanCalendarVO checkServicePlanCalendar(ServicePlanCalendarAO planCalendarAO);
+
+
+    /**
+     * 计算完成率
+     *
+     * @param list
+     * @return
+     */
+    String finishRate(List<ServicePlanCalendarList> list);
+
+    /**
+     * 查询已触发的保养单
+     */
+    List<MyAdviceEntity> getmMaintainPlanService(String userId, Integer startNo, Integer endNo);
+
+
+    void eqMesSfjj(String id);
+
+
+    /**
+     * 日历总查询
+     *
+     * @param servicePlanCalendarNewAO
+     * @return
+     */
+    ServicePlanCalendarVO checkDataByParams(ServicePlanCalendarNewAO servicePlanCalendarNewAO);
+
+
+    /**
+     * 一键生成订单
+     *
+     * @param servicePlan
+     */
+    void generateOrder(ServicePlanEntity servicePlan, int triggerType, String thatDay,boolean temp) throws Exception;
+    //修改服务计划临时时间触发的订单生成逻辑，增加状态字段用以识别  20241231
+
+    /**
+     * 手动触发服务计划订单
+     *
+     * @param planId
+     */
+    JsonResult<Object> manualTrigger(String planId);
+
+    /**
+     * 更新服务计划下一周期日期
+     */
+    void updateDate();
+
+    /**
+     * 暂停服务计划
+     *
+     * @param planId
+     * @return
+     */
+    JsonResult<Object> pause(String planId,String type);
+    /**
+     * 提前触发服务计划
+     *
+     * @param planId
+     * @return
+     */
+    JsonResult<Object> pretrigger(String planId);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/NxTriggerConditionServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/NxTriggerConditionServiceImpl.java
new file mode 100644
index 0000000..71e0aa3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/NxTriggerConditionServiceImpl.java
@@ -0,0 +1,270 @@
+package com.rootcloud.domain.service.sp.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.rootcloud.common.ResourceUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.common.DateUtil;
+import com.rootcloud.common.JEUuidUtil;
+import com.rootcloud.common.TokenUtil;
+import com.rootcloud.common.enums.ServicePlanEnums;
+import com.rootcloud.common.enums.StatusCodeEnum;
+import com.rootcloud.config.exception.BusinessException;
+import com.rootcloud.domain.ao.TriggerConditionAO;
+import com.rootcloud.domain.entity.ds.ModelPropertySyncEntity;
+import com.rootcloud.domain.entity.sp.NxTriggerConditionEntity;
+import com.rootcloud.domain.mapper.NxTriggerConditionMapper;
+import com.rootcloud.domain.service.ds.ModelPropertySyncService;
+import com.rootcloud.domain.service.sp.NxTriggerConditionService;
+import com.rootcloud.domain.service.sp.ServicePlanService;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpStatus;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * <p>
+ * 触发条件service实现
+ * </p>
+ *
+ * @author hejia
+ */
+@Service
+@Slf4j
+public class NxTriggerConditionServiceImpl extends ServiceImpl<NxTriggerConditionMapper, NxTriggerConditionEntity>
+    implements NxTriggerConditionService {
+
+    @Value("${os.iam.domain}")
+    private String domain;
+
+    @Value("${cms.addrule.uri}")
+    private String addRuleUrl;
+
+    @Value("${cms.thingdraft.uri}")
+    private String thingDraftUrl;
+
+    @Value("${cms.delrule.uri}")
+    private String delRuleUrl;
+
+    private final TokenUtil tokenUtil;
+    private final ServicePlanService servicePlanService;
+    private final ModelPropertySyncService modelPropertySyncService;
+
+    public NxTriggerConditionServiceImpl(TokenUtil tokenUtil,
+        @Lazy @Qualifier("servicePlanServiceImpl") ServicePlanService servicePlanService,
+        @Qualifier("modelPropertySyncService2") ModelPropertySyncService modelPropertySyncService) {
+        this.tokenUtil = tokenUtil;
+        this.servicePlanService = servicePlanService;
+        this.modelPropertySyncService = modelPropertySyncService;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void add(TriggerConditionAO conditionAo, String planId, String deviceNo) {
+        if (conditionAo == null || ObjectUtils.isEmpty(conditionAo)) {
+            return;
+        }
+        // 这里需要先设置id，下面调用平台接口的时候用到
+        conditionAo.setNxTriggerConditionId(JEUuidUtil.uuid());
+
+        String alarmTypeId = null;
+        // 调用平台接口进行添加操作
+        if (ServicePlanEnums.TriggerType.WORK_CONDITION.getCode().equals(conditionAo.getTriggerCondition())) {
+            alarmTypeId = this.addRule(conditionAo, deviceNo);
+        }
+
+        NxTriggerConditionEntity conditionEntity = new NxTriggerConditionEntity();
+        conditionEntity.setServicePlanId(planId);
+        conditionEntity.setAlarmTypeId(alarmTypeId);
+        conditionEntity.setCreateTime(DateUtil.getSysdateStr());
+        BeanUtils.copyProperties(conditionAo, conditionEntity);
+        this.save(conditionEntity);
+    }
+
+    @Override
+    public void update(TriggerConditionAO conditionAo, String planId, String deviceNo) {
+
+        String triggerCode = ServicePlanEnums.TriggerType.WORK_CONDITION.getCode();
+        if ("del".equals(conditionAo.getOperationType())) {
+            this.removeByPlanId(planId, deviceNo);
+        } else {
+            NxTriggerConditionEntity entity = this.getById(conditionAo.getNxTriggerConditionId());
+            if (ObjectUtil.isNull(entity)) {
+                return;
+            }
+
+            String alarmTypeId = null;
+            // 之前是工况类型，现在改为不是工况类型，要删除掉平台的数据
+            if (!triggerCode.equals(conditionAo.getTriggerCondition())
+                && triggerCode.equals(entity.getTriggerCondition())) {
+                removeRule(deviceNo, entity.getAlarmTypeId());
+            }
+            // 现在是工况，之前不是工况，在平台那里进行新增
+            if (triggerCode.equals(conditionAo.getTriggerCondition())
+                && !triggerCode.equals(entity.getTriggerCondition())) {
+                alarmTypeId = addRule(conditionAo, deviceNo);
+            }
+            // 现在是工况，之前也是工况，在平台就行修改
+            if (triggerCode.equals(conditionAo.getTriggerCondition())
+                && triggerCode.equals(entity.getTriggerCondition())) {
+                alarmTypeId = updateRule(conditionAo, deviceNo, entity.getAlarmTypeId());
+            }
+            // 注：这里【alarmTypeId】字段在实体里面修改了更新策略，null值允许修改
+            NxTriggerConditionEntity conditionEntity = new NxTriggerConditionEntity();
+            BeanUtils.copyProperties(conditionAo, conditionEntity);
+            conditionEntity.setAlarmTypeId(alarmTypeId);
+            this.updateById(conditionEntity);
+        }
+    }
+
+    @Override
+    public void removeByPlanId(String servicePlanId, String deviceNo) {
+        NxTriggerConditionEntity condition =
+                this.getOne(Wrappers.lambdaQuery(NxTriggerConditionEntity.class)
+                        .eq(NxTriggerConditionEntity::getServicePlanId, servicePlanId)
+                        .last("limit 1"));
+        if (ObjectUtil.isNull(condition)) {
+            return;
+        }
+        if (StrUtil.isNotBlank(condition.getAlarmTypeId())) {
+            this.removeRule(deviceNo, condition.getAlarmTypeId());
+        }
+        this.remove(Wrappers.lambdaQuery(NxTriggerConditionEntity.class).eq(NxTriggerConditionEntity::getServicePlanId,
+                servicePlanId));
+    }
+
+    private String updateRule(TriggerConditionAO conditionAo, String deviceNo, String alarmTypeId) {
+        String modelId = servicePlanService.getModelIdByDeviceNo(deviceNo);
+        // 构建请求参数
+        Map<String, Object> param = buildParam(conditionAo, modelId);
+        // 发送数据
+        String url = delRuleUrl.replace("{alarmTypeId}", alarmTypeId);
+        HttpRequest request = HttpRequest.put(domain + url);
+        setHeader(request);
+        log.info("【修改报警规则】请求参数==>{}", JSON.toJSONString(param));
+        request.body(JSON.toJSONString(param));
+        HttpResponse response = request.execute();
+        // 判断状态码
+        if (response.getStatus() != HttpStatus.HTTP_OK) {
+            log.error("调用平台【修改报警规则】接口出错:{}", response);
+            //throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),
+             //   StatusCodeEnum.FAIL_CALL_INTERFACE.getMessage());
+            throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),
+                    ResourceUtil.getI18nMessage("40000"));
+        }
+
+        log.info("【修改报警规则】返回参数==>{}", response.body());
+        JSONObject json = JSON.parseObject(response.body());
+        JSONObject payload = json.getJSONObject("payload");
+
+        // 请求发布的接口
+        this.releaseRule(modelId);
+
+        return payload.getString("alarmTypeId");
+    }
+
+    private void removeRule(String deviceNo, String alarmTypeId) {
+        String url = delRuleUrl.replace("{alarmTypeId}", alarmTypeId);
+        HttpRequest request = HttpRequest.delete(domain + url);
+        setHeader(request);
+        HttpResponse response = request.execute();
+        if (response.getStatus() != HttpStatus.HTTP_OK) {
+            log.error("调用平台【删除报警类型】接口出错:{}", response);
+           // throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),
+            //        StatusCodeEnum.FAIL_CALL_INTERFACE.getMessage());
+            throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),
+                    ResourceUtil.getI18nMessage("40000"));
+        }
+
+        String modelId = servicePlanService.getModelIdByDeviceNo(deviceNo);
+        this.releaseRule(modelId);
+    }
+
+    private void releaseRule(String modelId) {
+        String url = thingDraftUrl.replace("{modelId}", modelId);
+        HttpRequest request = HttpRequest.patch(domain + url);
+        setHeader(request);
+        HttpResponse response = request.execute();
+        if (response.getStatus() != HttpStatus.HTTP_OK) {
+            log.error("调用平台【发布物模型】接口出错:{}", response);
+            /*throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),
+                StatusCodeEnum.FAIL_CALL_INTERFACE.getMessage());*/
+            throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),
+                    ResourceUtil.getI18nMessage("40000"));
+        }
+    }
+
+    private String addRule(TriggerConditionAO conditionAo, String deviceNo) {
+        String modelId = servicePlanService.getModelIdByDeviceNo(deviceNo);
+        // 构建请求参数
+        Map<String, Object> param = buildParam(conditionAo, modelId);
+        // 发送数据
+        HttpRequest request = HttpRequest.post(domain + addRuleUrl);
+        setHeader(request);
+        log.info("【创建报警类型草稿版】请求参数==>{}", JSON.toJSONString(param));
+        request.body(JSON.toJSONString(param));
+        HttpResponse response = request.execute();
+        if (response.getStatus() != HttpStatus.HTTP_OK) {
+            log.error("平台【创建报警类型草稿版】接口出错:{}", response);
+            /*throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),
+                StatusCodeEnum.FAIL_CALL_INTERFACE.getMessage());*/
+            throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),
+                    ResourceUtil.getI18nMessage("40000"));
+        }
+        log.info("【创建报警类型草稿版】返回参数==>{}", response.body());
+        JSONObject json = JSON.parseObject(response.body());
+        JSONObject payload = json.getJSONObject("payload");
+
+        // 请求发布的接口
+        this.releaseRule(modelId);
+
+        return payload.getString("alarmTypeId");
+    }
+
+    private void setHeader(HttpRequest request) {
+        request.header("Authorization", "Bearer " + tokenUtil.getToken());
+        request.header("accept", "application/json");
+        request.header("Content-Type", "application/json");
+    }
+
+    private Map<String, Object> buildParam(TriggerConditionAO conditionAo, String modelId) {
+
+        ModelPropertySyncEntity property =
+            modelPropertySyncService.queryByModelIdAndPropertyId(modelId, conditionAo.getConditionTj());
+        Optional.ofNullable(property)
+            .orElseThrow(() -> new BusinessException(StatusCodeEnum.EXCEPTION.getRet(), ResourceUtil.getI18nMessage("50001")));
+
+        Map<String, Object> param = new HashMap<>(6);
+        StringBuilder subject = new StringBuilder(property.getPropertyName());
+        if (ServicePlanEnums.Condition.GT.getCode().equals(conditionAo.getConditionValue())) {
+            subject.append("过高");
+        } else if (ServicePlanEnums.Condition.LT.getCode().equals(conditionAo.getConditionValue())) {
+            subject.append("过低");
+        }
+        param.put("subject", subject.toString());
+        param.put("severityLevel", 1);
+        param.put("when", "becomesTrue");
+        param.put("alarmTypeName", conditionAo.getNxTriggerConditionId());
+        param.put("modelId", modelId);
+        param.put("requiredAck", Boolean.TRUE);
+        param.put("condition",
+            conditionAo.getConditionTj() + " " + conditionAo.getConditionValue() + " " + conditionAo.getSetValue());
+        return param;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/NxUserInfoServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/NxUserInfoServiceImpl.java
new file mode 100644
index 0000000..d56979b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/NxUserInfoServiceImpl.java
@@ -0,0 +1,434 @@
+package com.rootcloud.domain.service.sp.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.common.HttpUtils;
+import com.rootcloud.common.JEUuidUtil;
+import com.rootcloud.common.ResourceUtil;
+import com.rootcloud.common.TokenUtil;
+import com.rootcloud.common.constant.Properties;
+import com.rootcloud.common.enums.ServicePlanEnums;
+import com.rootcloud.common.enums.StatusCodeEnum;
+import com.rootcloud.config.auth.LoginUserInfo;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.config.auth.UserInfo;
+import com.rootcloud.config.exception.BusinessException;
+import com.rootcloud.domain.dao.GbsjbDao;
+import com.rootcloud.domain.dao.JeCoreEnduserDao;
+import com.rootcloud.domain.dao.JeSysUsermsgDao;
+import com.rootcloud.domain.dao.sp.NxUserInfoDao;
+import com.rootcloud.domain.entity.JeSysUsermsgEntity;
+import com.rootcloud.domain.entity.NxJeDeviceEntity;
+import com.rootcloud.domain.entity.sp.NxTriggerConditionEntity;
+import com.rootcloud.domain.entity.sp.NxUserInfoEntity;
+import com.rootcloud.domain.entity.sp.ServicePlanEntity;
+import com.rootcloud.domain.mapper.NxTriggerConditionMapper;
+import com.rootcloud.domain.mapper.NxUserInfoMapper;
+import com.rootcloud.domain.mapper.ServicePlanMapper;
+import com.rootcloud.domain.service.gkjk.NxJeDeviceService;
+import com.rootcloud.domain.service.sp.NxUserInfoService;
+import com.rootcloud.vo.service.NxUserInfoVo;
+import jline.internal.Log;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @ClassName NxUserInfoServiceImpl
+ * @Description 提醒用户
+ * @Author w-liuyi01
+ * @Date 2022/4/28 20:18
+ * @Version 1.0
+ */
+
+@Service("NxUserInfoServiceImpl")
+@Slf4j
+public class NxUserInfoServiceImpl extends ServiceImpl<NxUserInfoDao, NxUserInfoEntity> implements NxUserInfoService {
+
+
+    @Value("${os.iam.domain}")
+    private String domain;
+
+    @Value("${cms.email.uri}")
+    private String emailUrl;
+
+    @Autowired
+    JeCoreEnduserDao jeCoreEnduserDao;
+
+    @Autowired
+    JeSysUsermsgDao jeSysUsermsgDao;
+
+    private final TokenUtil tokenUtil;
+    private final NxUserInfoMapper nxUserInfoMapper;
+    private final Properties wfProperties;
+    private final GbsjbDao gbsjbDao;
+    private final ServicePlanMapper servicePlanMapper;
+    private final NxJeDeviceService nxJeDeviceService;
+    private final NxTriggerConditionMapper nxTriggerConditionMapper;
+
+    public NxUserInfoServiceImpl(TokenUtil tokenUtil, NxUserInfoMapper nxUserInfoMapper, Properties wfProperties,
+                                 GbsjbDao gbsjbDao, ServicePlanMapper servicePlanMapper, @Qualifier("nxJeDeviceServiceImpl") NxJeDeviceService nxJeDeviceService,
+                                 NxTriggerConditionMapper nxTriggerConditionMapper) {
+        this.tokenUtil = tokenUtil;
+        this.nxUserInfoMapper = nxUserInfoMapper;
+        this.wfProperties = wfProperties;
+        this.gbsjbDao = gbsjbDao;
+        this.servicePlanMapper = servicePlanMapper;
+        this.nxJeDeviceService = nxJeDeviceService;
+        this.nxTriggerConditionMapper = nxTriggerConditionMapper;
+    }
+
+
+    @Override
+    public void setReminders(String servicePlanId) {
+        String templateContent = getTemplateContent(servicePlanId);
+        QueryWrapper<NxUserInfoEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("SERVICE_PLAN_ID", servicePlanId);
+        NxUserInfoEntity nxUserInfoEntity = nxUserInfoMapper.selectOne(queryWrapper);
+        if (ObjectUtil.isEmpty(nxUserInfoEntity)) {
+            Log.info("服务计划{}nxUserInfoEntity is  Empty", servicePlanId);
+            return;
+        }
+
+        QueryWrapper<ServicePlanEntity> entityQueryWrapper = new QueryWrapper<>();
+        entityQueryWrapper.eq("SERVICE_PLAN_ID", servicePlanId);
+        ServicePlanEntity servicePlan = servicePlanMapper.selectOne(entityQueryWrapper);
+        if (ObjectUtil.isEmpty(servicePlan)) {
+            Log.info("服务计划{}servicePlan is  Empty", servicePlanId);
+            return;
+        }
+        List<String> customerAndRoles = getCustomerAndRoles(servicePlan.getDeviceCode());
+        if (customerAndRoles.isEmpty()) {
+            Log.info("服务计划{}customerAndRoles is  Empty", servicePlanId);
+            return;
+        }
+        customerAndRoles = customerAndRoles.stream().distinct().collect(Collectors.toList());
+        String userIds = customerAndRoles.stream()
+                .collect(Collectors.joining(","));
+
+        //如果提醒方式存在站内信 发送站内信
+        if (StringUtils.isNotBlank(nxUserInfoEntity.getSmsReminders()) && ServicePlanEnums.CheckType.CHECK_TURE.getCode().equals(nxUserInfoEntity.getSmsReminders())) {
+            //发送短信
+        }
+        if (StringUtils.isNotBlank(nxUserInfoEntity.getEmailReminders()) && ServicePlanEnums.CheckType.CHECK_TURE.getCode().equals(nxUserInfoEntity.getEmailReminders())) {
+            //发送邮件
+            List<Map> receiverList = returnByUserList(customerAndRoles);
+            if (!receiverList.isEmpty()) {
+                Map<String, Object> param = buildEmailParam(null, null, null, templateContent, new ArrayList<>(), returnByUserList(customerAndRoles));
+                if (!param.isEmpty()) {
+                    try {
+                        sendEmail(param);
+                    } catch (Exception e) {
+                        log.info("服务计划{}错误信息==>{}", servicePlanId, e.getMessage());
+                    }
+                }
+            }
+        }
+        if (StringUtils.isNotBlank(nxUserInfoEntity.getStationReminders()) && ServicePlanEnums.CheckType.CHECK_TURE.getCode().equals(nxUserInfoEntity.getStationReminders())) {
+            //发送站内信
+            sendStationReminders(userIds, ResourceUtil.getI18nMessage("60013"), templateContent);
+            Log.info("服务计划{}发送站内信成功", servicePlanId);
+        }
+
+        if (StringUtils.isNotBlank(nxUserInfoEntity.getExternalReminders()) && ServicePlanEnums.CheckType.CHECK_TURE.getCode().equals(nxUserInfoEntity.getExternalReminders())
+                && StringUtils.isNotBlank(nxUserInfoEntity.getSmsReminders()) && ServicePlanEnums.CheckType.CHECK_TURE.getCode().equals(nxUserInfoEntity.getSmsReminders())) {
+            //todo 存在外部提醒,并且勾选了短信   根据设备编号查询相应的客户，发送短信，（暂时预留）
+
+        }
+    }
+
+
+    public List<Map> returnByUserList(List<String> userList) {
+        List<Map> listMap = new ArrayList<>();
+        for (String userId : userList) {
+            Map<String, Object> map = new HashMap<>();
+            Map<String, String> stringStringMap = gbsjbDao.selectByUserId(userId);
+            if (stringStringMap != null && !stringStringMap.isEmpty()) {
+                map.put("language", "zh");
+                //企业标识
+                map.put("organizationId", "NX");
+                //接收人名称
+                map.put("receiveUser", stringStringMap.get("userName"));
+                //接收人用户ID
+                map.put("receiveUserId", stringStringMap.get("userId"));
+                //接收类型的值
+                map.put("receiveValue", stringStringMap.get("email"));
+                listMap.add(map);
+            }
+        }
+        return listMap;
+    }
+
+
+    /**
+     * @param businessId   业务方ID
+     * @param messageTitle 消息标题
+     * @param messageType  消息类型
+     * @param messageList  邮件内容
+     * @param receiverList 接收人信息
+     * @param content      内容
+     * @return
+     */
+    public Map<String, Object> buildEmailParam(String businessId, String messageTitle, String messageType, String content, List<Map> messageList, List<Map> receiverList) {
+        Map<String, Object> param = new HashMap<>();
+        //业务方ID
+        param.put("businessId", StringUtils.isNotBlank(businessId) ? businessId : "11");
+        //消息标题
+        param.put("messageTitle", StringUtils.isNotBlank(messageTitle) ? messageTitle : ResourceUtil.getI18nMessage("60013"));
+        //消息类型
+        param.put("messageType", StringUtils.isNotBlank(messageType) ? messageType : "ANNOUNCEMENT");
+        List<Map> messagelist = new ArrayList<>();
+        Map<String, Object> message = new HashMap<>();
+        //邮件内容
+        message.put("content", StringUtils.isNotBlank(content) ? content : "[iFSM]尊敬的【客户名称】您好，您编号为【设备编号】的设备工况【属性】已经【条件】【设置值】请及时跟进处理。");
+        message.put("language", "zh");
+        //邮件标题
+        message.put("title", ResourceUtil.getI18nMessage("60013"));
+        messagelist.add(message);
+        if (messageList.isEmpty()) {
+            param.put("messageContent", messagelist);
+        } else {
+            param.put("messageContent", messageList);
+        }
+        List<Map> list = new ArrayList<>();
+        param.put("receiver", receiverList);
+        //消息发送时间 0为即时发送
+        param.put("sendTime", "0");
+        return param;
+    }
+
+
+    @Override
+    public boolean sendStationReminders(String userIds, String title, String context) {
+        boolean flag = false;
+        //JP推送消息地址与接口路径
+        String host = wfProperties.getWfHost();
+        String url = Properties.dwr_sender_uri;
+        String[] userid = userIds.split(",");
+        for (String id : userid) {
+            UserInfo user = jeCoreEnduserDao.getUser(id);
+            if (user == null) {
+                continue;
+            }
+            //组装请求调用JP的发起站内信接口
+            JSONObject params = new JSONObject();
+            params.put("userId", id);
+            params.put("title", title);
+            params.put("context", user.getUserName() + "," + context);
+            Map<String, String> headers = new HashMap<>();
+            try {
+                Map<String, String> querys = new HashMap<>();
+                log.info("站内信，发送内容为==>{}", params.toJSONString());
+                HttpResponse response = HttpUtils.doPost(host + url, "", "post", headers, querys, params.toJSONString());
+                if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                    log.info("发送站内信成功，发送userid为==>{}", userIds);
+                    log.info("发送站内信成功，请求地址为==>{}", host + url);
+                    flag = true;
+                }
+                //站内信日志记录
+                String[] split = userIds.split(",");
+                //for (String userId:split) {
+                JeSysUsermsgEntity usermsgEntity = new JeSysUsermsgEntity();
+                usermsgEntity.setUsermsgJsrId(id);//接收人id
+                usermsgEntity.setUsermsgYd("0");//默认已读
+                usermsgEntity.setUsermsgNr(user.getUserName() + "," + context);//内容
+                usermsgEntity.setUsermsgBt(ResourceUtil.getI18nMessage("60013"));//标题
+                usermsgEntity.setUsermsgJssj(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()).toString());//接受时间
+                usermsgEntity.setUsermsgJsrName(user.getUserName());//接收人姓名
+                usermsgEntity.setUsermsgMsgtypeName(ResourceUtil.getI18nMessage("60013"));//用户消息类型_NAME
+                usermsgEntity.setUsermsgMsgtypeCode("NX");//用户消息类型
+                usermsgEntity.setJeSysUsermsgId(JEUuidUtil.uuid());//主键
+                usermsgEntity.setSyCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()).toString());//创建时间
+                LoginUserInfo current = UserContext.current();
+                usermsgEntity.setSyCreateuser(current.getUserName());//当前登陆人姓名
+                jeSysUsermsgDao.insert(usermsgEntity);
+                // }
+            } catch (Exception e) {
+                log.info("发送站内信错误==>{}", e.getMessage());
+                log.error("error", e);
+            }
+        }
+        return flag;
+    }
+
+    @Override
+    public boolean sendEmail(Map<String, Object> param) {
+        boolean flag = false;
+        HttpRequest request = HttpRequest.post(domain + emailUrl);
+        request.header("Authorization", "Bearer " + tokenUtil.getToken());
+        request.header("accept", "application/json");
+        request.header("Content-Type", "application/json");
+        log.info("发送邮件请求参数==>{}", JSON.toJSONString(param));
+        request.body(JSON.toJSONString(param));
+        cn.hutool.http.HttpResponse response = request.execute();
+        if (response.getStatus() != cn.hutool.http.HttpStatus.HTTP_OK) {
+            log.error("平台【发送邮件】接口出错:{}", response);
+            /*throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),
+                    StatusCodeEnum.FAIL_CALL_INTERFACE.getMessage());*/
+            throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),
+                    ResourceUtil.getI18nMessage("40000"));
+        } else {
+            flag = true;
+        }
+        log.info("发送邮件返回参数==>{}", response.body());
+        return flag;
+    }
+
+
+    @Override
+    public NxUserInfoVo selectByServicePlanId(String servicePlanId, String serviceCode, String syZhid) {
+        NxUserInfoVo vo = new NxUserInfoVo();
+        QueryWrapper<NxUserInfoEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("SERVICE_PLAN_ID", servicePlanId);
+        NxUserInfoEntity nxUserInfoEntity = nxUserInfoMapper.selectOne(queryWrapper);
+        if (!ObjectUtil.isEmpty(nxUserInfoEntity)) {
+            BeanUtils.copyProperties(nxUserInfoEntity, vo);
+            //把对应部门名称，用户名称，角色名称传进去
+            try {
+                if (StringUtils.isNotBlank(nxUserInfoEntity.getDepartmentId())) {
+                    String deptName = nxUserInfoMapper.getDeptName(Arrays.asList(nxUserInfoEntity.getDepartmentId().split(",")));
+                    vo.setDepartmentName(deptName);
+                }
+                if (StringUtils.isNotBlank(nxUserInfoEntity.getUserId())) {
+                    String userName = nxUserInfoMapper.getUserName(Arrays.asList(nxUserInfoEntity.getUserId().split(",")));
+                    vo.setUserName(userName);
+                }
+                if (StringUtils.isNotBlank(nxUserInfoEntity.getRoleId())) {
+                    String roleName = nxUserInfoMapper.getRoleName(Arrays.asList(nxUserInfoEntity.getRoleId().split(",")));
+                    vo.setRoleName(roleName);
+                }
+            } catch (Exception e) {
+                log.info("查询部门角色错误信息：{}", e);
+            }
+            //预留外部提醒
+            String externalReminders = nxUserInfoEntity.getExternalReminders();
+            if (StringUtils.isNotBlank(externalReminders) && ServicePlanEnums.CheckType.CHECK_TURE.getCode().equals(externalReminders)) {
+                //查询外部提醒
+                NxUserInfoVo nxUserInfoVo = nxUserInfoMapper.selectBySeviceCode(serviceCode, syZhid);
+                if (!ObjectUtil.isEmpty(nxUserInfoVo)) {
+                    vo.setMainContact(nxUserInfoVo.getMainContact());
+                    vo.setMainPhone(nxUserInfoVo.getMainPhone());
+                }
+            }
+        }
+
+        return vo;
+    }
+
+
+    @Override
+    public int deleteByServicePlanId(String servicePlanId) {
+        QueryWrapper<NxUserInfoEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("SERVICE_PLAN_ID", servicePlanId);
+        return nxUserInfoMapper.delete(queryWrapper);
+    }
+
+
+    @Override
+    public int saveNxUserInfo(NxUserInfoEntity nxUserInfoEntity) {
+        return nxUserInfoMapper.insert(nxUserInfoEntity);
+    }
+
+    @Override
+    public int updateNxUserInfo(NxUserInfoEntity nxUserInfoEntity) {
+        QueryWrapper<NxUserInfoEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("SERVICE_PLAN_ID", nxUserInfoEntity.getServicePlanId());
+        return nxUserInfoMapper.update(nxUserInfoEntity, queryWrapper);
+    }
+
+
+    @Override
+    public List<NxUserInfoEntity> queryUserInfoByPlanIds(List<String> servicePlanIds) {
+        QueryWrapper<NxUserInfoEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("SERVICE_PLAN_ID", servicePlanIds);
+        return nxUserInfoMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public String getTemplateContent(String servicePlanId) {
+        String templateContent = null;
+        ServicePlanEntity servicePlan = servicePlanMapper.selectById(servicePlanId);
+
+        QueryWrapper<NxUserInfoEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("SERVICE_PLAN_ID", servicePlanId);
+        queryWrapper.last("limit 1");
+        NxUserInfoEntity nxUserInfoEntity = nxUserInfoMapper.selectOne(queryWrapper);
+
+        QueryWrapper<NxTriggerConditionEntity> entityQueryWrapper = new QueryWrapper<>();
+        entityQueryWrapper.eq("SERVICE_PLAN_ID", servicePlanId);
+        entityQueryWrapper.last("limit 1");
+        NxTriggerConditionEntity triggerConditionEntity = nxTriggerConditionMapper.selectOne(entityQueryWrapper);
+
+        if (!ObjectUtil.isEmpty(servicePlan)) {
+            if (!ObjectUtil.isEmpty(nxUserInfoEntity)) {
+                String infoContent = nxUserInfoEntity.getInfoContent();
+                if (StringUtils.isNotBlank(infoContent)) {
+                    //【设备编码】【计划名称】【计划类型】【计划周期】【计划间隔】
+                    // 【计划时间段】【内部提醒】【触发类型】【选择条件】【提醒方式】
+                    // 【外部提醒】【条件值】【设置值】【完成的时间节点】【选择保养内容】
+                    infoContent = infoContent.replace("【设备编码】", servicePlan.getDeviceCode());
+                    infoContent = infoContent.replace("【计划名称】", servicePlan.getPlanName());
+                    infoContent = infoContent.replace("【计划类型】", servicePlan.getPlanTypeName());
+                    infoContent = infoContent.replace("【计划周期】", servicePlan.getPlanCycleName());
+                    infoContent = infoContent.replace("【计划间隔】", servicePlan.getPlanInterval() + "");
+                    infoContent = infoContent.replace("【计划时间段】", StringUtils.isNotBlank(servicePlan.getPlanStartTime()) ? servicePlan.getPlanStartTime() : "" + "~" + (StringUtils.isNotBlank(servicePlan.getPlanEndTime()) ? servicePlan.getPlanEndTime() : ""));
+                    /*infoContent = infoContent.replace("【内部提醒】", StringUtils.isNotBlank(nxUserInfoEntity.getDepartmentIdName())?nxUserInfoEntity.getDepartmentIdName():""
+                            +(StringUtils.isNotBlank(nxUserInfoEntity.getUserIdName())?nxUserInfoEntity.getUserIdName():"")
+                            +(StringUtils.isNotBlank(nxUserInfoEntity.getRoleIdName())?nxUserInfoEntity.getRoleIdName():""));*/
+                    infoContent = infoContent.replace("【内部提醒】", "");
+                    infoContent = infoContent.replace("【提醒方式】", servicePlan.getPlanRemindWayName());
+
+                    //查询外部提醒
+                    NxUserInfoVo nxUserInfoVo = nxUserInfoMapper.selectBySeviceCode(servicePlan.getDeviceCode(), servicePlan.getSyZhid());
+                    if (!ObjectUtil.isEmpty(nxUserInfoVo)) {
+                        infoContent = infoContent.replace("【外部提醒】", nxUserInfoVo.getMainContact());
+                    } else {
+                        infoContent = infoContent.replace("【外部提醒】", "");
+                    }
+
+                    infoContent = infoContent.replace("【完成的时间节点】", servicePlan.getFinishTimeNode() + "");
+                    infoContent = infoContent.replace("【选择保养内容】", servicePlan.getMaintainContentName());
+                }
+                if (!ObjectUtil.isEmpty(triggerConditionEntity)) {
+                    infoContent = infoContent.replace("【触发类型】", triggerConditionEntity.getTriggerConditionName());
+                    infoContent = infoContent.replace("【选择条件】", triggerConditionEntity.getConditionTjName());
+                    infoContent = infoContent.replace("【条件值】", triggerConditionEntity.getConditionValueName());
+                    infoContent = infoContent.replace("【设置值】", triggerConditionEntity.getSetValueName());
+                } else {
+                    infoContent = infoContent.replace("【触发类型】", "");
+                    infoContent = infoContent.replace("【选择条件】", "");
+                    infoContent = infoContent.replace("【条件值】", "");
+                    infoContent = infoContent.replace("【设置值】", "");
+                }
+                templateContent = infoContent;
+            }
+        }
+        return templateContent;
+    }
+
+
+    @Override
+    public List<String> getCustomerAndRoles(String deviceCode) {
+        NxJeDeviceEntity nxJeDeviceEntity = nxJeDeviceService.selectBySbbm(deviceCode);
+        if (!ObjectUtils.isEmpty(nxJeDeviceEntity) && StringUtils.isNotBlank(nxJeDeviceEntity.getDeviceSskh())) {
+            List<String> customerAndRoles = servicePlanMapper.getCustomerAndRoles(nxJeDeviceEntity.getDeviceSskh(), UserContext.getUserTenantId());
+            return customerAndRoles;
+        }
+        return new ArrayList<>();
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/ServicePlanHistoryServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/ServicePlanHistoryServiceImpl.java
new file mode 100644
index 0000000..8332af8
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/ServicePlanHistoryServiceImpl.java
@@ -0,0 +1,23 @@
+package com.rootcloud.domain.service.sp.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.domain.dao.sp.ServicePlanHistoryDao;
+import com.rootcloud.domain.entity.sp.ServicePlanHistoryEntity;
+import com.rootcloud.domain.service.sp.ServicePlanHistoryService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author lujiumin
+ * @date 2023/1/31
+ * 描述：
+ */
+@Slf4j
+@Service("servicePlanHistoryServiceImpl")
+public class ServicePlanHistoryServiceImpl extends ServiceImpl<ServicePlanHistoryDao, ServicePlanHistoryEntity> implements ServicePlanHistoryService {
+
+    @Autowired
+    private ServicePlanHistoryDao dao;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/ServicePlanServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/ServicePlanServiceImpl.java
new file mode 100644
index 0000000..e2abd10
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/ServicePlanServiceImpl.java
@@ -0,0 +1,2146 @@
+package com.rootcloud.domain.service.sp.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpStatus;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.common.*;
+import com.rootcloud.common.constant.Properties;
+import com.rootcloud.common.enums.OrderEnums;
+import com.rootcloud.common.enums.ServicePlanEnums;
+import com.rootcloud.common.enums.StatusCodeEnum;
+import com.rootcloud.common.util.CommonUtils;
+import com.rootcloud.common.util.DateUtils;
+import com.rootcloud.common.util.OrderNumberUtils;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.config.exception.BusinessException;
+import com.rootcloud.domain.ao.ServicePlanAO;
+import com.rootcloud.domain.ao.ServicePlanCalendarAO;
+import com.rootcloud.domain.ao.ServicePlanCalendarNewAO;
+import com.rootcloud.domain.ao.ServicePlanParamsAO;
+import com.rootcloud.domain.dao.sp.ServicePlanDao;
+import com.rootcloud.domain.dto.ConditionModel;
+import com.rootcloud.domain.entity.*;
+import com.rootcloud.domain.entity.device.NxDeviceEntity;
+import com.rootcloud.domain.entity.ds.ModelPropertySyncEntity;
+import com.rootcloud.domain.entity.sp.NxTriggerConditionEntity;
+import com.rootcloud.domain.entity.sp.NxUserInfoEntity;
+import com.rootcloud.domain.entity.sp.ServicePlanEntity;
+import com.rootcloud.domain.entity.sp.ServicePlanHistoryEntity;
+import com.rootcloud.domain.mapper.NxDeviceMapper;
+import com.rootcloud.domain.mapper.NxOrderMapper;
+import com.rootcloud.domain.mapper.ServicePlanMapper;
+import com.rootcloud.domain.service.auth.RootCloudAuthService;
+import com.rootcloud.domain.service.ds.ModelPropertySyncService;
+import com.rootcloud.domain.service.gkjk.NxJeDeviceService;
+import com.rootcloud.domain.service.network.NetworkUserService;
+import com.rootcloud.domain.service.sp.NxTriggerConditionService;
+import com.rootcloud.domain.service.sp.NxUserInfoService;
+import com.rootcloud.domain.service.sp.ServicePlanHistoryService;
+import com.rootcloud.domain.service.sp.ServicePlanService;
+import com.rootcloud.domain.service.todo.NxTodoLibraryService;
+import com.rootcloud.vo.device.ServicePlanCalendarDetailsVO;
+import com.rootcloud.vo.device.ServicePlanCalendarList;
+import com.rootcloud.vo.device.ServicePlanCalendarVO;
+import com.rootcloud.vo.device.ServicePlanDetailVO;
+import com.rootcloud.vo.order.OrderLcinfoParam;
+import com.rootcloud.vo.service.*;
+import jline.internal.Log;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.util.EntityUtils;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @ClassName ServicePlanServiceImpl
+ * @Description 服务计划实现类
+ * @Author w-liuyi01
+ * @Date 2022/4/28 20:02
+ * @Version 1.0
+ */
+@SuppressWarnings("LanguageDetectionInspection")
+@Slf4j
+@Service("servicePlanServiceImpl")
+public class ServicePlanServiceImpl extends ServiceImpl<ServicePlanDao, ServicePlanEntity> implements ServicePlanService {
+
+    private final NxTriggerConditionService nxTriggerConditionService;
+    private final NxJeDeviceService nxJeDeviceService;
+    private final ModelPropertySyncService modelPropertySyncService;
+    private final TokenUtil tokenUtil;
+    private final NxUserInfoService nxUserInfoService;
+    private final NxOrderMapper nxOrderMapper;
+    private final NxTodoLibraryService nxTodoLibraryService;
+    private final NxDeviceMapper nxDeviceMapper;
+    private final RootCloudAuthService rootCloudAuthService;
+    @Autowired
+    ServicePlanMapper servicePlanMapper;
+    @Autowired
+    NetworkUserService networkUserService;
+    @Autowired
+    Properties wfProperties;
+    @Autowired
+    Request request;
+    @Value("${os.iam.domain}")
+    private String domain;
+    @Value("${cms.codealarm.uri}")
+    private String codeAlarmUri;
+    @Value("${cms.codealarmbatch.uri}")
+    private String codeAlarmBatchUrl;
+    @Resource(name = "servicePlanHistoryServiceImpl")
+    private ServicePlanHistoryService servicePlanHistoryService;
+
+    public ServicePlanServiceImpl(@Qualifier("nxTriggerConditionServiceImpl") NxTriggerConditionService nxTriggerConditionService,
+                                  @Qualifier("nxJeDeviceServiceImpl") NxJeDeviceService nxJeDeviceService,
+                                  @Qualifier("modelPropertySyncService2") ModelPropertySyncService modelPropertySyncService,
+                                  TokenUtil tokenUtil, NxOrderMapper nxOrderMapper,
+                                  @Qualifier("NxUserInfoServiceImpl") NxUserInfoService nxUserInfoService,
+                                  @Qualifier("nxTodoLibraryServiceImpl") NxTodoLibraryService nxTodoLibraryService,
+                                  @Qualifier("cloudAuthService") RootCloudAuthService rootCloudAuthService,
+                                  NxDeviceMapper nxDeviceMapper) {
+        this.nxTriggerConditionService = nxTriggerConditionService;
+        this.nxJeDeviceService = nxJeDeviceService;
+        this.modelPropertySyncService = modelPropertySyncService;
+        this.tokenUtil = tokenUtil;
+        this.nxOrderMapper = nxOrderMapper;
+        this.nxUserInfoService = nxUserInfoService;
+        this.nxTodoLibraryService = nxTodoLibraryService;
+        this.rootCloudAuthService = rootCloudAuthService;
+        this.nxDeviceMapper = nxDeviceMapper;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public JsonResult addPlan(ServicePlanAO planAO) {
+        //新增基础服务计划
+        String planId = buildServicePlan(planAO);
+
+        if (StrUtil.isNotBlank(planAO.getServicePlanId()) && planAO.getConditionAO() != null
+                && StrUtil.isNotBlank(planAO.getConditionAO().getNxTriggerConditionId())) {
+            nxTriggerConditionService.update(planAO.getConditionAO(), planId, planAO.getDeviceCode());
+        } else {
+            // 添加触发条件
+            nxTriggerConditionService.add(planAO.getConditionAO(), planId, planAO.getDeviceCode());
+        }
+
+        //如果选择系统时间则需要将基础服务中的基础时间同步为触发条件中所选时间
+//        if (ServicePlanEnums.TriggerType.YSY_TIME.getCode().equals(conditionEntity.getTriggerCondition())){
+//            LambdaUpdateWrapper<ServicePlanEntity> lambda = new UpdateWrapper<ServicePlanEntity>().lambda();
+//            lambda.set(ServicePlanEntity::getPlanStartTime, conditionEntity.getSetValue())
+//                    .eq(ServicePlanEntity::getServicePlanId, planId);
+//            this.update(lambda);
+//        }
+        //提醒用户信息添加
+
+        NxUserInfoEntity userInfo = new NxUserInfoEntity();
+        BeanUtils.copyProperties(planAO.getUserInfoAO(), userInfo);
+        //判断是新增还修改
+        if (StringUtils.isNotBlank(planAO.getUserInfoAO().getNxUserInfoId())) {
+            nxUserInfoService.updateNxUserInfo(userInfo);
+        } else {
+            userInfo.setServicePlanId(planId);
+            userInfo.setNxUserInfoId(JEUuidUtil.uuid());
+            userInfo.setCreateTime(DateUtil.getSysdateStr());
+            nxUserInfoService.saveNxUserInfo(userInfo);
+        }
+        return JsonResult.success();
+    }
+
+    /**
+     * @return java.lang.String
+     * @Author w-liuyi01
+     * @Description //基础信息插入
+     * @Date 2022/4/29 16:29
+     * @Param [planAO]
+     **/
+    private String buildServicePlan(ServicePlanAO planAO) {
+        ServicePlanEntity planEntity = new ServicePlanEntity();
+        BeanUtils.copyProperties(planAO, planEntity);
+        if (StringUtils.isNotBlank(planAO.getServicePlanId())) {
+            //获取旧数据保存到历史表中
+            ServicePlanEntity historyInfo = servicePlanMapper.selectById(planAO.getServicePlanId());
+            ServicePlanHistoryEntity servicePlanHistoryEntity = new ServicePlanHistoryEntity();
+            servicePlanHistoryEntity.setId(CommonUtils.uuid());
+            servicePlanHistoryEntity.setContent(JSON.toJSONString(historyInfo));
+            servicePlanHistoryEntity.setServicePlanId(planAO.getServicePlanId());
+            servicePlanHistoryEntity.setOperator(UserContext.getUserId());
+            servicePlanHistoryEntity.setOperatorTime(DateUtils.format(new Date(), DateUtils.C_TIME_PATTON_DEFAULT));
+            servicePlanHistoryService.save(servicePlanHistoryEntity);
+            //修改下一个周期时间
+            try {
+                String nextTime = getNextDateByStartDateNew(planEntity);
+                planEntity.setNextCycleTime(nextTime);
+            } catch (Exception e) {
+                Log.error("设置下一个计划周期失败，失败原因：" + e.getMessage());
+                e.printStackTrace();
+            }
+            //修改服务计划数据
+            servicePlanMapper.updateById(planEntity);
+        } else {
+            planEntity.setDetailStatus(ServicePlanEnums.DetailStatus.DEFAULT.getCode());
+            planEntity.setCreateTime(DateUtil.getSysdateStr());
+            planEntity.setNextCycleTime(planEntity.getPlanStartTime());
+            planEntity.setServicePlanId(JEUuidUtil.uuid());
+            planEntity.setSyZhid(UserContext.getUserTenantId());
+            servicePlanMapper.insert(planEntity);
+
+        }
+        return planEntity.getServicePlanId();
+    }
+
+    @Override
+    public JsonResult startServicePlan(String servicePlanId) {
+        ServicePlanEntity servicePlanEntity = servicePlanMapper.selectById(servicePlanId);
+        return JsonResult.success();
+    }
+
+    @Override
+    public List<ModelPropertySyncEntity> getWorkCondition(String deviceNo) {
+        String modelId = this.getModelIdByDeviceNo(deviceNo);
+        return modelPropertySyncService.queryListByModelId(modelId);
+    }
+
+    @Override
+    public String getModelIdByDeviceNo(String deviceNo) {
+        String syZhid = UserContext.getTenantId();
+        NxJeDeviceEntity device = nxJeDeviceService
+                .getOne(Wrappers.lambdaQuery(NxJeDeviceEntity.class).eq(NxJeDeviceEntity::getDeviceSbbm, deviceNo).eq(NxJeDeviceEntity::getSyZhid, syZhid));
+        Optional.ofNullable(device)
+                .orElseThrow(() -> new BusinessException(StatusCodeEnum.EXCEPTION.getRet(), ResourceUtil.getI18nMessage("13500")));
+        return device.getModelId();
+    }
+
+
+    @RabbitListener(queues = "base.queue.nxgx.alarm")
+    public void getMessage(Message message) {
+        String body = new String(message.getBody(), StandardCharsets.UTF_8);
+        Log.info("工况消费者监听消息：{}", body);
+        JSONObject result = JSONObject.parseObject(body);
+        JSONObject payload = JSONObject.parseObject(result.getString("payload"));
+        if (payload == null) {
+            return;
+        }
+        String typeId = payload.getString("alarmTopicId");
+        if (StrUtil.isBlank(typeId)) {
+            return;
+        }
+
+        String now = DateUtil.format(new Date());
+        // 查询出所有在时间范围内，然后状态在进行中，并且类型是工况的数据
+        List<ConditionModel> conditionList = servicePlanMapper.findConditionList(now,
+                ServicePlanEnums.PlanStatus.IN_PROGRESS.getCode(), ServicePlanEnums.TriggerType.WORK_CONDITION.getCode(),
+                ServicePlanEnums.DetailStatus.DEFAULT.getCode(), typeId);
+        if (CollectionUtil.isEmpty(conditionList)) {
+            //Log.info("工况触发条件list为空");
+            return;
+        }
+        List<String> planIdList =
+                conditionList.stream().map(ConditionModel::getServicePlanId).collect(Collectors.toList());
+        // 修改状态为待发送
+        servicePlanMapper.updateDetailStatusByPlanIds(planIdList, ServicePlanEnums.DetailStatus.DETAIL.getCode());
+    }
+
+//    @Scheduled(cron = "${nx.plan.query:0 0/15 * * * ? }")
+
+    public void queryAlarmQz() {
+        // 查询到所有的台账
+        List<NxJeDeviceEntity> devices = nxJeDeviceService.queryAllJeDevice();
+        List<List<NxJeDeviceEntity>> lists = splitListByCount(devices, 50);
+        for (List<NxJeDeviceEntity> list : lists) {
+            queryAlarm(list);
+        }
+
+    }
+
+    public List<List<NxJeDeviceEntity>> splitListByCount(List<NxJeDeviceEntity> list, int count) {
+        List<List<NxJeDeviceEntity>> listAll = new ArrayList<>();
+        int size = list.size();
+        if (size > count) {
+            int absInt = Math.abs(size / count);
+            if (size - absInt * count > 0) {
+                listAll.add(list.subList(absInt * count, size));
+            }
+            for (int i = 1; i < absInt + 1; i++) {
+                listAll.add(list.subList((i - 1) * count, i * count));
+            }
+        } else {
+            listAll.add(list);
+        }
+        return listAll;
+    }
+
+    public void queryAlarm(List<NxJeDeviceEntity> devices) {
+
+
+        Map<Object, List<NxJeDeviceEntity>> map = devices.stream().filter(x -> StringUtils.isNotBlank(x.getSyZhid())).collect(Collectors.toList()).stream().collect(Collectors.groupingBy(b -> b.getSyZhid()));
+        for (Object zhid : map.keySet()) {
+
+            List<String> thingIds = map.get(zhid.toString()).stream().map(NxJeDeviceEntity::getNxJeDeviceId).collect(Collectors.toList());
+
+            HttpRequest request = HttpRequest.post(domain + codeAlarmBatchUrl);
+            request.header("Authorization", "Bearer " + tokenUtil.getToken(zhid.toString()));
+            request.header("accept", "application/json");
+            request.header("Content-Type", "application/json");
+            Map<String, Object> param = new HashMap<>(1);
+            param.put("thingIds", thingIds);
+            String jsonString = JSON.toJSONString(param);
+            //Log.info("【查询报警信息】请求参数 ==> {}", jsonString);
+            request.body(jsonString);
+            HttpResponse response = request.execute();
+
+
+            if (response.getStatus() != HttpStatus.HTTP_OK) {
+                Log.error("调用平台【查询报警信息】接口出错：{}", response);
+                // throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),
+                //   StatusCodeEnum.FAIL_CALL_INTERFACE.getMessage());
+                throw new BusinessException(StatusCodeEnum.FAIL_CALL_INTERFACE.getRet(),
+                        ResourceUtil.getI18nMessage("40000"));
+            }
+
+            JSONObject resultJson = JSONObject.parseObject(response.body());
+            // Log.info("调用平台【查询报警信息】返回结果 ==> {}", resultJson);
+            JSONArray payloadArray = resultJson.getJSONArray("payload");
+            if (payloadArray.isEmpty()) {
+                Log.info("查询报警信息【payload】节点为空，==> {}", resultJson);
+                return;
+            }
+
+            // 获取到所有的故障码
+            List<String> codeList = payloadArray.stream().map(item -> {
+                JSONObject payloadJson = (JSONObject) item;
+                return payloadJson.getString("code");
+            }).distinct().collect(Collectors.toList());
+
+            // 查询出所有的报警等级
+            List<NxZskFaultCodeEntity> alarmLevel = servicePlanMapper.selectAlarmLevel(codeList);
+            if (CollectionUtil.isEmpty(alarmLevel)) {
+                return;
+            }
+
+            String now = DateUtil.format(new Date());
+            // 查询出所有时间范围内，并且是进行中，类型为报警的触发条件
+            List<ConditionModel> conditionList =
+                    servicePlanMapper.findConditionList(now, ServicePlanEnums.PlanStatus.IN_PROGRESS.getCode(),
+                            ServicePlanEnums.TriggerType.ALARM.getCode(), ServicePlanEnums.DetailStatus.DEFAULT.getCode(), null);
+            if (CollectionUtil.isEmpty(conditionList)) {
+                Log.info("报警触发条件list为空");
+                return;
+            }
+
+            List<String> planIdList = conditionList.stream().filter(v -> {
+
+                // 等级越小，值越大
+                // 任意一个等级值大于所设置的值，条件设置为【<】都满足条件
+                // 任意一个等级值小于所设置的值，条件设置为【>】都满足条件
+                if (ServicePlanEnums.Condition.GT.getCode().equals(v.getConditionValue())) {
+                    int value = Integer.parseInt(v.getSetValue());
+                    for (NxZskFaultCodeEntity fault : alarmLevel) {
+                        try {
+                            int level = Integer.parseInt(fault.getFaultcodeGzdjcode());
+                            // 平台发送过来的等级值只要有一个值小于设置的值，说明就有等级大于设置的等级，就进行发短信等操作；
+                            if (level < value && v.getDeviceTypeCode().equals(fault.getFaultcodeSblxcode())) {
+                                return true;
+                            }
+                        } catch (Exception e) {
+                            continue;
+                        }
+                    }
+
+                }
+
+                if (ServicePlanEnums.Condition.LT.getCode().equals(v.getConditionValue())) {
+                    int value = Integer.parseInt(v.getSetValue());
+                    for (NxZskFaultCodeEntity fault : alarmLevel) {
+                        try {
+                            int level = Integer.parseInt(fault.getFaultcodeGzdjcode());
+                            // 平台发送过来的等级值只要有一个值大于设置的值，说明就有等级小于设置的等级，就进行发短信等操作；
+                            if (level > value && v.getDeviceTypeCode().equals(fault.getFaultcodeSblxcode())) {
+                                return true;
+                            }
+                        } catch (Exception e) {
+                            continue;
+                        }
+                    }
+                }
+
+                if (ServicePlanEnums.Condition.EQ.getCode().equals(v.getConditionValue())) {
+                    int value = Integer.parseInt(v.getSetValue());
+                    for (NxZskFaultCodeEntity fault : alarmLevel) {
+                        try {
+                            int level = Integer.parseInt(fault.getFaultcodeGzdjcode());
+                            if (level == value && v.getDeviceTypeCode().equals(fault.getFaultcodeSblxcode())) {
+                                return true;
+                            }
+                        } catch (Exception e) {
+                            continue;
+                        }
+                    }
+                }
+                // 都不满足就去掉这条数据
+                return false;
+            }).map(ConditionModel::getServicePlanId).collect(Collectors.toList());
+            if (CollectionUtil.isEmpty(planIdList)) {
+                return;
+            }
+            // 修改状态为待发送
+            servicePlanMapper.updateDetailStatusByPlanIds(planIdList, ServicePlanEnums.DetailStatus.DETAIL.getCode());
+        }
+    }
+
+    //@Scheduled(cron = "${nx.plan.execute:0 0 10 * * ? }")
+    @Override
+    public void execute() {
+        List<ServicePlanEntity> servicePlanEntities = servicePlanMapper.selectScheduledTasksList();
+        List<String> ids = new ArrayList<>();
+        if (!servicePlanEntities.isEmpty()) {
+            for (ServicePlanEntity servicePlan : servicePlanEntities) {
+                ids.add(servicePlan.getServicePlanId());
+                nxUserInfoService.setReminders(servicePlan.getServicePlanId());
+                //如果发送成功修改状态
+                updateServicePlanStatus(servicePlan.getServicePlanId(), 0, ServicePlanEnums.PlanStatus.FINISHED.getCode(), false, null);
+            }
+            servicePlanMapper.updateStatus(ids, ServicePlanEnums.PlanStatus.FINISHED,
+                    ServicePlanEnums.DetailStatus.DEFAULT.getCode());
+        }
+    }
+
+    @Override
+    public ServicePlanDetailVO selectDetailById(String servicePlanId) {
+        ServicePlanDetailVO servicePlanVo = new ServicePlanDetailVO();
+        ServicePlanEntity servicePlanEntity = servicePlanMapper.selectById(servicePlanId);
+        if (ObjectUtil.isEmpty(servicePlanEntity)) {
+            // throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_EXIST.getRet(),StatusCodeEnum.SERVICE_PLAN_NOT_EXIST.getMessage());
+            throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("16001"));
+        }
+
+        BeanUtils.copyProperties(servicePlanEntity, servicePlanVo);
+        //获取设备id
+        LambdaQueryWrapper<NxDeviceEntity> nxDeviceEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        nxDeviceEntityLambdaQueryWrapper.eq(NxDeviceEntity::getSblbSbbm, servicePlanEntity.getDeviceCode());
+        nxDeviceEntityLambdaQueryWrapper.eq(NxDeviceEntity::getSyZhid, servicePlanEntity.getSyZhid());
+        NxDeviceEntity nxDeviceEntity = nxDeviceMapper.selectOne(nxDeviceEntityLambdaQueryWrapper);
+        if (nxDeviceEntity != null) {
+            servicePlanVo.setDeviceId(nxDeviceEntity.getNxJcxxSblbId());
+        }
+        if (StringUtils.isNotBlank(servicePlanVo.getMaintainContentName())) {
+            //List<MaintenanceListVo> maintenanceListVos = servicePlanMapper.selectListByName(servicePlanVo.getMaintainContentName());
+            List<MaintenanceListVo> maintenanceListVos = servicePlanMapper.selectListByName2(servicePlanVo.getMaintainContentName(), servicePlanVo.getMaintainContent());
+            servicePlanVo.setMaintenanceListVo(maintenanceListVos);
+        }
+
+        NxTriggerConditionEntity condition =
+                nxTriggerConditionService.getOne(Wrappers.lambdaQuery(NxTriggerConditionEntity.class)
+                        .eq(NxTriggerConditionEntity::getServicePlanId, servicePlanId).last("limit 1"));
+        servicePlanVo.setCondition(condition);
+        NxUserInfoVo nxUserInfoVo = nxUserInfoService.selectByServicePlanId(servicePlanId, servicePlanEntity.getDeviceCode(), servicePlanEntity.getSyZhid());
+        servicePlanVo.setNxUserInfoVo(nxUserInfoVo);
+        return servicePlanVo;
+    }
+
+    @Override
+    public int deleteServicePlan(String servicePlanId) {
+        QueryWrapper<ServicePlanEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("SERVICE_PLAN_ID", servicePlanId);
+        ServicePlanEntity servicePlanEntity = servicePlanMapper.selectOne(queryWrapper);
+        if (ObjectUtil.isEmpty(servicePlanEntity)) {
+            //throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_EXIST.getRet(),StatusCodeEnum.SERVICE_PLAN_NOT_EXIST.getMessage());
+            throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("16001"));
+        }
+        if (ServicePlanEnums.PlanStatus.IN_PROGRESS.getCode().equals(servicePlanEntity.getPlanStatus())) {
+            //throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_DELETE.getRet(),StatusCodeEnum.SERVICE_PLAN_NOT_DELETE.getMessage());
+            throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_DELETE.getRet(), ResourceUtil.getI18nMessage("16002"));
+        }
+        //删除触发条件
+        nxTriggerConditionService.removeByPlanId(servicePlanId, servicePlanEntity.getDeviceCode());
+
+        nxUserInfoService.deleteByServicePlanId(servicePlanId);
+
+        servicePlanEntity.setSyStatus("0");
+        int i = servicePlanMapper.updateById(servicePlanEntity);
+        //int i = servicePlanMapper.deleteById(servicePlanId);
+        return i;
+    }
+
+
+    @Override
+    public void scheduledProcessing() {
+        //获取当天日期
+        String thatDay = DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE);
+        log.info("服务计划执行日期：{}" , thatDay);
+        List<ServicePlanVo> servicePlanVos = servicePlanMapper.selectExecutedServicePlan(thatDay);
+        if (servicePlanVos.size() > 0) {
+            for (ServicePlanVo item : servicePlanVos) {
+                try {
+                    log.info("服务计划ID:{}已进入执行", item.getServicePlanId());
+                    //判断是否临时触发时间的服务计划
+                    boolean tempTime = false;
+                    if (StringUtils.isNotBlank(item.getPlanLscfsj())) {
+                        tempTime = true;
+                        log.info("服务计划:{}为临时触发计划",item.getServicePlanId());
+                    }
+                    QueryWrapper<ServicePlanEntity> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("SERVICE_PLAN_ID", item.getServicePlanId());
+                    ServicePlanEntity servicePlanEntity = servicePlanMapper.selectOne(queryWrapper);
+                    //如果是自动触发则需要判定当前日期所在的周期内是否有存在服务计划订单
+                    //todo 2024-12-27 新增逻辑：由于原有逻辑在查单时无法准确判断已生成的工单是当次延迟工单还是下次提前工单 导致此段逻辑异常
+                    //异常表现为：如果查到的是当月延迟的工单会导致下次工单不生成
+                    //新逻辑为：订单表增加一个字段service_plan_order_status，这个字段在临时触发时间生效，生成工单时，进行赋值，赋值为after
+                    //当下次定时任务生成开始生成工单时，查询到有工单后原逻辑会不生成，现逻辑改为查询时筛选掉是after的工单后，如果还存在工单，那么工单就是手动提前触发了下次的工单，此时不生成，否则生成
+                    String startDate = getCurrentDateStartDate(servicePlanEntity, thatDay);
+                    String endDate = thatDay;
+                    if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)) {
+                        Integer count = servicePlanMapper.checkOrderCount(servicePlanEntity.getServicePlanId(), startDate, endDate);
+                        if (count > 0) {
+                            log.info("该服务计划{}当前周期：{}>>>{}内，已生成订单...", item.getServicePlanId(), startDate, endDate);
+                            //本次周期提前触发过 调整下次触发时间
+                            String nextTime = getNextDateByStartDateNew(servicePlanEntity);
+                            servicePlanEntity.setNextCycleTime(nextTime);
+                            servicePlanMapper.update(servicePlanEntity, queryWrapper);
+                            continue;
+                        }
+                    }
+                    //根据服务计划和开始日期查询代办库，看服务计划是否执行生成了订单
+                    Integer count = servicePlanMapper.checkOrder(item.getServicePlanId(), thatDay);
+                    if (count > 0) {
+                        log.info("该服务计划{}当天已生成订单...", item.getServicePlanId());
+                    } else {
+                        //发送
+                        nxUserInfoService.setReminders(item.getServicePlanId());
+                        //如果发送成功修改状态
+                        updateServicePlanStatus(item.getServicePlanId(), 0, ServicePlanEnums.PlanStatus.FINISHED.getCode(), tempTime, thatDay);
+                    }
+                } catch (Exception e) {
+                    log.info("发送以及修改状态错误信息:{}", e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void scheduledProcessingNew(String thatDay, String planId) {
+        if (StringUtils.isNotBlank(thatDay)) {
+            //获取当天日期
+            Log.info("服务计划执行日期：" + thatDay);
+            List<ServicePlanVo> servicePlanVos = servicePlanMapper.selectExecutedServicePlan(thatDay);
+            if (servicePlanVos.size() > 0) {
+                for (ServicePlanVo item : servicePlanVos) {
+                    try {
+                        Log.info("服务计划：" + item);
+                        //判断是否临时触发时间的服务计划
+                        boolean tempTime = false;
+                        if (StringUtils.isNotBlank(item.getPlanLscfsj())) {
+                            tempTime = true;
+                        }
+                        //根据服务计划和开始日期查询代办库，看服务计划是否执行生成了订单
+                        Integer count = servicePlanMapper.checkOrder(item.getServicePlanId(), thatDay);
+                        if (count > 0) {
+                            Log.info("该服务计划当天已生成订单...");
+                            continue;
+                        } else {
+                            //发送
+                            nxUserInfoService.setReminders(item.getServicePlanId());
+                            //如果发送成功修改状态
+                            updateServicePlanStatus(item.getServicePlanId(), 0, ServicePlanEnums.PlanStatus.FINISHED.getCode(), tempTime, thatDay);
+                        }
+                    } catch (Exception e) {
+                        Log.info("发送以及修改状态错误信息:{}", e);
+                    }
+                }
+            }
+        }
+        //单个执行
+        if (StringUtils.isNotBlank(planId) && StringUtils.isNotBlank(thatDay)) {
+            List<ServicePlanVo> servicePlanVos = servicePlanMapper.selectExecutedServicePlanByPlanId(planId);
+            if (servicePlanVos.size() > 0) {
+                for (ServicePlanVo item : servicePlanVos) {
+                    try {
+                        Log.info("服务计划：" + item);
+                        //判断是否临时触发时间的服务计划
+                        boolean tempTime = false;
+                        if (StringUtils.isNotBlank(item.getPlanLscfsj())) {
+                            tempTime = true;
+                        }
+                        //根据服务计划和开始日期查询代办库，看服务计划是否执行生成了订单
+                        Integer count = servicePlanMapper.checkOrder(item.getServicePlanId(), thatDay);
+                        if (count > 0) {
+                            Log.info("该服务计划当天已生成订单...");
+                            continue;
+                        } else {
+                            //发送
+                            nxUserInfoService.setReminders(item.getServicePlanId());
+                            //如果发送成功修改状态
+                            updateServicePlanStatus(item.getServicePlanId(), 0, ServicePlanEnums.PlanStatus.FINISHED.getCode(), tempTime, thatDay);
+                        }
+                    } catch (Exception e) {
+                        Log.info("发送以及修改状态错误信息:{}", e);
+                    }
+                }
+            }
+        }
+    }
+
+    @SneakyThrows
+    @Override
+    public void updateStatusScheduled() {
+        //所有进行中和 已经完成状态的， 进行中的  看看是否在时间周期之内  如果不在 则修改成已完成状态
+        ServicePlanParamsAO ao = new ServicePlanParamsAO();
+        ao.setPlanStatus(ServicePlanEnums.PlanStatus.IN_PROGRESS.getCode());
+        List<ServicePlanEntity> servicePlanEntities = servicePlanMapper.selectListByParams(ao);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        if (!servicePlanEntities.isEmpty()) {
+            servicePlanEntities.stream().forEach(item -> {
+                try {
+                    if (StringUtils.isNotBlank(item.getPlanEndTime())
+                            && LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")).compareTo(sdf.format(sdf.parse(item.getPlanEndTime()))) >= 0) {
+                        updateServicePlanStatus(item.getServicePlanId(), 0, ServicePlanEnums.PlanStatus.FINISHED.getCode(), false, null);
+                    }
+                } catch (ParseException e) {
+                    Log.info("错误信息={}", e);
+                }
+            });
+        }
+
+        //完成状态  看看是否在时间段之内
+        ao.setPlanStatus(ServicePlanEnums.PlanStatus.FINISHED.getCode());
+        ao.setSysTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        ao.setPlanCycle("planCycle");
+        List<ServicePlanEntity> finishEntities = servicePlanMapper.selectListByParams(ao);
+        if (!finishEntities.isEmpty()) {
+            finishEntities.stream().forEach(item -> {
+                if (item.getPlanCycle() == null) {
+                    //无周期 直接改
+                    updateServicePlanStatus(item.getServicePlanId(), 0, ServicePlanEnums.PlanStatus.IN_PROGRESS.getCode(), false, null);
+                } else {
+                    //有周期 特殊处理周期
+                    //查询有没有下一周期值
+                    //如果没有下一周期值   直接修改为进行中  并且计算下一周期值修改进去
+                    //如果有下一周期值     判断是不是当前时间是不是大于等于这个时间  如果是的进行修改为进行中  并且计算下一周期的值修改进去，因为要提前一天触发，所护
+                    if (StringUtils.isNotBlank(item.getNextCycleTime())) {
+                        try {
+                            if (LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")).compareTo(sdf.format(DateUtils.addDays(sdf.parse(item.getNextCycleTime()), -1))) < 0) {
+                                return;
+                            }
+                        } catch (ParseException e) {
+                            Log.info("错误信息={}", e);
+                            return;
+                        }
+                    }
+                    //修改状态以及下一个周期时间
+                    updateServicePlanStatus(item.getServicePlanId(), 0, ServicePlanEnums.PlanStatus.IN_PROGRESS.getCode(), false, null);
+                }
+            });
+        }
+    }
+
+    @Override
+    @SneakyThrows
+    public boolean updateServicePlanStatus(String servicePlanId, int triggerType, Integer servicePlanStatus, boolean tempTime, String thatDay) {
+        log.info("服务计划{}自动触发修改计划状态", servicePlanId);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        QueryWrapper<ServicePlanEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("SERVICE_PLAN_ID", servicePlanId);
+        ServicePlanEntity servicePlanEntity = servicePlanMapper.selectOne(queryWrapper);
+        if (ObjectUtil.isEmpty(servicePlanEntity)) {
+            log.info("{}16001异常", servicePlanId);
+            //throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_EXIST.getRet(),StatusCodeEnum.SERVICE_PLAN_NOT_EXIST.getMessage());
+            throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("16001"));
+        }
+        if (ServicePlanEnums.PlanStatus.PAUSED.getCode().equals(servicePlanStatus)) {
+            //停止
+            if (ServicePlanEnums.PlanStatus.PAUSED.getCode().equals(servicePlanEntity.getPlanStatus())) {
+                log.info("{}16003异常", servicePlanId);
+                //throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_STOP.getRet(),StatusCodeEnum.SERVICE_PLAN_NOT_STOP.getMessage());
+                throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_STOP.getRet(), ResourceUtil.getI18nMessage("16003"));
+            }
+            servicePlanEntity.setPlanStatusName("已暂停");
+        }
+        if (ServicePlanEnums.PlanStatus.FINISHED.getCode().equals(servicePlanStatus)) {
+            //已完成的状态如果订单为空的可以手动触发
+            if (!ServicePlanEnums.PlanStatus.IN_PROGRESS.getCode().equals(servicePlanEntity.getPlanStatus()) && !ServicePlanEnums.PlanStatus.FINISHED.getCode().equals(servicePlanEntity.getPlanStatus())) {
+                log.info("{}16004异常", servicePlanId);
+                throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_FINISH.getRet(), ResourceUtil.getI18nMessage("16004"));
+            }
+            servicePlanEntity.setPlanStatusName("已完成");
+            //已经完成 时间没有超过时间范围  就更新最新触发时间;
+            if (StringUtils.isBlank(servicePlanEntity.getPlanEndTime())) {
+                servicePlanEntity.setLatestTriggerTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+            } else {
+                try {
+                    if (LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")).compareTo(sdf.format(sdf.parse(servicePlanEntity.getPlanEndTime()))) <= 0) {
+                        servicePlanEntity.setLatestTriggerTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+                    }
+                } catch (ParseException e) {
+                    log.info("{}错误信息={}", servicePlanId, e.getMessage());
+                }
+            }
+            try {
+                //一键生成订单  只有由状态变成已完成生成
+                generateOrder(servicePlanEntity, triggerType, thatDay, tempTime);  //20241231
+            } catch (Exception e) {
+                log.info("生成订单异常:" + e);
+                e.printStackTrace();
+            }
+            //修改下一周期时间
+            String nextTime = getNextDateByStartDateNew(servicePlanEntity);
+            servicePlanEntity.setNextCycleTime(nextTime);
+
+            //存在临时时间，清空
+            if (tempTime) {
+                servicePlanEntity.setPlanLscfsj("");
+            }
+        }
+        if (ServicePlanEnums.PlanStatus.IN_PROGRESS.getCode().equals(servicePlanStatus)) {
+            //进行中
+            if (ServicePlanEnums.PlanStatus.IN_PROGRESS.getCode().equals(servicePlanEntity.getPlanStatus())) {
+                //throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_STAR.getRet(),StatusCodeEnum.SERVICE_PLAN_NOT_STAR.getMessage());
+                throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_STAR.getRet(), ResourceUtil.getI18nMessage("16005"));
+            }
+            servicePlanEntity.setPlanStatusName("进行中");
+        }
+        servicePlanEntity.setPlanStatus(servicePlanStatus);
+        int update = servicePlanMapper.update(servicePlanEntity, queryWrapper);
+
+        if (update == 1) {
+            return true;
+        }
+        return false;
+    }
+
+    /*public String getNextDateByStartDate(Date startDate, ServicePlanEntity servicePlan) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Integer planCycle = servicePlan.getPlanCycle();
+        Integer planInterval = servicePlan.getPlanInterval();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(startDate);
+        if (ServicePlanEnums.PlanCycle.DAY.getCode().equals(planCycle)) {
+            //日
+            calendar.add(Calendar.DATE, planInterval);
+        }
+        if (ServicePlanEnums.PlanCycle.WEEK.getCode().equals(planCycle)) {
+            //周
+            calendar.add(Calendar.DATE, 7 * planInterval);
+        }
+        if (ServicePlanEnums.PlanCycle.MONTH.getCode().equals(planCycle)) {
+            //月
+            calendar.add(Calendar.MONTH, planInterval);
+        }
+        if (ServicePlanEnums.PlanCycle.YEAR.getCode().equals(planCycle)) {
+            //年
+            calendar.add(Calendar.YEAR, planInterval);
+        }
+        String endDate = sdf.format(calendar.getTime());
+        return endDate;
+    }*/
+
+    /**
+     * 获取本次周期的开始时间
+     *
+     * @param servicePlan
+     * @param currentDay
+     * @return
+     */
+    public String getCurrentDateStartDate(ServicePlanEntity servicePlan, String currentDay) {
+        try {
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+            //获取计划开始日期
+            Date endDate = df.parse(currentDay);
+            Integer planCycle = servicePlan.getPlanCycle();
+            //转为负数
+            Integer planInterval = -(servicePlan.getPlanInterval());
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(endDate);
+            //日
+            if (ServicePlanEnums.PlanCycle.DAY.getCode().equals(planCycle)) {
+                calendar.add(Calendar.DATE, planInterval);
+            }
+            //周
+            if (ServicePlanEnums.PlanCycle.WEEK.getCode().equals(planCycle)) {
+                calendar.add(Calendar.DATE, 7 * planInterval);
+            }
+            //月
+            if (ServicePlanEnums.PlanCycle.MONTH.getCode().equals(planCycle)) {
+                calendar.add(Calendar.MONTH, planInterval);
+            }
+            //年
+            if (ServicePlanEnums.PlanCycle.YEAR.getCode().equals(planCycle)) {
+                calendar.add(Calendar.YEAR, planInterval);
+            }
+            //必须加1 因为周期开始时间必须加1，例如 6.21日--9.20日算一个周期的结束
+            calendar.add(Calendar.DATE, 1);
+            Date startDate = calendar.getTime();
+            return df.format(startDate);
+        } catch (Exception e) {
+            Log.error("获取数据失败，失败原因：" + e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * 获取下一个周期时间
+     *
+     * @param servicePlan
+     * @return
+     */
+    public String getNextDateByStartDateNew(ServicePlanEntity servicePlan) {
+        Date endDate = null;
+        try {
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+            //获取当前日期
+            String current = df.format(new Date());
+            Date currentDate = df.parse(current);
+            //获取计划开始日期
+            endDate = df.parse(servicePlan.getPlanStartTime());
+            Integer planCycle = servicePlan.getPlanCycle();
+            Integer planInterval = servicePlan.getPlanInterval();
+            do {
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(endDate);
+                //日
+                if (ServicePlanEnums.PlanCycle.DAY.getCode().equals(planCycle)) {
+                    calendar.add(Calendar.DATE, planInterval);
+                }
+                //周
+                if (ServicePlanEnums.PlanCycle.WEEK.getCode().equals(planCycle)) {
+                    calendar.add(Calendar.DATE, 7 * planInterval);
+                }
+                //月
+                if (ServicePlanEnums.PlanCycle.MONTH.getCode().equals(planCycle)) {
+                    calendar.add(Calendar.MONTH, planInterval);
+                }
+                //年
+                if (ServicePlanEnums.PlanCycle.YEAR.getCode().equals(planCycle)) {
+                    calendar.add(Calendar.YEAR, planInterval);
+                }
+                endDate = calendar.getTime();
+            } while (endDate.getTime() <= currentDate.getTime());  //whl.2024241122
+            Log.info("下一周期日期：" + df.format(endDate));
+            //针对有结束时间的服务计划做判断
+            if (StringUtils.isNotBlank(servicePlan.getPlanEndTime())) {
+                Date planEndTime = df.parse(servicePlan.getPlanEndTime());
+                if (endDate.getTime() > planEndTime.getTime()) {
+                    return null;
+                }
+            }
+            return df.format(endDate);
+        } catch (Exception e) {
+            Log.error("获取数据失败，失败原因：" + e.getMessage());
+            return null;
+        }
+
+    }
+
+    public String getPreviousDateByStartDate(Date startDate, ServicePlanEntity servicePlan) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Integer planCycle = servicePlan.getPlanCycle();
+        Integer planInterval = servicePlan.getPlanInterval();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(startDate);
+        if (ServicePlanEnums.PlanCycle.DAY.getCode().equals(planCycle)) {
+            //日
+            calendar.add(Calendar.DATE, -planInterval);
+        }
+        if (ServicePlanEnums.PlanCycle.WEEK.getCode().equals(planCycle)) {
+            //周
+            calendar.add(Calendar.DATE, -7 * planInterval);
+        }
+        if (ServicePlanEnums.PlanCycle.MONTH.getCode().equals(planCycle)) {
+            //月
+            calendar.add(Calendar.MONTH, -planInterval);
+        }
+        if (ServicePlanEnums.PlanCycle.YEAR.getCode().equals(planCycle)) {
+            //年
+            calendar.add(Calendar.YEAR, -planInterval);
+        }
+        String endDate = sdf.format(calendar.getTime());
+        return endDate;
+    }
+
+
+    @Override
+    public ServicePlanCalendarVO checkServicePlanCalendar(ServicePlanCalendarAO planCalendarAO) {
+        ServicePlanCalendarVO vo = new ServicePlanCalendarVO();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        ServicePlanEntity servicePlanEntity = servicePlanMapper.selectById(planCalendarAO.getServicePlanId());
+        if (ObjectUtil.isEmpty(servicePlanEntity)) {
+            // throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_EXIST.getRet(),StatusCodeEnum.SERVICE_PLAN_NOT_EXIST.getMessage());
+            throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("16001"));
+        }
+        if (!ServicePlanEnums.PlanType.MAINTAIN.getCode().toString().equals(servicePlanEntity.getPlanType())) {
+            //throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_CALENDAR.getRet(),StatusCodeEnum.SERVICE_PLAN_NOT_CALENDAR.getMessage());
+            throw new BusinessException(StatusCodeEnum.SERVICE_PLAN_NOT_CALENDAR.getRet(), ResourceUtil.getI18nMessage("16006"));
+        }
+        NxJeDeviceEntity deviceEntity = nxJeDeviceService.selectBySbbm(servicePlanEntity.getDeviceCode());
+
+        List<ServicePlanCalendarList> list = new ArrayList<ServicePlanCalendarList>();
+        //根据查询获取月份的开始和结束日期
+        String queryTime = planCalendarAO.getQueryTime();
+        Date parse = null;
+        try {
+            parse = format.parse(queryTime);
+        } catch (ParseException e) {
+            Log.info("获取月份错误信息：{}", e.getMessage());
+        }
+        Calendar cld = Calendar.getInstance();
+        cld.setTime(parse);
+        cld.add(Calendar.MONTH, 1);
+        cld.set(Calendar.DAY_OF_MONTH, 0);
+        String lastDay = sdf.format(cld.getTime());
+        Log.info("当月最后一天={}", lastDay);
+        cld.set(Calendar.DAY_OF_MONTH, 1);
+        String firstDay = sdf.format(cld.getTime());
+        Log.info("当月第一天={}", firstDay);
+
+        //查询待办库里面的是否满足条件数据,历史数据
+        Map param = new HashMap();
+        param.put("planId", servicePlanEntity.getServicePlanId());
+        param.put("firstDay", firstDay);
+        param.put("lastDay", lastDay);
+        List<Map<String, String>> todoLibrary = servicePlanMapper.getTodoLibrary(param);
+        List<String> dates = new ArrayList<>();
+        Map<String, String> orderMap = new HashMap<>();
+
+        if (todoLibrary.size() > 0) {
+            for (Map<String, String> item :
+                    todoLibrary) {
+                dates.add(item.get("TIME"));
+                orderMap.put(item.get("TIME"), item.get("ORDER_STATUS"));
+            }
+        }
+        //存在临时时间  如果临时时间不在当前月， 不参与此次展示
+        if (StringUtils.isNotBlank(servicePlanEntity.getPlanLscfsj())) {
+            if (servicePlanEntity.getPlanLscfsj().contains(queryTime)) {
+                dates.add(servicePlanEntity.getPlanLscfsj());
+            }
+        }
+        String planStartTime = servicePlanEntity.getPlanStartTime();
+        String planEndTime = servicePlanEntity.getPlanEndTime();
+        List<String> days = com.rootcloud.common.live.DateUtil.findDates(planStartTime, planEndTime,
+                String.valueOf(servicePlanEntity.getPlanCycle()), servicePlanEntity.getPlanInterval(), firstDay, lastDay);
+        Log.info("获取到日期1：" + days);
+        //取出最后一个历史数据时间
+        /*if (dates.size() > 0) {
+            String lastTime = dates.get(dates.size() - 1).substring(0, 10);
+            days.stream().forEach(item -> {
+                //保留大于最后一个时间的数据
+                if (item.length() >= 10) {
+                    if (item.substring(0, 10).compareTo(lastTime) > 0) {
+                        dates.add(item);
+                    }
+                }
+            });
+        } else {
+            dates.addAll(days);
+        }*/
+        if (dates.size() > 0) {
+            if (dates.size() < days.size()) {
+                for (int i = dates.size(); i < days.size(); i++) {
+                    dates.add(days.get(i));
+                }
+            }
+        } else {
+            dates.addAll(days);
+        }
+        //清理掉提前触发日期
+        List<String> newDates = new ArrayList<>();
+        String planTqcfrq = servicePlanEntity.getPlanTqcfrq();
+        if (StringUtils.isNotBlank(planTqcfrq)) {
+            List<String> tqfcrqList = Arrays.asList(servicePlanEntity.getPlanTqcfrq().split(","));
+            if (tqfcrqList.size() > 0) {
+                dates.forEach(o -> {
+                    if (!tqfcrqList.contains(o)) {
+                        newDates.add(o);
+                    }
+                });
+            } else {
+                newDates.addAll(dates);
+            }
+        } else {
+            newDates.addAll(dates);
+        }
+        //数据状态为暂停 则取最后一条数据比对，大于这个时间的数据全部隐藏
+        List<String> liss = new ArrayList<>();
+        String planStatus = servicePlanEntity.getPlanStatus().toString();
+        if (ServicePlanEnums.PlanStatus.PAUSED.getCode().toString().equals(planStatus)) {
+            String ztrq = servicePlanEntity.getPlanZtrq();
+            List<String> ztrqList = new ArrayList<>();
+            if (StringUtils.isNotBlank(ztrq)) {
+                ztrqList = new ArrayList<>(Arrays.asList(ztrq.split(",")));
+            }
+            //获取暂停开始时间
+            String start = null;
+            if (ztrqList.size() > 0) {
+                start = ztrqList.get(ztrqList.size() - 1);
+            }
+            if (StringUtils.isNotBlank(start)) {
+                for (int i = 0; i < newDates.size(); i++) {
+                    if (newDates.get(i).compareTo(start) < 0) {
+                        liss.add(newDates.get(i));
+                    }
+                }
+            } else {
+                liss.addAll(newDates);
+            }
+        } else {
+            liss.addAll(newDates);
+        }
+        //清理掉暂停日期的
+        List<String> screenDates = new ArrayList<>();
+        String ztrq = servicePlanEntity.getPlanZtrq();
+        if (StringUtils.isNotBlank(ztrq)) {
+            List<String> ztrqList = Arrays.asList(ztrq.split(","));
+            if (ztrqList.size() > 0) {
+                liss.forEach(o -> {
+                    if (!ztrqList.contains(o)) {
+                        screenDates.add(o);
+                    }
+                });
+            } else {
+                screenDates.addAll(liss);
+            }
+        } else {
+            screenDates.addAll(liss);
+        }
+        Log.info("服务计划：" + servicePlanEntity.getPlanName() + " 获取到日期：" + screenDates);
+        screenDates.stream().forEach(item -> {
+            ServicePlanCalendarList servicePlanCalendarList = new ServicePlanCalendarList();
+            servicePlanCalendarList.setCalendarDate(item);
+            servicePlanCalendarList.setOrderStatus(orderMap.get(item));
+            ServicePlanCalendarDetailsVO servicePlanCalendarDetailsVO = new ServicePlanCalendarDetailsVO();
+            servicePlanCalendarDetailsVO.setDeviceCode(deviceEntity.getDeviceSbbm());
+            servicePlanCalendarDetailsVO.setDviceName(deviceEntity.getDeviceSbmc());
+            servicePlanCalendarDetailsVO.setCustomerName(deviceEntity.getDeviceSskhmc());
+            servicePlanCalendarDetailsVO.setPlanStartTime(servicePlanEntity.getPlanStartTime());
+            servicePlanCalendarDetailsVO.setServiceName(servicePlanEntity.getPlanName());
+            servicePlanCalendarDetailsVO.setPlanEndTime(servicePlanEntity.getPlanEndTime());
+            servicePlanCalendarDetailsVO.setFinishTimeNode(servicePlanEntity.getFinishTimeNode());
+            String s = returnDateStatusNew(servicePlanEntity, item);
+            servicePlanCalendarDetailsVO.setDateStatus(s);
+            servicePlanCalendarList.setDateStatus(s);
+            servicePlanCalendarList.setServicePlanCalendarDetailsVO(servicePlanCalendarDetailsVO);
+            list.add(servicePlanCalendarList);
+        });
+        vo.setList(list);
+        vo.setFinishRate(finishRateNew(list));
+        return vo;
+    }
+
+
+    /**
+     * 计算日期
+     *
+     * @param startTime
+     * @param servicePlanEntity
+     * @return
+     */
+    public String calcDate(String startTime, ServicePlanEntity servicePlanEntity) throws ParseException {
+        Integer finishTimeNode = servicePlanEntity.getFinishTimeNode() == null ? 0 : servicePlanEntity.getFinishTimeNode();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        if (finishTimeNode != 0) {
+            Date parse = sdf.parse(startTime);
+            Calendar cld = Calendar.getInstance();
+            cld.setTime(parse);
+            cld.add(Calendar.DATE, finishTimeNode);
+            String format = sdf.format(cld.getTime());
+            return format;
+        } else {
+            return sdf.format(sdf.parse(startTime));
+        }
+    }
+
+    /**
+     * 当前任务日历状态
+     *
+     * @param servicePlanEntity
+     * @return
+     */
+    public String returnDateStatus(ServicePlanEntity servicePlanEntity, String time) {
+        //1进行中，2已经完成，0暂停
+        String servicePlanId = servicePlanEntity.getServicePlanId();
+        NxOrderEntity order = nxOrderMapper.selectByServicePlanId(servicePlanId, time);
+        Log.info("任务日历查询订单", JSON.toJSON(order));
+        if (ObjectUtils.isNotEmpty(order)) {
+            if (OrderEnums.OrderStatus.DONE.getCode().equals(order.getOrderOrderstatusCode())) {
+                return "2";
+            }
+            if (OrderEnums.OrderStatus.DEPRECATED.getCode().equals(order.getOrderOrderstatusCode())
+                    || OrderEnums.OrderStatus.DELETED.getCode().equals(order.getOrderOrderstatusCode())) {
+                return "0";
+            }
+        }
+        return "1";
+    }
+
+
+    public Date returnEndDate(Date startData, ServicePlanEntity servicePlanEntity) {
+        Date endData = null;
+        Calendar cld = Calendar.getInstance();
+        cld.setTime(startData);
+        if (ServicePlanEnums.PlanCycle.DAY.getCode().equals(servicePlanEntity.getPlanCycle())) {
+            Integer day = servicePlanMapper.queryLgortsByCode("DAY");
+            if (day == null) {
+                day = 0;
+            }
+            cld.add(Calendar.DATE, day);
+        } else if (ServicePlanEnums.PlanCycle.WEEK.getCode().equals(servicePlanEntity.getPlanCycle())) {
+            Integer week = servicePlanMapper.queryLgortsByCode("WEEK");
+            if (week == null) {
+                week = 3;
+            }
+            cld.add(Calendar.DATE, week);
+        } else if (ServicePlanEnums.PlanCycle.MONTH.getCode().equals(servicePlanEntity.getPlanCycle())) {
+            Integer month = servicePlanMapper.queryLgortsByCode("MONTH");
+            if (month == null) {
+                month = 7;
+            }
+            cld.add(Calendar.DATE, month);
+        } else if (ServicePlanEnums.PlanCycle.YEAR.getCode().equals(servicePlanEntity.getPlanCycle())) {
+            Integer year = servicePlanMapper.queryLgortsByCode("YEAR");
+            if (year == null) {
+                year = 180;
+            }
+            cld.add(Calendar.DATE, year);
+        }
+        endData = cld.getTime();
+        return endData;
+    }
+
+
+    /**
+     * 当前任务日历状态
+     *
+     * @param servicePlanEntity
+     * @param time
+     * @return
+     */
+    @SneakyThrows
+    public String returnDateStatusNew(ServicePlanEntity servicePlanEntity, String time) {
+        //设计要求：任务完成状态划分为： 未发起状态灰色、已发起状态蓝色、正常完成绿色（审核完成）、延期未完成-浅绿色、 拖期完成橙色、未完成红色
+        //具体要求：拖期完成 - （天保养往后默认延期0天、 周是往后默认延期3天、月是往后默认延期7天、年是往后默认延期180天)，新增计划页面上添加配置项
+        String servicePlanId = servicePlanEntity.getServicePlanId();
+        SimpleDateFormat sdf = null;
+        if (time.length() > 10) {
+            sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        } else {
+            sdf = new SimpleDateFormat("yyyy-MM-dd");
+        }
+        //获取到当前日期
+        String currentDate = sdf.format(new Date());
+        //Log.info("获取到服务计划ID:" + servicePlanId + "，时间：" + time);
+        NxOrderEntity order = nxOrderMapper.selectByServicePlanId(servicePlanId, time);
+        /*if (order == null) {
+            Date beginDate = sdf.parse(time);
+            Date endDate = sdf.parse(currentDate);
+            if (beginDate.before(endDate)) {
+                return ServicePlanEnums.MaintenanceType.STATUS_FINISH.getCode();
+            }
+        }*/
+        //Log.info("获取到服务计划ID对应订单：" + order);
+        String dataStatus = null;
+        //获取正常完成时间
+        Calendar cld = Calendar.getInstance();
+        cld.setTime(sdf.parse(time));
+        if (servicePlanEntity.getFinishTimeNode() != null) {
+            cld.add(Calendar.DATE, (servicePlanEntity.getFinishTimeNode()));
+        }
+        Date startData = cld.getTime();
+        //计算范围
+        Date endData = returnEndDate(startData, servicePlanEntity);
+        if (ObjectUtils.isNotEmpty(order) && "1".equals(order.getSyStatus())) {
+            //已发起状态蓝色
+            dataStatus = ServicePlanEnums.MaintenanceType.STATUS_LAUNCH.getCode();
+            //先看状态
+            if ((OrderEnums.OrderStatus.TO_BE_RETURNED.getCode().equals(order.getOrderOrderstatusCode()) ||
+                    OrderEnums.OrderStatus.DONE.getCode().equals(order.getOrderOrderstatusCode()))
+                    && StringUtils.isNotBlank(order.getOrderShtgsj())) {
+                //完成：正常完成绿色（审核完成）、拖期完成橙色、
+                dataStatus = ServicePlanEnums.MaintenanceType.STATUS_FINISH.getCode();
+                //拖期完成橙色 审核时间在拖期范围
+                Date date = DateUtil.timestampToDate(Long.valueOf(order.getOrderShtgsj()));
+                Date shsj = sdf.parse(sdf.format(date));
+                //完成时间可以加完成时间节点
+                /*Calendar cldar = Calendar.getInstance();
+                cldar.setTime(endData);
+                if(servicePlanEntity.getFinishTimeNode()!=null){
+                    cldar.add(Calendar.DATE, servicePlanEntity.getFinishTimeNode());
+                }
+                endData = cldar.getTime();*/
+                if (shsj.getTime() <= endData.getTime() && shsj.getTime() > startData.getTime()) {
+                    dataStatus = ServicePlanEnums.MaintenanceType.STATUS_EXTENDED_FINISH.getCode();
+                }
+                //未完成
+                //审核时间大于拖期范围
+                if (shsj.getTime() > endData.getTime()) {
+                    dataStatus = ServicePlanEnums.MaintenanceType.STATUS_NO_FINISH.getCode();
+                }
+            } else {
+                //未完成：延期未完成-浅绿色、未完成红色
+                //dataStatus = ServicePlanEnums.MaintenanceType.STATUS_NO_FINISH.getCode();
+                //延期未完成-浅绿色 日历日期在延期时间范围
+                //现在日期 比较日历日期
+                Date nowDate = sdf.parse(sdf.format(new Date()));
+                if (nowDate.getTime() <= endData.getTime() && nowDate.getTime() > startData.getTime()) {
+                    dataStatus = ServicePlanEnums.MaintenanceType.STATUS_EXTENDED_NO_FINISH.getCode();
+                }
+                if (nowDate.getTime() > endData.getTime()) {
+                    dataStatus = ServicePlanEnums.MaintenanceType.STATUS_NO_FINISH.getCode();
+                }
+            }
+        }
+        if (StringUtils.isNotBlank(dataStatus)) {
+            return dataStatus;
+        }
+        //未发起状态灰色
+        return ServicePlanEnums.MaintenanceType.STATUS_NO_LAUNCH.getCode();
+    }
+
+
+    /**
+     * 当前计划完成率
+     *
+     * @param list
+     * @return
+     */
+    @Override
+    public String finishRate(List<ServicePlanCalendarList> list) {
+        //已经完成成率 = （已经完成的保养计划数量/(当月所有保养计划数量-已经暂停计划数量)）*100%
+        if (!list.isEmpty()) {
+            //已经完成
+            int finshSize = list.stream().filter(temp -> "2".equals(temp.getDateStatus())).collect(Collectors.toList()).size();
+            //当月所有保养计划数量-已经暂停计划数量
+            int size = list.stream().filter(temp -> !"0".equals(temp.getDateStatus())).collect(Collectors.toList()).size();
+            if (size == 0) {
+                return "0%";
+            } else {
+                BigDecimal multiply = (new BigDecimal(finshSize).multiply(new BigDecimal(100)).divide(new BigDecimal(size), 1, RoundingMode.HALF_UP));
+                return multiply.setScale(1, BigDecimal.ROUND_HALF_UP) + "%";
+            }
+        }
+        return "0%";
+    }
+
+
+    /**
+     * 当前计划完成率新的
+     *
+     * @param list
+     * @return
+     */
+    public String finishRateNew(List<ServicePlanCalendarList> list) {
+
+        //除去删除的订单
+        List<ServicePlanCalendarList> newlist = list.stream().filter(temp -> (!"0".equals(temp.getOrderStatus()))).collect(Collectors.toList());
+        //已经完成成率 = （已经完成的保养计划数量/(当月所有保养计划数量）*100%
+        if (!newlist.isEmpty()) {
+            //已经完成
+            int finshSize = newlist.stream().filter(temp -> ((ServicePlanEnums.MaintenanceType.STATUS_EXTENDED_FINISH.getCode().equals(temp.getDateStatus()) || ServicePlanEnums.MaintenanceType.STATUS_FINISH.getCode().equals(temp.getDateStatus())))).collect(Collectors.toList()).size();
+            //当月所有保养计划数量
+            int size = newlist.size();
+            if (size == 0) {
+                return "0%";
+            } else {
+                BigDecimal multiply = (new BigDecimal(finshSize).multiply(new BigDecimal(100)).divide(new BigDecimal(size), 1, RoundingMode.HALF_UP));
+                return multiply.setScale(1, BigDecimal.ROUND_HALF_UP) + "%";
+            }
+        }
+        return "0%";
+    }
+
+    /**
+     * 当前计划完成率新的
+     *
+     * @param list
+     * @return
+     */
+    public String finishRateNewTotal(List<ServicePlanCalendarList> list) {
+
+        List<ServicePlanCalendarDetailsVO> newlist = new ArrayList<>();
+        for (ServicePlanCalendarList temp : list) {
+            if (temp.getLists() != null && temp.getLists().size() > 0) {
+                for (ServicePlanCalendarDetailsVO vo :
+                        temp.getLists()) {
+                    if (!"0".equals(vo.getOrderStatus())) {
+                        newlist.add(vo);
+                    }
+                }
+            }
+        }
+        Log.info("未删除的订单个数:" + newlist.size());
+        //除去删除的订单
+        //已经完成成率 = （已经完成的保养计划数量/(当月所有保养计划数量）*100%
+        if (!newlist.isEmpty()) {
+            //已经完成
+            int finshSize = newlist.stream().filter(temp -> ((ServicePlanEnums.MaintenanceType.STATUS_EXTENDED_FINISH.getCode().equals(temp.getDateStatus()) || ServicePlanEnums.MaintenanceType.STATUS_FINISH.getCode().equals(temp.getDateStatus())))).collect(Collectors.toList()).size();
+            //当月所有保养计划数量
+            int size = newlist.size();
+            if (size == 0) {
+                return "0%";
+            } else {
+                BigDecimal multiply = (new BigDecimal(finshSize).multiply(new BigDecimal(100)).divide(new BigDecimal(size), 1, RoundingMode.HALF_UP));
+                return multiply.setScale(1, BigDecimal.ROUND_HALF_UP) + "%";
+            }
+        }
+        return "0%";
+    }
+
+
+    /**
+     * 保养通知信息查询 根据设备编码查询设备保养信息
+     *
+     * @param userId
+     * @param startNo
+     * @param endNo
+     * @return
+     */
+    @Override
+    public List<MyAdviceEntity> getmMaintainPlanService(String userId, Integer startNo, Integer endNo) {
+        List<MyAdviceEntity> resultList = new ArrayList<>();
+        List<ServicePlanEntity> planEntityList = servicePlanMapper.selectByUserId(userId, startNo, endNo);
+        if (CollectionUtil.isEmpty(planEntityList)) {
+            return resultList;
+        }
+        List<String> servicePlanIds = planEntityList.stream().map(ServicePlanEntity::getServicePlanId).collect(Collectors.toList());
+
+        //根据已出发的保养任务计划id查询推送的消息内容
+        List<NxUserInfoEntity> userInfoEntities = nxUserInfoService.queryUserInfoByPlanIds(servicePlanIds);
+        for (ServicePlanEntity temp : planEntityList) {
+            NxJeDeviceEntity nxJeDeviceEntity = nxJeDeviceService.selectBySbbm(temp.getDeviceCode());
+            MyAdviceEntity myAdviceEntity = new MyAdviceEntity();
+            myAdviceEntity.setAdviceClass(ResourceUtil.getI18nMessage("60014"));
+            myAdviceEntity.setAdvicObjectCode(temp.getDeviceCode());
+            myAdviceEntity.setAdviceName(temp.getMaintainContent());
+            myAdviceEntity.setAdviceTime(temp.getLatestTriggerTime());
+            myAdviceEntity.setAdviceContent(getMessageContent(temp, userInfoEntities));
+            myAdviceEntity.setTypeCode(ServicePlanEnums.MessageType.MAINTENANCE_REMINDERS.getCode());
+            myAdviceEntity.setAdviceCode(ServicePlanEnums.MessageCodeType.MAINTENANCE_MESSAGE.getCode());
+            myAdviceEntity.setSignData(temp.getServicePlanId());
+            myAdviceEntity.setServicePlanId(temp.getServicePlanId());
+            myAdviceEntity.setPlanName(temp.getPlanName());//计划名称
+            myAdviceEntity.setPlanEndTime(temp.getPlanEndTime());//计划完成时间
+            if (!ObjectUtil.isEmpty(nxJeDeviceEntity)) {
+                myAdviceEntity.setAdviceObjectName(nxJeDeviceEntity.getDeviceSbmc());
+            }
+            List<NxTodoLibrary> nxTodoLibraries = nxTodoLibraryService.selectBySign(myAdviceEntity.getAdviceCode(), myAdviceEntity.getSignData(), myAdviceEntity.getAdviceTime());
+            if (nxTodoLibraries.isEmpty()) {
+                resultList.add(myAdviceEntity);
+            }
+
+
+        }
+        return resultList;
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void generateOrder(ServicePlanEntity servicePlan, int triggerType, String thatDay, boolean tempTime) throws Exception {
+        log.info("{}订单创建日志-服务计划{}触发订单创建方法，是否临时触发订单{}，触发类型:{}", new Date(), servicePlan.getServicePlanId(),tempTime,triggerType);
+        //判断是否存在派工， 只有存在派工才走订单申请
+        Map<String, String> islcpzb = servicePlanMapper.getIslcpzb(servicePlan.getSyZhid());
+        if (islcpzb != null) {
+            String LCPZB_SFXYPG = islcpzb.get("LCPZB_SFXYPG");
+            if (LCPZB_SFXYPG.equals("0")) {
+                //没有派工
+                Log.info(new Date() + " " + "订单创建日志-没有派工:" + servicePlan.getSyZhid() + " " + servicePlan.getServicePlanId());
+                return;
+            }
+        }
+        List servicePlanIds = new ArrayList();
+        servicePlanIds.add(servicePlan.getServicePlanId());
+        //默认通知是提前一天发起的，订单创建时间晚一天
+        //String tom_day = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(DateUtils.addDays(, 1));  //获取明天的时间
+        String tom_day = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());  //获取当天的时间
+        String order_time = tom_day;  //默认订单时间是明天时间
+        String start_time = null;
+        if (StringUtils.isNotBlank(thatDay)) {
+            start_time = thatDay;
+        } else {
+            start_time = tom_day.substring(0, 10);//默认开工时候是当天时间
+        }
+        //根据服务计划和开始日期查询代办库，看服务计划是否执行生成了订单
+        Integer count = servicePlanMapper.checkOrder(servicePlan.getServicePlanId(), start_time);
+        if (count > 0) {
+            log.info("订单创建日志-查询待办库{}，有值，未生成订单,服务计划ID：{}", new Date(), servicePlan.getServicePlanId());
+            return;
+        }
+        /*String curTime = DateUtil.dateToString(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE);  //获取当前年月日时间
+        String servicePlanTime = DateUtil.dateToString(DateUtil.parse(servicePlan.getPlanStartTime(), DateUtil.PATTERN_CLASSICAL_SIMPLE), DateUtil.PATTERN_CLASSICAL_SIMPLE);
+        if (servicePlanTime.equals(curTime) || servicePlanTime.equals(servicePlan.getPlanLscfsj())) {
+            // 遇到计划开始时间/临时时间是当天情况：订单创建时间不需要晚一天,设置当天时间, 开工时间
+            order_time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+            start_time = curTime;
+        } else if (servicePlanTime.compareTo(curTime) >= 0) {
+            // 在计划开始时间之前触发的订单，开工时间都是计划时间
+            start_time = DateUtil.dateToString(DateUtil.parse(servicePlanTime, DateUtil.PATTERN_CLASSICAL_SIMPLE), DateUtil.PATTERN_CLASSICAL_SIMPLE);
+        }*/
+        //根据已出发的保养任务计划id查询推送的消息内容
+        List<NxUserInfoEntity> userInfoEntities = nxUserInfoService.queryUserInfoByPlanIds(servicePlanIds);
+        QueryWrapper<NxDeviceEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("NX_JCXX_SBLB_ID", servicePlan.getDeviceId());
+        NxDeviceEntity nxDeviceEntity = nxDeviceMapper.selectOne(queryWrapper);
+        log.info("{}订单创建日志-服务计划{}触发派单获取设备信息-->{}", new Date(), servicePlan.getServicePlanId(), nxDeviceEntity);
+        if (nxDeviceEntity == null) {
+            log.info("{}订单创建日志-{}触发1404行return", new Date(), servicePlan.getServicePlanId());
+            return;
+        }
+        //新增订单
+        log.info("{}订单创建日志-{}新增订单开始---->", new Date(), servicePlan.getServicePlanId());
+        NxOrderEntity order = new NxOrderEntity();
+        String orderId = JEUuidUtil.uuid();
+        order.setNxOrderId(orderId);
+        String orderNumber = "B" + OrderNumberUtils.generateOrderNumber();
+        order.setOrderOrdernumber(orderNumber);
+        order.setOrderSource("app");
+        order.setOrderDevicecode(nxDeviceEntity.getSblbSbbm());
+        order.setOrderDevicename(nxDeviceEntity.getSblbSbmc());
+        order.setOrderDevicetype(nxDeviceEntity.getSblbSblxName());
+        order.setOrderDevicemodel(nxDeviceEntity.getSblbSbxhName());
+        //判断是否为临时触发时间生成的订单
+        order.setServicePlanOrderStatus(tempTime ? "after" : "");
+        order.setTriggerType(triggerType);
+        if (!ObjectUtil.isEmpty(nxDeviceEntity)) {
+            order.setOrderWbjsrq(nxDeviceEntity.getSblbWbjsrq());
+            if (StringUtils.isNotBlank(nxDeviceEntity.getSblbWbjsrq())) {
+                if (new SimpleDateFormat("yyyy-MM-dd").format(new Date()).compareTo(nxDeviceEntity.getSblbWbjsrq()) <= 0) {
+                    order.setOrderWarrantiesCode(ServicePlanEnums.CheckType.CHECK_TURE.getCode());
+                    order.setOrderWarrantiesName(ServicePlanEnums.CheckType.CHECK_TURE.getDesc());
+                } else {
+                    order.setOrderWarrantiesCode(ServicePlanEnums.CheckType.CHECK_FALSE.getCode());
+                    order.setOrderWarrantiesName(ServicePlanEnums.CheckType.CHECK_FALSE.getDesc());
+                }
+            }
+            order.setOrderServiceaddress(nxDeviceEntity.getSblbSbxxdz());
+            order.setOrderServiceaddressLongitude(nxDeviceEntity.getSblbJd());
+            order.setOrderServiceaddressDimension(nxDeviceEntity.getSblbWd());
+            order.setOrderCustomerName(nxDeviceEntity.getSblbKhmc());
+            order.setOrderKhlxr(nxDeviceEntity.getSblbKhlxr());
+            order.setOrderContactway(nxDeviceEntity.getSblbLxfs());
+            order.setOrderCustomerId(nxDeviceEntity.getSblbKhid());
+            //根据customerId 查询  NX_KHGL
+            String wdId = servicePlanMapper.selectOutletsIdByCustomerId(nxDeviceEntity.getSblbKhid(), servicePlan.getSyZhid());
+            log.info("订单创建日志-服务计划{}触发派单获取服务网点ID-->{}", servicePlan.getServicePlanId(), wdId);
+            if (StringUtils.isNotBlank(wdId)) {
+                order.setOrderFwwdid(wdId);
+            }
+        }
+        order.setOrderServicetypeCode(ServicePlanEnums.MessageType.MAINTENANCE.getCode());
+        order.setOrderServicetypeName(ServicePlanEnums.MessageType.MAINTENANCE.getDesc());
+        order.setOrderOrderstatusCode(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getCode());
+        order.setOrderOrderstatusName(OrderEnums.OrderStatus.WORKERS_TO_BE_DISPATCHED.getDesc());
+        order.setSyCreatetime(order_time);
+        order.setSyStatus("1");
+        order.setOrderBynr(servicePlan.getMaintainContent());
+        //2023.3.22日加上保养级别和保养内容名称
+        order.setOrderByjb(servicePlan.getMaintenanceType());
+        order.setOrderBynrname(servicePlan.getMaintainContentName());
+        order.setOrderDemanddescription(servicePlan.getMaintainContentName());
+        String latestTriggerTime = servicePlan.getLatestTriggerTime();
+        Calendar cld = Calendar.getInstance();
+        try {
+            cld.setTime(new SimpleDateFormat("yyyy-MM-dd").parse(latestTriggerTime));
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info("订单创建日志{}-1458日期转换错误", servicePlan.getServicePlanId());
+        }
+        cld.add(Calendar.DAY_OF_MONTH, 1);
+        String orderApplydate = new SimpleDateFormat("yyyy-MM-dd").format(cld.getTime());
+        order.setOrderApplydate(orderApplydate);
+        List<OrderLcinfoParam> list = new ArrayList<>();
+        OrderLcinfoParam orderLcinfoParam = new OrderLcinfoParam();
+        orderLcinfoParam.setId(1);
+        orderLcinfoParam.setName("已受理");
+        orderLcinfoParam.setUserName("管理员");
+        orderLcinfoParam.setIcon("sl_icon");
+        orderLcinfoParam.setEndDate(String.valueOf(DateUtil.getTimesByString(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()))));
+        list.add(orderLcinfoParam);
+        order.setOrderLcinfo(JSON.toJSONString(list).toString());
+        order.setSyZhid(servicePlan.getSyZhid());//设置租户ID 20221020号
+        log.info("订单创建日志-order：{}", order);
+        nxOrderMapper.insert(order);
+        log.info("订单创建日志-服务计划{}生成订单成功", servicePlan.getServicePlanId());
+        //生成待办库
+        NxTodoLibrary library = new NxTodoLibrary();
+        library.setTitle(ResourceUtil.getI18nMessage("60014"));
+        library.setContent(getMessageContent(servicePlan, userInfoEntities));
+        library.setDeviceName(nxDeviceEntity.getSblbSbmc());
+        library.setDeviceCode(servicePlan.getDeviceCode());
+        library.setOperation(servicePlan.getMaintainContent());
+        library.setTime(start_time);   //实工开始时间
+        library.setSyCreatetime(DateUtil.format(new Date()));
+        library.setAdviceCode(ServicePlanEnums.MessageCodeType.MAINTENANCE_MESSAGE.getCode());
+        library.setTypeCode(ServicePlanEnums.MessageType.MAINTENANCE_REMINDERS.getCode());
+        library.setSignData(servicePlan.getServicePlanId());
+        library.setStatus("0");
+        library.setPlanName(servicePlan.getPlanName());//计划名称
+        library.setPlanEndTime(servicePlan.getPlanEndTime());//计划完成时间
+        library.setServicePlanId(servicePlan.getServicePlanId());
+        library.setSyCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        String libraryId = JEUuidUtil.uuid();
+        library.setNxTodoLibraryId(libraryId);
+        library.setNxOrderId(order.getNxOrderId());
+        nxTodoLibraryService.save(library);
+        log.info("订单创建日志-服务计划{}生成代办库成功-->{}", servicePlan.getServicePlanId(), library);
+        //保养内容需要增加
+        List<Map> selectListXMBY = servicePlanMapper.selectListXMBY(servicePlan.getMaintainContent(), servicePlan.getSyZhid());
+        if (selectListXMBY.size() > 0) {
+            for (Map map : selectListXMBY
+            ) {
+                map.put("NX_BYNR_ID", JEUuidUtil.uuid());
+            }
+            servicePlanMapper.insertXmbynr(selectListXMBY, order.getNxOrderId());
+        }
+        //流程引擎
+        if (StringUtils.isNotBlank(order.getOrderFwwdid())) {
+            log.info("订单创建日志-{}进入派工流程引擎", servicePlan.getServicePlanId());
+            //调用登录接口
+            String loginName = servicePlanMapper.queryStringByCode("loginName") == null ? "app_master_admin" : servicePlanMapper.queryStringByCode("loginName");
+            String loginPassword = servicePlanMapper.queryStringByCode("loginPassword") == null ? "Liu@123456" : servicePlanMapper.queryStringByCode("loginPassword");
+            OAuthResult login = rootCloudAuthService.login(loginName, loginPassword, null);
+            Log.info(servicePlan.getServicePlanId() + "订单创建日志-登录接口:" + login + "loginName:" + loginName + " loginPassword:" + loginPassword);
+            OutletsVO outletsVO = servicePlanMapper.returnUserNames(order.getOrderFwwdid());
+            String sponsorProcess = wfProperties.getWfHost() + "/je/jbpm/taskInfo/sponsorProcess";
+            Map<String, String> map = new HashMap();
+            map.put("pdid", "frx-ningxia-dingdan_22051015-7");
+            map.put("beanId", orderId);
+            map.put("currentTaskName", "");
+            map.put("submitComments", "订单待派工，请尽快处理");
+            map.put("targerTaskName", "是否派工");
+            map.put("targerTransition", "");
+            map.put("assigeeName", outletsVO.getUserNames());
+            map.put("assigeeId", outletsVO.getUserIds());
+            map.put("submitType", "to_submit");
+            Map<String, String> headers = new HashMap<>();
+            headers.put("authorization", login.getAccess_token());
+            log.info("订单创建日志-authorization{}",login.getAccess_token());
+//            headers.put("authorization", "Hpq9v3R1hoCTVTaVD0p");
+            headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+            try {
+                Map<String, String> querys = new HashMap<>();
+                org.apache.http.HttpResponse post = HttpUtils.doPost(sponsorProcess, "", "post", headers, querys, map);
+                int statusCode = post.getStatusLine().getStatusCode();
+                String responseContent = EntityUtils.toString(post.getEntity(), "UTF-8");
+                log.info("订单创建日志-服务计划{},派工订单待派工状态码:{},返回值:{}", servicePlan.getServicePlanId(), statusCode, responseContent);
+                sponsorProcess = wfProperties.getWfHost() + "/je/jbpm/taskInfo/completeTask";
+                map.clear();
+                JSONObject res = JSONObject.parseObject(responseContent);
+                Object obj = res.get("obj");
+                if (obj != null) {
+                    String taskId = ((JSONObject) obj).get("taskId").toString();
+                    map.put("taskId", taskId);
+                    map.put("pdid", "frx-ningxia-dingdan_22051015-7");
+                    map.put("beanId", orderId);
+                    map.put("submitComments", "同意");
+                    map.put("currentTaskName", "是否派工");
+                    map.put("targerTaskName", "待派工");
+                    map.put("targerTransition", "to_decision2");
+                    map.put("assigeeName", outletsVO.getUserNames());
+                    map.put("assigeeId", outletsVO.getUserIds());
+                    map.put("submitType", "to_submit");
+                    querys.clear();
+                    post = HttpUtils.doPost(sponsorProcess, "", "post", headers, querys, map);
+                    statusCode = post.getStatusLine().getStatusCode();
+                    log.info("订单创建日志-服务计划派同意派工状态码:{}", statusCode);
+                } else {
+                    log.error("订单创建日志-服务计划{}派同意派工taskId获取不到", servicePlan.getServicePlanId());
+                    throw new Exception();
+                }
+            } catch (Exception e) {
+                log.error("订单创建日志-{}流程引擎错误触发回滚:{}", servicePlan.getServicePlanId(), e.getMessage());
+                e.printStackTrace();
+                throw new Exception();    //事务回滚
+            }
+        }
+
+    }
+
+
+    @Override
+    public void eqMesSfjj(String id) {
+        servicePlanMapper.eqMesSfjj(id);
+    }
+
+    @Override
+    public ServicePlanCalendarVO checkDataByParams(ServicePlanCalendarNewAO servicePlanCalendarNewAO) {
+        ServicePlanCalendarVO servicePlanCalendarVO = new ServicePlanCalendarVO();
+        servicePlanCalendarNewAO.setSyZhid(UserContext.getUserTenantId());
+        List<ServicePlanInfoVO> servicePlanInfoVOS = servicePlanMapper.selectByParams(servicePlanCalendarNewAO);
+        List<ServicePlanCalendarList> list = new ArrayList<>();
+        servicePlanInfoVOS.stream().forEach(item -> {
+            //List<ServicePlanCalendarList> servicePlanCalendarLists = byServicePlanCalendarNewAO(servicePlanCalendarNewAO, item);
+            //Log.info("计划名称：{}", item.getPlanName());
+            List<ServicePlanCalendarList> servicePlanCalendarLists = checkServicePlanCalendar(servicePlanCalendarNewAO, item);
+            list.addAll(servicePlanCalendarLists);
+        });
+        List<ServicePlanCalendarList> servicePlanCalendarLists = new ArrayList<>();
+        Map<String, List<ServicePlanCalendarList>> collect = list.stream().collect(Collectors.groupingBy(ServicePlanCalendarList::getCalendarDate));
+        for (String key : collect.keySet()) {
+            ServicePlanCalendarList servicePlanCalendarList = new ServicePlanCalendarList();
+            servicePlanCalendarList.setCalendarDate(key);
+            List<ServicePlanCalendarDetailsVO> lists = collect.get(key).stream().map(ServicePlanCalendarList::getServicePlanCalendarDetailsVO).collect(Collectors.toList());
+            servicePlanCalendarList.setLists(lists);
+            servicePlanCalendarLists.add(servicePlanCalendarList);
+        }
+        servicePlanCalendarLists.sort((ServicePlanCalendarList cale1, ServicePlanCalendarList cale2) -> cale1.getCalendarDate().compareTo(cale2.getCalendarDate()));
+        servicePlanCalendarVO.setList(servicePlanCalendarLists);
+        servicePlanCalendarVO.setFinishRate(finishRateNewTotal(servicePlanCalendarLists));
+        return servicePlanCalendarVO;
+    }
+
+    /**
+     * 获取每个服务计划对应周期日期
+     *
+     * @param servicePlanCalendarNewAO
+     * @param servicePlanInfoVO
+     * @return
+     */
+    public List<ServicePlanCalendarList> checkServicePlanCalendar(ServicePlanCalendarNewAO servicePlanCalendarNewAO, ServicePlanInfoVO servicePlanInfoVO) {
+        ServicePlanCalendarVO vo = new ServicePlanCalendarVO();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        ServicePlanEntity servicePlanEntity = servicePlanMapper.selectById(servicePlanInfoVO.getServicePlanId());
+        List<ServicePlanCalendarList> list = new ArrayList<>();
+        //根据查询获取月份的开始和结束日期
+        String queryTime = servicePlanCalendarNewAO.getQueryTime();
+        Date parse = null;
+        try {
+            parse = format.parse(queryTime);
+        } catch (ParseException e) {
+            Log.info("获取月份错误信息：{}", e.getMessage());
+        }
+        Calendar cld = Calendar.getInstance();
+        cld.setTime(parse);
+        cld.add(Calendar.MONTH, 1);
+        cld.set(Calendar.DAY_OF_MONTH, 0);
+        String lastDay = sdf.format(cld.getTime());
+        //Log.info("当月最后一天={}",lastDay);
+        cld.set(Calendar.DAY_OF_MONTH, 1);
+        String firstDay = sdf.format(cld.getTime());
+        //Log.info("当月第一天={}",firstDay);
+
+        //查询待办库里面的是否满足条件数据,历史数据
+        Map param = new HashMap();
+        param.put("planId", servicePlanEntity.getServicePlanId());
+        param.put("firstDay", firstDay);
+        param.put("lastDay", lastDay);
+        List<Map<String, String>> todoLibrary = servicePlanMapper.getTodoLibrary(param);
+        List<String> dates = new ArrayList<>();
+        Map<String, String> orderMap = new HashMap<>();
+
+        if (todoLibrary.size() > 0) {
+            for (Map<String, String> item :
+                    todoLibrary) {
+                dates.add(item.get("TIME"));
+                orderMap.put(item.get("TIME"), item.get("ORDER_STATUS"));
+            }
+        }
+        //存在临时时间
+        if (StringUtils.isNotBlank(servicePlanEntity.getPlanLscfsj())) {
+            if (servicePlanEntity.getPlanLscfsj().contains(queryTime)) {
+                dates.add(servicePlanEntity.getPlanLscfsj());
+            }
+        }
+        String planStartTime = servicePlanEntity.getPlanStartTime();
+        String planEndTime = servicePlanEntity.getPlanEndTime();
+        List<String> days = com.rootcloud.common.live.DateUtil.findDates(planStartTime, planEndTime,
+                String.valueOf(servicePlanEntity.getPlanCycle()), servicePlanEntity.getPlanInterval(), firstDay, lastDay);
+        //Log.info("获取到日期1：" + days);
+        //取出最后一个历史数据时间
+        /*if (dates.size() > 0) {
+            String lastTime = dates.get(dates.size() - 1).substring(0, 10);
+            days.stream().forEach(item -> {
+                //保留大于最后一个时间的数据
+                if (item.length() >= 10) {
+                    if (item.substring(0, 10).compareTo(lastTime) > 0) {
+                        dates.add(item);
+                    }
+                }
+            });
+        } else {
+            dates.addAll(days);
+        }*/
+        if (dates.size() > 0) {
+            if (dates.size() < days.size()) {
+                for (int i = dates.size(); i < days.size(); i++) {
+                    dates.add(days.get(i));
+                }
+            }
+        } else {
+            dates.addAll(days);
+        }
+        //清理掉提前触发日期
+        List<String> newDates = new ArrayList<>();
+        String planTqcfrq = servicePlanEntity.getPlanTqcfrq();
+        if (StringUtils.isNotBlank(planTqcfrq)) {
+            List<String> tqfcrqList = Arrays.asList(servicePlanEntity.getPlanTqcfrq().split(","));
+            if (tqfcrqList.size() > 0) {
+                dates.forEach(o -> {
+                    if (!tqfcrqList.contains(o)) {
+                        newDates.add(o);
+                    }
+                });
+            } else {
+                newDates.addAll(dates);
+            }
+        } else {
+            newDates.addAll(dates);
+        }
+        //数据状态为暂停 则取最后一条数据比对，大于这个时间的数据全部隐藏
+        List<String> liss = new ArrayList<>();
+        String planStatus = servicePlanEntity.getPlanStatus().toString();
+        Log.info("服务计划状态：" + planStatus);
+        if (ServicePlanEnums.PlanStatus.PAUSED.getCode().toString().equals(planStatus)) {
+            String ztrq = servicePlanEntity.getPlanZtrq();
+            Log.info("服务计划暂停日期：" + ztrq);
+            List<String> ztrqList = new ArrayList<>();
+            if (StringUtils.isNotBlank(ztrq)) {
+                ztrqList = new ArrayList<>(Arrays.asList(ztrq.split(",")));
+            }
+            //获取暂停开始时间
+            String start = null;
+            if (ztrqList.size() > 0) {
+                start = ztrqList.get(ztrqList.size() - 1);
+            }
+            if (StringUtils.isNotBlank(start)) {
+                for (int i = 0; i < newDates.size(); i++) {
+                    if (newDates.get(i).compareTo(start) < 0) {
+                        liss.add(newDates.get(i));
+                    }
+                }
+            }
+        } else {
+            liss.addAll(newDates);
+        }
+        //清理掉暂停日期的
+        List<String> screenDates = new ArrayList<>();
+        String ztrq = servicePlanEntity.getPlanZtrq();
+        if (StringUtils.isNotBlank(ztrq)) {
+            List<String> ztrqList = Arrays.asList(ztrq.split(","));
+            if (ztrqList.size() > 0) {
+                liss.forEach(o -> {
+                    if (!ztrqList.contains(o)) {
+                        screenDates.add(o);
+                    }
+                });
+            } else {
+                screenDates.addAll(liss);
+            }
+        } else {
+            screenDates.addAll(liss);
+        }
+        Log.info("服务计划：" + servicePlanEntity.getPlanName() + " 获取到日期：" + screenDates);
+        screenDates.stream().forEach(item -> {
+            ServicePlanCalendarList servicePlanCalendarList = new ServicePlanCalendarList();
+            servicePlanCalendarList.setCalendarDate(item);
+            servicePlanCalendarList.setOrderStatus(orderMap.get(item));
+            ServicePlanCalendarDetailsVO servicePlanCalendarDetailsVO = new ServicePlanCalendarDetailsVO();
+            servicePlanCalendarDetailsVO.setDeviceCode(servicePlanInfoVO.getDeviceCode());
+            servicePlanCalendarDetailsVO.setDviceName(servicePlanInfoVO.getDeviceTypeName());
+            servicePlanCalendarDetailsVO.setCustomerName(servicePlanInfoVO.getCustomerName());
+            servicePlanCalendarDetailsVO.setPlanStartTime(servicePlanEntity.getPlanStartTime());
+            servicePlanCalendarDetailsVO.setServiceName(servicePlanEntity.getPlanName());
+            servicePlanCalendarDetailsVO.setPlanEndTime(servicePlanEntity.getPlanEndTime());
+            servicePlanCalendarDetailsVO.setFinishTimeNode(servicePlanEntity.getFinishTimeNode());
+            String s = returnDateStatusNew(servicePlanEntity, item);
+            servicePlanCalendarDetailsVO.setDateStatus(s);
+            servicePlanCalendarList.setDateStatus(s);
+            servicePlanCalendarList.setServicePlanCalendarDetailsVO(servicePlanCalendarDetailsVO);
+            list.add(servicePlanCalendarList);
+        });
+        return list;
+    }
+
+
+    /**
+     * 就算任务在某个月份所有执行的日子
+     *
+     * @param servicePlanCalendarNewAO
+     * @param servicePlanInfoVO
+     * @return
+     */
+    public List<ServicePlanCalendarList> calcMonthDay(ServicePlanCalendarNewAO servicePlanCalendarNewAO, ServicePlanInfoVO servicePlanInfoVO) {
+        List<ServicePlanCalendarList> list = new ArrayList<>();
+        ServicePlanEntity servicePlanEntity = new ServicePlanEntity();
+        BeanUtils.copyProperties(servicePlanInfoVO, servicePlanEntity);
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        //根据查询获取月份的开始和结束日期
+        String queryTime = servicePlanCalendarNewAO.getQueryTime();
+        Date parse = null;
+        try {
+            parse = format.parse(queryTime);
+        } catch (ParseException e) {
+            Log.info("获取月份错误信息：{}", e.getMessage());
+        }
+        Calendar cld = Calendar.getInstance();
+        cld.setTime(parse);
+        cld.add(Calendar.MONTH, 1);
+        cld.set(Calendar.DAY_OF_MONTH, 0);
+        String lastDay = sdf.format(cld.getTime());
+        cld.set(Calendar.DAY_OF_MONTH, 1);
+        String firstDay = sdf.format(cld.getTime());
+
+        //查询待办库里面的是否满足条件数据,历史数据
+        Map param = new HashMap();
+        param.put("planId", servicePlanEntity.getServicePlanId());
+        param.put("firstDay", firstDay);
+        param.put("lastDay", lastDay);
+        List<Map<String, String>> todoLibrary = servicePlanMapper.getTodoLibrary(param);
+        List<String> dates = new ArrayList<>();
+        Map<String, String> orderMap = new HashMap<>();
+        if (todoLibrary.size() > 0) {
+            for (Map<String, String> item :
+                    todoLibrary) {
+                dates.add(item.get("TIME"));
+                orderMap.put(item.get("TIME"), item.get("ORDER_STATUS"));
+            }
+        }
+        //存在临时时间
+        if (StringUtils.isNotBlank(servicePlanEntity.getPlanLscfsj())) {
+            dates.add(servicePlanEntity.getPlanLscfsj());
+        }
+        String planStartTime = servicePlanEntity.getPlanStartTime();
+        String planEndTime = servicePlanInfoVO.getPlanEndTime();
+        List<String> days = com.rootcloud.common.live.DateUtil.findDates(planStartTime, planEndTime,
+                String.valueOf(servicePlanInfoVO.getPlanCycle()), servicePlanInfoVO.getPlanInterval(), firstDay, lastDay);
+        //取出最后一个历史数据时间
+        if (dates.size() > 0) {
+            String lastTime = dates.get(dates.size() - 1).substring(0, 10);
+            days.stream().forEach(item -> {
+                //保留大于最后一个时间的数据
+                if (item.length() >= 10) {
+                    if (item.substring(0, 10).compareTo(lastTime) > 0) {
+                        dates.add(item);
+                    }
+                }
+            });
+        } else {
+            dates.addAll(days);
+        }
+        //Log.info("获取到日期：" + dates);
+        dates.stream().forEach(item -> {
+            ServicePlanCalendarList servicePlanCalendarList = new ServicePlanCalendarList();
+            servicePlanCalendarList.setCalendarDate(item);
+            ServicePlanCalendarDetailsVO servicePlanCalendarDetailsVO = new ServicePlanCalendarDetailsVO();
+            servicePlanCalendarDetailsVO.setDeviceCode(servicePlanInfoVO.getDeviceCode());
+            servicePlanCalendarDetailsVO.setDviceName(servicePlanInfoVO.getDeviceName());
+            servicePlanCalendarDetailsVO.setCustomerName(servicePlanInfoVO.getCustomerName());
+            servicePlanCalendarDetailsVO.setPlanStartTime(servicePlanInfoVO.getPlanStartTime());
+            servicePlanCalendarDetailsVO.setServiceName(servicePlanInfoVO.getPlanName());
+            servicePlanCalendarDetailsVO.setPlanEndTime(servicePlanInfoVO.getPlanEndTime());
+            servicePlanCalendarDetailsVO.setFinishTimeNode(servicePlanInfoVO.getFinishTimeNode());
+            servicePlanCalendarDetailsVO.setOrderStatus(orderMap.get(item));
+            String s = returnDateStatusNew(servicePlanEntity, item);
+            servicePlanCalendarDetailsVO.setDateStatus(s);
+            servicePlanCalendarList.setDateStatus(s);
+            servicePlanCalendarList.setServicePlanCalendarDetailsVO(servicePlanCalendarDetailsVO);
+            list.add(servicePlanCalendarList);
+        });
+        return list;
+    }
+
+
+    /**
+     * 根据计划的名字获取发给用户的短息内容
+     *
+     * @param entity
+     * @param userInfoEntities
+     * @return
+     */
+    public String getMessageContent(ServicePlanEntity entity, List<NxUserInfoEntity> userInfoEntities) {
+        //todo 模板内容未定，消息内容具体怎么拼接还需要产品确认
+        String result = "";
+        for (NxUserInfoEntity userInfoEntity : userInfoEntities) {
+            if (userInfoEntity.getServicePlanId().equals(entity.getServicePlanId())) {
+                result = userInfoEntity.getInfoContent();
+                break;
+            }
+        }
+        if (StringUtils.isNotBlank(result)) {
+            result = nxUserInfoService.getTemplateContent(entity.getServicePlanId());
+        }
+        return result;
+    }
+
+
+    /**
+     * 手动触发服务计划订单
+     *
+     * @param planId
+     */
+    @Override
+    public JsonResult<Object> manualTrigger(String planId) {
+        Map param = new HashMap();
+        //查询服务计划
+        ServicePlanEntity servicePlanEntity = servicePlanMapper.selectById(planId);
+        //获取下一次周期时间
+        String nextCycleTime = servicePlanEntity.getNextCycleTime();
+        if (StringUtils.isNotBlank(nextCycleTime)) {
+            param.put("nextCycleTime", nextCycleTime);
+            String previousTime = getPreviousDateByStartDate(DateUtil.parse(nextCycleTime, DateUtil.PATTERN_CLASSICAL_SIMPLE), servicePlanEntity);
+            param.put("previousTime", previousTime);
+        }
+        param.put("planId", planId);
+
+        List<Map<String, String>> exsitOrder = servicePlanMapper.getPlanExsitOrder(param);
+        if (exsitOrder.size() > 0) {
+            //存在订单号
+            return JsonResult.failed("500", "当前期计划已存在订单");
+        } else {
+            try {
+                //发送
+                nxUserInfoService.setReminders(planId);
+                //如果发送成功修改状态
+                updateServicePlanStatus(planId, 1, ServicePlanEnums.PlanStatus.FINISHED.getCode(), true, null);
+                return JsonResult.success("操作成功");
+            } catch (Exception e) {
+                Log.info("手动创建发送以及修改状态错误信息:{}", e);
+                return JsonResult.failed("500", "手动创建订单出现异常");
+            }
+        }
+    }
+
+    /**
+     * 更新服务计划下一周期日期
+     */
+    @Override
+    public void updateDate() {
+        List<ServicePlanEntity> list = servicePlanMapper.selectData();
+        if (list.size() > 0) {
+            list.forEach(o -> {
+                String date = getNextDateByStartDate(o);
+                if (!date.equals(o.getNextCycleTime())) {
+                    o.setNextCycleTime(date);
+                    Log.info("服务计划id：" + o.getServicePlanId() + "，计划周期：" + o.getPlanCycle() + "，计划间隔：" + o.getPlanInterval() + "，开始日期：" + o.getPlanStartTime() + "，原下一个周期日期：" + o.getNextCycleTime() + "，需修改成的日期：" + date);
+                    servicePlanMapper.updateData(o.getServicePlanId(), date);
+                }
+            });
+        }
+    }
+
+    /**
+     * 暂停服务计划
+     *
+     * @param planId
+     * @param type
+     * @return
+     */
+    @Override
+    public JsonResult<Object> pause(String planId, String type) {
+        if (StringUtils.isNotBlank(planId)) {
+            ServicePlanEntity info = servicePlanMapper.selectById(planId);
+            if (info == null) {
+                return JsonResult.failed("450", "获取数据失败");
+            }
+            Log.info("获取到服务计划：" + info);
+            //判断是否删除
+            if ("0".equals(info.getSyStatus())) {
+                return JsonResult.failed("450", "服务计划已被删除");
+            }
+            String date = null;
+            //暂停日期
+            List<String> ztrqList = new ArrayList<>();
+            String planZtrq = info.getPlanZtrq();
+            //暂停
+            if (ServicePlanEnums.PlanStatus.PAUSED.getCode().toString().equals(type)) {
+                if (StringUtils.isNotBlank(planZtrq)) {
+                    ztrqList = new ArrayList<>(Arrays.asList(planZtrq.split(",")));
+                }
+                ztrqList.add(DateUtil.format(DateUtil.getNextWorkday(), DateUtil.PATTERN_CLASSICAL_SIMPLE));
+            }
+            //启动服务计划
+            if (ServicePlanEnums.PlanStatus.IN_PROGRESS.getCode().toString().equals(type)) {
+                //修改下一周期时间
+                date = getNextDateByStartDateNew(info);
+                //启动服务计划计算出暂停日期
+                if (StringUtils.isNotBlank(planZtrq)) {
+                    ztrqList = new ArrayList<>(Arrays.asList(planZtrq.split(",")));
+                    if (ztrqList.size() > 0) {
+                        String startDate = ztrqList.get(ztrqList.size() - 1);
+                        ztrqList.remove(startDate);
+                        String endDate = DateUtil.format(new Date());
+                        List<String> rqList = DateUtil.getDays(startDate, endDate);
+                        if (rqList.size() > 0) {
+                            ztrqList.addAll(rqList);
+                        }
+                    }
+                }
+            }
+            planZtrq = ztrqList.stream().collect(Collectors.joining(","));
+            Log.info("修改服务计划：planId" + planId + ",NEXT_CYCLE_TIME：" + date + ",PLAN_STATUS:" + type + ",PLAN_ZTRQ：" + planZtrq);
+            servicePlanMapper.updateServicePlanStatus(planId, date, type, planZtrq);
+            return JsonResult.success();
+        }
+        return JsonResult.failed("450", "获取数据失败");
+    }
+
+    /**
+     * 提前触发服务计划
+     *
+     * @param planId
+     * @return
+     */
+    @Override
+    public JsonResult<Object> pretrigger(String planId) {
+        if (StringUtils.isNotBlank(planId)) {
+            ServicePlanEntity info = servicePlanMapper.selectById(planId);
+            if (info == null) {
+                return JsonResult.failed("450", "获取数据失败");
+            }
+            //获取提前触发日期字段
+            List<String> tqcfrqList = new ArrayList<>();
+            String tqcfrq = info.getPlanTqcfrq();
+            if (StringUtils.isNotBlank(tqcfrq)) {
+                tqcfrqList = Arrays.asList(info.getPlanTqcfrq().split(","));
+            }
+            String nextCycleTime = info.getNextCycleTime();
+
+            //判断是否提前触发过
+            Map param = new HashMap();
+            if (StringUtils.isNotBlank(nextCycleTime)) {
+                param.put("nextCycleTime", nextCycleTime);
+                String previousTime = getPreviousDateByStartDate(DateUtil.parse(nextCycleTime, DateUtil.PATTERN_CLASSICAL_SIMPLE), info);
+                param.put("previousTime", previousTime);
+            }
+            Log.info("获取到数据：" + param);
+            param.put("planId", planId);
+            List<Map<String, String>> exsitOrder = servicePlanMapper.getPlanExsitOrder(param);
+            if (exsitOrder.size() > 0) {
+                return JsonResult.failed("450", "该服务计划已提前触发过！");
+            }
+            //判断上一个服务计划是否完成
+            String orderStatus = servicePlanMapper.lastServicePlanOrderStatus(planId);
+            if (StringUtils.isNotBlank(orderStatus)) {
+                //已完成订单才支持提前触发
+                if (OrderEnums.OrderStatus.DONE.getCode().equals(orderStatus)) {
+                    List<ServicePlanVo> servicePlanVos = servicePlanMapper.selectExecutedServicePlanByPlanId(planId);
+                    if (servicePlanVos.size() > 0) {
+                        for (ServicePlanVo item : servicePlanVos) {
+                            try {
+                                Log.info("服务计划：" + item);
+                                //判断是否临时触发时间的服务计划
+                                boolean tempTime = false;
+                                if (StringUtils.isNotBlank(item.getPlanLscfsj())) {
+                                    tempTime = true;
+                                }
+                                //根据服务计划和开始日期查询代办库，看服务计划是否执行生成了订单
+                                Integer count = servicePlanMapper.checkOrder(item.getServicePlanId(), info.getNextCycleTime());
+                                if (count > 0) {
+                                    return JsonResult.failed("450", "该服务计划已提前触发过！");
+                                } else {
+                                    //发送
+                                    nxUserInfoService.setReminders(item.getServicePlanId());
+                                    //如果发送成功修改状态
+                                    updateServicePlanStatus(item.getServicePlanId(), 1, ServicePlanEnums.PlanStatus.FINISHED.getCode(), true, null);
+                                    //记录提前触发日期
+                                    //格式化日期 只保留年月日
+                                    tqcfrqList.add(nextCycleTime);
+                                    servicePlanMapper.updateTqcfrq(planId, tqcfrqList.stream().collect(Collectors.joining(",")));
+                                    return JsonResult.success("操作成功");
+                                }
+                            } catch (Exception e) {
+                                Log.info("发送以及修改状态错误信息:{}", e);
+                            }
+                        }
+                    }
+                } else {
+                    return JsonResult.failed("450", "上一次服务计划未完成，请完成后在操作！");
+                }
+            } else {
+                try {
+                    //发送
+                    nxUserInfoService.setReminders(planId);
+                    //如果发送成功修改状态
+                    updateServicePlanStatus(planId, 1, ServicePlanEnums.PlanStatus.FINISHED.getCode(), true, null);
+                    //记录提前触发日期
+                    //格式化日期 只保留年月日
+                    tqcfrqList.add(nextCycleTime);
+                    servicePlanMapper.updateTqcfrq(planId, tqcfrqList.stream().collect(Collectors.joining(",")));
+                    return JsonResult.success("操作成功");
+                } catch (Exception e) {
+                    Log.info("手动创建发送以及修改状态错误信息:{}", e);
+                    return JsonResult.failed("500", "手动创建订单出现异常");
+                }
+            }
+        }
+        return JsonResult.failed("450", "提前触发失败");
+    }
+
+    /**
+     * 获取下一个周期时间
+     *
+     * @param servicePlan
+     * @return
+     */
+    public String getNextDateByStartDate(ServicePlanEntity servicePlan) {
+        Date endDate = null;
+        try {
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+            //获取当前日期
+            String current = df.format(new Date());
+            Date currentDate = df.parse(current);
+            //获取计划开始日期
+            endDate = df.parse(servicePlan.getPlanStartTime());
+            Integer planCycle = servicePlan.getPlanCycle();
+            Integer planInterval = servicePlan.getPlanInterval();
+            do {
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(endDate);
+                //日
+                if (ServicePlanEnums.PlanCycle.DAY.getCode().equals(planCycle)) {
+                    calendar.add(Calendar.DATE, planInterval);
+                }
+                //周
+                if (ServicePlanEnums.PlanCycle.WEEK.getCode().equals(planCycle)) {
+                    calendar.add(Calendar.DATE, 7 * planInterval);
+                }
+                //月
+                if (ServicePlanEnums.PlanCycle.MONTH.getCode().equals(planCycle)) {
+                    calendar.add(Calendar.MONTH, planInterval);
+                }
+                //年
+                if (ServicePlanEnums.PlanCycle.YEAR.getCode().equals(planCycle)) {
+                    calendar.add(Calendar.YEAR, planInterval);
+                }
+                endDate = calendar.getTime();
+                if (endDate.getTime() == currentDate.getTime()) {
+                    Log.info("今天需要执行的服务计划：" + servicePlan);
+                }
+            } while (endDate.getTime() <= currentDate.getTime());
+            return df.format(endDate);
+        } catch (Exception e) {
+            Log.error("获取数据失败，失败原因：" + e.getMessage());
+            return null;
+        }
+
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/todo/NxTodoLibraryService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/todo/NxTodoLibraryService.java
new file mode 100644
index 0000000..3d8c1f7
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/todo/NxTodoLibraryService.java
@@ -0,0 +1,66 @@
+package com.rootcloud.domain.service.todo;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rootcloud.domain.entity.MyAdviceEntity;
+import com.rootcloud.domain.entity.MyMessageEntity;
+import com.rootcloud.domain.entity.NxTodoLibrary;
+import com.rootcloud.vo.todo.TodoVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 宁夏_待办库 服务类
+ * </p>
+ *
+ * @author yangyijun
+ * @since 2022-05-27
+ */
+public interface NxTodoLibraryService extends IService<NxTodoLibrary> {
+
+    /**
+     * 分页查询待办库
+     * @param page
+     * @param size
+     * @param queryData
+     * @param userId
+     * @return
+     */
+    IPage<TodoVo> getPage(int page, int size, String queryData,String userId);
+
+
+    /**
+     * 改变代办库状态
+     * @param nxTodoLibraryId
+     */
+    void updateStatus(String nxTodoLibraryId);
+
+
+    /**
+     * 将订单主键写到代办库
+     * @param nxTodoLibraryId
+     * @param nxOrderId
+     */
+    void updateLibrary(String nxTodoLibraryId,String nxOrderId);
+
+    /**
+     * 将消息移入代办库
+     */
+    void insertMessageLibarary(MyMessageEntity myMessageEntity);
+
+    /**
+     * 将通知移入代办库
+     */
+    void insertAdviceToLibarary(MyAdviceEntity myAdviceEntity);
+
+
+
+    List<NxTodoLibrary> selectBySign(String adviceCode,String signData,String time);
+
+    void delTodoLibrary(String nxTodoLibraryId);
+
+    List<String> selectByData(String adviceCode,List<String> list);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/todo/impl/NxTodoLibraryServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/todo/impl/NxTodoLibraryServiceImpl.java
new file mode 100644
index 0000000..59d26df
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/todo/impl/NxTodoLibraryServiceImpl.java
@@ -0,0 +1,189 @@
+package com.rootcloud.domain.service.todo.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rootcloud.common.DateUtil;
+import com.rootcloud.common.ResourceUtil;
+import com.rootcloud.common.enums.OrderEnums;
+import com.rootcloud.common.enums.ServicePlanEnums;
+import com.rootcloud.common.enums.StatusCodeEnum;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.config.exception.BusinessException;
+import com.rootcloud.domain.entity.MyAdviceEntity;
+import com.rootcloud.domain.entity.MyMessageEntity;
+import com.rootcloud.domain.entity.NxJeDeviceEntity;
+import com.rootcloud.domain.entity.NxTodoLibrary;
+import com.rootcloud.domain.entity.ds.DeviceListEntity;
+import com.rootcloud.domain.mapper.NxTodoLibraryMapper;
+import com.rootcloud.domain.service.gkjk.NxJeDeviceService;
+import com.rootcloud.domain.service.todo.NxTodoLibraryService;
+import com.rootcloud.vo.todo.TodoVo;
+import jline.internal.Log;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 宁夏_待办库 服务实现类
+ * </p>
+ *
+ * @author yangyijun
+ * @since 2022-05-27
+ */
+@Service("nxTodoLibraryServiceImpl")
+public class NxTodoLibraryServiceImpl extends ServiceImpl<NxTodoLibraryMapper, NxTodoLibrary> implements NxTodoLibraryService {
+
+
+    private final NxTodoLibraryMapper nxTodoLibraryMapper;
+    @Resource(name = "nxJeDeviceServiceImpl")
+    private final NxJeDeviceService nxJeDeviceService;
+
+    public NxTodoLibraryServiceImpl(NxTodoLibraryMapper nxTodoLibraryMapper, NxJeDeviceService nxJeDeviceService) {
+        this.nxTodoLibraryMapper = nxTodoLibraryMapper;
+        this.nxJeDeviceService = nxJeDeviceService;
+    }
+
+
+    @Override
+    public IPage<TodoVo> getPage(int page, int size, String queryData, String userId) {
+        IPage<TodoVo> iPage = new Page(page, size);
+        IPage<TodoVo> listPage = nxTodoLibraryMapper.getPageNew(iPage, queryData, userId, UserContext.getUserTenantId());
+        Log.info("获取到用户id：" + userId + "，租户ID：" + UserContext.getUserTenantId());
+        List<TodoVo> records = listPage.getRecords();
+        records.stream().forEach(item -> {
+            if (ServicePlanEnums.MessageCodeType.MAINTENANCE_MESSAGE.getCode().equals(item.getAdviceCode())) {
+                String deviceCode = item.getDeviceCode();
+                NxJeDeviceEntity nxJeDeviceEntity = nxJeDeviceService.selectBySbbm(deviceCode);
+                if (!ObjectUtils.isEmpty(nxJeDeviceEntity)) {
+                    item.setDeviceId(nxJeDeviceEntity.getNxJeDeviceId());
+                }
+            }
+        });
+        return listPage;
+    }
+
+
+    @Override
+    public void updateStatus(String nxTodoLibraryId) {
+        NxTodoLibrary nxTodoLibrary = getById(nxTodoLibraryId);
+        if (ObjectUtils.isEmpty(nxTodoLibrary)) {
+            //throw new BusinessException(StatusCodeEnum.TODO_NOT_EXIST.getRet(), StatusCodeEnum.TODO_NOT_EXIST.getMessage());
+            throw new BusinessException(StatusCodeEnum.TODO_NOT_EXIST.getRet(), ResourceUtil.getI18nMessage("18001"));
+        }
+        if (OrderEnums.TodoStatus.RESOLVED.getCode().equals(nxTodoLibrary.getStatus())) {
+            //throw new BusinessException(StatusCodeEnum.TODO_NOT_STATUS.getRet(), StatusCodeEnum.TODO_NOT_STATUS.getMessage());
+            throw new BusinessException(StatusCodeEnum.TODO_NOT_STATUS.getRet(), ResourceUtil.getI18nMessage("18002"));
+        }
+        nxTodoLibrary.setStatus(OrderEnums.TodoStatus.RESOLVED.getCode());
+        nxTodoLibraryMapper.updateById(nxTodoLibrary);
+    }
+
+
+    @Override
+    public void updateLibrary(String nxTodoLibraryId, String nxOrderId) {
+        NxTodoLibrary nxTodoLibrary = getById(nxTodoLibraryId);
+        if (ObjectUtils.isEmpty(nxTodoLibrary)) {
+            throw new BusinessException(StatusCodeEnum.TODO_NOT_EXIST.getRet(), StatusCodeEnum.TODO_NOT_EXIST.getMessage());
+        }
+        nxTodoLibrary.setNxOrderId(nxOrderId);
+        nxTodoLibraryMapper.updateById(nxTodoLibrary);
+    }
+
+    @Override
+    public void insertMessageLibarary(MyMessageEntity myMessageEntity) {
+        NxTodoLibrary library = new NxTodoLibrary();
+        library.setTitle(myMessageEntity.getMessageClass());
+        library.setContent(myMessageEntity.getMessageContent());
+        library.setDeviceName(myMessageEntity.getMessageObjectName());
+        library.setDeviceCode(myMessageEntity.getMessageObjectCode());
+        library.setOperation(myMessageEntity.getMessageName());
+        library.setTime(myMessageEntity.getMessageTime());
+        library.setSyCreatetime(DateUtil.format(new Date()));
+        library.setNxTodoLibraryId(UUID.randomUUID().toString().substring(0, 10));
+        library.setAdviceCode(myMessageEntity.getAdviceCode());
+        library.setTypeCode(myMessageEntity.getTypeCode());
+        library.setSignData(myMessageEntity.getSignData());
+        library.setStatus("0");
+        library.setUserid(myMessageEntity.getUserId());
+        library.setGzdj(myMessageEntity.getGzdj());//故障等级
+        library.setBjbm(myMessageEntity.getBjbm());//报警编码
+        library.setBjsj(myMessageEntity.getBjsj());//报警时间
+        library.setGcs(myMessageEntity.getOrderAssignengineer());//工程师
+        library.setDdbh(myMessageEntity.getOrderOrdernumber());//订单编号
+        this.save(library);
+    }
+
+    @Override
+    public void insertAdviceToLibarary(MyAdviceEntity myAdviceEntity) {
+        NxTodoLibrary library = new NxTodoLibrary();
+        library.setTitle(myAdviceEntity.getAdviceClass());
+        if (ServicePlanEnums.MessageCodeType.SPARE_PARTS_LIFE.getCode().equals(myAdviceEntity.getAdviceCode())) {
+            library.setTitle(myAdviceEntity.getAdviceName());
+        }
+        library.setContent(myAdviceEntity.getAdviceContent());
+        library.setDeviceName(myAdviceEntity.getAdviceObjectName());
+        library.setDeviceCode(myAdviceEntity.getAdvicObjectCode());
+        library.setOperation(myAdviceEntity.getAdviceName());
+        library.setTime(myAdviceEntity.getAdviceTime());
+        library.setSyCreatetime(DateUtil.format(new Date()));
+        library.setAdviceCode(myAdviceEntity.getAdviceCode());
+        library.setTypeCode(myAdviceEntity.getTypeCode());
+        library.setSignData(myAdviceEntity.getSignData());
+        library.setStatus("0");
+        library.setUserid(myAdviceEntity.getUserId());
+        library.setSn(myAdviceEntity.getSn());//SN
+        library.setPartAzwh(myAdviceEntity.getPartAzwh());//安装位号
+        library.setPartGzsc(myAdviceEntity.getPartGzsc());//工作时长
+        library.setPlanName(myAdviceEntity.getPlanName());//计划名称
+        library.setPlanEndTime(myAdviceEntity.getPlanEndTime());//计划完成时间
+        library.setPartXtmk(myAdviceEntity.getPartXtmk());//系统模块
+        library.setPartBjmc(myAdviceEntity.getPartBjmc());//备件名称
+        if (ServicePlanEnums.MessageCodeType.MAINTENANCE_MESSAGE.getCode().equals(myAdviceEntity.getAdviceCode())) {
+            library.setServicePlanId(myAdviceEntity.getSignData());
+        }
+        library.setNxTodoLibraryId(UUID.randomUUID().toString().substring(0, 10));
+        this.save(library);
+    }
+
+    @Override
+    public List<NxTodoLibrary> selectBySign(String adviceCode, String signData, String time) {
+        QueryWrapper<NxTodoLibrary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("ADVICE_CODE", adviceCode);
+        queryWrapper.eq("SIGN_DATA", signData);
+        queryWrapper.eq("TIME", time);
+        return nxTodoLibraryMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public void delTodoLibrary(String nxTodoLibraryId) {
+        nxTodoLibraryMapper.deleteById(nxTodoLibraryId);
+    }
+
+    @Override
+    public List<String> selectByData(String adviceCode, List<String> list) {
+        //Log.info("【代办表】查询开始时间 ==> {}", DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL));
+        QueryWrapper<NxTodoLibrary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("ADVICE_CODE", adviceCode);
+        queryWrapper.in("SIGN_DATA", list);
+        List<NxTodoLibrary> ls = nxTodoLibraryMapper.selectList(queryWrapper);
+        //Log.info("【代办表】查询结束时间 ==> {}", DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL));
+        return ls.stream().map(NxTodoLibrary::getSignData).collect(Collectors.toList());
+    }
+
+
+    public NxTodoLibrary getById(String nxTodoLibraryId) {
+        QueryWrapper<NxTodoLibrary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("NX_TODO_LIBRARY_ID", nxTodoLibraryId);
+        NxTodoLibrary nxTodoLibrary = nxTodoLibraryMapper.selectOne(queryWrapper);
+        return nxTodoLibrary;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/CarouselVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/CarouselVO.java
new file mode 100644
index 0000000..7d7555c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/CarouselVO.java
@@ -0,0 +1,29 @@
+package com.rootcloud.domain.vo;
+
+import com.rootcloud.domain.dto.ImageUrlsDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author w-yanxiang
+ * @Date 2022/6/16 10:22
+ * @Version 1.0
+ * @Description
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CarouselVO implements Serializable {
+
+    @ApiModelProperty(value = "时间间隙")
+    private String timeGap;
+
+    @ApiModelProperty(value = "轮播图片路径")
+    private List<ImageUrlsDTO> imageUrls;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/ConfigVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/ConfigVO.java
new file mode 100644
index 0000000..79a6987
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/ConfigVO.java
@@ -0,0 +1,52 @@
+package com.rootcloud.domain.vo;
+
+public class ConfigVO {
+
+    private String code;
+    private String name;
+    private String value;
+    private String desc;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    @Override
+    public String toString() {
+        return "ConfigVO{" +
+                "code='" + code + '\'' +
+                ", name='" + name + '\'' +
+                ", value='" + value + '\'' +
+                ", desc='" + desc + '\'' +
+                '}';
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/CustomerSales.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/CustomerSales.java
new file mode 100644
index 0000000..865c679
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/CustomerSales.java
@@ -0,0 +1,15 @@
+package com.rootcloud.domain.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CustomerSales {
+
+    @ApiModelProperty("客户名称")
+    private String personName;
+
+    @ApiModelProperty("销售金额")
+    private String countSales;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/CustomerVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/CustomerVO.java
new file mode 100644
index 0000000..73ef7c0
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/CustomerVO.java
@@ -0,0 +1,89 @@
+package com.rootcloud.domain.vo;
+
+public class CustomerVO {
+
+    /** 租户ID */
+    private String tenantId;
+    /** 客户名称 */
+    private String customerName;  //nx_khgl客户表里的 KHGL_KHMC 客户名称
+    /** 客户编号 */
+    private String customerCode; // -- nx_khgl客户表里的 NX_KHGL_ID  主键ID   与nx_je_device里面有个DEVICE_SSKH -客户ID关联
+
+    private String userCode;  // 用户表je_core_enduser  的字段BACKUSERCODE去匹配客户表nx_khgl 的KHGL_XSJLDH，查出所属的客户列表
+
+    /** 所属机构ID */
+    private String officeId;
+
+    /** 所属机构名称 */
+    private String officeName;
+
+    public String getTenantId() {
+        return tenantId;
+    }
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId == null ? null : tenantId.trim();
+    }
+
+    public String getOfficeId() {
+        return officeId;
+    }
+
+    public void setOfficeId(String officeId) {
+        this.officeId = officeId;
+    }
+
+    public String getOfficeName() {
+        return officeName;
+    }
+
+    public void setOfficeName(String officeName) {
+        this.officeName = officeName;
+    }
+    /**
+     * 获取客户名称
+     *
+     * @return
+     *            客户名称
+     */
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    /**
+     * 设置客户名称
+     *
+     * @param customerName
+     *            客户名称
+     */
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName == null ? null : customerName.trim();
+    }
+
+    /**
+     * 获取客户编号
+     *
+     * @return
+     *            客户编号
+     */
+    public String getCustomerCode() {
+        return customerCode;
+    }
+
+    /**
+     * 设置客户编号
+     *
+     * @param customerCode
+     *            客户编号
+     */
+    public void setCustomerCode(String customerCode) {
+        this.customerCode = customerCode == null ? null : customerCode.trim();
+    }
+
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/DeviceListVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/DeviceListVO.java
new file mode 100644
index 0000000..3a1dca3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/DeviceListVO.java
@@ -0,0 +1,33 @@
+package com.rootcloud.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * 宁夏共享-设备列表 档案表
+ * */
+
+@TableName("nx_jcxx_sblb")
+public class DeviceListVO {
+
+    private String  deviceCode; //设备编码  --2215-10
+    private String  deviceName; //设备名称
+
+
+    public String getDeviceCode() {
+        return deviceCode;
+    }
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/DeviceStatusStatistic.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/DeviceStatusStatistic.java
new file mode 100644
index 0000000..052102f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/DeviceStatusStatistic.java
@@ -0,0 +1,42 @@
+package com.rootcloud.domain.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class DeviceStatusStatistic {
+
+    @ApiModelProperty("设备总数")
+    private String deviceTotal;
+
+    @ApiModelProperty("出租")
+    private String lease;
+
+    @ApiModelProperty("变卖")
+    private String sellOff;
+
+    @ApiModelProperty("闲置")
+    private String free;
+
+    @ApiModelProperty("封存")
+    private String sealed;
+
+
+    @ApiModelProperty("启用")
+    private String enable;
+
+    @ApiModelProperty("废弃")
+    private String discard;
+
+    @ApiModelProperty("在用")
+    private String inUse;
+
+
+    @ApiModelProperty("在制")
+    private String inProcess;
+
+    @ApiModelProperty("待交付")
+    private String toBeDelivered;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/FaultNumber.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/FaultNumber.java
new file mode 100644
index 0000000..bedba19
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/FaultNumber.java
@@ -0,0 +1,20 @@
+package com.rootcloud.domain.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FaultNumber {
+
+    @ApiModelProperty("故障名称")
+    private String faultName;
+
+
+    @ApiModelProperty("故障code")
+    private String faultCode;
+
+
+    @ApiModelProperty("出现次数")
+    private String appearNumber;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/FittingsSales.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/FittingsSales.java
new file mode 100644
index 0000000..785c844
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/FittingsSales.java
@@ -0,0 +1,16 @@
+package com.rootcloud.domain.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FittingsSales {
+
+
+    @ApiModelProperty("业务员名称")
+    private String personName;
+
+    @ApiModelProperty("销售金额")
+    private String countSales;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/KhVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/KhVO.java
new file mode 100644
index 0000000..242e919
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/KhVO.java
@@ -0,0 +1,24 @@
+package com.rootcloud.domain.vo;
+
+public class KhVO {
+
+    private String userName;
+    private String userId;
+
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/NxDeviceVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/NxDeviceVO.java
new file mode 100644
index 0000000..de223a3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/NxDeviceVO.java
@@ -0,0 +1,497 @@
+package com.rootcloud.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * 宁夏共享-设备台账表 同步从4.0平台过来的物模型、物实例
+ * */
+
+@TableName("nx_je_device")
+public class NxDeviceVO {
+
+    private String  thingID; //主键ID --设备实例ID
+    private String  modeID;//物模型ID
+    private String  deviceCode; //设备编码  --2215-10
+    private String  deviceName; //设备名称
+    private String  deviceTypeId; //设备类型CODE    --5719
+    private String  devicexhID; //设备型号CODE    --2215 1800
+    private String  deviceTypeName;  //设备类型名称  --3DP打印机
+    private String  devicexhName;//设备型号名称    --2215机型打印机
+
+    public String getThingID() {
+        return thingID;
+    }
+
+    public void setThingID(String thingID) {
+        this.thingID = thingID;
+    }
+
+    public String getModeID() {
+        return modeID;
+    }
+
+    public void setModeID(String modeID) {
+        this.modeID = modeID;
+    }
+
+    public String getDeviceCode() {
+        return deviceCode;
+    }
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceTypeId() {
+        return deviceTypeId;
+    }
+
+    public void setDeviceTypeId(String deviceTypeId) {
+        this.deviceTypeId = deviceTypeId;
+    }
+
+    public String getDevicexhID() {
+        return devicexhID;
+    }
+
+    public void setDevicexhID(String devicexhID) {
+        this.devicexhID = devicexhID;
+    }
+
+    public String getDeviceTypeName() {
+        return deviceTypeName;
+    }
+
+    public void setDeviceTypeName(String deviceTypeName) {
+        this.deviceTypeName = deviceTypeName;
+    }
+
+    public String getDevicexhName() {
+        return devicexhName;
+    }
+
+    public void setDevicexhName(String devicexhName) {
+        this.devicexhName = devicexhName;
+    }
+/*
+    private String  NX_JE_DEVICE_ID; //主键ID --设备实例ID
+    private String  DEVICE_SBBM; //设备编码  --2215-10
+    private String  DEVICE_SBMC; //设备名称
+    private String  DEVICE_SBLX; //设备类型CODE    --5719
+    private String  DEVICE_SBXH; //设备型号CODE    --2215 1800
+    private String  DEVICE_SBLX_NAME;  //设备类型名称  --3DP打印机
+    private String  DEVICE_SBXH_NAME;//设备型号名称    --2215机型打印机
+    private String  MODEL_ID;//物模型ID
+
+    private String  DEVICE_SBEWM;
+    private String  DEVICE_SBCCRQ;
+    private String  DEVICE_SBXXDZ;
+    private String  DEVICE_SSGJ;
+    private String  DEVICE_SSSFMC;
+    private String  DEVICE_SSSFBM;
+
+    private String  DEVICE_SSCSMC;
+    private String  DEVICE_SSQXMC;
+    private String  DEVICE_JD;
+    private String  DEVICE_WD;
+    private String  DEVICE_SSKH;
+    private String  DEVICE_STATUS_CODE; //设备状态
+    private String  DEVICE_NETWORK_STATUS_CODE;
+    private String  DEVICE_SSKHMC;//所属客户名称
+    private String  DEVICE_SSQXBM;
+    private String  DEVICE_SSCSBM;
+    private String  DEVICE_SBFJ;
+
+    private String  DEVICE_JWD;
+    private String  SY_FUNCEDIT;
+    private String  SY_AUDFLAG;
+    private String  SY_CREATEORGID;
+    private String  SY_CREATEORG;
+    private String  SY_CREATEORGNAME;
+    private String  SY_CREATETIME;
+    private String  SY_CREATEUSERID;
+    private String  SY_CREATEUSER;
+
+    private String  SY_CREATEUSERNAME;
+    private String  SY_STATUS;
+    private String  SY_ORDERINDEX;
+    private String  SY_PIID;
+    private String  SY_PDID;
+    private String  SY_JTGSMC;
+    private String  SY_JTGSID;
+
+    private String  DEVICE_TAG;
+    private String  DEVICE_SOURCE;
+    private String  CREATE_TIME;
+    private String  UPDATE_TIME;
+
+
+    public String getNX_JE_DEVICE_ID() {
+        return NX_JE_DEVICE_ID;
+    }
+
+    public void setNX_JE_DEVICE_ID(String NX_JE_DEVICE_ID) {
+        this.NX_JE_DEVICE_ID = NX_JE_DEVICE_ID;
+    }
+
+    public String getDEVICE_SBBM() {
+        return DEVICE_SBBM;
+    }
+
+    public void setDEVICE_SBBM(String DEVICE_SBBM) {
+        this.DEVICE_SBBM = DEVICE_SBBM;
+    }
+
+    public String getDEVICE_SBMC() {
+        return DEVICE_SBMC;
+    }
+
+    public void setDEVICE_SBMC(String DEVICE_SBMC) {
+        this.DEVICE_SBMC = DEVICE_SBMC;
+    }
+
+    public String getDEVICE_SBLX() {
+        return DEVICE_SBLX;
+    }
+
+    public void setDEVICE_SBLX(String DEVICE_SBLX) {
+        this.DEVICE_SBLX = DEVICE_SBLX;
+    }
+
+    public String getDEVICE_SBXH() {
+        return DEVICE_SBXH;
+    }
+
+    public void setDEVICE_SBXH(String DEVICE_SBXH) {
+        this.DEVICE_SBXH = DEVICE_SBXH;
+    }
+
+    public String getDEVICE_SBLX_NAME() {
+        return DEVICE_SBLX_NAME;
+    }
+
+    public void setDEVICE_SBLX_NAME(String DEVICE_SBLX_NAME) {
+        this.DEVICE_SBLX_NAME = DEVICE_SBLX_NAME;
+    }
+
+    public String getDEVICE_SBXH_NAME() {
+        return DEVICE_SBXH_NAME;
+    }
+
+    public void setDEVICE_SBXH_NAME(String DEVICE_SBXH_NAME) {
+        this.DEVICE_SBXH_NAME = DEVICE_SBXH_NAME;
+    }
+
+    public String getMODEL_ID() {
+        return MODEL_ID;
+    }
+
+    public void setMODEL_ID(String MODEL_ID) {
+        this.MODEL_ID = MODEL_ID;
+    }
+
+    public String getDEVICE_SBEWM() {
+        return DEVICE_SBEWM;
+    }
+
+    public void setDEVICE_SBEWM(String DEVICE_SBEWM) {
+        this.DEVICE_SBEWM = DEVICE_SBEWM;
+    }
+
+    public String getDEVICE_SBCCRQ() {
+        return DEVICE_SBCCRQ;
+    }
+
+    public void setDEVICE_SBCCRQ(String DEVICE_SBCCRQ) {
+        this.DEVICE_SBCCRQ = DEVICE_SBCCRQ;
+    }
+
+    public String getDEVICE_SBXXDZ() {
+        return DEVICE_SBXXDZ;
+    }
+
+    public void setDEVICE_SBXXDZ(String DEVICE_SBXXDZ) {
+        this.DEVICE_SBXXDZ = DEVICE_SBXXDZ;
+    }
+
+    public String getDEVICE_SSGJ() {
+        return DEVICE_SSGJ;
+    }
+
+    public void setDEVICE_SSGJ(String DEVICE_SSGJ) {
+        this.DEVICE_SSGJ = DEVICE_SSGJ;
+    }
+
+    public String getDEVICE_SSSFMC() {
+        return DEVICE_SSSFMC;
+    }
+
+    public void setDEVICE_SSSFMC(String DEVICE_SSSFMC) {
+        this.DEVICE_SSSFMC = DEVICE_SSSFMC;
+    }
+
+    public String getDEVICE_SSSFBM() {
+        return DEVICE_SSSFBM;
+    }
+
+    public void setDEVICE_SSSFBM(String DEVICE_SSSFBM) {
+        this.DEVICE_SSSFBM = DEVICE_SSSFBM;
+    }
+
+    public String getDEVICE_SSCSMC() {
+        return DEVICE_SSCSMC;
+    }
+
+    public void setDEVICE_SSCSMC(String DEVICE_SSCSMC) {
+        this.DEVICE_SSCSMC = DEVICE_SSCSMC;
+    }
+
+    public String getDEVICE_SSQXMC() {
+        return DEVICE_SSQXMC;
+    }
+
+    public void setDEVICE_SSQXMC(String DEVICE_SSQXMC) {
+        this.DEVICE_SSQXMC = DEVICE_SSQXMC;
+    }
+
+    public String getDEVICE_JD() {
+        return DEVICE_JD;
+    }
+
+    public void setDEVICE_JD(String DEVICE_JD) {
+        this.DEVICE_JD = DEVICE_JD;
+    }
+
+    public String getDEVICE_WD() {
+        return DEVICE_WD;
+    }
+
+    public void setDEVICE_WD(String DEVICE_WD) {
+        this.DEVICE_WD = DEVICE_WD;
+    }
+
+    public String getDEVICE_SSKH() {
+        return DEVICE_SSKH;
+    }
+
+    public void setDEVICE_SSKH(String DEVICE_SSKH) {
+        this.DEVICE_SSKH = DEVICE_SSKH;
+    }
+
+    public String getDEVICE_STATUS_CODE() {
+        return DEVICE_STATUS_CODE;
+    }
+
+    public void setDEVICE_STATUS_CODE(String DEVICE_STATUS_CODE) {
+        this.DEVICE_STATUS_CODE = DEVICE_STATUS_CODE;
+    }
+
+    public String getDEVICE_NETWORK_STATUS_CODE() {
+        return DEVICE_NETWORK_STATUS_CODE;
+    }
+
+    public void setDEVICE_NETWORK_STATUS_CODE(String DEVICE_NETWORK_STATUS_CODE) {
+        this.DEVICE_NETWORK_STATUS_CODE = DEVICE_NETWORK_STATUS_CODE;
+    }
+
+    public String getDEVICE_SSKHMC() {
+        return DEVICE_SSKHMC;
+    }
+
+    public void setDEVICE_SSKHMC(String DEVICE_SSKHMC) {
+        this.DEVICE_SSKHMC = DEVICE_SSKHMC;
+    }
+
+    public String getDEVICE_SSQXBM() {
+        return DEVICE_SSQXBM;
+    }
+
+    public void setDEVICE_SSQXBM(String DEVICE_SSQXBM) {
+        this.DEVICE_SSQXBM = DEVICE_SSQXBM;
+    }
+
+    public String getDEVICE_SSCSBM() {
+        return DEVICE_SSCSBM;
+    }
+
+    public void setDEVICE_SSCSBM(String DEVICE_SSCSBM) {
+        this.DEVICE_SSCSBM = DEVICE_SSCSBM;
+    }
+
+    public String getDEVICE_SBFJ() {
+        return DEVICE_SBFJ;
+    }
+
+    public void setDEVICE_SBFJ(String DEVICE_SBFJ) {
+        this.DEVICE_SBFJ = DEVICE_SBFJ;
+    }
+
+    public String getDEVICE_JWD() {
+        return DEVICE_JWD;
+    }
+
+    public void setDEVICE_JWD(String DEVICE_JWD) {
+        this.DEVICE_JWD = DEVICE_JWD;
+    }
+
+    public String getSY_FUNCEDIT() {
+        return SY_FUNCEDIT;
+    }
+
+    public void setSY_FUNCEDIT(String SY_FUNCEDIT) {
+        this.SY_FUNCEDIT = SY_FUNCEDIT;
+    }
+
+    public String getSY_AUDFLAG() {
+        return SY_AUDFLAG;
+    }
+
+    public void setSY_AUDFLAG(String SY_AUDFLAG) {
+        this.SY_AUDFLAG = SY_AUDFLAG;
+    }
+
+    public String getSY_CREATEORGID() {
+        return SY_CREATEORGID;
+    }
+
+    public void setSY_CREATEORGID(String SY_CREATEORGID) {
+        this.SY_CREATEORGID = SY_CREATEORGID;
+    }
+
+    public String getSY_CREATEORG() {
+        return SY_CREATEORG;
+    }
+
+    public void setSY_CREATEORG(String SY_CREATEORG) {
+        this.SY_CREATEORG = SY_CREATEORG;
+    }
+
+    public String getSY_CREATEORGNAME() {
+        return SY_CREATEORGNAME;
+    }
+
+    public void setSY_CREATEORGNAME(String SY_CREATEORGNAME) {
+        this.SY_CREATEORGNAME = SY_CREATEORGNAME;
+    }
+
+    public String getSY_CREATETIME() {
+        return SY_CREATETIME;
+    }
+
+    public void setSY_CREATETIME(String SY_CREATETIME) {
+        this.SY_CREATETIME = SY_CREATETIME;
+    }
+
+    public String getSY_CREATEUSERID() {
+        return SY_CREATEUSERID;
+    }
+
+    public void setSY_CREATEUSERID(String SY_CREATEUSERID) {
+        this.SY_CREATEUSERID = SY_CREATEUSERID;
+    }
+
+    public String getSY_CREATEUSER() {
+        return SY_CREATEUSER;
+    }
+
+    public void setSY_CREATEUSER(String SY_CREATEUSER) {
+        this.SY_CREATEUSER = SY_CREATEUSER;
+    }
+
+    public String getSY_CREATEUSERNAME() {
+        return SY_CREATEUSERNAME;
+    }
+
+    public void setSY_CREATEUSERNAME(String SY_CREATEUSERNAME) {
+        this.SY_CREATEUSERNAME = SY_CREATEUSERNAME;
+    }
+
+    public String getSY_STATUS() {
+        return SY_STATUS;
+    }
+
+    public void setSY_STATUS(String SY_STATUS) {
+        this.SY_STATUS = SY_STATUS;
+    }
+
+    public String getSY_ORDERINDEX() {
+        return SY_ORDERINDEX;
+    }
+
+    public void setSY_ORDERINDEX(String SY_ORDERINDEX) {
+        this.SY_ORDERINDEX = SY_ORDERINDEX;
+    }
+
+    public String getSY_PIID() {
+        return SY_PIID;
+    }
+
+    public void setSY_PIID(String SY_PIID) {
+        this.SY_PIID = SY_PIID;
+    }
+
+    public String getSY_PDID() {
+        return SY_PDID;
+    }
+
+    public void setSY_PDID(String SY_PDID) {
+        this.SY_PDID = SY_PDID;
+    }
+
+    public String getSY_JTGSMC() {
+        return SY_JTGSMC;
+    }
+
+    public void setSY_JTGSMC(String SY_JTGSMC) {
+        this.SY_JTGSMC = SY_JTGSMC;
+    }
+
+    public String getSY_JTGSID() {
+        return SY_JTGSID;
+    }
+
+    public void setSY_JTGSID(String SY_JTGSID) {
+        this.SY_JTGSID = SY_JTGSID;
+    }
+
+    public String getDEVICE_TAG() {
+        return DEVICE_TAG;
+    }
+
+    public void setDEVICE_TAG(String DEVICE_TAG) {
+        this.DEVICE_TAG = DEVICE_TAG;
+    }
+
+    public String getDEVICE_SOURCE() {
+        return DEVICE_SOURCE;
+    }
+
+    public void setDEVICE_SOURCE(String DEVICE_SOURCE) {
+        this.DEVICE_SOURCE = DEVICE_SOURCE;
+    }
+
+    public String getCREATE_TIME() {
+        return CREATE_TIME;
+    }
+
+    public void setCREATE_TIME(String CREATE_TIME) {
+        this.CREATE_TIME = CREATE_TIME;
+    }
+
+    public String getUPDATE_TIME() {
+        return UPDATE_TIME;
+    }
+
+    public void setUPDATE_TIME(String UPDATE_TIME) {
+        this.UPDATE_TIME = UPDATE_TIME;
+    }
+    */
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/OrderStatistic.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/OrderStatistic.java
new file mode 100644
index 0000000..ff04080
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/OrderStatistic.java
@@ -0,0 +1,16 @@
+package com.rootcloud.domain.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class OrderStatistic {
+
+    @ApiModelProperty("订单个数")
+    private Integer value;
+
+
+    @ApiModelProperty("订单时间")
+    private String  date;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/OrderStatusStatistic.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/OrderStatusStatistic.java
new file mode 100644
index 0000000..4bda1ea
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/OrderStatusStatistic.java
@@ -0,0 +1,36 @@
+package com.rootcloud.domain.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class OrderStatusStatistic {
+
+    @ApiModelProperty("订单总数")
+    private String orderTotal;
+
+    @ApiModelProperty("今日新增")
+    private String todayAdd;
+
+    @ApiModelProperty("今日完成")
+    private String todayFinish;
+
+    @ApiModelProperty("待派工")
+    private String dipatched;
+
+    @ApiModelProperty("待签到")
+    private String checkIn;
+
+    @ApiModelProperty("待报工")
+    private String reporting;
+
+    @ApiModelProperty("待审核")
+    private String  review;
+
+    @ApiModelProperty("待评价")
+    private String appraise;
+
+    @ApiModelProperty("已完成")
+    private String finish;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/Outlets.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/Outlets.java
new file mode 100644
index 0000000..18e28d1
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/Outlets.java
@@ -0,0 +1,31 @@
+package com.rootcloud.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class Outlets {
+
+    @ApiModelProperty("订单总数")
+    private String orderTotal;
+
+
+    @ApiModelProperty("客户总数")
+    private String customerTotal;
+
+
+    @ApiModelProperty("网点经纬度")
+    private String  outletsJwd;
+
+
+    @ApiModelProperty("网点名称")
+    private String  outletsName;
+
+    @ApiModelProperty("网点地址")
+    private String  outletsAddress;
+
+    @ApiModelProperty("网点控制区域")
+    private String  outletsKzqy;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PartsFaultNumber.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PartsFaultNumber.java
new file mode 100644
index 0000000..057ed17
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PartsFaultNumber.java
@@ -0,0 +1,19 @@
+package com.rootcloud.domain.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PartsFaultNumber {
+
+    @ApiModelProperty("配件类型")
+    private String partsName;
+
+
+    @ApiModelProperty("配件类型code")
+    private String partsCode;
+
+    @ApiModelProperty("出现次数")
+    private String appearNumber;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PersonAllStatistic.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PersonAllStatistic.java
new file mode 100644
index 0000000..35c3b36
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PersonAllStatistic.java
@@ -0,0 +1,36 @@
+package com.rootcloud.domain.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PersonAllStatistic {
+
+
+    @ApiModelProperty("人员订单前十")
+    private List<PersonnelStatistic> orders;
+
+    @ApiModelProperty("人员服务评价前十")
+    private List<PersonnelStatistic> appraises;
+
+    @ApiModelProperty("人员工作时长前十")
+    private List<PersonnelStatistic> works;
+
+    @ApiModelProperty("设备故障前十")
+    private List<FaultNumber> faultNumbers;
+
+    @ApiModelProperty("配件故障前十")
+    private  List<PartsFaultNumber> partsFaultNumbers;
+
+    @ApiModelProperty("配件销售额前十")
+    private List<FittingsSales> fittingsSales;
+
+    @ApiModelProperty("客户销售额前十")
+    private  List<CustomerSales> customerSales;
+
+    @ApiModelProperty("服务评价项")
+    private Integer serviceItem;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PersonnelStatistic.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PersonnelStatistic.java
new file mode 100644
index 0000000..1dc26af
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PersonnelStatistic.java
@@ -0,0 +1,30 @@
+package com.rootcloud.domain.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class PersonnelStatistic {
+
+    @ApiModelProperty("人员名称")
+    private String personName;
+
+    @ApiModelProperty("订单总数")
+    private String orderNum;
+
+    @ApiModelProperty("服务评价数")
+    private String serviceNum;
+
+    @ApiModelProperty("人员工作时长")
+    private String workTimeNum;
+
+    private String gcsId;
+
+    private BigDecimal sc;
+
+    private String orderAssistengineerid;
+    private String orderAssignengineerid;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PrinterEfficiencyWorkVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PrinterEfficiencyWorkVO.java
new file mode 100644
index 0000000..8b500a8
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PrinterEfficiencyWorkVO.java
@@ -0,0 +1,119 @@
+package com.rootcloud.domain.vo;
+
+public class PrinterEfficiencyWorkVO {
+
+    private String deviceId;
+    private String deviceTypeId;
+    private float dyhs;
+    private float dyTime;
+    private float ghjhl;
+    private Integer sameSpentTimeCount = 0;
+
+    public PrinterEfficiencyWorkVO(
+            String deviceId,
+            String deviceTypeId) {
+        this.deviceId = deviceId;
+        this.deviceTypeId = deviceTypeId;
+    }
+
+    /**
+     * 增加设备相关指标值
+     */
+    public void addData(
+            float dyhs,
+            float dyTime,
+            float ghjhl) {
+        this.dyhs += dyhs;
+        this.dyTime += dyTime;
+        this.ghjhl += ghjhl;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceTypeId() {
+        return deviceTypeId;
+    }
+
+    public void setDeviceTypeId(String deviceTypeId) {
+        this.deviceTypeId = deviceTypeId;
+    }
+
+    public float getDyhs() {
+        return dyhs;
+    }
+
+    public void setDyhs(float dyhs) {
+        this.dyhs = dyhs;
+    }
+
+    public float getDyTime() {
+        return dyTime;
+    }
+
+    public void setDyTime(float dyTime) {
+        this.dyTime = dyTime;
+    }
+
+    public float getGhjhl() {
+        return ghjhl;
+    }
+
+    public void setGhjhl(float ghjhl) {
+        this.ghjhl = ghjhl;
+    }
+
+    @Override
+    public String toString() {
+        return "PrinterWork{" +
+                "deviceId='" + deviceId + '\'' +
+                ", deviceTypeId='" + deviceTypeId + '\'' +
+                ", dyhs=" + dyhs +
+                ", dyTime=" + dyTime +
+                ", ghjhl=" + ghjhl +
+                '}';
+    }
+
+    public PrinterEfficiencyWorkVO deviceId(String deviceId) {
+        this.deviceId = deviceId;
+        return this;
+    }
+
+    public PrinterEfficiencyWorkVO deviceTypeId(String deviceTypeId) {
+        this.deviceTypeId = deviceTypeId;
+        return this;
+    }
+
+    public PrinterEfficiencyWorkVO dyhs(float dyhs) {
+        this.dyhs = dyhs;
+        return this;
+    }
+
+    public PrinterEfficiencyWorkVO dyTime(float dyTime) {
+        this.dyTime = dyTime;
+        return this;
+    }
+
+    public PrinterEfficiencyWorkVO ghjhl(float ghjhl) {
+        this.ghjhl = ghjhl;
+        return this;
+    }
+
+    public PrinterEfficiencyWorkVO sameSpentTimeCount(Integer sameSpentTimeCount) {
+        this.sameSpentTimeCount = sameSpentTimeCount;
+        return this;
+    }
+
+    public void setSameSpentTimeCount(Integer sameSpentTimeCount) {
+        this.sameSpentTimeCount = sameSpentTimeCount;
+    }
+
+    public Integer getSameSpentTimeCount() {
+        return this.sameSpentTimeCount;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PrinterHeadRecordVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PrinterHeadRecordVO.java
new file mode 100644
index 0000000..b6dc642
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/PrinterHeadRecordVO.java
@@ -0,0 +1,292 @@
+package com.rootcloud.domain.vo;
+
+public class PrinterHeadRecordVO {
+    private Long id;
+    private String tenantId;
+    private String deviceCode;
+    private String thingId;
+    private String kuCode;
+    private String kuName;
+    private String updatetime;  //写入日期  Timestamp
+    private String SN1;
+    private String SN2;
+    private String SN3;
+    private String SN4;
+    private String SN5;
+    private String SN6;
+    private String SN7;
+    private String SN8;
+    private String SN9;
+    private String SN10;
+    private String SN11;
+    private String SN12;
+    private String SN13;
+    private String SN14;
+    private String SN15;
+    private String SN16;
+    private String SN17;
+    private String SN18;
+    private String SN19;
+    private String SN20;
+    private String SN21;
+    private String SN22;
+    private String SN23;
+    private String SN24;
+    private String SN25;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getDeviceCode() {
+        return deviceCode;
+    }
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
+    }
+
+    public String getThingId() {
+        return thingId;
+    }
+
+    public void setThingId(String thingId) {
+        this.thingId = thingId;
+    }
+
+    public String getKuCode() {
+        return kuCode;
+    }
+
+    public void setKuCode(String kuCode) {
+        this.kuCode = kuCode;
+    }
+
+    public String getKuName() {
+        return kuName;
+    }
+
+    public void setKuName(String kuName) {
+        this.kuName = kuName;
+    }
+
+    public String getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(String updatetime) {
+        this.updatetime = updatetime;
+    }
+
+    public String getSN1() {
+        return SN1;
+    }
+
+    public void setSN1(String SN1) {
+        this.SN1 = SN1;
+    }
+
+    public String getSN2() {
+        return SN2;
+    }
+
+    public void setSN2(String SN2) {
+        this.SN2 = SN2;
+    }
+
+    public String getSN3() {
+        return SN3;
+    }
+
+    public void setSN3(String SN3) {
+        this.SN3 = SN3;
+    }
+
+    public String getSN4() {
+        return SN4;
+    }
+
+    public void setSN4(String SN4) {
+        this.SN4 = SN4;
+    }
+
+    public String getSN5() {
+        return SN5;
+    }
+
+    public void setSN5(String SN5) {
+        this.SN5 = SN5;
+    }
+
+    public String getSN6() {
+        return SN6;
+    }
+
+    public void setSN6(String SN6) {
+        this.SN6 = SN6;
+    }
+
+    public String getSN7() {
+        return SN7;
+    }
+
+    public void setSN7(String SN7) {
+        this.SN7 = SN7;
+    }
+
+    public String getSN8() {
+        return SN8;
+    }
+
+    public void setSN8(String SN8) {
+        this.SN8 = SN8;
+    }
+
+    public String getSN9() {
+        return SN9;
+    }
+
+    public void setSN9(String SN9) {
+        this.SN9 = SN9;
+    }
+
+    public String getSN10() {
+        return SN10;
+    }
+
+    public void setSN10(String SN10) {
+        this.SN10 = SN10;
+    }
+
+    public String getSN11() {
+        return SN11;
+    }
+
+    public void setSN11(String SN11) {
+        this.SN11 = SN11;
+    }
+
+    public String getSN12() {
+        return SN12;
+    }
+
+    public void setSN12(String SN12) {
+        this.SN12 = SN12;
+    }
+
+    public String getSN13() {
+        return SN13;
+    }
+
+    public void setSN13(String SN13) {
+        this.SN13 = SN13;
+    }
+
+    public String getSN14() {
+        return SN14;
+    }
+
+    public void setSN14(String SN14) {
+        this.SN14 = SN14;
+    }
+
+    public String getSN15() {
+        return SN15;
+    }
+
+    public void setSN15(String SN15) {
+        this.SN15 = SN15;
+    }
+
+    public String getSN16() {
+        return SN16;
+    }
+
+    public void setSN16(String SN16) {
+        this.SN16 = SN16;
+    }
+
+    public String getSN17() {
+        return SN17;
+    }
+
+    public void setSN17(String SN17) {
+        this.SN17 = SN17;
+    }
+
+    public String getSN18() {
+        return SN18;
+    }
+
+    public void setSN18(String SN18) {
+        this.SN18 = SN18;
+    }
+
+    public String getSN19() {
+        return SN19;
+    }
+
+    public void setSN19(String SN19) {
+        this.SN19 = SN19;
+    }
+
+    public String getSN20() {
+        return SN20;
+    }
+
+    public void setSN20(String SN20) {
+        this.SN20 = SN20;
+    }
+
+    public String getSN21() {
+        return SN21;
+    }
+
+    public void setSN21(String SN21) {
+        this.SN21 = SN21;
+    }
+
+    public String getSN22() {
+        return SN22;
+    }
+
+    public void setSN22(String SN22) {
+        this.SN22 = SN22;
+    }
+
+    public String getSN23() {
+        return SN23;
+    }
+
+    public void setSN23(String SN23) {
+        this.SN23 = SN23;
+    }
+
+    public String getSN24() {
+        return SN24;
+    }
+
+    public void setSN24(String SN24) {
+        this.SN24 = SN24;
+    }
+
+    public String getSN25() {
+        return SN25;
+    }
+
+    public void setSN25(String SN25) {
+        this.SN25 = SN25;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepMttDataVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepMttDataVO.java
new file mode 100644
index 0000000..fce6c11
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepMttDataVO.java
@@ -0,0 +1,222 @@
+package com.rootcloud.domain.vo;
+
+public class RepMttDataVO {
+    public String name;
+    public String text;
+    public String strValue1;
+    public String value1;
+    public String strValue2;
+    public String value2;
+    public String strValue3;
+    public String value3;
+    public String strValue4;
+    public String value4;
+    public String strValue5;
+    public String value5;
+    public String strValue6;
+    public String value6;
+    public String strValue7;
+    public String value7;
+    public String strValue8;
+    public String value8;
+    public String strValue9;
+    public String value9;
+    public String strValue10;
+    public String value10;
+
+    public Double value11;   //存储可以倒序排列的double值
+
+    public String strValue11;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getStrValue1() {
+        return strValue1;
+    }
+
+    public void setStrValue1(String strValue1) {
+        this.strValue1 = strValue1;
+    }
+
+    public String getValue1() {
+        return value1;
+    }
+
+    public void setValue1(String value1) {
+        this.value1 = value1;
+    }
+
+    public String getStrValue2() {
+        return strValue2;
+    }
+
+    public void setStrValue2(String strValue2) {
+        this.strValue2 = strValue2;
+    }
+
+    public String getValue2() {
+        return value2;
+    }
+
+    public void setValue2(String value2) {
+        this.value2 = value2;
+    }
+
+    public String getStrValue3() {
+        return strValue3;
+    }
+
+    public void setStrValue3(String strValue3) {
+        this.strValue3 = strValue3;
+    }
+
+    public String getValue3() {
+        return value3;
+    }
+
+    public void setValue3(String value3) {
+        this.value3 = value3;
+    }
+
+    public String getStrValue4() {
+        return strValue4;
+    }
+
+    public void setStrValue4(String strValue4) {
+        this.strValue4 = strValue4;
+    }
+
+    public String getValue4() {
+        return value4;
+    }
+
+    public void setValue4(String value4) {
+        this.value4 = value4;
+    }
+
+    public String getStrValue5() {
+        return strValue5;
+    }
+
+    public void setStrValue5(String strValue5) {
+        this.strValue5 = strValue5;
+    }
+
+    public String getValue5() {
+        return value5;
+    }
+
+    public void setValue5(String value5) {
+        this.value5 = value5;
+    }
+
+    public String getStrValue6() {
+        return strValue6;
+    }
+
+    public void setStrValue6(String strValue6) {
+        this.strValue6 = strValue6;
+    }
+
+    public String getValue6() {
+        return value6;
+    }
+
+    public void setValue6(String value6) {
+        this.value6 = value6;
+    }
+
+    public String getStrValue7() {
+        return strValue7;
+    }
+
+    public void setStrValue7(String strValue7) {
+        this.strValue7 = strValue7;
+    }
+
+    public String getValue7() {
+        return value7;
+    }
+
+    public void setValue7(String value7) {
+        this.value7 = value7;
+    }
+
+    public String getStrValue8() {
+        return strValue8;
+    }
+
+    public void setStrValue8(String strValue8) {
+        this.strValue8 = strValue8;
+    }
+
+    public String getValue8() {
+        return value8;
+    }
+
+    public void setValue8(String value8) {
+        this.value8 = value8;
+    }
+
+    public String getStrValue9() {
+        return strValue9;
+    }
+
+    public void setStrValue9(String strValue9) {
+        this.strValue9 = strValue9;
+    }
+
+    public String getValue9() {
+        return value9;
+    }
+
+    public void setValue9(String value9) {
+        this.value9 = value9;
+    }
+
+    public String getStrValue10() {
+        return strValue10;
+    }
+
+    public void setStrValue10(String strValue10) {
+        this.strValue10 = strValue10;
+    }
+
+    public String getValue10() {
+        return value10;
+    }
+
+    public void setValue10(String value10) {
+        this.value10 = value10;
+    }
+
+    public Double getValue11() {
+        return value11;
+    }
+
+    public void setValue11(Double value11) {
+        this.value11 = value11;
+    }
+
+    public String getStrValue11() {
+        return strValue11;
+    }
+
+    public void setStrValue11(String strValue11) {
+        this.strValue11 = strValue11;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterEmailConfigVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterEmailConfigVO.java
new file mode 100644
index 0000000..611eca1
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterEmailConfigVO.java
@@ -0,0 +1,49 @@
+package com.rootcloud.domain.vo;
+
+public class RepPrinterEmailConfigVO {
+
+    private Long id;
+    private String email;			//邮箱
+    private String tenantId;  		//租户编号
+    private String name; 			//姓名
+    private String customerId;  	//客户编号
+    private String delFlag; 		//删除标记 0默认，1删除
+
+    public Long getId() {
+        return id;
+    }
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getEmail() {
+        return email;
+    }
+    public void setEmail(String email) {
+        this.email = email;
+    }
+    public String getTenantId() {
+        return tenantId;
+    }
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getCustomerId() {
+        return customerId;
+    }
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
+    }
+    public String getDelFlag() {
+        return delFlag;
+    }
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterOutputVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterOutputVO.java
new file mode 100644
index 0000000..18e0e57
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterOutputVO.java
@@ -0,0 +1,198 @@
+package com.rootcloud.domain.vo;
+
+import java.math.BigDecimal;
+
+public class RepPrinterOutputVO {
+
+    /**
+     * 主键
+     */
+    private Integer id;
+    /**
+     * 设备编号
+     */
+    private  String deviceId;
+    /**
+     * 年份
+     */
+    private Integer dataYear;
+    /**
+     * 月份
+     */
+    private Integer       dataMonth;
+    /**
+     * 日期
+     */
+    private Integer dataDay;
+    /**
+     * 产量
+     */
+    private BigDecimal gkScDyCl;
+    /**
+     * 合格量
+     */
+    private BigDecimal        gkScDyHgl;
+
+    /**
+     * 总废品量
+     */
+    private BigDecimal        gkScDyFpnum;
+
+    /**
+     * 设备废品量
+     */
+    private BigDecimal        gkScDyDevfpnum;
+
+    /**
+     * 总废品率
+     */
+    private BigDecimal gkScDyFpl;
+    /**
+     * 设备废品率
+     */
+    private BigDecimal gkScDyDevfpl;
+    /**
+     * 数据生成时间
+     */
+    private  String createDate;
+
+    //开始日期
+    private String startDate ;
+
+    //结束日期
+    private String endDate ;
+
+
+    private Integer startNo ;
+    private Integer endNo ;
+
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public BigDecimal getGkScDyFpnum() {
+        return gkScDyFpnum;
+    }
+
+    public void setGkScDyFpnum(BigDecimal gkScDyFpnum) {
+        this.gkScDyFpnum = gkScDyFpnum;
+    }
+
+    public BigDecimal getGkScDyDevfpnum() {
+        return gkScDyDevfpnum;
+    }
+
+    public void setGkScDyDevfpnum(BigDecimal gkScDyDevfpnum) {
+        this.gkScDyDevfpnum = gkScDyDevfpnum;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+
+    public Integer getDataYear() {
+        return dataYear;
+    }
+
+    public void setDataYear(Integer dataYear) {
+        this.dataYear = dataYear;
+    }
+
+    public Integer getDataMonth() {
+        return dataMonth;
+    }
+
+    public void setDataMonth(Integer dataMonth) {
+        this.dataMonth = dataMonth;
+    }
+
+    public Integer getDataDay() {
+        return dataDay;
+    }
+
+    public void setDataDay(Integer dataDay) {
+        this.dataDay = dataDay;
+    }
+
+    public BigDecimal getGkScDyCl() {
+        return gkScDyCl;
+    }
+
+    public void setGkScDyCl(BigDecimal gkScDyCl) {
+        this.gkScDyCl = gkScDyCl;
+    }
+
+    public BigDecimal getGkScDyHgl() {
+        return gkScDyHgl;
+    }
+
+    public void setGkScDyHgl(BigDecimal gkScDyHgl) {
+        this.gkScDyHgl = gkScDyHgl;
+    }
+
+    public BigDecimal getGkScDyFpl() {
+        return gkScDyFpl;
+    }
+
+    public void setGkScDyFpl(BigDecimal gkScDyFpl) {
+        this.gkScDyFpl = gkScDyFpl;
+    }
+
+    public BigDecimal getGkScDyDevfpl() {
+        return gkScDyDevfpl;
+    }
+
+    public void setGkScDyDevfpl(BigDecimal gkScDyDevfpl) {
+        this.gkScDyDevfpl = gkScDyDevfpl;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getStartNo() {
+        return startNo;
+    }
+
+    public void setStartNo(Integer startNo) {
+        this.startNo = startNo;
+    }
+
+    public Integer getEndNo() {
+        return endNo;
+    }
+
+    public void setEndNo(Integer endNo) {
+        this.endNo = endNo;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterReportItemVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterReportItemVO.java
new file mode 100644
index 0000000..75c22c5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterReportItemVO.java
@@ -0,0 +1,41 @@
+package com.rootcloud.domain.vo;
+
+/**
+ * 	打印机运维报告数据
+ *
+ * @author  liumiaodi 2020/03/23
+ * @version V1.0
+ **/
+public class RepPrinterReportItemVO {
+
+    private Long id;
+    private Long reportId;  		//用户报告id
+    private String reportType; 		//报告类型
+    private String reportData;		//报表数据
+
+    public Long getId() {
+        return id;
+    }
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public Long getReportId() {
+        return reportId;
+    }
+    public void setReportId(Long reportId) {
+        this.reportId = reportId;
+    }
+    public String getReportType() {
+        return reportType;
+    }
+    public void setReportType(String reportType) {
+        this.reportType = reportType;
+    }
+    public String getReportData() {
+        return reportData;
+    }
+    public void setReportData(String reportData) {
+        this.reportData = reportData;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterReportVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterReportVO.java
new file mode 100644
index 0000000..713436d
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterReportVO.java
@@ -0,0 +1,942 @@
+package com.rootcloud.domain.vo;
+
+import java.util.Date;
+
+public class RepPrinterReportVO {
+    private Long id;
+    private String tenantId;  		//租户编号
+    private String title; 			//报告名称
+    private String emails;			//邮箱
+    private String officeId;  		//所属机构编号
+    private String officeName; 	//机构名称
+    private String customerId;  	//客户编号
+    private String customerName; 	//客户名称
+    private Date createDate; 		//数据生成时间
+    private Integer createType; 	//报表类型【1:周边 2:月报 3:季报 4:年报 5:按照指定日期】
+
+    private float rate10;			//设备平均空间利用率
+    private String rate10Str;		//设备平均空间利用率[百分比 eg:30%]
+
+    private String value0;			//平均开动率最低设备
+    private float rate1;			//设备平均开动率
+    private String rate1Str;		//设备平均开动率[百分比 eg:30%]
+    private float rate2;			//设备平均开动率最低
+    private float rate3;			//产品平均废品率
+    private String rate3Str;		//产品平均废品率[百分比 eg:30%]
+    private float rate4;			//设备平均废品率
+    private String rate4Str;		//设备平均废品率[百分比 eg:30%]
+    private String value1;			//前三大废品原因
+    private String value2;			//前三大废品率高的设备
+    private float rate5;			//砂型密度平均合格率
+    private String rate5Str;		//砂型密度平均合格率[百分比 eg:30%]
+    private String value3;			//密度不合格的设备
+    private float rate6;			//打印机平均树脂加入比
+    private String rate6Str;		//打印机平均树脂加入比[百分比 eg:30%]
+    private float rate7;			//最大加入比
+    private String rate7Str;		//最大加入比[百分比 eg:30%]
+    private String value4;			//最大树脂加入比设备
+    private float rate8;			//平均打印新砂占比
+    private String rate8Str;		//平均打印新砂占比【百分比 eg:30%】
+    private String value5;			//新砂占比前三大设备
+    private String value5_1;		//这三台设备的新旧砂占比值
+    private float rate9;			//打印机平均漏沙量
+    private float rate11;			//砂型强度平均合格率
+    private String rate11Str;			//砂型强度平均合格率
+    private float rate12;			//平均产能利用率
+    private String rate12Str;			//平均产能利用率
+    private float rate13;			//平均打印高度
+    private float rate14;			//打印机平均维修费用
+    private float rate15;			//打印机平均固化剂单耗
+
+    private String value6;			//漏砂量前三设备
+    private String value6_1;		//这三台设备的漏砂量
+    private String value7;			//更换下的喷头平均寿命x月
+    private String value8;			//x个备件寿命预警
+    private String value9;			//空间利用率文本
+    private String value11;			//砂型强度合格率最低的三台的设备
+    private String value12;			//产能利用率最低的三台设备
+    private String value13;			//平均打印高度最低
+    private String value14;			//维修费用最高三台的设备
+    private String value15;			//固化剂单耗最大为
+    private String value16;			//平均换线时间
+    private String value17;			//换件时间最长的设备
+    private String value18;			//换件时间最长的设备的时长
+    private String value19;			//平均MTBF
+    private String value20;			//平均MTTR
+    private String value21;			//MTTR最高的三台设备1
+    private String value22;			//MTTR最高的三台设备2
+    private String value23;			//MTTR最高的三台设备3
+    private String value24;			//星级评价最高最低三台设备
+
+    private String remindlist;		//关键备件候命预警提醒
+    private String ratelist;		//平均打印效率(如：2218机型为xx,SDream机型为xx; 2218-1最低xx, SDreamA最低xx)
+    private Integer dataYear;		//年份
+    private Integer dataQuarter;	//季度
+    private Integer dataMonth;		//月份
+    private Integer dataWeek;		//周
+    private String startDate; 		//报告开始时间
+    private String endDate; 		//报告结束日期
+
+    private String targetValues;	//目标值
+
+
+    private String data1;			//设备开动率统计
+    private String data2;			//空间利用率
+    private String data3;			//打印效率统计
+    private String data4;			//打印产量统计
+    private String data5;			//废品原因统计
+    private String data6;			//砂型密度合格率统计
+    private String data7;			//打印机树脂加入比
+    private String data8;			//新旧砂加入占比
+    private String data9;			//漏砂量统计
+    private String data10;			//喷头寿命
+    private String data11;			//产能利用率
+    private String data12;			//平均打印高度
+    private String data13;			//砂芯强度合格率
+    private String data14;			//维修费用
+    private String data15;			//固化剂单耗
+    private String data16;			//换件时间
+    private String data17;			//故障停机
+    private String data18;			//星级评价
+
+
+    private String remark1;			//设备开动率统计备注
+    private String remark2;			//空间利用率备注
+    private String remark3;			//打印效率统计备注
+    private String remark4;			//打印产量统计备注
+    private String remark5;			//废品原因统计备注
+    private String remark6;			//砂型密度合格率统计备注
+    private String remark7;			//打印机树脂加入比备注
+    private String remark8;			//新旧砂加入占比备注
+    private String remark9;			//漏砂量统计备注
+    private String remark10;		//喷头寿命备注
+    private String remark11;		//产能利用率备注
+    private String remark12;		//平均打印高度备注
+    private String remark13;		//砂芯强度合格率备注
+    private String remark14;		//维修费用备注
+    private String remark15;		//固化剂单耗备注
+    private String remark16;		//星级评价备注
+
+
+    public float getRate11() {
+        return rate11;
+    }
+
+    public void setRate11(float rate11) {
+        this.rate11 = rate11;
+    }
+
+    public String getRate11Str() {
+        return rate11Str;
+    }
+
+    public void setRate11Str(String rate11Str) {
+        this.rate11Str = rate11Str;
+    }
+
+    public String getValue11() {
+        return value11;
+    }
+
+    public void setValue11(String value11) {
+        this.value11 = value11;
+    }
+
+    public Integer getCreateType() {
+        return createType;
+    }
+
+    public void setCreateType(Integer createType) {
+        this.createType = createType;
+    }
+
+    public String getRemark1() {
+        return remark1;
+    }
+
+    public void setRemark1(String remark1) {
+        this.remark1 = remark1;
+    }
+
+    public String getRemark2() {
+        return remark2;
+    }
+
+    public void setRemark2(String remark2) {
+        this.remark2 = remark2;
+    }
+
+    public String getRemark3() {
+        return remark3;
+    }
+
+    public void setRemark3(String remark3) {
+        this.remark3 = remark3;
+    }
+
+    public String getRemark4() {
+        return remark4;
+    }
+
+    public void setRemark4(String remark4) {
+        this.remark4 = remark4;
+    }
+
+    public String getRemark5() {
+        return remark5;
+    }
+
+    public void setRemark5(String remark5) {
+        this.remark5 = remark5;
+    }
+
+    public String getRemark6() {
+        return remark6;
+    }
+
+    public void setRemark6(String remark6) {
+        this.remark6 = remark6;
+    }
+
+    public String getRemark7() {
+        return remark7;
+    }
+
+    public void setRemark7(String remark7) {
+        this.remark7 = remark7;
+    }
+
+    public String getRemark8() {
+        return remark8;
+    }
+
+    public void setRemark8(String remark8) {
+        this.remark8 = remark8;
+    }
+
+    public String getRemark9() {
+        return remark9;
+    }
+
+    public void setRemark9(String remark9) {
+        this.remark9 = remark9;
+    }
+
+    public String getRemark10() {
+        return remark10;
+    }
+
+    public void setRemark10(String remark10) {
+        this.remark10 = remark10;
+    }
+
+    public String getRate7Str() {
+        return rate7Str;
+    }
+
+    public void setRate7Str(String rate7Str) {
+        this.rate7Str = rate7Str;
+    }
+
+    public String getValue9() {
+        return value9;
+    }
+
+    public void setValue9(String value9) {
+        this.value9 = value9;
+    }
+
+    public float getRate10() {
+        return rate10;
+    }
+
+    public void setRate10(float rate10) {
+        this.rate10 = rate10;
+    }
+
+    public String getRate10Str() {
+        return rate10Str;
+    }
+
+    public void setRate10Str(String rate10Str) {
+        this.rate10Str = rate10Str;
+    }
+
+    public String getRate6Str() {
+        return rate6Str;
+    }
+
+    public void setRate6Str(String rate6Str) {
+        this.rate6Str = rate6Str;
+    }
+
+    public String getRate5Str() {
+        return rate5Str;
+    }
+
+    public void setRate5Str(String rate5Str) {
+        this.rate5Str = rate5Str;
+    }
+
+    public String getRate8Str() {
+        return rate8Str;
+    }
+
+    public void setRate8Str(String rate8Str) {
+        this.rate8Str = rate8Str;
+    }
+
+
+
+    public String getRate1Str() {
+        return rate1Str;
+    }
+
+    public void setRate1Str(String rate1Str) {
+        this.rate1Str = rate1Str;
+    }
+
+    public String getRate3Str() {
+        return rate3Str;
+    }
+
+    public void setRate3Str(String rate3Str) {
+        this.rate3Str = rate3Str;
+    }
+
+    public String getRate4Str() {
+        return rate4Str;
+    }
+
+    public void setRate4Str(String rate4Str) {
+        this.rate4Str = rate4Str;
+    }
+
+    public String getData1() {
+        return data1;
+    }
+
+    public void setData1(String data1) {
+        this.data1 = data1;
+    }
+
+    public String getData2() {
+        return data2;
+    }
+
+    public void setData2(String data2) {
+        this.data2 = data2;
+    }
+
+    public String getData3() {
+        return data3;
+    }
+
+    public void setData3(String data3) {
+        this.data3 = data3;
+    }
+
+    public String getData4() {
+        return data4;
+    }
+
+    public void setData4(String data4) {
+        this.data4 = data4;
+    }
+
+    public String getData5() {
+        return data5;
+    }
+
+    public void setData5(String data5) {
+        this.data5 = data5;
+    }
+
+    public String getData6() {
+        return data6;
+    }
+
+    public void setData6(String data6) {
+        this.data6 = data6;
+    }
+
+    public String getData7() {
+        return data7;
+    }
+
+    public void setData7(String data7) {
+        this.data7 = data7;
+    }
+
+    public String getData8() {
+        return data8;
+    }
+
+    public void setData8(String data8) {
+        this.data8 = data8;
+    }
+
+    public String getData9() {
+        return data9;
+    }
+
+    public void setData9(String data9) {
+        this.data9 = data9;
+    }
+
+    public String getData10() {
+        return data10;
+    }
+
+    public void setData10(String data10) {
+        this.data10 = data10;
+    }
+
+    public String getValue0() {
+        return value0;
+    }
+
+    public void setValue0(String value0) {
+        this.value0 = value0;
+    }
+
+    public String getTargetValues() {
+        return targetValues;
+    }
+
+    public void setTargetValues(String targetValues) {
+        this.targetValues = targetValues;
+    }
+
+    public Integer getDataYear() {
+        return dataYear;
+    }
+
+    public void setDataYear(Integer dataYear) {
+        this.dataYear = dataYear;
+    }
+
+    public Integer getDataQuarter() {
+        return dataQuarter;
+    }
+
+    public void setDataQuarter(Integer dataQuarter) {
+        this.dataQuarter = dataQuarter;
+    }
+
+    public Integer getDataMonth() {
+        return dataMonth;
+    }
+
+    public void setDataMonth(Integer dataMonth) {
+        this.dataMonth = dataMonth;
+    }
+
+    public Integer getDataWeek() {
+        return dataWeek;
+    }
+
+    public void setDataWeek(Integer dataWeek) {
+        this.dataWeek = dataWeek;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getRatelist() {
+        return ratelist;
+    }
+
+    public void setRatelist(String ratelist) {
+        this.ratelist = ratelist;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getEmails() {
+        return emails;
+    }
+
+    public void setEmails(String emails) {
+        this.emails = emails;
+    }
+
+    public String getOfficeId() {
+        return officeId;
+    }
+
+    public void setOfficeId(String officeId) {
+        this.officeId = officeId;
+    }
+
+    public String getOfficeName() {
+        return officeName;
+    }
+
+    public void setOfficeName(String officeName) {
+        this.officeName = officeName;
+    }
+
+    public String getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public float getRate1() {
+        return rate1;
+    }
+
+    public void setRate1(float rate1) {
+        this.rate1 = rate1;
+    }
+
+    public float getRate2() {
+        return rate2;
+    }
+
+    public void setRate2(float rate2) {
+        this.rate2 = rate2;
+    }
+
+    public float getRate3() {
+        return rate3;
+    }
+
+    public void setRate3(float rate3) {
+        this.rate3 = rate3;
+    }
+
+    public float getRate4() {
+        return rate4;
+    }
+
+    public void setRate4(float rate4) {
+        this.rate4 = rate4;
+    }
+
+    public float getRate5() {
+        return rate5;
+    }
+
+    public void setRate5(float rate5) {
+        this.rate5 = rate5;
+    }
+
+    public float getRate6() {
+        return rate6;
+    }
+
+    public void setRate6(float rate6) {
+        this.rate6 = rate6;
+    }
+
+    public float getRate7() {
+        return rate7;
+    }
+
+    public void setRate7(float rate7) {
+        this.rate7 = rate7;
+    }
+
+    public float getRate8() {
+        return rate8;
+    }
+
+    public void setRate8(float rate8) {
+        this.rate8 = rate8;
+    }
+
+    public String getValue1() {
+        return value1;
+    }
+
+    public void setValue1(String value1) {
+        this.value1 = value1;
+    }
+
+    public String getValue2() {
+        return value2;
+    }
+
+    public void setValue2(String value2) {
+        this.value2 = value2;
+    }
+
+    public float getRate9() {
+        return rate9;
+    }
+
+    public void setRate9(float rate9) {
+        this.rate9 = rate9;
+    }
+
+    public String getValue3() {
+        return value3;
+    }
+
+    public void setValue3(String value3) {
+        this.value3 = value3;
+    }
+
+
+    public String getValue4() {
+        return value4;
+    }
+
+    public void setValue4(String value4) {this.value4 = value4; }
+
+
+    public String getValue5() { return value5; }
+    public void setValue5(String value5) { this.value5 = value5; }
+
+    public String getValue5_1() { return value5_1; }
+    public void setValue5_1(String value5_1) { this.value5_1 = value5_1; }
+
+    public String getValue6() {
+        return value6;
+    }
+    public void setValue6(String value6) {
+        this.value6 = value6;
+    }
+
+    public String getValue6_1() {
+        return value6_1;
+    }
+    public void setValue6_1(String value6_1) {
+        this.value6_1 = value6_1;
+    }
+
+    public String getValue7() {
+        return value7;
+    }
+
+    public void setValue7(String value7) {
+        this.value7 = value7;
+    }
+
+    public String getValue8() {
+        return value8;
+    }
+
+    public void setValue8(String value8) {
+        this.value8 = value8;
+    }
+
+    public String getRemindlist() {
+        return remindlist;
+    }
+
+    public void setRemindlist(String remindlist) {
+        this.remindlist = remindlist;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getData11() {
+        return data11;
+    }
+
+    public void setData11(String data11) {
+        this.data11 = data11;
+    }
+
+    public String getData12() {
+        return data12;
+    }
+
+    public void setData12(String data12) {
+        this.data12 = data12;
+    }
+
+    public String getData13() {
+        return data13;
+    }
+
+    public void setData13(String data13) {
+        this.data13 = data13;
+    }
+
+    public String getData14() {
+        return data14;
+    }
+
+    public void setData14(String data14) {
+        this.data14 = data14;
+    }
+
+    public String getData15() {
+        return data15;
+    }
+
+    public void setData15(String data15) {
+        this.data15 = data15;
+    }
+
+    public String getData16() {
+        return data16;
+    }
+
+    public void setData16(String data16) {
+        this.data16 = data16;
+    }
+
+    public String getData17() {
+        return data17;
+    }
+
+    public void setData17(String data17) {
+        this.data17 = data17;
+    }
+
+    public String getRemark11() {
+        return remark11;
+    }
+
+    public void setRemark11(String remark11) {
+        this.remark11 = remark11;
+    }
+
+    public String getRemark12() {
+        return remark12;
+    }
+
+    public void setRemark12(String remark12) {
+        this.remark12 = remark12;
+    }
+
+    public String getRemark13() {
+        return remark13;
+    }
+
+    public void setRemark13(String remark13) {
+        this.remark13 = remark13;
+    }
+
+    public String getRemark14() {
+        return remark14;
+    }
+
+    public void setRemark14(String remark14) {
+        this.remark14 = remark14;
+    }
+
+    public String getRemark15() {
+        return remark15;
+    }
+
+    public void setRemark15(String remark15) {
+        this.remark15 = remark15;
+    }
+
+    public float getRate12() {
+        return rate12;
+    }
+
+    public void setRate12(float rate12) {
+        this.rate12 = rate12;
+    }
+
+    public String getRate12Str() {
+        return rate12Str;
+    }
+
+    public void setRate12Str(String rate12Str) {
+        this.rate12Str = rate12Str;
+    }
+
+    public float getRate13() {
+        return rate13;
+    }
+
+    public void setRate13(float rate13) {
+        this.rate13 = rate13;
+    }
+
+    public float getRate14() {
+        return rate14;
+    }
+
+    public void setRate14(float rate14) {
+        this.rate14 = rate14;
+    }
+
+    public float getRate15() {
+        return rate15;
+    }
+
+    public void setRate15(float rate15) {
+        this.rate15 = rate15;
+    }
+
+    public String getValue12() {
+        return value12;
+    }
+
+    public void setValue12(String value12) {
+        this.value12 = value12;
+    }
+
+    public String getValue13() {
+        return value13;
+    }
+
+    public void setValue13(String value13) {
+        this.value13 = value13;
+    }
+
+    public String getValue14() {
+        return value14;
+    }
+
+    public void setValue14(String value14) {
+        this.value14 = value14;
+    }
+
+    public String getValue15() {
+        return value15;
+    }
+
+    public void setValue15(String value15) {
+        this.value15 = value15;
+    }
+
+    public String getValue16() {
+        return value16;
+    }
+
+    public void setValue16(String value16) {
+        this.value16 = value16;
+    }
+
+    public String getValue17() {
+        return value17;
+    }
+
+    public void setValue17(String value17) {
+        this.value17 = value17;
+    }
+
+    public String getValue18() {
+        return value18;
+    }
+
+    public void setValue18(String value18) {
+        this.value18 = value18;
+    }
+
+    public String getValue19() {
+        return value19;
+    }
+
+    public void setValue19(String value19) {
+        this.value19 = value19;
+    }
+
+    public String getValue20() {
+        return value20;
+    }
+
+    public void setValue20(String value20) {
+        this.value20 = value20;
+    }
+
+    public String getValue21() {
+        return value21;
+    }
+
+    public void setValue21(String value21) {
+        this.value21 = value21;
+    }
+
+    public String getValue22() {
+        return value22;
+    }
+
+    public void setValue22(String value22) {
+        this.value22 = value22;
+    }
+
+    public String getValue23() {
+        return value23;
+    }
+
+    public void setValue23(String value23) {
+        this.value23 = value23;
+    }
+
+    public String getValue24() {
+        return value24;
+    }
+
+    public void setValue24(String value24) {
+        this.value24 = value24;
+    }
+
+    public String getData18() {
+        return data18;
+    }
+
+    public void setData18(String data18) {
+        this.data18 = data18;
+    }
+
+    public String getRemark16() {
+        return remark16;
+    }
+
+    public void setRemark16(String remark16) {
+        this.remark16 = remark16;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterSandPassrateVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterSandPassrateVO.java
new file mode 100644
index 0000000..a6ed140
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterSandPassrateVO.java
@@ -0,0 +1,188 @@
+package com.rootcloud.domain.vo;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 砂型密度
+ * @author whl
+ *
+ */
+public class RepPrinterSandPassrateVO {
+
+    /**
+     * 主键
+     */
+    private Integer id;
+    private Integer sxType;
+    /**
+     * 设备编号
+     */
+    private  String deviceId;
+    /**
+     * 年份
+     */
+    private Integer dataYear;
+    /**
+     * 月份
+     */
+    private Integer       dataMonth;
+    /**
+     * 日期
+     */
+    private Integer dataDay;
+    /**
+     * 砂型密度合格率
+     */
+    private BigDecimal gkScDySxmd;
+
+    /**
+     * 砂型密度平均值
+     */
+    private BigDecimal sxmdAve;
+
+    /**
+     * 砂型密度样品总数
+     */
+    private Integer sxmdTotal;
+
+    /**
+     * 砂型密度样品合格数
+     */
+    private Integer sxmdHgnum;
+
+    //开始日期
+    private String startDate ;
+
+    //结束日期
+    private String endDate ;
+
+    /**
+     * 数据生成时间
+     */
+    private  String createDate;
+
+    private Integer startNo ;
+    private Integer endNo ;
+
+
+    public Integer getSxType() {
+        return sxType;
+    }
+
+    public void setSxType(Integer sxType) {
+        this.sxType = sxType;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public BigDecimal getSxmdAve() {
+        return sxmdAve;
+    }
+
+    public void setSxmdAve(BigDecimal sxmdAve) {
+        this.sxmdAve = sxmdAve;
+    }
+
+    public Integer getSxmdTotal() {
+        return sxmdTotal;
+    }
+
+    public void setSxmdTotal(Integer sxmdTotal) {
+        this.sxmdTotal = sxmdTotal;
+    }
+
+    public Integer getSxmdHgnum() {
+        return sxmdHgnum;
+    }
+
+    public void setSxmdHgnum(Integer sxmdHgnum) {
+        this.sxmdHgnum = sxmdHgnum;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public Integer getDataYear() {
+        return dataYear;
+    }
+
+    public void setDataYear(Integer dataYear) {
+        this.dataYear = dataYear;
+    }
+
+    public Integer getDataMonth() {
+        return dataMonth;
+    }
+
+    public void setDataMonth(Integer dataMonth) {
+        this.dataMonth = dataMonth;
+    }
+
+    public Integer getDataDay() {
+        return dataDay;
+    }
+
+    public void setDataDay(Integer dataDay) {
+        this.dataDay = dataDay;
+    }
+
+    public BigDecimal getGkScDySxmd() {
+        return gkScDySxmd;
+    }
+
+    public void setGkScDySxmd(BigDecimal gkScDySxmd) {
+        this.gkScDySxmd = gkScDySxmd;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getStartNo() {
+        return startNo;
+    }
+
+    public void setStartNo(Integer startNo) {
+        this.startNo = startNo;
+    }
+
+    public Integer getEndNo() {
+        return endNo;
+    }
+
+    public void setEndNo(Integer endNo) {
+        this.endNo = endNo;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterSandPercentVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterSandPercentVO.java
new file mode 100644
index 0000000..6d6719d
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterSandPercentVO.java
@@ -0,0 +1,451 @@
+package com.rootcloud.domain.vo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 打印机打印机树脂加入比 新旧砂加入占比 漏砂量统计
+ *
+ * @author  ZhouYZ 2020/03/20-11:03
+ * @version V1.0
+ **/
+public class RepPrinterSandPercentVO {
+
+
+    private Long id;
+
+    private String officeId; //机构编码
+
+    private String deviceId;  //设备编号
+
+    private String deviceTypeId; //设备型号
+
+    private Integer dataYear; //年
+
+    private Integer dataMonth;  //月
+
+    private Integer dataDay; //日
+
+    private BigDecimal gkScDySxmd; //树脂加入比
+
+    private String gkScDyXjszb; //新旧砂加入占比
+
+    private BigDecimal gkScDyLsl; //漏砂量
+
+    private BigDecimal gkScDyWsysl; //未使用砂量
+
+    private BigDecimal gkScDyDyxl; //打印效率
+    private BigDecimal gkScDyBtl; //布图率
+
+    private BigDecimal sbBindercost; //树脂耗量
+
+    private BigDecimal hmiVolume; //打印体积
+
+    private BigDecimal sbMxAsandlv; //A砂用量
+
+    private BigDecimal sbMxBsandlv; //B砂用量
+
+    private BigDecimal sbMxMixingtimes; //混砂计数
+
+    private BigDecimal hmiThickness; //打印层厚
+    private BigDecimal sbActivatorcost; //固化剂耗量
+
+
+
+    private String hmiJobid	;//打印编号
+    private String hmiBegintime	;//开始打印时间
+    private String hmiEndtime	;//打印结束时间
+    private BigDecimal hmiTotaltimecost ;//打印耗时
+    private Integer hmiCurprintlayer ;//当前打印层数
+    private BigDecimal hmiCleanerCost;//清洗剂耗量
+
+    private Date createDate; //数据生成时间
+    private BigDecimal hmiLayercosttime ;//层打印耗时
+
+    public RepPrinterSandPercentVO id(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public RepPrinterSandPercentVO() {}
+
+    public RepPrinterSandPercentVO(
+            String deviceId,
+            String deviceTypeId) {
+        this.deviceId = deviceId;
+        this.deviceTypeId = deviceTypeId;
+    }
+
+    public BigDecimal getSbActivatorcost() {
+        return sbActivatorcost;
+    }
+
+    public void setSbActivatorcost(BigDecimal sbActivatorcost) {
+        this.sbActivatorcost = sbActivatorcost;
+    }
+
+    public RepPrinterSandPercentVO sbActivatorcost(BigDecimal sbActivatorcost) {
+        this.sbActivatorcost = sbActivatorcost;
+        return this;
+    }
+
+    public BigDecimal getGkScDyWsysl() {
+        return gkScDyWsysl;
+    }
+
+    public void setGkScDyWsysl(BigDecimal gkScDyWsysl) {
+        this.gkScDyWsysl = gkScDyWsysl;
+    }
+
+    public BigDecimal getHmiThickness() {
+        return hmiThickness;
+    }
+
+    public void setHmiThickness(BigDecimal hmiThickness) {
+        this.hmiThickness = hmiThickness;
+    }
+
+    public String getHmiJobid() {
+        return hmiJobid;
+    }
+
+    public void setHmiJobid(String hmiJobid) {
+        this.hmiJobid = hmiJobid;
+    }
+
+    public String getHmiBegintime() {
+        return hmiBegintime;
+    }
+
+    public void setHmiBegintime(String hmiBegintime) {
+        this.hmiBegintime = hmiBegintime;
+    }
+
+    public String getHmiEndtime() {
+        return hmiEndtime;
+    }
+
+    public void setHmiEndtime(String hmiEndtime) {
+        this.hmiEndtime = hmiEndtime;
+    }
+
+    public BigDecimal getHmiTotaltimecost() {
+        return hmiTotaltimecost;
+    }
+
+    public void setHmiTotaltimecost(BigDecimal hmiTotaltimecost) {
+        this.hmiTotaltimecost = hmiTotaltimecost;
+    }
+
+    public BigDecimal getHmiLayercosttime() {
+        return hmiLayercosttime;
+    }
+
+    public void setHmiLayercosttime(BigDecimal hmiLayercosttime) {
+        this.hmiLayercosttime = hmiLayercosttime;
+    }
+
+    public Integer getHmiCurprintlayer() {
+        return hmiCurprintlayer;
+    }
+
+    public void setHmiCurprintlayer(Integer hmiCurprintlayer) {
+        this.hmiCurprintlayer = hmiCurprintlayer;
+    }
+
+    public BigDecimal getHmiCleanerCost() {
+        return hmiCleanerCost;
+    }
+
+    public void setHmiCleanerCost(BigDecimal hmiCleanerCost) {
+        this.hmiCleanerCost = hmiCleanerCost;
+    }
+
+    public BigDecimal getSbBindercost() {
+        return sbBindercost;
+    }
+
+    public void setSbBindercost(BigDecimal sbBindercost) {
+        this.sbBindercost = sbBindercost;
+    }
+
+    public BigDecimal getHmiVolume() {
+        return hmiVolume;
+    }
+
+    public void setHmiVolume(BigDecimal hmiVolume) {
+        this.hmiVolume = hmiVolume;
+    }
+
+    public BigDecimal getSbMxAsandlv() {
+        return sbMxAsandlv;
+    }
+
+    public void setSbMxAsandlv(BigDecimal sbMxAsandlv) {
+        this.sbMxAsandlv = sbMxAsandlv;
+    }
+
+    public BigDecimal getSbMxBsandlv() {
+        return sbMxBsandlv;
+    }
+
+    public void setSbMxBsandlv(BigDecimal sbMxBsandlv) {
+        this.sbMxBsandlv = sbMxBsandlv;
+    }
+
+    public BigDecimal getSbMxMixingtimes() {
+        return sbMxMixingtimes;
+    }
+
+    public void setSbMxMixingtimes(BigDecimal sbMxMixingtimes) {
+        this.sbMxMixingtimes = sbMxMixingtimes;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceTypeId() {
+        return deviceTypeId;
+    }
+
+    public void setDeviceTypeId(String deviceTypeId) {
+        this.deviceTypeId = deviceTypeId;
+    }
+
+
+
+    public String getOfficeId() {
+        return officeId;
+    }
+
+    public void setOfficeId(String officeId) {
+        this.officeId = officeId;
+    }
+
+    public Integer getDataYear() {
+        return dataYear;
+    }
+
+    public void setDataYear(Integer dataYear) {
+        this.dataYear = dataYear;
+    }
+
+    public Integer getDataMonth() {
+        return dataMonth;
+    }
+
+    public void setDataMonth(Integer dataMonth) {
+        this.dataMonth = dataMonth;
+    }
+
+    public Integer getDataDay() {
+        return dataDay;
+    }
+
+    public void setDataDay(Integer dataDay) {
+        this.dataDay = dataDay;
+    }
+
+    public BigDecimal getGkScDySxmd() {
+        return gkScDySxmd;
+    }
+
+    public void setGkScDySxmd(BigDecimal gkScDySxmd) {
+        this.gkScDySxmd = gkScDySxmd;
+    }
+
+    public String getGkScDyXjszb() {
+        return gkScDyXjszb;
+    }
+
+    public void setGkScDyXjszb(String gkScDyXjszb) {
+        this.gkScDyXjszb = gkScDyXjszb;
+    }
+
+    public BigDecimal getGkScDyLsl() {
+        return gkScDyLsl;
+    }
+
+    public void setGkScDyLsl(BigDecimal gkScDyLsl) {
+        this.gkScDyLsl = gkScDyLsl;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+
+
+
+    public RepPrinterSandPercentVO officeId(String officeId){
+        this.officeId = officeId;
+        return this;
+    }
+
+    public RepPrinterSandPercentVO deviceId(String deviceId){
+        this.deviceId = deviceId;
+        return this;
+    }
+
+    public RepPrinterSandPercentVO deviceTypeId(String deviceTypeId){
+        this.deviceTypeId = deviceTypeId;
+        return this;
+    }
+
+    public RepPrinterSandPercentVO dataYear(Integer dataYear){
+        this.dataYear = dataYear;
+        return this;
+    }
+
+    public RepPrinterSandPercentVO dataMonth(Integer dataMonth){
+        this.dataMonth = dataMonth;
+        return this;
+    }
+
+    public RepPrinterSandPercentVO dataDay(Integer dataDay){
+        this.dataDay = dataDay;
+        return this;
+    }
+
+    public RepPrinterSandPercentVO gkScDySxmd(BigDecimal gkScDySxmd){
+        this.gkScDySxmd = gkScDySxmd;
+        return this;
+    }
+
+    public RepPrinterSandPercentVO gkScDyXjszb(String gkScDyXjszb){
+        this.gkScDyXjszb = gkScDyXjszb;
+        return this;
+    }
+
+    public RepPrinterSandPercentVO gkScDyLsl(BigDecimal gkScDyLsl){
+        this.gkScDyLsl = gkScDyLsl;
+        return this;
+    }
+
+    //树脂耗量
+    public RepPrinterSandPercentVO sbBindercost(BigDecimal sbBindercost){
+        this.sbBindercost = sbBindercost;
+        return this;
+    }
+
+    //清洗剂耗量
+    public RepPrinterSandPercentVO hmiCleanerCost(BigDecimal hmiCleanerCost){
+        this.hmiCleanerCost = hmiCleanerCost;
+        return this;
+    }
+
+
+    //打印体积
+    public RepPrinterSandPercentVO hmiVolume(BigDecimal hmiVolume){
+        this.hmiVolume = hmiVolume;
+        return this;
+    }
+
+    //A砂用量
+    public RepPrinterSandPercentVO sbMxAsandlv(BigDecimal sbMxAsandlv){
+        this.sbMxAsandlv = sbMxAsandlv;
+        return this;
+    }
+
+    //B砂用量
+    public RepPrinterSandPercentVO sbMxBsandlv(BigDecimal sbMxBsandlv){
+        this.sbMxBsandlv = sbMxBsandlv;
+        return this;
+    }
+
+    //混砂计数
+    public RepPrinterSandPercentVO sbMxMixingtimes(BigDecimal sbMxMixingtimes){
+        this.sbMxMixingtimes = sbMxMixingtimes;
+        return this;
+    }
+
+    //打印编号
+    public RepPrinterSandPercentVO hmiJobid(String hmiJobid){
+        this.hmiJobid = hmiJobid;
+        return this;
+    }
+
+    //开始打印时间
+    public RepPrinterSandPercentVO hmiBegintime(String hmiBegintime){
+        this.hmiBegintime = hmiBegintime;
+        return this;
+    }
+
+    //打印结束时间
+    public RepPrinterSandPercentVO hmiEndtime(String hmiEndtime){
+        this.hmiEndtime = hmiEndtime;
+        return this;
+    }
+
+    //打印耗时
+    public RepPrinterSandPercentVO hmiTotaltimecost(BigDecimal hmiTotaltimecost){
+        this.hmiTotaltimecost = hmiTotaltimecost;
+        return this;
+    }
+
+    //层打印耗时
+    public RepPrinterSandPercentVO hmiLayercosttime(BigDecimal hmiLayercosttime){
+        this.hmiLayercosttime = hmiLayercosttime;
+        return this;
+    }
+
+    //当前打印层数
+    public RepPrinterSandPercentVO hmiCurprintlayer(Integer hmiCurprintlayer){
+        this.hmiCurprintlayer = hmiCurprintlayer;
+        return this;
+    }
+
+    //打印层厚
+    public RepPrinterSandPercentVO hmiThickness(BigDecimal hmiThickness) {
+        this.hmiThickness = hmiThickness;
+        return this;
+    }
+
+    public RepPrinterSandPercentVO gkScDyWsysl(BigDecimal gkScDyWsysl) {
+        this.gkScDyWsysl = gkScDyWsysl;
+        return this;
+    }
+
+    public BigDecimal getGkScDyDyxl() {
+        return gkScDyDyxl;
+    }
+
+    public void setGkScDyDyxl(BigDecimal gkScDyDyxl) {
+        this.gkScDyDyxl = gkScDyDyxl;
+    }
+
+    public RepPrinterSandPercentVO gkScDyDyxl(BigDecimal gkScDyDyxl) {
+        this.gkScDyDyxl = gkScDyDyxl;
+        return this;
+    }
+
+    public BigDecimal getGkScDyBtl() {
+        return gkScDyBtl;
+    }
+
+    public void setGkScDyBtl(BigDecimal gkScDyBtl) {
+        this.gkScDyBtl = gkScDyBtl;
+    }
+    public RepPrinterSandPercentVO gkScDyBtl(BigDecimal gkScDyBtl) {
+        this.gkScDyBtl = gkScDyBtl;
+        return this;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterStarPassrateVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterStarPassrateVO.java
new file mode 100644
index 0000000..7c8e0a5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterStarPassrateVO.java
@@ -0,0 +1,186 @@
+package com.rootcloud.domain.vo;
+
+
+import java.math.BigDecimal;
+
+/**
+ * 星级评价数据源，砂型尺寸、外观、精度
+ * @author whl
+ *
+ */
+public class RepPrinterStarPassrateVO {
+
+    /**
+     * 主键
+     */
+    private Integer id;
+    private Integer sxType;
+    /**
+     * 设备编号
+     */
+    private  String deviceId;
+    /**
+     * 年份
+     */
+    private Integer dataYear;
+    /**
+     * 月份
+     */
+    private Integer dataMonth;
+    /**
+     * 日期
+     */
+    private Integer dataDay;
+    /**
+     * 砂型检验合格率
+     */
+    private BigDecimal itemHglv;
+
+
+    /**
+     * 砂型检验数目
+     */
+    private Integer itemInspect;
+
+    /**
+     * 砂型检验合格数
+     */
+    private Integer itemHgnum;
+
+    //开始日期
+    private String startDate ;
+
+    //结束日期
+    private String endDate ;
+
+    /**
+     * 数据生成时间
+     */
+    private  String createDate;
+
+    private String customerName;
+
+    private Integer startNo ;
+    private Integer endNo ;
+
+    public Integer getSxType() {
+        return sxType;
+    }
+
+    public void setSxType(Integer sxType) {
+        this.sxType = sxType;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public BigDecimal getItemHglv() {
+        return itemHglv;
+    }
+
+    public void setItemHglv(BigDecimal itemHglv) {
+        this.itemHglv = itemHglv;
+    }
+
+    public Integer getItemInspect() {
+        return itemInspect;
+    }
+
+    public void setItemInspect(Integer itemInspect) {
+        this.itemInspect = itemInspect;
+    }
+
+    public Integer getItemHgnum() {
+        return itemHgnum;
+    }
+
+    public void setItemHgnum(Integer itemHgnum) {
+        this.itemHgnum = itemHgnum;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public Integer getDataYear() {
+        return dataYear;
+    }
+
+    public void setDataYear(Integer dataYear) {
+        this.dataYear = dataYear;
+    }
+
+    public Integer getDataMonth() {
+        return dataMonth;
+    }
+
+    public void setDataMonth(Integer dataMonth) {
+        this.dataMonth = dataMonth;
+    }
+
+    public Integer getDataDay() {
+        return dataDay;
+    }
+
+    public void setDataDay(Integer dataDay) {
+        this.dataDay = dataDay;
+    }
+
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public Integer getStartNo() {
+        return startNo;
+    }
+
+    public void setStartNo(Integer startNo) {
+        this.startNo = startNo;
+    }
+
+    public Integer getEndNo() {
+        return endNo;
+    }
+
+    public void setEndNo(Integer endNo) {
+        this.endNo = endNo;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterTargetDicVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterTargetDicVO.java
new file mode 100644
index 0000000..5286765
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterTargetDicVO.java
@@ -0,0 +1,131 @@
+package com.rootcloud.domain.vo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 打印机运维报告目标值字典表
+ *
+ * @author  whl
+ * @version V1.0
+ **/
+public class RepPrinterTargetDicVO {
+
+    private Long id;
+
+    private String customerId;  //客户编号
+    private String customerName;  //客户名称
+
+    private String statisticsType;  //统计类型
+
+    private BigDecimal targetValue; //目标值
+
+    private String targetShow;	//目标值（显示）
+
+    private Date startDate; //开始日期
+
+    private Date endDate;  //结束日期
+
+    private Date createDate; //创建时间
+
+    private Date updateDate; //修改时间
+
+    private Integer startNo ;
+    private Integer endNo ;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getStatisticsType() {
+        return statisticsType;
+    }
+
+    public void setStatisticsType(String statisticsType) {
+        this.statisticsType = statisticsType;
+    }
+
+    public BigDecimal getTargetValue() {
+        return targetValue;
+    }
+
+    public void setTargetValue(BigDecimal targetValue) {
+        this.targetValue = targetValue;
+    }
+
+    public String getTargetShow() {
+        return targetShow;
+    }
+
+    public void setTargetShow(String targetShow) {
+        this.targetShow = targetShow;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public String getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public Integer getStartNo() {
+        return startNo;
+    }
+
+    public void setStartNo(Integer startNo) {
+        this.startNo = startNo;
+    }
+
+    public Integer getEndNo() {
+        return endNo;
+    }
+
+    public void setEndNo(Integer endNo) {
+        this.endNo = endNo;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterWasteTypeVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterWasteTypeVO.java
new file mode 100644
index 0000000..0f8aa8d
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterWasteTypeVO.java
@@ -0,0 +1,27 @@
+package com.rootcloud.domain.vo;
+
+public class RepPrinterWasteTypeVO {
+
+    /**
+     * 主键
+     */
+    private Integer id;
+    /**
+     * 分类名称
+     */
+    private  String name;
+
+    public Integer getId() {
+        return id;
+    }
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterWastereasonVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterWastereasonVO.java
new file mode 100644
index 0000000..2e28f27
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepPrinterWastereasonVO.java
@@ -0,0 +1,175 @@
+package com.rootcloud.domain.vo;
+
+import java.math.BigDecimal;
+
+public class RepPrinterWastereasonVO {
+
+    /**
+     * 主键
+     */
+    private Integer id;
+
+    /**
+     * 年份
+     */
+    private Integer dataYear;
+    /**
+     * 月份
+     */
+    private Integer       dataMonth;
+    /**
+     * 日期
+     */
+    private Integer dataDay;
+    /**
+     * 废品原因类型
+     */
+    private String       wasteType;
+    /**
+     * 废品原因数量
+     */
+    private BigDecimal gkScDyCount;
+
+    /**
+     * 客户名称
+     */
+    private String       customerName;
+
+    /**
+     * 客户编号
+     */
+    private String       customerCode;
+
+    /**
+     * 机构编号
+     */
+    private String       officeId;
+
+    /**
+     * 数据生成时间
+     */
+    private  String createDate;
+
+    //开始日期
+    private String startDate ;
+
+    //结束日期
+    private String endDate ;
+
+
+    private Integer startNo ;
+    private Integer endNo ;
+
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public String getCustomerCode() {
+        return customerCode;
+    }
+
+    public void setCustomerCode(String customerCode) {
+        this.customerCode = customerCode;
+    }
+
+    public String getOfficeId() {
+        return officeId;
+    }
+
+    public void setOfficeId(String officeId) {
+        this.officeId = officeId;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getDataYear() {
+        return dataYear;
+    }
+
+    public void setDataYear(Integer dataYear) {
+        this.dataYear = dataYear;
+    }
+
+    public Integer getDataMonth() {
+        return dataMonth;
+    }
+
+    public void setDataMonth(Integer dataMonth) {
+        this.dataMonth = dataMonth;
+    }
+
+    public Integer getDataDay() {
+        return dataDay;
+    }
+
+    public void setDataDay(Integer dataDay) {
+        this.dataDay = dataDay;
+    }
+
+    public String getWasteType() {
+        return wasteType;
+    }
+
+    public void setWasteType(String wasteType) {
+        this.wasteType = wasteType;
+    }
+
+    public BigDecimal getGkScDyCount() {
+        return gkScDyCount;
+    }
+
+    public void setGkScDyCount(BigDecimal gkScDyCount) {
+        this.gkScDyCount = gkScDyCount;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getStartNo() {
+        return startNo;
+    }
+
+    public void setStartNo(Integer startNo) {
+        this.startNo = startNo;
+    }
+
+    public Integer getEndNo() {
+        return endNo;
+    }
+
+    public void setEndNo(Integer endNo) {
+        this.endNo = endNo;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepStarEvaluateVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepStarEvaluateVO.java
new file mode 100644
index 0000000..722abbe
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/RepStarEvaluateVO.java
@@ -0,0 +1,239 @@
+package com.rootcloud.domain.vo;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+/**
+ * 星级评价计算分析模型VO实体类
+ * */
+public class RepStarEvaluateVO {
+    private String id;
+    private String tenantid;
+    private String deviceid;
+    private String devicetypeid;
+    private String data_year;
+    private String data_month;
+    private String indexname;
+    private String statistics_type;
+
+    private String expression; //公式
+    private BigDecimal indexvaluex;
+    private BigDecimal target_value;
+    private BigDecimal target_value1;
+    private BigDecimal target_value2;
+    private BigDecimal target_weight;
+    private BigDecimal result_score;
+
+    private String officeid;
+    private String officename;
+    private String jixing;
+    private Timestamp insertdatetime;//
+    private Timestamp updatetime;//
+
+    public RepStarEvaluateVO()
+    {
+    }
+
+    public RepStarEvaluateVO(
+            String tenantid,
+            String deviceid,
+            String devicetypeid,
+            String data_year,
+            String data_month,
+            String indexname,
+            String statistics_type,
+            String expression,
+            BigDecimal indexvaluex,
+            BigDecimal target_value,
+            BigDecimal target_value1,
+            BigDecimal target_value2,
+            BigDecimal target_weight,
+            BigDecimal result_score,
+            String officeid,
+            String officename,
+            String jixing,
+            Timestamp insertdatetime,
+            Timestamp updatetime
+    ) {
+        this.tenantid = tenantid;
+        this.deviceid = deviceid;
+        this.devicetypeid = devicetypeid;
+        this.data_year = data_year;
+        this.data_month = data_month;
+        this.indexname = indexname;
+        this.statistics_type = statistics_type;
+        this.expression = expression;
+        this.indexvaluex = indexvaluex;
+        this.target_value = target_value;
+        this.target_value1 = target_value1;
+        this.target_value2 = target_value2;
+        this.target_weight = target_weight;
+        this.result_score = result_score;
+        this.officeid = officeid;
+        this.officename = officename;
+        this.jixing = jixing;
+        this.insertdatetime = insertdatetime;
+        this.updatetime = updatetime;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTenantid() {
+        return tenantid;
+    }
+
+    public void setTenantid(String tenantid) {
+        this.tenantid = tenantid;
+    }
+
+    public String getDeviceid() {
+        return deviceid;
+    }
+
+    public void setDeviceid(String deviceid) {
+        this.deviceid = deviceid;
+    }
+
+    public String getDevicetypeid() {
+        return devicetypeid;
+    }
+
+    public void setDevicetypeid(String devicetypeid) {
+        this.devicetypeid = devicetypeid;
+    }
+
+    public String getData_year() {
+        return data_year;
+    }
+
+    public void setData_year(String data_year) {
+        this.data_year = data_year;
+    }
+
+    public String getData_month() {
+        return data_month;
+    }
+
+    public void setData_month(String data_month) {
+        this.data_month = data_month;
+    }
+
+    public String getIndexname() {
+        return indexname;
+    }
+
+    public void setIndexname(String indexname) {
+        this.indexname = indexname;
+    }
+
+    public String getStatistics_type() {
+        return statistics_type;
+    }
+
+    public void setStatistics_type(String statistics_type) {
+        this.statistics_type = statistics_type;
+    }
+
+    public BigDecimal getIndexvaluex() {
+        return indexvaluex;
+    }
+
+    public void setIndexvaluex(BigDecimal indexvaluex) {
+        this.indexvaluex = indexvaluex;
+    }
+
+
+    public String getExpression() {
+        return expression;
+    }
+
+    public void setExpression(String expression) {
+        this.expression = expression;
+    }
+
+    public BigDecimal getTarget_value() {
+        return target_value;
+    }
+
+    public void setTarget_value(BigDecimal target_value) {
+        this.target_value = target_value;
+    }
+
+    public BigDecimal getTarget_value1() {
+        return target_value1;
+    }
+
+    public void setTarget_value1(BigDecimal target_value1) {
+        this.target_value1 = target_value1;
+    }
+
+    public BigDecimal getTarget_value2() {
+        return target_value2;
+    }
+
+    public void setTarget_value2(BigDecimal target_value2) {
+        this.target_value2 = target_value2;
+    }
+
+    public BigDecimal getTarget_weight() {
+        return target_weight;
+    }
+
+    public void setTarget_weight(BigDecimal target_weight) {
+        this.target_weight = target_weight;
+    }
+
+    public BigDecimal getResult_score() {
+        return result_score;
+    }
+
+    public void setResult_score(BigDecimal result_score) {
+        this.result_score = result_score;
+    }
+
+    public String getOfficeid() {
+        return officeid;
+    }
+
+    public void setOfficeid(String officeid) {
+        this.officeid = officeid;
+    }
+
+    public String getOfficename() {
+        return officename;
+    }
+
+    public void setOfficename(String officename) {
+        this.officename = officename;
+    }
+
+    public String getJixing() {
+        return jixing;
+    }
+
+    public void setJixing(String jixing) {
+        this.jixing = jixing;
+    }
+
+    public Timestamp getInsertdatetime() {
+        return insertdatetime;
+    }
+
+    public void setInsertdatetime(Timestamp insertdatetime) {
+        this.insertdatetime = insertdatetime;
+    }
+
+    public Timestamp getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(Timestamp updatetime) {
+        this.updatetime = updatetime;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/SMSVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/SMSVO.java
new file mode 100644
index 0000000..561be96
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/SMSVO.java
@@ -0,0 +1,15 @@
+package com.rootcloud.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @author LiPingAn 2022/7/20 21:13
+ * @version 1.0
+ **/
+@Data
+public class SMSVO {
+    private String phone;
+
+    private String yzm;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/StatusVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/StatusVO.java
new file mode 100644
index 0000000..6d96dbc
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/StatusVO.java
@@ -0,0 +1,16 @@
+package com.rootcloud.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class StatusVO {
+
+    @ApiModelProperty("订单状态统计")
+    private OrderStatusStatistic orderStatusStatistic;
+
+
+    @ApiModelProperty("设备状态统计")
+    private DeviceStatusStatistic deviceStatusStatistic;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/TargetTypeVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/TargetTypeVO.java
new file mode 100644
index 0000000..0e71af9
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/TargetTypeVO.java
@@ -0,0 +1,84 @@
+package com.rootcloud.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+/**
+ * 目标类型字典表
+ *
+ * @author  whl
+ * @version V1.0
+ **/
+
+
+@TableName("rep_printer_target_type")
+public class TargetTypeVO {
+
+    private Long id;
+    private String targetName; //目标类型中文名
+    private String targetCode; //目标类型编码
+
+    private Date createDate; //创建时间
+
+    private Date updateDate; //修改时间
+
+    private Integer startNo ;
+    private Integer endNo ;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTargetName() {
+        return targetName;
+    }
+
+    public void setTargetName(String targetName) {
+        this.targetName = targetName;
+    }
+
+    public String getTargetCode() {
+        return targetCode;
+    }
+
+    public void setTargetCode(String targetCode) {
+        this.targetCode = targetCode;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Integer getStartNo() {
+        return startNo;
+    }
+
+    public void setStartNo(Integer startNo) {
+        this.startNo = startNo;
+    }
+
+    public Integer getEndNo() {
+        return endNo;
+    }
+
+    public void setEndNo(Integer endNo) {
+        this.endNo = endNo;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/TechnicalTaskVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/TechnicalTaskVO.java
new file mode 100644
index 0000000..17c342f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/TechnicalTaskVO.java
@@ -0,0 +1,131 @@
+package com.rootcloud.domain.vo;
+
+public class TechnicalTaskVO {
+    private String id;
+    private String tenantId;
+    private String technicalCode;
+    private String deviceCode;
+    private String deviceName;//
+    private String deviceXh;//设备型号
+    private String technicalComponent;//技改部件(铺砂器、混砂罐等）
+    private String technicalSparepart;//技改备件（1-是/ 0-否）
+    private String technicalMethod;//技改方法
+    private String technicalHours;//技改工时(研发给的)
+    private String updateTime;//更新时间
+    private String status;//状态(0-默认写入  1-已完成提取)
+
+    private String orderId;//触发的技改工单id
+    private String orderNum;//触发的技改工单编码
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getTechnicalCode() {
+        return technicalCode;
+    }
+
+    public void setTechnicalCode(String technicalCode) {
+        this.technicalCode = technicalCode;
+    }
+
+    public String getDeviceCode() {
+        return deviceCode;
+    }
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceXh() {
+        return deviceXh;
+    }
+
+    public void setDeviceXh(String deviceXh) {
+        this.deviceXh = deviceXh;
+    }
+
+    public String getTechnicalComponent() {
+        return technicalComponent;
+    }
+
+    public void setTechnicalComponent(String technicalComponent) {
+        this.technicalComponent = technicalComponent;
+    }
+
+    public String getTechnicalSparepart() {
+        return technicalSparepart;
+    }
+
+    public void setTechnicalSparepart(String technicalSparepart) {
+        this.technicalSparepart = technicalSparepart;
+    }
+
+    public String getTechnicalMethod() {
+        return technicalMethod;
+    }
+
+    public void setTechnicalMethod(String technicalMethod) {
+        this.technicalMethod = technicalMethod;
+    }
+
+    public String getTechnicalHours() {
+        return technicalHours;
+    }
+
+    public void setTechnicalHours(String technicalHours) {
+        this.technicalHours = technicalHours;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getOrderNum() {
+        return orderNum;
+    }
+
+    public void setOrderNum(String orderNum) {
+        this.orderNum = orderNum;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/UserRoleVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/UserRoleVO.java
new file mode 100644
index 0000000..4664acd
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/vo/UserRoleVO.java
@@ -0,0 +1,132 @@
+package com.rootcloud.domain.vo;
+
+import java.util.List;
+
+public class UserRoleVO {
+    private String userId;    //uid
+    private String userCode;
+    private String userName;
+    private String deptid;    //部门id
+    private String deptName;  //部门名称
+    private String deptCode;
+    private String roleNames; //role名称
+    private String roleCodes;
+    private String roleIds;  //roleid集合
+    private String superManager; //1 -超管  0-非
+    private String backUserCode; //18688191270
+    private String isSuper;  //是否超管
+    private String tenantId;
+    private List<String> userIdList;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getDeptid() {
+        return deptid;
+    }
+
+    public void setDeptid(String deptid) {
+        this.deptid = deptid;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getDeptCode() {
+        return deptCode;
+    }
+
+    public void setDeptCode(String deptCode) {
+        this.deptCode = deptCode;
+    }
+
+    public String getRoleNames() {
+        return roleNames;
+    }
+
+    public void setRoleNames(String roleNames) {
+        this.roleNames = roleNames;
+    }
+
+    public String getRoleCodes() {
+        return roleCodes;
+    }
+
+    public void setRoleCodes(String roleCodes) {
+        this.roleCodes = roleCodes;
+    }
+
+    public String getRoleIds() {
+        return roleIds;
+    }
+
+    public void setRoleIds(String roleIds) {
+        this.roleIds = roleIds;
+    }
+
+    public String getSuperManager() {
+        return superManager;
+    }
+
+    public void setSuperManager(String superManager) {
+        this.superManager = superManager;
+    }
+
+    public String getBackUserCode() {
+        return backUserCode;
+    }
+
+    public void setBackUserCode(String backUserCode) {
+        this.backUserCode = backUserCode;
+    }
+
+    public String getIsSuper() {
+        return isSuper;
+    }
+
+    public void setIsSuper(String isSuper) {
+        this.isSuper = isSuper;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public List<String> getUserIdList() {
+        return userIdList;
+    }
+
+    public void setUserIdList(List<String> userIdList) {
+        this.userIdList = userIdList;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/exception/ExceptionCode.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/exception/ExceptionCode.java
new file mode 100644
index 0000000..85c0bff
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/exception/ExceptionCode.java
@@ -0,0 +1,18 @@
+package com.rootcloud.exception;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/1 19:11
+ */
+public interface ExceptionCode {
+    String NON_AUTHORIZATION= "203";
+    String SERVER_ERROR = "500";
+    String CLIENT_DATA_NOT_FOUND = "400";
+    String OPERATION_NOT_ALLOWED = "401";
+    String ARGUMENT_NOT_VALID = "430";
+    String FILE_UPLOAD_ERROR = "600";
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/exception/OperationNotAllowedException.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/exception/OperationNotAllowedException.java
new file mode 100644
index 0000000..0ec034d
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/exception/OperationNotAllowedException.java
@@ -0,0 +1,14 @@
+package com.rootcloud.exception;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/5/29
+ */
+public class OperationNotAllowedException extends Exception {
+    public OperationNotAllowedException() {
+    }
+
+    public OperationNotAllowedException(String message) {
+        super("操作失败: " + message);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/exception/UserUnauthorizedException.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/exception/UserUnauthorizedException.java
new file mode 100644
index 0000000..bcdfe7c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/exception/UserUnauthorizedException.java
@@ -0,0 +1,11 @@
+package com.rootcloud.exception;
+
+/**
+ * @Author: jun2.wang
+ * @Date: 2021/5/29
+ */
+public class UserUnauthorizedException extends OperationNotAllowedException {
+    public UserUnauthorizedException() {
+        super("功能未授权");
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/CarouselService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/CarouselService.java
new file mode 100644
index 0000000..0c5fe9d
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/CarouselService.java
@@ -0,0 +1,42 @@
+package com.rootcloud.service;
+
+import com.rootcloud.domain.dto.CarouselDTO;
+import com.rootcloud.domain.entity.CarouselEntity;
+import com.rootcloud.domain.vo.CarouselVO;
+
+import java.util.List;
+
+/**
+ * @Author w-yanxiang
+ * @Date 2022/6/16 10:18
+ * @Version 1.0
+ * @Description
+ */
+public interface CarouselService {
+    /**
+     * 提交或保存轮播图信息
+     * @param carouselDTO
+     */
+   void saveOrsubmitCarousel(CarouselDTO carouselDTO);
+
+    /**
+     * 查询
+     * @param source
+     * @return
+     */
+   CarouselVO findCarouselInfoData(String source);
+
+    /**
+     * 保存或修改一个轮播图数据
+     * @param id 主键ID
+     * @param imageUrl 图片地址
+     */
+   void saveOrUpdateOneCarousel(String id, String imageUrl);
+
+    /**
+     * 删除轮播图数据
+     * @param ids 主键id
+     */
+   void deleteCarousel(List<String> ids);
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/ConfigService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/ConfigService.java
new file mode 100644
index 0000000..9c5d599
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/ConfigService.java
@@ -0,0 +1,33 @@
+package com.rootcloud.service;
+
+import com.rootcloud.domain.vo.ConfigVO;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 配置服务
+ *
+ * @author LiuQI 2018/8/29 10:40
+ * @version V1.0
+ **/
+public interface ConfigService {
+    void add(ConfigVO configVO);
+
+    void delete(String code);
+
+    List<ConfigVO> find(String code);
+
+    List<ConfigVO> list();
+
+    Optional<ConfigVO> findOne(String code);
+
+    void update(String code, String value);
+
+    void update(ConfigVO vo);
+
+    default String getTenantId() {
+        Optional<ConfigVO> configVOOptional = findOne("printer_tenant_id");
+        return configVOOptional.map(ConfigVO::getValue).orElse("110");
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/EmailService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/EmailService.java
new file mode 100644
index 0000000..8e35cb3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/EmailService.java
@@ -0,0 +1,19 @@
+package com.rootcloud.service;
+
+import com.rootcloud.domain.vo.RepPrinterReportVO;
+
+public interface EmailService {
+
+    /**
+     * 给指定邮箱发送用户运维报告
+     */
+    String mailUserReport(RepPrinterReportVO vo) throws Exception; //产线发送
+
+//    String mailUserReport2(RepPrinterReportVO2 vo) throws Exception;
+//
+//    String mailUserReport3(RepPrinterReportVO3 vo) throws Exception;
+//
+//    String mailUserReport4(RepPrinterReportVO4 vo) throws Exception;
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/PrinterEfficiencyService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/PrinterEfficiencyService.java
new file mode 100644
index 0000000..a30edf6
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/PrinterEfficiencyService.java
@@ -0,0 +1,40 @@
+package com.rootcloud.service;
+
+import com.rootcloud.web.dto.PrinterReportDTO;
+
+import java.time.LocalDate;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+
+public interface PrinterEfficiencyService {
+
+    List<Map<String, Object>> getPrinterEfficiencyData();
+
+
+    /**
+     * 0-24h内跑批打印效率(打印耗时)报表数据（单台机单日开动率指标）
+     * */
+//    void run0(Calendar calendar) throws Exception;
+//
+//    void runEurop0(Calendar calendar) throws Exception;
+
+
+    /**
+     * 跑批打印效率(打印耗时)报表数据（单台机单日开动率指标）
+     * */
+    void run1(Calendar calendar) throws Exception;
+
+    /**
+     * 跑批打印产量（单台机单日开动率指标）
+     * */
+    void run2(LocalDate calendar) throws Exception;
+
+    /**
+     * 获取打印机效率报表图像结构数据(设备维度)
+     */
+    Map<String, Object> getReportBarDataByDevice(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData, Map<String, Object> targetmap) throws Exception;
+
+
+    void run0_statistics_month(Calendar calendar)  throws Exception;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepCustomerService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepCustomerService.java
new file mode 100644
index 0000000..bc19a2a
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepCustomerService.java
@@ -0,0 +1,19 @@
+package com.rootcloud.service;
+
+import com.rootcloud.common.JsonResult2;
+
+public interface RepCustomerService {
+
+
+    //获取所有客户信息列表
+    public JsonResult2 getAllCustomerList(String tenantId) throws Exception;
+
+    //获取指定用户所属的客户信息列表
+    public JsonResult2 getCustomerListByUserId(String tenantId, String userId) throws Exception;
+
+    //查询指定客户(机构)下所有的设备编号列表
+    public JsonResult2 getDeviceCodeListByCustomerCode(String tenantId, String officeId) throws Exception;
+
+    //查询指定客户(机构)下所有的设备列表
+    public JsonResult2 getDeviceListByCustomerCode(String tenantId, String officeId) throws Exception;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterReportService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterReportService.java
new file mode 100644
index 0000000..9c4ca93
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterReportService.java
@@ -0,0 +1,62 @@
+package com.rootcloud.service;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.rootcloud.common.JsonResult2;
+import com.rootcloud.domain.vo.RepPrinterReportItemVO;
+import com.rootcloud.domain.vo.RepPrinterReportVO;
+import com.rootcloud.service.condition.QueryUserReportCondition;
+
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 打印机运维报告接口
+ * @author whl
+ */
+public interface RepPrinterReportService {
+
+    /**
+     * 产创设备跑批
+     * */
+    void run(Calendar calendar) throws Exception;
+    /**
+     * 全部3DP设备跑批
+     * */
+    void run1(Calendar calendar) throws Exception;
+
+    void createUserReportV2(QueryUserReportCondition c) throws Exception;
+
+    /**
+     * 分页查找用户报告列表
+     */
+    public JsonResult2 reportPageList(String tenantId, String user_id, QueryUserReportCondition c) throws Exception;
+
+    /**
+     * 	根据租户id与用户报告ID 得到用户报告
+     */
+    public RepPrinterReportVO getUserReport(Map<String, Object> params) throws Exception;
+
+    /**
+     * 	根据id删除用户报告
+     */
+    public JsonResult2 deleteReportById(Long reportId) ;
+
+
+    List<RepPrinterReportItemVO> getReportItem(Long reportId);
+
+    void updateReportItem(List<RepPrinterReportItemVO> items);
+
+    void updateUserReportValue(RepPrinterReportVO vo);
+
+
+
+    /**
+     * 产线级-指定邮箱发送打印机用户运维报告
+     */
+    String sendUserReportByUser(Map<String, Object> params) throws Exception;
+
+    List<JSONObject> queryUserReport(String tenantId, QueryUserReportCondition condition) throws Exception;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterSandPercentService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterSandPercentService.java
new file mode 100644
index 0000000..4a43084
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterSandPercentService.java
@@ -0,0 +1,118 @@
+package com.rootcloud.service;
+
+import com.rootcloud.web.dto.GuHuaJiDanHaoDto;
+import com.rootcloud.web.dto.PinJunDaYinGaoDuDto;
+import com.rootcloud.web.dto.PrinterReportDTO;
+
+import java.util.List;
+import java.util.Map;
+
+public interface RepPrinterSandPercentService {
+
+    Map<String, Object> getRepPrinterSandPercentBarData(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData)throws Exception;
+    List<PinJunDaYinGaoDuDto> pinJunDaYinGaoDu(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData);
+    List<GuHuaJiDanHaoDto> guHuaJiDanHao(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData);
+
+    /***
+     *
+     * @Title: insert
+     * @Description: 新增
+     * @param vo
+     * @return
+     */
+//    JsonResult2 insert(RepPrinterSandPercentVO vo);
+
+    /***
+     *
+     * @Title: update
+     * @Description: 更新
+     * @param vo
+     * @return
+     */
+//    JsonResult2 update(RepPrinterSandPercentVO vo);
+
+    /***
+     *
+     * @Title: deleteById
+     * @Description: 删除
+     * @param id
+     * @return
+     */
+//    JsonResult2 deleteById(@Param("id") Long id);
+
+    /***
+     *
+     * @Title: getRepPrinterSandPercentList
+     * @Description: 获取数据集
+     * @param params
+     * @return List
+     */
+//    Map<String, Object> getRepPrinterSandPercentList(PrinterReportDTO printerReportDTO, String tenantId, String pUid, Map<String, String> printerDeviceRelationData)throws Exception;
+//    Map<String, Object> getRepPrinterSandPercentList2(PrinterReportDTO printerReportDTO, String tenantId, String pUid,Map<String, String> printerDeviceRelationData)throws Exception;
+
+    /***
+     *
+     * @Title: getRepPrinterSandSXMDList
+     * @Description: 树脂加入比
+     * @param params
+     * @return List
+     */
+    //Map<String, Object> getRepPrinterSandSXMDList(PrinterReportDTO printerReportDTO, String tenantId, String pUid,Map<String, String> printerDeviceRelationData)throws CommonException;
+
+
+    /***
+     *
+     * @Title: getRepPrinterSandXJSZBList
+     * @Description: 新砂占比
+     * @param params
+     * @return List
+     */
+    //Map<String, Object> getRepPrinterSandXJSZBList(PrinterReportDTO printerReportDTO, String tenantId, String pUid,Map<String, String> printerDeviceRelationData)throws CommonException;
+
+
+    /***
+     *
+     * @Title: getRepPrinterSandLSLList
+     * @Description: 获取漏砂量
+     * @param params
+     * @return List
+     */
+    //Map<String, Object> getRepPrinterSandLSLList(PrinterReportDTO printerReportDTO, String tenantId, String pUid,Map<String, String> printerDeviceRelationData)throws CommonException;
+
+
+    /***
+     *
+     * @Title: getRepPrinterSandPercentBarData
+     * @Description: 获取数据集(图形数据)
+     * @param params
+     * @return List
+     */
+//    Map<String, Object> getRepPrinterSandPercentBarData(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData)throws Exception;
+//    Map<String, Object> getRepPrinterSandPercentBarData2(PrinterReportDTO printerReportDTO, String tenantId,Map<String, String> printerDeviceRelationData)throws Exception;
+
+    /***
+     *
+     * @Title: getRepPrinterSandPercentSummary
+     * @Description: 获取数据集总结
+     * 5、打印机平均树脂加入比为        ，最大加入比为：       ，最大树脂加入比的设备有      、     、     。
+     * 6、平均打印新砂占比为         ，新砂占比前三大设备为      、       、        。
+     * 7、打印机平均漏沙量为         ；漏砂量前三设备是         、         、         。
+     * @param params
+     * @return List
+     */
+    //RepPrinterReportVO getRepPrinterSandPercentSummary(PrinterReportDTO printerReportDTO, String tenantId, String pUid,Map<String, String> printerDeviceRelationData)throws CommonException;
+
+    /**
+     * 获得打印机体积
+     * @param printerReportDTO
+     * @return
+     */
+//    List<Map<String,Object>> getRepPrinterVolumeList(PrinterReportDTO printerReportDTO, Map<String, String> printerDeviceRelationData);
+//
+//    List<PinJunDaYinGaoDuDto> pinJunDaYinGaoDu(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData);
+//    List<PinJunDaYinGaoDuDto> pinJunDaYinGaoDu2(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData);
+//
+//    List<GuHuaJiDanHaoDto> guHuaJiDanHao(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData);
+//    List<GuHuaJiDanHaoDto> guHuaJiDanHao2(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData);
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterService.java
new file mode 100644
index 0000000..d7f85b8
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterService.java
@@ -0,0 +1,77 @@
+package com.rootcloud.service;
+
+import com.rootcloud.common.JsonResult2;
+import com.rootcloud.domain.vo.RepPrinterStarPassrateVO;
+import com.rootcloud.web.dto.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 数据导入逻辑服务接口
+ * */
+public interface RepPrinterService {
+
+    //分页查找废品原因统计列表
+    public JsonResult2 deviceWastePageList(String tenantId, RepPrinterWastereasonDTO c) throws Exception;
+    //分页查找砂型强度、密度合格率统计列表
+    public JsonResult2 sandPassratePageList(String tenantId, RepPrinterSandPassrateDTO c) throws Exception;
+    //分页查找打印产量统计列表
+    public JsonResult2 outputPageList(String tenantId, RepPrinterOutputDTO c) throws Exception;
+    //精度、尺寸、外观数据excel文件批量导入
+    void starPassrate(MultipartFile file, Integer sxType)throws  Exception;
+    //删除精度、尺寸、外观数据
+    public JsonResult2 deleteStarPassrate(String tenantId, RepPrinterStarPassrateVO c) throws Exception;
+    //分页查找砂型尺寸、外观、精度、合格率统计列表
+    public JsonResult2 starPassratePageList(String tenantId, RepPrinterStarPassrateDTO c) throws Exception;
+
+
+    Map<String, Object> sumWastereasonData(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData) throws Exception;
+    //产线运维报告- 取废品原因
+    Map<String, Object> sumDeviceProductWasteData(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData) throws Exception;
+    Map<String, Object> sumPrinterSandPassrateData(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData) throws Exception;
+
+
+    List<ChanNengLiYongLvDto> chanNengLiYongLv(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData, Map<String, Object> targetmap);
+    Map<String, Object> sumPrinterSandPassrateData1(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData) throws Exception;
+
+
+    /**
+     * 删除操作
+     * */
+//    public JsonResult2 deleteDeviceWaste(String tenantId, RepPrinterWastereasonVO c) throws Exception;
+//    public JsonResult2 deleteSandPassrate(String tenantId, RepPrinterSandPassrateVO c) throws Exception;
+//    public JsonResult2 deleteOutput(String tenantId, RepPrinterOutputVO c) throws Exception;
+//
+
+
+//
+//    public JsonResult2 outputPageList2(String tenantId, RepPrinterOutputDTO c) throws Exception;
+//    void deviceWaste(MultipartFile file)throws  Exception;
+//    void deviceWastereason(MultipartFile file)throws  Exception;
+//    void sandPassrate(MultipartFile file,Integer sxType)throws  Exception;
+//    void starPassrate(MultipartFile file,Integer sxType)throws  Exception;
+
+//    Map<String, Object> sumWastereasonData(PrinterReportDTO printerReportDTO, String tenantId, Map<String,String> printerDeviceRelationData) throws CommonException;
+//    Map<String, Object> sumPrinterSandPassrateData(PrinterReportDTO printerReportDTO, String tenantId, Map<String,String> printerDeviceRelationData) throws CommonException;
+//    Map<String, Object> sumPrinterSandPassrateData1(PrinterReportDTO printerReportDTO, String tenantId, Map<String,String> printerDeviceRelationData) throws CommonException;
+//    Map<String, Object> sumDeviceProductWasteData(PrinterReportDTO printerReportDTO, String tenantId, Map<String,String> printerDeviceRelationData) throws CommonException;
+
+
+//
+//
+//
+//
+//    public JsonResult2 getRepPrinterWasteTypes();
+//
+//    List<ChanNengLiYongLvDto> chanNengLiYongLv(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData, Map<String, Object> targetmap);
+
+    //    List<ChanNengLiYongLvDto> chanNengLiYongLv2(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData, Map<String, Object> targetmap);
+
+
+//    List<WeiXuFeiYongTongJiDto> weiXuFeiYongTongJi(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData);
+//    List<WeiXuFeiYongTongJiDto> weiXuFeiYongTongJi2(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData);
+//    List<WeiXuFeiYongTongJiDto> weiXuFeiYongTongJiWeiBo(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData);
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterStarEvaluateService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterStarEvaluateService.java
new file mode 100644
index 0000000..7bc5c8a
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterStarEvaluateService.java
@@ -0,0 +1,23 @@
+package com.rootcloud.service;
+
+import java.util.Calendar;
+
+/**
+ * 3DP设备星级评价统计接口
+ * @author whl
+ */
+public interface RepPrinterStarEvaluateService {
+
+    //跑批所有打印机
+    default void run(Calendar calendar) {
+        run(calendar);
+    }
+//    default void clear(Calendar calendar) {
+//        clear(calendar);
+//    }
+//    JsonResult2 getStarEvaluateChart(Map<String, Object> params);
+//    default void runPartMTT(Calendar calendar) {
+//        run(calendar);
+//    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterTargetDicService.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterTargetDicService.java
new file mode 100644
index 0000000..1d86550
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/RepPrinterTargetDicService.java
@@ -0,0 +1,65 @@
+package com.rootcloud.service;
+
+import com.rootcloud.common.JsonResult2;
+import com.rootcloud.domain.vo.RepPrinterTargetDicVO;
+import com.rootcloud.service.condition.QueryRepPrinterTargetDicCondition;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface RepPrinterTargetDicService {
+
+    /***
+     *
+     * @Title: insert
+     * @Description: 新增
+     * @param vo
+     * @return
+     */
+    JsonResult2 insert(RepPrinterTargetDicVO vo);
+
+    /***
+     *
+     * @Title: update
+     * @Description: 更新
+     * @param vo
+     * @return
+     */
+    JsonResult2 update(RepPrinterTargetDicVO vo);
+
+    /***
+     *
+     * @Title: deleteById
+     * @Description: 删除
+     * @param id
+     * @return
+     */
+    JsonResult2 deleteById(@Param("id") Long id);
+
+    /***
+     *
+     * @Title: getRepPrinterTargetDicById
+     * @Description: 获取数据集
+     * @param params id
+     * @return RepPrinterTargetDicVO
+     */
+    RepPrinterTargetDicVO getRepPrinterTargetDicById(@Param("id") Long id);
+    RepPrinterTargetDicVO getRepPrinterTargetDicByKey(@Param("statisticsType") String statisticsType, @Param("customerId") String customerId);
+
+    /***
+     *
+     * @Title: getRepPrinterTargetDicList
+     * @Description: 获取数据集
+     * @param params
+     * @return List
+     */
+    List<RepPrinterTargetDicVO> getRepPrinterTargetDicList(Map<String, Object> params);
+    JsonResult2 getRepPrinterTargetDicList(String tenantId, QueryRepPrinterTargetDicCondition query);
+
+    /**
+     * 按统计类型分组获取最新目标值
+     */
+    List<RepPrinterTargetDicVO> groupByPrinterTargetDic();
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/AddRepPrinterTargetDicCondition.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/AddRepPrinterTargetDicCondition.java
new file mode 100644
index 0000000..e574138
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/AddRepPrinterTargetDicCondition.java
@@ -0,0 +1,98 @@
+package com.rootcloud.service.condition;
+
+import com.rootcloud.validate.annotation.NotBlank;
+import com.rootcloud.validate.annotation.Validate;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+@Validate
+public class AddRepPrinterTargetDicCondition {
+
+    private String customerId;  //客户编号
+    private String customerName;  //客户名称
+
+    /** 统计类型 */
+    @ApiModelProperty(value = "统计类型", required = true)
+    @NotBlank(message="统计类型不可以为空")
+    private String statisticsType;
+
+    /** 目标值 */
+    @ApiModelProperty(value = "目标值", required = true)
+    @NotBlank(message="目标值不可以为空")
+    private BigDecimal targetValue;
+
+
+    /** 目标值(显示) */
+    @ApiModelProperty(value = "目标值(显示)", required = true)
+    @NotBlank(message="目标值(显示)不可以为空")
+    private String targetShow;
+
+    /** 开始日期 */
+    @ApiModelProperty(value = "开始日期", required = true)
+    @NotBlank(message="开始日期不可以为空")
+    private String startDate;
+
+    /** 结束日期 */
+    @ApiModelProperty(value = "结束日期", required = true)
+    @NotBlank(message="结束日期不可以为空")
+    private String endDate;
+
+
+    public String getTargetShow() {
+        return targetShow;
+    }
+
+    public void setTargetShow(String targetShow) {
+        this.targetShow = targetShow;
+    }
+
+    public String getStatisticsType() {
+        return statisticsType;
+    }
+
+    public void setStatisticsType(String statisticsType) {
+        this.statisticsType = statisticsType;
+    }
+
+    public BigDecimal getTargetValue() {
+        return targetValue;
+    }
+
+    public void setTargetValue(BigDecimal targetValue) {
+        this.targetValue = targetValue;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/DelRepPrinterTargetDicCondition.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/DelRepPrinterTargetDicCondition.java
new file mode 100644
index 0000000..62c89b2
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/DelRepPrinterTargetDicCondition.java
@@ -0,0 +1,24 @@
+package com.rootcloud.service.condition;
+
+import com.rootcloud.validate.annotation.NotBlank;
+import com.rootcloud.validate.annotation.Validate;
+import io.swagger.annotations.ApiModelProperty;
+
+@Validate
+public class DelRepPrinterTargetDicCondition {
+
+
+    /** ID */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message="ID不可以为空")
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/QueryRepPrinterTargetDicCondition.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/QueryRepPrinterTargetDicCondition.java
new file mode 100644
index 0000000..aae7939
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/QueryRepPrinterTargetDicCondition.java
@@ -0,0 +1,95 @@
+package com.rootcloud.service.condition;
+
+import com.rootcloud.common.vo.RepPageVO;
+import com.rootcloud.validate.annotation.NotBlank;
+import io.swagger.annotations.ApiModelProperty;
+
+public class QueryRepPrinterTargetDicCondition extends RepPageVO {
+
+    private String customerId;  //客户编号
+    private String customerName;  //客户名称
+
+    /** 统计类型 */
+    @ApiModelProperty(value = "统计类型", required = false)
+    @NotBlank(message="统计类型不可以为空")
+    private String statisticsType;
+
+    /** 目标值 */
+    @ApiModelProperty(value = "目标值", required = false)
+    @NotBlank(message="目标值不可以为空")
+    private String targetValue;
+
+
+    /** 目标值(显示) */
+    @ApiModelProperty(value = "目标值(显示)", required = false)
+    @NotBlank(message="目标值(显示)不可以为空")
+    private String targetShow;
+
+    /** 开始日期 */
+    @ApiModelProperty(value = "开始日期", required = false)
+    @NotBlank(message="开始日期不可以为空")
+    private String startDate;
+
+    /** 结束日期 */
+    @ApiModelProperty(value = "结束日期", required = false)
+    @NotBlank(message="结束日期不可以为空")
+    private String endDate;
+
+
+    public String getTargetShow() {
+        return targetShow;
+    }
+
+    public void setTargetShow(String targetShow) {
+        this.targetShow = targetShow;
+    }
+
+    public String getStatisticsType() {
+        return statisticsType;
+    }
+
+    public void setStatisticsType(String statisticsType) {
+        this.statisticsType = statisticsType;
+    }
+
+    public String getTargetValue() {
+        return targetValue;
+    }
+
+    public void setTargetValue(String targetValue) {
+        this.targetValue = targetValue;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/QueryUserReportCondition.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/QueryUserReportCondition.java
new file mode 100644
index 0000000..698cb30
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/QueryUserReportCondition.java
@@ -0,0 +1,119 @@
+package com.rootcloud.service.condition;
+import com.rootcloud.common.vo.RepPageVO;
+
+public class QueryUserReportCondition extends RepPageVO{
+
+
+    private Long id;//用户报告id
+    private String emails;			//邮箱
+    private String officeId;  		//所属机构编号
+    private String officeName; 		//机构名称
+    private String customerId;  	//客户编号
+    private String customerName; 	//客户名称
+
+    private Integer dataYear;		//年份
+    private Integer dataQuarter;	//季度
+    private Integer dataMonth;		//月份
+    private Integer dataWeek;		//周
+
+    private Integer createType;		//默认为null,1为周，2为月，3为季，4为年，5为指定时间段 (生成报告)
+    private String createCustomerCode;//指定客户编码生成报告
+
+    private String startDt;//开始日期
+    private String endDt;//结束日期
+
+    private String deviceid;
+
+    public String getStartDt() {
+        return startDt;
+    }
+    public void setStartDt(String startDt) {
+        this.startDt = startDt;
+    }
+    public String getEndDt() {
+        return endDt;
+    }
+    public void setEndDt(String endDt) {
+        this.endDt = endDt;
+    }
+    public String getCreateCustomerCode() {
+        return createCustomerCode;
+    }
+    public void setCreateCustomerCode(String createCustomerCode) {
+        this.createCustomerCode = createCustomerCode;
+    }
+    public Integer getCreateType() {
+        return createType;
+    }
+    public void setCreateType(Integer createType) {
+        this.createType = createType;
+    }
+    public Long getId() {
+        return id;
+    }
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getEmails() {
+        return emails;
+    }
+    public void setEmails(String emails) {
+        this.emails = emails;
+    }
+    public String getOfficeId() {
+        return officeId;
+    }
+    public void setOfficeId(String officeId) {
+        this.officeId = officeId;
+    }
+    public String getOfficeName() {
+        return officeName;
+    }
+    public void setOfficeName(String officeName) {
+        this.officeName = officeName;
+    }
+    public String getCustomerId() {
+        return customerId;
+    }
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
+    }
+    public String getCustomerName() {
+        return customerName;
+    }
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+    public Integer getDataYear() {
+        return dataYear;
+    }
+    public void setDataYear(Integer dataYear) {
+        this.dataYear = dataYear;
+    }
+    public Integer getDataQuarter() {
+        return dataQuarter;
+    }
+    public void setDataQuarter(Integer dataQuarter) {
+        this.dataQuarter = dataQuarter;
+    }
+    public Integer getDataMonth() {
+        return dataMonth;
+    }
+    public void setDataMonth(Integer dataMonth) {
+        this.dataMonth = dataMonth;
+    }
+    public Integer getDataWeek() {
+        return dataWeek;
+    }
+    public void setDataWeek(Integer dataWeek) {
+        this.dataWeek = dataWeek;
+    }
+
+    public String getDeviceid() {
+        return deviceid;
+    }
+
+    public void setDeviceid(String deviceid) {
+        this.deviceid = deviceid;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/UpdateRepPrinterTargetDicCondition.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/UpdateRepPrinterTargetDicCondition.java
new file mode 100644
index 0000000..bc8b19e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/condition/UpdateRepPrinterTargetDicCondition.java
@@ -0,0 +1,111 @@
+package com.rootcloud.service.condition;
+
+import com.rootcloud.common.NotBlank;
+import com.rootcloud.common.Validate;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+@Validate
+public class UpdateRepPrinterTargetDicCondition {
+
+    private String customerId;  //客户编号
+    private String customerName;  //客户名称
+
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true)
+    @NotBlank(message="ID不可以为空")
+    private Long id;
+
+    /** 统计类型 */
+    @ApiModelProperty(value = "统计类型", required = true)
+    @NotBlank(message="统计类型不可以为空")
+    private String statisticsType;
+
+    /** 目标值 */
+    @ApiModelProperty(value = "目标值", required = true)
+    @NotBlank(message="目标值不可以为空")
+    private BigDecimal targetValue;
+
+    /** 目标值(显示) */
+    @ApiModelProperty(value = "目标值(显示)", required = true)
+    @NotBlank(message="目标值(显示)不可以为空")
+    private String targetShow;
+
+    /** 开始日期 */
+    @ApiModelProperty(value = "开始日期", required = true)
+    @NotBlank(message="开始日期不可以为空")
+    private String startDate;
+
+    /** 结束日期 */
+    @ApiModelProperty(value = "结束日期", required = true)
+    @NotBlank(message="结束日期不可以为空")
+    private String endDate;
+
+
+
+    public String getTargetShow() {
+        return targetShow;
+    }
+
+    public void setTargetShow(String targetShow) {
+        this.targetShow = targetShow;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getStatisticsType() {
+        return statisticsType;
+    }
+
+    public void setStatisticsType(String statisticsType) {
+        this.statisticsType = statisticsType;
+    }
+
+    public BigDecimal getTargetValue() {
+        return targetValue;
+    }
+
+    public void setTargetValue(BigDecimal targetValue) {
+        this.targetValue = targetValue;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/constant/ExceptionStatus.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/constant/ExceptionStatus.java
new file mode 100644
index 0000000..c705264
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/constant/ExceptionStatus.java
@@ -0,0 +1,24 @@
+package com.rootcloud.service.constant;
+
+/***
+ * JSON数据返回状态码
+ * @author Adams.huang
+ *
+ */
+public class ExceptionStatus {
+
+    /***
+     * 系统异常
+     */
+    public final static String RET_EXCEPTION = "50230000";
+
+    public final static String RET_EXCEPTION_CN = "系统异常";
+
+    /**
+     * 您没有发起此流程权限
+     */
+    public final static String RET_UN_AUTH_START_PROC = "50230001";
+
+    public final static String RET_UN_AUTH_START_PROC_CN = "您没有发起此流程权限，请联系管理员！";
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/CarouselServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/CarouselServiceImpl.java
new file mode 100644
index 0000000..43f765c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/CarouselServiceImpl.java
@@ -0,0 +1,118 @@
+package com.rootcloud.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.rootcloud.config.auth.UserContext;
+import com.rootcloud.domain.dto.CarouselDTO;
+import com.rootcloud.domain.dto.ImageUrlsDTO;
+import com.rootcloud.domain.entity.CarouselEntity;
+import com.rootcloud.domain.mapper.CarouselMapper;
+import com.rootcloud.domain.vo.CarouselVO;
+import com.rootcloud.service.CarouselService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.util.Asserts;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Author w-yanxiang
+ * @Date 2022/6/16 10:19
+ * @Version 1.0
+ * @Description
+ */
+@Service
+@Slf4j
+public class CarouselServiceImpl implements CarouselService {
+
+    @Resource
+    private CarouselMapper carouselMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveOrsubmitCarousel(CarouselDTO carouselDTO) {
+            if(carouselDTO.getOperationType().equals("2")){
+                Asserts.notBlank(carouselDTO.getTimeGap(),"timeGap");
+            }
+            String now = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+            String syZhid = UserContext.getTenantId();
+            CarouselEntity carouselEntity =new CarouselEntity();
+            carouselEntity.setSyZhid(syZhid);
+            carouselMapper.delete(Wrappers.lambdaQuery(carouselEntity));
+            carouselEntity.setLbxxCslx("timeGap");
+            carouselEntity.setLbxxCsz(carouselDTO.getTimeGap());
+            carouselEntity.setLbxxSfsx(carouselDTO.getOperationType());
+            carouselEntity.setSyCreatetime(now);
+            carouselEntity.setSyCreateuserid(UserContext.getUserId());
+            carouselEntity.setSyZhid(syZhid);
+            carouselMapper.insert(carouselEntity);
+            if(CollectionUtils.isNotEmpty(carouselDTO.getImageUrls())){
+                if(carouselDTO.getImageUrls().size()<=20){
+                    carouselDTO.getImageUrls().forEach(v->{
+                        CarouselEntity carouselEntitys =new CarouselEntity();
+                        carouselEntitys.setLbxxCslx("imageUrl");
+                        carouselEntitys.setLbxxCsz(JSONObject.toJSONString(v));
+                        carouselEntitys.setLbxxSfsx(carouselDTO.getOperationType());
+                        carouselEntitys.setSyCreatetime(now);
+                        carouselEntitys.setSyCreateuserid(UserContext.getUserId());
+                        carouselEntitys.setSyZhid(syZhid);
+                        carouselMapper.insert(carouselEntitys);
+                    });
+                }else {
+                    throw new RuntimeException("轮播图片数据过多");
+                }
+            }
+    }
+
+    @Override
+    public CarouselVO findCarouselInfoData(String source) {
+        LambdaQueryWrapper<CarouselEntity> queryWrapper = Wrappers.lambdaQuery(CarouselEntity.class);
+        if("APP".equalsIgnoreCase(source)){
+           // queryWrapper.eq(CarouselEntity::getLbxxSfsx,"2");   //没有入口配置生效
+        }
+        List<CarouselEntity> entities = carouselMapper.selectList(queryWrapper);
+        CarouselVO carouselVO = new CarouselVO();
+        if(CollectionUtils.isNotEmpty(entities)){
+            carouselVO.setTimeGap(entities.stream().filter(v->"timeGap".equals(v.getLbxxCslx())).findFirst().orElse(new CarouselEntity()).getLbxxCsz());
+            List<CarouselEntity> imageUrls = entities.stream().filter(v -> "imageUrl".equals(v.getLbxxCslx())).collect(Collectors.toList());
+            List<JSONObject> collect = imageUrls.stream().map(v -> JSONObject.parseObject(v.getLbxxCsz())).collect(Collectors.toList());
+            carouselVO.setImageUrls(JSONObject.parseArray(JSONObject.toJSONString(collect),ImageUrlsDTO.class));
+        }
+        return carouselVO;
+    }
+
+    @Override
+    public void saveOrUpdateOneCarousel(String id, String imageUrl) {
+        if(StringUtils.isNotBlank(id)){
+            if(carouselMapper.selectCount(Wrappers.lambdaQuery(CarouselEntity.class).eq(CarouselEntity::getLbxxCslx,"timeGap"))>19){
+                throw new RuntimeException("轮播图片数据过多");
+            }
+            CarouselEntity carouselEntity = new CarouselEntity();
+            carouselEntity.setNxgxLbxxId(id);
+            carouselEntity.setLbxxCsz(imageUrl);
+            carouselMapper.updateById(carouselEntity);
+        }else {
+            CarouselEntity carouselEntity = new CarouselEntity();
+            carouselEntity.setSyCreateuserid(UserContext.getUserId());
+            carouselEntity.setSyCreatetime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            carouselEntity.setLbxxCslx("imageUrl");
+            carouselEntity.setLbxxCsz(imageUrl);
+            carouselEntity.setLbxxSfsx("1");
+            carouselMapper.insert(carouselEntity);
+        }
+    }
+
+    @Override
+    public void deleteCarousel(List<String> ids) {
+        carouselMapper.deleteBatchIds(ids);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/ConfigServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/ConfigServiceImpl.java
new file mode 100644
index 0000000..44a4b4c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/ConfigServiceImpl.java
@@ -0,0 +1,68 @@
+package com.rootcloud.service.impl;
+
+import com.rootcloud.domain.dao.ConfigDao;
+import com.rootcloud.domain.vo.ConfigVO;
+import com.rootcloud.service.ConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+
+@Service("configServices")
+public class ConfigServiceImpl implements ConfigService {
+
+    @Autowired
+    private ConfigDao configDao;
+
+    @Override
+    public void add(ConfigVO configVO) {
+        if (null == configVO) {
+            return;
+        }
+
+        configDao.add(configVO);
+    }
+
+    @Override
+    public void delete(String code) {
+        configDao.delete(code);
+    }
+
+    @Override
+    public List<ConfigVO> find(String code) {
+        return Optional.ofNullable(configDao.find(code)).orElse(new ArrayList<>(0));
+    }
+
+    @Override
+    public List<ConfigVO> list() {
+        return Optional.ofNullable(configDao.list()).orElse(new ArrayList<>(0));
+    }
+
+    @Override
+    public Optional<ConfigVO> findOne(String code) {
+        Optional<List<ConfigVO>> list = Optional.ofNullable(configDao.find(code));
+        if (list.isPresent() && 0 != list.get().size()) {
+            return Optional.of(list.get().get(0));
+        }
+
+        return Optional.empty();
+    }
+
+    @Override
+    public void update(String code, String value) {
+        ConfigVO configVO = new ConfigVO();
+        configVO.setCode(code);
+        configVO.setValue(value);
+        configDao.update(configVO);
+    }
+    @Override
+    public void update(ConfigVO vo) {
+        ConfigVO configVO = new ConfigVO();
+        configVO.setCode(vo.getCode());
+        configVO.setValue(vo.getValue());
+        configDao.update(configVO);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/EmailServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/EmailServiceImpl.java
new file mode 100644
index 0000000..edcf397
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/EmailServiceImpl.java
@@ -0,0 +1,127 @@
+package com.rootcloud.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.rootcloud.common.util.EncryptUtil;
+import com.rootcloud.common.util.MapBuilder;
+import com.rootcloud.domain.vo.RepPrinterReportVO;
+import com.rootcloud.service.EmailService;
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.WebResource;
+import io.undertow.client.ClientResponse;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Map;
+
+@Service("emailServices")
+public class EmailServiceImpl implements EmailService {
+
+    private static final Logger logger = LoggerFactory.getLogger(EmailServiceImpl.class);
+
+    /*
+    @Value("${mail.server.path}")
+    private String mailServerPath;
+
+    @Value("${mail.link.path}")
+    private String mailLinkPath;
+
+    @Value("${mail.link.path2}")
+    private String mailLinkPath2;
+
+    @Value("${mail.link.path3}")
+    private String mailLinkPath3;
+
+    @Value("${mail.link.path4}")
+    private String mailLinkPath4;
+    */
+
+    @Value("${mail.iam.server_path}")
+    private String mailServerPath;
+
+    @Value("${mail.iam.link_path}")
+    private String mailLinkPath;
+
+    /**
+     * 给指定邮箱发送用户运维报告
+     */
+    public String mailUserReport(RepPrinterReportVO vo) throws Exception {
+
+        if (StringUtils.isBlank(vo.getEmails())) {
+            throw new Exception("发送邮件地址为空");
+        }
+
+        EncryptUtil encryptUtil = EncryptUtil.getInstance() ;
+        String[] emailArray = vo.getEmails().split(",");
+        String id = encryptUtil.DESencode(vo.getId()+"", "paras");
+        String tenantId = encryptUtil.DESencode(vo.getTenantId()+"", "paras");
+        String link = "";
+        for(String to : emailArray) {
+            //标题
+            String title = vo.getTitle().replace("打印机运维报告", "");
+            // 内容
+            String text = vo.getTitle();
+            // 内容的链接
+            link = mailLinkPath.replace("{0}", id).replace("{1}", tenantId);
+
+            logger.info("mailUserReport start getMailMap");
+            Map<String, Object> params = getMailMap(to, title, text, link);
+            logger.info("mailUserReport end getMailMap ="+params.toString());
+
+
+            logger.info("mailUserReport create Client");
+            Client client = Client.create();
+            client.setConnectTimeout(60 * 1000);
+
+            logger.info("mailUserReport client get resource");
+            WebResource webResource = client.resource(mailServerPath);
+            logger.info("mailUserReport client get resource mailServerPath="+mailServerPath);
+            String paramsString = JSON.toJSONString(params);
+            webResource.type("application/json").post(ClientResponse.class, paramsString);
+            logger.info("mailUserReport post mailServerPath="+mailServerPath+" params="+paramsString);
+            logger.info("当前产线运维发送成功!");
+
+        }
+        return link;
+    }
+
+
+    private static Map<String, Object> getMailMap(String to, String title, String text, String link) {
+        return MapBuilder.of(5).put("templateName", "nxgxPrinterReport").put("to", to)
+                .put("subjectKey", "email.printer.report.title.zh_CN").put("subjectKeyValue", Arrays.asList(title))
+                .put("data", MapBuilder.of(2).put("printerReportUrl", link).put("printerReportText", text).build())
+                .build();
+    }
+
+    /*
+    public static void main(String[] args) {
+        // url配置，以下测试地址，生产地址为https://openapi.irootech.com/base-notification/api/send-mail
+        String url = "http://base-notification.bdn-base-alauda-qa.irootechapp.com/api/send-mail";
+        // 邮箱为单个
+        String to = "8274862@qq.com";
+        // 标题
+        String title = "2020年3月装备成形工厂2";
+        // 内容
+        String text = "2020年3月装备成形工厂2打印机运维报告";
+        // 内容的链接
+        String link = "http://iof.kocelcloud.cn/index-3.html?id={0}&tenantId={1}";
+
+        Map<String, Object> params = getMailMap(to, title, text, link);
+
+        try {
+            Client client = Client.create();
+            client.setConnectTimeout(60 * 1000);
+            WebResource webResource = client.resource(url);
+            webResource.type("application/json").post(ClientResponse.class, JSON.toJSONString(params));
+            System.out.println("发送成功!");
+        } catch (Exception e) {
+
+        }
+    }
+    */
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/PrinterEfficiencyServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/PrinterEfficiencyServiceImpl.java
new file mode 100644
index 0000000..97af7df
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/PrinterEfficiencyServiceImpl.java
@@ -0,0 +1,1448 @@
+package com.rootcloud.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.rootcloud.common.Constants;
+import com.rootcloud.common.DateUtil;
+import com.rootcloud.common.HttpClientUtil;
+import com.rootcloud.common.TokenUtil;
+import com.rootcloud.common.enums.HttpRequestMethedEnum;
+import com.rootcloud.common.util.DateUtils;
+import com.rootcloud.common.util.PlatformDeviceTransUtil;
+import com.rootcloud.common.vo.PrinterWorkBoxSize;
+import com.rootcloud.domain.dao.NxDeviceDao;
+import com.rootcloud.domain.dao.PrinterEfficiencyWorkDao;
+import com.rootcloud.domain.dao.RepPrinterStarEvaluateDAO;
+import com.rootcloud.domain.mapper.DeviceMapper;
+import com.rootcloud.domain.vo.*;
+import com.rootcloud.service.ConfigService;
+import com.rootcloud.service.PrinterEfficiencyService;
+import com.rootcloud.web.dto.PrinterReportDTO;
+import jline.internal.Log;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service("efficiency")
+public class PrinterEfficiencyServiceImpl implements PrinterEfficiencyService {
+
+    private static final Logger logger = LoggerFactory.getLogger(PrinterEfficiencyServiceImpl.class);
+
+    @Autowired
+    private PrinterEfficiencyWorkDao printerEfficiencyWorkDao;
+
+    @Autowired
+    private NxDeviceDao nxDeviceDao;
+
+    @Autowired
+    private RepPrinterStarEvaluateDAO starEvaluateDAO;
+    @Resource(name = "configServices")
+    private ConfigService configService;
+
+    @Autowired
+    private TokenUtil tokenUtil;
+
+    @Autowired
+    private DeviceMapper deviceMapper;
+
+    @Value("${os.iam.domain}")
+    private String reqUrl;
+    private static final String PRINTER_DEVICE_TYPE = "printer_device_type";
+
+    public static final String DATE_FORMAT_YYYY_MM_DD = "yyyy-MM-dd HH:mm:ss";
+
+    public List<Map<String, Object>> getPrinterEfficiencyData() {
+        LocalDate localDate = LocalDate.now().minusDays(1);
+        return printerEfficiencyWorkDao.getPrinterEfficiencyData(localDate.getYear(), localDate.getMonthValue(), localDate.getDayOfMonth());
+    }
+
+    private boolean isDaylight(TimeZone zone,Date date) {
+        return zone.useDaylightTime()&&zone.inDaylightTime(date);
+    }
+
+
+    /** 单台机用，实际从0-24点内的有效打印时间、打印效率*/
+//    public void run0(Calendar calendar) throws Exception {
+//        int year = calendar.get(Calendar.YEAR);
+//        int month = calendar.get(Calendar.MONTH) + 1;
+//        int day = calendar.get(Calendar.DAY_OF_MONTH);
+//        // 需要从ES中查询前一天00-24内数据
+//        LocalDateTime startDatetime = LocalDateTime.of(year, month, day, 0, 0, 0);
+//        LocalDateTime endDatetime = startDatetime.plusHours(24);
+//        NxDeviceVO v = new NxDeviceVO();
+//        v.setModeID("197ZUeGcXkY");
+//        v.setDeviceTypeName("3DP打印机");
+//        //1.取出打印机所有的设备编号
+//        List<NxDeviceVO> list = nxDeviceDao.getDeviceList(v);
+//        Log.info("取出打印机所有的设备编号返回数据:" + list.size());
+//        List<PrinterEfficiencyWorkVO> resultList = new ArrayList<>(16);
+//        for (int i = 0; i < list.size(); i++) {
+//            String deviceCode = list.get(i).getDeviceCode();
+//            String modelId = list.get(i).getModeID();
+//            String thingId = list.get(i).getThingID();
+//            String deviceTypeId = list.get(i).getDeviceTypeId();
+//            try {
+//                resultList.addAll(processDeviceHistoryGK0(LocalDate.of(year, month, day), startDatetime, endDatetime,
+//                        deviceCode, deviceTypeId, modelId, thingId));
+//            } catch (Exception ex) {
+//                Log.error("本次错误,设备:" + deviceCode + "|error:" + ex.toString());
+//            }
+//        }
+//        if (CollectionUtils.isEmpty(resultList)) {
+//            Log.info("本次resultList获取0条");
+//            return;
+//        }
+//
+//        Log.info("本次resultList获取" + resultList.size(), resultList);
+//        //保存到临时表
+//        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+//        String time = dateFormat.format(calendar.getTime());
+//        Map<String, Object> param = new HashMap<>();
+//        param.put("time", time + " 00:00:00");
+//        param.put("resultList", resultList);
+//        param.put("syCreatetime", new Date());
+//        deviceMapper.clearDeviceTimesDay(param);
+//        deviceMapper.batchAddDeviceTimesDay(param);
+//    }
+
+    /**
+     * 需要统计一下月时长 */
+    public void run0_statistics_month(Calendar calendar)throws Exception {
+        //跑完后，需要统计一下月时长
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM");
+        String month = dateFormat.format(calendar.getTime());
+        Map<String, Object> param = new HashMap<>();
+        param.put("month", month);
+        List<Map<String, String>> statisticsDeviceTimesMonth = deviceMapper.statisticsDeviceTimesMonth(param);
+        if (statisticsDeviceTimesMonth.size() > 0) {
+            for (Map<String, String> map : statisticsDeviceTimesMonth) {
+                String deviceId = map.get("deviceId");
+                param.put("deviceId", deviceId);
+                param.put("onlinedTimes", map.get("onlinedTimes"));
+                param.put("time", month + "-01 00:00:00");
+                List<Map<String, String>> getDeviceTimesMonth = deviceMapper.getDeviceTimesMonth(param);
+                if (getDeviceTimesMonth != null && getDeviceTimesMonth.size() > 0) {
+                    deviceMapper.updateDeviceTimesMonth(param);
+                } else {
+                    deviceMapper.insertDeviceTimesMonth(param);
+                }
+            }
+        }
+    }
+
+//    public void runEurop0(Calendar calendar) throws Exception{
+//        Integer year = calendar.get(Calendar.YEAR);
+//        Integer month = calendar.get(Calendar.MONTH) + 1;
+//        Integer day = calendar.get(Calendar.DAY_OF_MONTH);
+//
+//
+//        String mon ="";
+//        String days ="";
+//        mon = month<10?"0"+month.toString():month.toString();
+//        days = day<10?"0"+day.toString():day.toString();
+//        String startTime = year.toString() +"-" + mon +"-" + days.toString() + " " + "00:00:00"; //2021-01-12 00:00:00
+//        String endTime = year.toString() +"-" + mon + "-" + days.toString() + " " + "23:59:59"; //2021-01-12 23:59:59
+//        String startDate = year.toString() +"-" + mon +"-" + days;
+//
+//        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        //sf.setTimeZone(TimeZone.getTimeZone("GMT+0"));
+////  	Date dateTime=sf.parse("2016-11-6 5:59:59");
+////        Date d1=sf.parse("2016-03-13 6:59:59");//false
+////        Date d1 = new Date();
+//        LocalDateTime currentDatetime = LocalDateTime.now(ZoneId.of("Europe/Berlin"));  //2022-09-12 06:00:00
+//        Date d1 = Date.from(currentDatetime.atZone(ZoneId.systemDefault()).toInstant()); //欧洲时间
+//        //LocalDateTime endDatetime = currentDatetime.plusHours(24);  //2022-09-13 06:00:00
+//        TimeZone york = TimeZone.getTimeZone("Europe/Berlin"); //GMT-1
+//        //System.out.println("目标时区是否使用了夏令时:"+isDaylight(york, d1));
+//
+//        LocalDateTime startDatetime;  //2022-09-12 06:00:00
+//        LocalDateTime endDatetime;  //2022-09-13 06:00:00
+//        if(isDaylight(york, d1))
+//        {
+//            //夏令时
+//            startDatetime = LocalDateTime.of(year,month,day,6,0,0);  //2022-09-12 06:00:00  -->2022-09-12 00:00:00
+//            endDatetime = startDatetime.plusHours(24);  //2022-09-13 06:00:00  -->2022-09-13 00:00:00
+//        }
+//        else
+//        {
+//            //夏令时
+//            startDatetime = LocalDateTime.of(year,month,day,7,0,0);  //2022-11-12 07:00:00  -->2022-09-12 00:00:00
+//            endDatetime = startDatetime.plusHours(24);  //2022-11-13 07:00:00  -->2022-09-13 00:00:00
+//        }
+//        // 夏季东八区时间  2022-09-12 06:00:00~2022-09-13 06:00:00 对应奥钢联时间的 2022-09-12 00:00:00~2022-09-13 00:00:00
+//        // 冬季东八区时间  2022-09-12 07:00:00~2022-09-13 07:00:00 对应奥钢联时间的 2022-09-12 00:00:00~2022-09-13 00:00:00
+////        LocalDateTime startDatetime = LocalDateTime.of(year,month,day,6,0,0);  //2022-09-12 06:00:00
+////        LocalDateTime endDatetime = startDatetime.plusHours(24);  //2022-09-13 06:00:00
+//        NxDeviceVO v = new NxDeviceVO();
+////        v.setModeID("197ZUeGcXkY");
+////        v.setDeviceTypeName("3DP打印机");
+//        //1.取出打印机所有的设备编号
+//        List<NxDeviceVO> list = nxDeviceDao.getDeviceListEurope(v);
+//        List<PrinterEfficiencyWorkVO> resultList = new ArrayList<>(16);
+//        for(int i=0;i<list.size();i++)
+//        {
+//            String deviceCode=list.get(i).getDeviceCode();
+//            String modelId=list.get(i).getModeID();
+//            String thingId=list.get(i).getThingID();
+//            String deviceTypeId=list.get(i).getDeviceTypeId();
+//            try
+//            {
+//                //处理海外东1区奥钢联设备，相比东八区，夏季偏差6(夏令时)、冬季偏差7h
+//                resultList.addAll(processDeviceHistoryGK0(LocalDate.of(year,month,day), startDatetime, endDatetime,
+//                        deviceCode,deviceTypeId,modelId,thingId));
+//            }
+//            catch (Exception ex){
+//                logger.error("本次错误,设备:"+deviceCode +"|error:"+ex.toString());
+//            }
+//        }
+//
+//        if (CollectionUtils.isEmpty(resultList)) {
+//            return;
+//        }
+//
+//        Log.info("本次resultList获取" + resultList.size(), resultList);
+//        //保存到临时表
+//        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+//        String time = dateFormat.format(calendar.getTime());
+//        Map<String, Object> param = new HashMap<>();
+//        param.put("time", time + " 00:00:00");
+//        param.put("resultList", resultList);
+//        param.put("syCreatetime", new Date());
+//        param.put("clearAll", false);
+//        deviceMapper.clearDeviceTimesDay(param);
+//        deviceMapper.batchAddDeviceTimesDay(param);
+//
+//    }
+
+
+
+//    private Collection<PrinterEfficiencyWorkVO> processDeviceHistoryGK0(
+//            LocalDate localDate,
+//            LocalDateTime startDatetime,
+//            LocalDateTime endDatetime,
+//            String deviceId,String deviceTypeId,String modelId,String thingId) {
+//
+//        List<PrinterEfficiencyWorkVO> workVOS = new ArrayList<>();
+//        String DATE_FORMAT_DAY = "yyyy-MM-dd";
+//        DateTimeFormatter dtfDay = DateTimeFormatter.ofPattern(DATE_FORMAT_DAY);
+//        String today = localDate.format(dtfDay);
+//        String yestoday = localDate.minusDays(1).format(dtfDay);
+//        String tomorrow = localDate.plusDays(1).format(dtfDay);
+//        Map<String, Map<String, Object>> resultMap = new HashMap<>(16);
+//        boolean isRepeat = false;
+//        boolean yestdayisFinieshed=false;
+//        boolean todayisFinieshed=false;
+//        Map<String, String> headers = new HashMap<>();
+//        headers.put("Authorization", "Bearer " + tokenUtil.getToken());
+//        try
+//        {
+//            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+//            String startTime =startDatetime.plusHours(-8).format(dtf);
+//            String endTime=   endDatetime.plusHours(-8).format(dtf);
+//            startTime = DateUtil.handlerTime(startTime);
+//            endTime = DateUtil.handlerTime(endTime);
+//            //http://openapi.zengcaicloud.com/historian-manage/v1/historian/models/197ZUeGcXkY/things/199DK04jaWA?startTime=2022-05-01T02:30:00.000Z&endTime=2022-05-06T03:20:30.000Z
+////            String resp = HttpClientUtil.sendHttp(HttpRequestMethedEnum.HttpGet, reqUrl + "/historian-manage/v1/historian/models/"
+////                    + modelId + "/things/" + thingId+""+"?startTime="+startTime+"&endTime="+endTime+"&skip=0&limit=10000", null, headers);
+//            String resp = HttpClientUtil.sendHttp(HttpRequestMethedEnum.HttpGet,  reqUrl + "/historian-manage/v1/historian/models/"
+//                    + modelId + "/things/" + thingId+"?startTime="+startTime+"&endTime="+endTime+"&skip=0&limit=10000" +
+//                    "&properties="+ URLEncoder.encode("[\"HMI_JobID\",\"time\",\"HMI_TotalLayer\",\"HMI_CurPrintLayer\",\"HMI_Volume\",\"HMI_Thickness\",\"HMI_TotalTimeCost\",\"HMI_BeginTime\",\"HMI_EndTime\",\"SB_ZT_Running\"]", "UTF-8"), null, headers);
+//            Thread.sleep(1000);
+////            logger.info("平台历史工况接口返回数据：{}", resp);
+//            JSONObject jsonObject = JSONObject.parseObject(resp);
+//            JSONArray array = jsonObject.getJSONArray("payload");
+//            JSONArray colums = array.getJSONObject(0).getJSONArray("columns");
+//            JSONArray rows = array.getJSONObject(0).getJSONArray("rows");
+//
+//            //取出需要分析的属性字段的下标
+//            int jobid_serque = getSequeByKey(colums, "HMI_JobID");
+//            int time_serque = getSequeByKey(colums, "time");
+//            int HMI_TotalLayer_seq = getSequeByKey(colums, "HMI_TotalLayer");
+//            int HMI_CurPrintLayer_seq = getSequeByKey(colums, "HMI_CurPrintLayer");
+//            int HMI_Volume_seq = getSequeByKey(colums, "HMI_Volume");
+//            int HMI_Thicknessr_seq = getSequeByKey(colums, "HMI_Thickness");
+//            int HMI_TotalTimeCost_seq = getSequeByKey(colums, "HMI_TotalTimeCost");
+//            int HMI_BeginTime_seq = getSequeByKey(colums, "HMI_BeginTime");
+//            int HMI_EndTime_seq = getSequeByKey(colums, "HMI_EndTime");
+//            int SB_ZT_Running_seq = getSequeByKey(colums, "SB_ZT_Running");
+//            for (int idx=0;idx< rows.size();idx++)
+//            {
+//                String cur_HMI_JobID =getString(rows.getJSONArray(idx).get(jobid_serque));//HMI_JobID	打印编号
+//                String Timestamp_Local ="";  //当前工况时间
+//                String UTCtimeStr = getString(rows.getJSONArray(idx).get(time_serque)); //UTC 格式的时间
+//                Timestamp_Local =  DateUtil.UTCtoBeijing_1(UTCtimeStr);//UTC转换为北京时间
+////                if (!Timestamp_Local.startsWith(today) && !Timestamp_Local.startsWith(yestoday) && !Timestamp_Local.startsWith(tomorrow)) {
+////                    continue;
+////                }
+//                if (!Timestamp_Local.substring(0,10).startsWith(today))
+//                {
+//                    continue;
+//                }
+//                if( StringUtils.isBlank(cur_HMI_JobID)){
+//                    continue;
+//                }
+//                /*
+//                if(cur_HMI_JobID.contains("试块") || cur_HMI_JobID.contains("调试")||
+//                        cur_HMI_JobID.contains("测试")|| cur_HMI_JobID.contains("实验")
+//                        || cur_HMI_JobID.contains("调整"))
+//                {
+//                    continue;
+//                    //试块、调试的打印任务自动过滤掉
+//                }
+//                */
+//                float HMI_Volume = getFloat(rows.getJSONArray(idx).get(HMI_Volume_seq)); //打印体积(HMI_Volume)
+//                //HMI_CurPrintLayer 当前打印层数
+//                float HMI_CurPrintLayer = getFloat(rows.getJSONArray(idx).get(HMI_CurPrintLayer_seq));
+//                float HMI_TotalLayer = getFloat(rows.getJSONArray(idx).get(HMI_TotalLayer_seq));
+//                String HMI_BeginTime = getString(rows.getJSONArray(idx).get(HMI_BeginTime_seq)); //MapUtils.getString(data, "HMI_BeginTime");
+//                String HMI_EndTime = getString(rows.getJSONArray(idx).get(HMI_EndTime_seq));//MapUtils.getString(data, "HMI_EndTime");
+//                String HMI_RUNNING = getString(rows.getJSONArray(idx).get(SB_ZT_Running_seq));//MapUtils.getString(data, "SB_ZT_Running");
+////                if (HMI_CurPrintLayer < 200) {
+////                    continue;
+////                }
+//                //***判断开头已经打印结束的
+//                if(idx == 0)
+//                {
+//                    //判断前一天已经打印完成的
+//                    if((HMI_CurPrintLayer == HMI_TotalLayer) &&HMI_CurPrintLayer > 200)
+//                    {
+//                        yestdayisFinieshed =true;
+//                        continue;  //过滤已经打印完的
+//                    }
+//                }
+//                if(yestdayisFinieshed && HMI_TotalLayer == 0.0 && HMI_CurPrintLayer == 0.0)
+//                {
+//                    yestdayisFinieshed = false;//清除开头已经打印结束的任务,继续打印
+//                }
+//                if(yestdayisFinieshed && HMI_RUNNING.equals("true"))//开头已经打印结束后面重新开始打印的情况，则继续扫描
+//                {
+//                    yestdayisFinieshed = false;
+//                }
+//                if(yestdayisFinieshed)
+//                {
+//                    continue;  //
+//                }
+//                //重新清零参数进行新的打印
+//                if(HMI_TotalLayer == 0.0 && HMI_CurPrintLayer == 0.0)
+//                {
+//                    todayisFinieshed = false;
+//                }
+//                if(HMI_RUNNING.equals("true")) //当日继续打印，继续
+//                {
+//                    todayisFinieshed = false;
+//                }
+//                //判断当前正常打印结束之后，再次打印
+//                //*** 判断当前批次任务已经打印结束,记录
+//                if(todayisFinieshed)
+//                {
+//                    continue;  //当前批次任务已经打印结束后面数据不再处理
+//                }
+//                //200层以下不计入，针对一些前后任务切换的特殊情况，数据会超过24h,需要过滤掉
+//                if (HMI_CurPrintLayer < 200 && HMI_TotalLayer < 200) {
+//                    continue;
+//                }
+//                if (idx > 1) {
+//                    String last_HMI_JobID = getString(rows.getJSONArray(idx-1).get(jobid_serque)); // HMI_JobID
+//                    float last_HMI_Volume = getFloat(rows.getJSONArray(idx-1).get(HMI_Volume_seq));//HMI_Volume
+//                    if ( !cur_HMI_JobID.equals(last_HMI_JobID) && HMI_Volume ==  last_HMI_Volume) {
+//                        isRepeat = true;
+//                        continue;
+//                    }
+//                    if (isRepeat && HMI_Volume ==  last_HMI_Volume) {
+//                        continue;
+//                    } else if (isRepeat && HMI_Volume !=  last_HMI_Volume) {
+//                        isRepeat = false;
+//                    }
+//                }
+////              String cloudtime = rows.getJSONArray(idx).get(time_serque).toString().substring(0,10);
+//                String cloudtime = Timestamp_Local.substring(0,10);
+//                String cloudtime_1 = HMI_BeginTime;
+//
+//                Map<String, Object> hisData = resultMap.computeIfAbsent( cloudtime_1 + cur_HMI_JobID, m -> new HashMap<>(16)); //cloudtime
+//                hisData.put("cloudtime", cloudtime);
+//                hisData.put("deviceId", deviceId);
+//                hisData.put("HMI_JobID", cur_HMI_JobID);
+//                float HMI_Thickness = getFloat(rows.getJSONArray(idx).get(HMI_Thicknessr_seq));//HMI_Thickness
+//                float HMI_TotalTimeCost = getFloat(rows.getJSONArray(idx).get(HMI_TotalTimeCost_seq));// HMI_TotalTimeCost
+//
+//                float his_HMI_Volume = getFloat(hisData,"HMI_Volume");// "HMI_Volume"
+//                float his_HMI_TotalTimeCost = getFloat(hisData,"HMI_TotalTimeCost");
+//                float his_HMI_CurPrintLayer = getFloat(hisData,"HMI_CurPrintLayer");
+//                float his_HMI_Thickness = getFloat(hisData,"HMI_Thickness");
+//                float his_HMI_TotalLayers = getFloat(hisData,"HMI_TotalLayer");
+//                String his_HMI_RUNNING =  getStringS(hisData,"HMI_RUNNING");
+//
+//                //正常情况，满足下面的条件；特殊的如2515切换批次不清空上一批次打印参数的情况，完全不适用
+//                if ( HMI_TotalTimeCost > his_HMI_TotalTimeCost) {
+//                    hisData.put("HMI_TotalTimeCost", HMI_TotalTimeCost);
+//                }
+//                if ( HMI_Volume > his_HMI_Volume) {
+//                    hisData.put("HMI_Volume", HMI_Volume);
+//                }
+//                if ( HMI_CurPrintLayer > his_HMI_CurPrintLayer) {
+//                    hisData.put("HMI_CurPrintLayer", HMI_CurPrintLayer);
+//                }
+//                if ( HMI_Thickness > his_HMI_Thickness) {
+//                    hisData.put("HMI_Thickness", HMI_Thickness);
+//                }
+//                //正常打印结束的任务  正常情况 当前打印层数 = 总层数
+//                if(HMI_TotalLayer > 200 && HMI_TotalLayer == HMI_CurPrintLayer)
+//                {
+//                    hisData.put("Timestamp_Local", Timestamp_Local);
+//                    todayisFinieshed = true;
+//                }
+//                //正常打印结束的任务   特殊情况 2515 当前打印层数 = 总层数+1
+//                if(HMI_TotalLayer > 200 && HMI_TotalLayer + 1 == HMI_CurPrintLayer)
+//                {
+//                    hisData.put("Timestamp_Local", Timestamp_Local);
+//                    todayisFinieshed = true;
+//                }
+//                //正常打印中中止的情况？
+//                if(HMI_TotalLayer > 200 && HMI_CurPrintLayer < HMI_TotalLayer && HMI_RUNNING.equals("false"))
+//                {
+//                    hisData.put("Timestamp_Local", Timestamp_Local);
+//                    todayisFinieshed = true;
+//                }
+//
+////                if(HMI_CurPrintLayer >= his_HMI_CurPrintLayer && HMI_CurPrintLayer > 0 && his_HMI_CurPrintLayer >0){
+//                if(HMI_TotalLayer >= his_HMI_TotalLayers) //> 1800-1数据异常特殊情况,当前层数N,总层0，存在下面参数进不去
+//                {
+//                    //记录每一个批次内的遍历参数,为后面根据批次标识(jobid+startTime)进行归类分析
+//                    hisData.put("HMI_TotalTimeCost", HMI_TotalTimeCost);
+//                    //hisData.put("HMI_CurPrintLayer", HMI_CurPrintLayer);
+//                    if ( HMI_CurPrintLayer > his_HMI_CurPrintLayer) {
+//                        hisData.put("HMI_CurPrintLayer", HMI_CurPrintLayer);
+//                    }
+//                    hisData.put("HMI_TotalLayer", HMI_TotalLayer);
+//                    hisData.put("HMI_BeginTime", HMI_BeginTime);
+//                    hisData.put("HMI_EndTime", HMI_EndTime);
+//                    hisData.put("Timestamp_Local", Timestamp_Local);
+//                    hisData.put("HMI_Volume", HMI_Volume);
+//                    hisData.put("HMI_RUNNING", HMI_RUNNING);
+//                }
+//                //logger.info("设备编号:"+deviceId+ " |JobID:"+cur_HMI_JobID +" |总层数："+HMI_TotalLayer+" |当前打印层数:"+HMI_CurPrintLayer+" |Beijing-time:"+Timestamp_Local+" |UTC-time:"+time);
+//            }
+//        }catch (Exception ex)
+//        {
+//            Log.error("报错位置：deviceId:"+deviceId);
+//            Log.error("调用平台查询实时工况信息error",ex);
+//        }
+//
+//        List<Map<String,Object>> todayList1 = resultMap.values().stream()
+//                .filter(x->today.equals(MapUtils.getString(x, "cloudtime"))).collect(Collectors.toList());
+//
+//        Map<String, Map<String, Object>> resultMap2 = new HashMap<>(16);
+//        List<Map<String,Object>> todayList = new ArrayList<Map<String,Object>>();
+//        //MMP
+//        for(int i=0;i<todayList1.size();i++)
+//        {
+//            Map<String,Object> newMap = todayList1.get(i);
+//            String HMI_JobID1 = newMap.getOrDefault("HMI_JobID","").toString();
+//            String HMI_Volume1 = newMap.getOrDefault("HMI_Volume","").toString();
+//            String HMI_CurPrintLayer1 = newMap.getOrDefault("HMI_CurPrintLayer","").toString();
+//            if(HMI_CurPrintLayer1.equals("")) //处理特殊情况不存在层数的情况()
+//                HMI_CurPrintLayer1 = "0.0";
+//            //判断当前批次的最大打印层数是否200以内,剔除200层以内的试块（特殊情况下试块打印总层数>200,最大打印层数超过200层）
+////            if(Double.parseDouble(HMI_CurPrintLayer1) < 200)  //2022-09-06 暂时200层以下计入
+////            {
+////                continue;
+////            }
+//            String HMI_TotalLayer1 = newMap.getOrDefault("HMI_TotalLayer","").toString();
+//            String HMI_BeginTime1 = newMap.getOrDefault("HMI_BeginTime","").toString();
+//            String HMI_EndTime1 = newMap.getOrDefault("HMI_EndTime","").toString();
+//            String HMI_Thickness1 = newMap.getOrDefault("HMI_Thickness","").toString();
+//            String Timestamp_Local1 = newMap.getOrDefault("Timestamp_Local","").toString();
+//            String cloudtime1 = newMap.getOrDefault("cloudtime","").toString();
+//            String deviceId1 = newMap.getOrDefault("deviceId","").toString();
+//            String HMI_TotalTimeCost1 = newMap.getOrDefault("HMI_TotalTimeCost","").toString();
+//            String HMI_RUNNING =  newMap.getOrDefault("HMI_RUNNING","").toString() == "false" ? "0":"1";  //runnning 状态值
+//
+//            if(HMI_TotalTimeCost1.equals(""))
+//                HMI_TotalTimeCost1 ="0.0";
+//            LocalDateTime t1= LocalDateTime.parse(HMI_BeginTime1, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//            LocalDateTime t2 = LocalDateTime.parse(today +" "+"00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//
+//            float totalTimeCost =0;
+//            if(t1.isBefore(t2)) //隔天情况(添加判断不在同一天),前一天没有打印完当天接着打印的，打印耗时按从当天0点到打印结束时间这段时间为有效时间
+//            {
+//                //这里有坑，结束后会有一段时间的静置期，Timestamp_Local1会持续到下一批任务，所以应该取打印结束时间比较准确
+//                LocalDateTime temp= LocalDateTime.parse(HMI_EndTime1.substring(0,19) , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//                LocalDateTime current_RecordTime = LocalDateTime.parse(Timestamp_Local1, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//                //1800-3 09-09 数据异常，前一批故障未结束且打印参数未清零，下一批任务jobid切换进来后，打印开始、结束，层数还是上一批的参数。几分钟后才开始清空
+//                if(temp.isBefore(current_RecordTime) && HMI_CurPrintLayer1.equals("0.0") && HMI_Volume1.equals("0.0") && HMI_TotalTimeCost1.equals("0.0"))
+//                {
+//                    totalTimeCost = Float.valueOf(0); //默认0
+//                }
+//                else
+//                {
+//                    String spanT = String.valueOf(Duration.between(t2,temp).toMinutes()); //t1  t2之间相差多少h
+//                    if(Float.parseFloat(spanT) < 0)
+//                    {
+//                        totalTimeCost = 0; //异常情况，前一天打印未结束直接异常数据没清空
+//                    }
+//                    else
+//                    {
+//                        //temp -- 预计结束时间(动态可变)
+//                        LocalDateTime current_task_endTime = temp;
+//                        //Timestamp_Local1  --任务当前时间
+//                        LocalDateTime current_taskTime = LocalDateTime.parse(Timestamp_Local1, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//                        //特殊情况，跨天到当天的打印任务，前一天打印故障数据未清零持续到当天的情况 Max-A  2022-09-11
+//                        float rate = Float.parseFloat(HMI_CurPrintLayer1) * 100 /Float.parseFloat(HMI_TotalLayer1);
+//                        //若跨天已打印总任务的95%以下，且任务停止时间(故障停机水平停止线)< 任务预计结束时间，则大概率是失败的情况，否则不计算；大于>95%以上，则成功(当前层>=总层数 或 当前层<=总层数)
+//                        if( rate < 95 && Float.parseFloat(HMI_CurPrintLayer1) < Float.parseFloat(HMI_TotalLayer1) && current_taskTime.isBefore(current_task_endTime))
+//                        {
+//                            totalTimeCost = Float.valueOf(0); //默认0
+//                        }
+//                        else
+//                        {
+//                            Float tt = Math.abs(Float.parseFloat(spanT)) /60;
+//                            //totalTimeCost = Float.valueOf(spanT);
+//                            totalTimeCost = Math.abs(Float.parseFloat(spanT)) /60;
+//                            DecimalFormat decl = new DecimalFormat("0.0");
+//                            String p = decl.format(totalTimeCost);
+//                            totalTimeCost = Float.valueOf(p);
+//                            HMI_BeginTime1 =  today +" "+"00:00:00";
+//                        }
+//
+//                    }
+//                }
+//
+//
+//            }
+//            else  //当日内打完的情况；当日没打结束跨到下一天，则打印耗时直接是批次中最后一条记录(若数据22点掉线了，可能会统计数据偏小？)
+//            {
+//                totalTimeCost = Math.abs(Float.valueOf(HMI_TotalTimeCost1));
+//            }
+//            Map<String,Object> map1 = new HashMap<String,Object>();
+//            map1.put("HMI_JobID", HMI_JobID1);
+//            map1.put("HMI_Volume", HMI_Volume1);
+//            map1.put("HMI_CurPrintLayer", HMI_CurPrintLayer1);
+//            map1.put("HMI_TotalLayer", HMI_TotalLayer1);
+//            map1.put("HMI_BeginTime", HMI_BeginTime1);
+//            map1.put("HMI_EndTime", HMI_EndTime1);
+//            map1.put("HMI_Thickness", HMI_Thickness1);
+//            map1.put("Timestamp_Local", Timestamp_Local1);
+//            map1.put("cloudtime", cloudtime1);
+//            map1.put("deviceId", deviceId1);
+//            map1.put("HMI_TotalTimeCost", totalTimeCost);
+//            todayList.add(map1);
+//
+//            //重构resultMap2
+//            String cloudtime = cloudtime1;
+//            String cloudtime_1 = HMI_BeginTime1;
+//            Map<String, Object> hisData = resultMap2.computeIfAbsent( cloudtime_1 + HMI_JobID1, m -> new HashMap<>(16));
+//
+//            hisData.put("HMI_JobID", HMI_JobID1);
+//            hisData.put("HMI_Volume", HMI_Volume1);
+//            hisData.put("HMI_CurPrintLayer", HMI_CurPrintLayer1);
+//            hisData.put("HMI_TotalLayer", HMI_TotalLayer1);
+//            hisData.put("HMI_BeginTime", HMI_BeginTime1);
+//            hisData.put("HMI_EndTime", HMI_EndTime1);
+//            hisData.put("HMI_Thickness", HMI_Thickness1);
+//            hisData.put("Timestamp_Local", Timestamp_Local1);
+//            hisData.put("cloudtime", cloudtime1);
+//            hisData.put("deviceId", deviceId1);
+//            hisData.put("HMI_TotalTimeCost", totalTimeCost);
+//        }
+//
+//        List<Map<String,Object>> yestodayList = resultMap.values().stream()
+//                .filter(x->yestoday.equals(MapUtils.getString(x, "cloudtime"))).collect(Collectors.toList());
+//        List<Map<String,Object>> tomorrowList = resultMap.values().stream()
+//                .filter(x->tomorrow.equals(MapUtils.getString(x, "cloudtime"))).collect(Collectors.toList());
+//        Set<String> excludeJobIds = new HashSet<>();
+//        for (Map<String,Object> todayData: todayList) {
+//            String jobId = MapUtils.getString(todayData, "HMI_JobID");
+//            float HMI_Volume = getFloat(todayData, "HMI_Volume");
+//            if (yestodayList.stream().anyMatch(x->{
+//                if(jobId.equals(MapUtils.getString(x, "HMI_JobID"))
+//                        && HMI_Volume <= getFloat(x,"HMI_Volume")){
+//                    return true;}else{return false;}})) {
+//                excludeJobIds.add(jobId);
+//            }else if (tomorrowList.stream().anyMatch(x->{
+//                if(jobId.equals(MapUtils.getString(x, "HMI_JobID"))
+//                        && HMI_Volume < getFloat(x,"HMI_Volume")){
+//                    return true;}else{return false;}})) {
+//                excludeJobIds.add(jobId);
+//            }
+//        }
+//        Double dyhs = 0d;
+//        Double dyTime =0d;
+//        Double ghjhl =0d;
+//        List<Map<String,Object>> resultList = resultMap2.values().stream()
+//                .filter(x-> today.equals(MapUtils.getString(x, "cloudtime"))
+//                        &&!excludeJobIds.contains(MapUtils.getString(x, "HMI_JobID"))).collect(Collectors.toList());
+//        if (!CollectionUtils.isEmpty(resultList)) {
+//            dyhs = resultList.stream().mapToDouble(x -> getFloat(x, "HMI_TotalTimeCost")).sum();
+//            dyhs = dyhs >= 24 ?  24: dyhs;  //异常超过24H情况
+//            dyTime = 0d;//resultList.stream().mapToDouble(x -> getDyxl(x)).average().orElse(0d);
+//            ghjhl = 0d;//resultList.stream().mapToDouble(x -> getBtl(x)).average().orElse(0d);
+//        }
+//        Log.info("计算过程：resultMap2：{},excludeJobIds:{}", resultMap2,excludeJobIds);
+//        PrinterEfficiencyWorkVO newWorkVO = new PrinterEfficiencyWorkVO(thingId, deviceTypeId)
+//                .dyhs(dyhs.floatValue())
+//                .dyTime(dyTime.floatValue())
+//                .ghjhl(ghjhl.floatValue());
+//        workVOS.add(newWorkVO);
+//        return workVOS;
+//    }
+
+    private String getStringS(
+            Map<String, Object> map,
+            String key) {
+        Object str = map.getOrDefault(key, "0");
+        String value = "";
+        if (null != str && !"null".equals(str)) {
+            value = str.toString();
+        }
+        return value;
+    }
+
+
+    /** 有效打印时间、打印效率*/
+    public void run1(Calendar calendar) throws Exception{
+
+        int year = calendar.get(Calendar.YEAR);
+        int month = calendar.get(Calendar.MONTH) + 1;
+        int day = calendar.get(Calendar.DAY_OF_MONTH);
+        // 需要从ES中查询前一天及当天的数据，因为前一天开始的有可能当天才结束 前一天23:00开始到后一天01:00
+        LocalDateTime startDatetime = LocalDateTime.of(year,month,day,0,0,0).minusHours(1);
+        LocalDateTime endDatetime = startDatetime.plusHours(26);
+
+        //DEVICE_SBLX-设备类型CODE --5719    DEVICE_SBLX_NAME-设备类型名称  --3DP打印机
+        NxDeviceVO v = new NxDeviceVO();
+//        v.setDEVICE_SBLX("5719");
+//        v.setDEVICE_SBLX_NAME("3DP打印机");
+        v.setDeviceTypeId("5719");
+        v.setDeviceTypeName("3DP打印机");
+
+
+        //1.取出打印机所有的设备编号
+        List<NxDeviceVO> list = nxDeviceDao.getDeviceList(v);
+//        List<NxDeviceVO> list2 = nxDeviceDao.getDeviceList2();
+        List<PrinterEfficiencyWorkVO> resultList = new ArrayList<>(16);
+
+        for(int i=0;i<list.size();i++)
+        {
+//            String deviceCode=list.get(i).getDEVICE_SBBM();
+//            String modelId=list.get(i).getMODEL_ID();
+//            String thingId=list.get(i).getNX_JE_DEVICE_ID();
+            String deviceCode=list.get(i).getDeviceCode();
+            String modelId=list.get(i).getModeID();
+            String thingId=list.get(i).getThingID();
+            String deviceTypeId=list.get(i).getDeviceTypeId();
+
+            resultList.addAll(processDeviceHistoryGK(LocalDate.of(year,month,day), startDatetime, endDatetime,
+                    deviceCode,deviceTypeId,modelId,thingId));
+        }
+        if (CollectionUtils.isEmpty(resultList)) {
+            return;
+        }
+        // 将计算的结果存储到结果表中去，需要将之前的数据清空
+        printerEfficiencyWorkDao.clear(year, month, day);
+        printerEfficiencyWorkDao.batchAdd(resultList, year, month, day);
+
+
+
+    }
+    private Collection<PrinterEfficiencyWorkVO> processDeviceHistoryGK(
+            LocalDate localDate,
+            LocalDateTime startDatetime,
+            LocalDateTime endDatetime,
+            String deviceId,String deviceTypeId,String modelId,String thingId) {
+
+        List<PrinterEfficiencyWorkVO> workVOS = new ArrayList<>();
+
+        String DATE_FORMAT_DAY = "yyyy-MM-dd";
+        DateTimeFormatter dtfDay = DateTimeFormatter.ofPattern(DATE_FORMAT_DAY);
+        String today = localDate.format(dtfDay);
+        String yestoday = localDate.minusDays(1).format(dtfDay);
+        String tomorrow = localDate.plusDays(1).format(dtfDay);
+        Map<String, Map<String, Object>> resultMap = new HashMap<>(16);
+        boolean isRepeat = false;
+
+
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Authorization", "Bearer " + tokenUtil.getToken());
+        try
+        {
+            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            String startTime =startDatetime.plusHours(-8).format(dtf);
+            String endTime=   endDatetime.plusHours(-8).format(dtf);
+            startTime = DateUtil.handlerTime(startTime);
+            endTime = DateUtil.handlerTime(endTime);
+
+            //http://openapi.zengcaicloud.com/historian-manage/v1/historian/models/197ZUeGcXkY/things/199DK04jaWA?startTime=2022-05-01T02:30:00.000Z&endTime=2022-05-06T03:20:30.000Z
+            String resp = HttpClientUtil.sendHttp(HttpRequestMethedEnum.HttpGet, reqUrl + "/historian-manage/v1/historian/models/"
+                    + modelId + "/things/" + thingId+""+"?startTime="+startTime+"&endTime="+endTime+"&skip=0&limit=10000", null, headers);
+//            logger.info("平台历史工况接口返回数据：{}", resp);
+            JSONObject jsonObject = JSONObject.parseObject(resp);
+            JSONArray array = jsonObject.getJSONArray("payload");
+            JSONArray colums = array.getJSONObject(0).getJSONArray("columns");
+            JSONArray rows = array.getJSONObject(0).getJSONArray("rows");
+
+            //取出需要分析的属性字段的下标
+            int jobid_serque = getSequeByKey(colums, "HMI_JobID");
+            int time_serque = getSequeByKey(colums, "time");
+            int HMI_TotalLayer_seq = getSequeByKey(colums, "HMI_TotalLayer");
+            int HMI_CurPrintLayer_seq = getSequeByKey(colums, "HMI_CurPrintLayer");
+            int HMI_Volume_seq = getSequeByKey(colums, "HMI_Volume");
+            int HMI_Thicknessr_seq = getSequeByKey(colums, "HMI_Thickness");
+            int HMI_TotalTimeCost_seq = getSequeByKey(colums, "HMI_TotalTimeCost");
+
+
+            for (int idx=0;idx< rows.size();idx++) {
+
+//                String cur_HMI_JobID ="";
+//                String HMI_TotalLayer ="";
+//                String HMI_CurPrintLayer = "";
+//                String HMI_Volume="";
+//                String HMI_Thicknessr ="";
+//                String HMI_TotalTimeCost ="";
+//                if(rows.getJSONArray(idx).get(jobid_serque)!=null)
+//                {
+//                    cur_HMI_JobID = rows.getJSONArray(idx).get(jobid_serque).toString();
+//                }
+//                HMI_TotalLayer = rows.getJSONArray(id).get(HMI_TotalLayer_seq).toString();
+//                HMI_CurPrintLayer = rows.getJSONArray(id).get(HMI_CurPrintLayer_seq).toString();
+
+                String cur_HMI_JobID =getString(rows.getJSONArray(idx).get(jobid_serque));//HMI_JobID	打印编号
+                String Timestamp_Local ="";  //当前工况时间
+                String UTCtimeStr = getString(rows.getJSONArray(idx).get(time_serque)); //UTC 格式的时间
+                Timestamp_Local =  DateUtil.UTCtoBeijing_1(UTCtimeStr);//UTC转换为北京时间
+                if (!Timestamp_Local.startsWith(today) && !Timestamp_Local.startsWith(yestoday) && !Timestamp_Local.startsWith(tomorrow)) {
+                    continue;
+                }
+                if( StringUtils.isBlank(cur_HMI_JobID)){
+                    continue;
+                }
+//            if(cur_HMI_JobID.contains("试块") || cur_HMI_JobID.contains("调试")||
+//                    cur_HMI_JobID.contains("测试")|| cur_HMI_JobID.contains("实验")
+//                    || cur_HMI_JobID.contains("调整"))
+//            {
+//                continue;
+//                //试块、调试的打印任务自动过滤掉
+//            }
+                float HMI_Volume = getFloat(rows.getJSONArray(idx).get(HMI_Volume_seq)); //打印体积(HMI_Volume)
+                //HMI_CurPrintLayer 当前打印层数
+                float HMI_CurPrintLayer = getFloat(rows.getJSONArray(idx).get(HMI_CurPrintLayer_seq));
+                if (HMI_CurPrintLayer < 200) {
+                    continue;
+                }
+                if (idx > 1) {
+                    String last_HMI_JobID = getString(rows.getJSONArray(idx-1).get(jobid_serque)); // HMI_JobID
+                    float last_HMI_Volume = getFloat(rows.getJSONArray(idx-1).get(HMI_Volume_seq));//HMI_Volume
+                    if ( !cur_HMI_JobID.equals(last_HMI_JobID) && HMI_Volume ==  last_HMI_Volume) {
+                        isRepeat = true;
+                        continue;
+                    }
+                    if (isRepeat && HMI_Volume ==  last_HMI_Volume) {
+                        continue;
+                    } else if (isRepeat && HMI_Volume !=  last_HMI_Volume) {
+                        isRepeat = false;
+                    }
+                }
+
+//              String cloudtime = rows.getJSONArray(idx).get(time_serque).toString().substring(0,10);
+                String cloudtime = Timestamp_Local.substring(0,10);
+                Map<String, Object> hisData = resultMap.computeIfAbsent( cloudtime + cur_HMI_JobID, m -> new HashMap<>(16));
+                hisData.put("cloudtime", cloudtime);
+                hisData.put("deviceId", deviceId);
+                hisData.put("HMI_JobID", cur_HMI_JobID);
+                float HMI_Thickness = getFloat(rows.getJSONArray(idx).get(HMI_Thicknessr_seq));//HMI_Thickness
+                float HMI_TotalTimeCost = getFloat(rows.getJSONArray(idx).get(HMI_TotalTimeCost_seq));// HMI_TotalTimeCost
+
+                float his_HMI_Volume = getFloat(hisData,"HMI_Volume");// "HMI_Volume"
+                float his_HMI_TotalTimeCost = getFloat(hisData,"HMI_TotalTimeCost");
+                float his_HMI_CurPrintLayer = getFloat(hisData,"HMI_CurPrintLayer");
+                float his_HMI_Thickness = getFloat(hisData,"HMI_Thickness");
+
+                if ( HMI_TotalTimeCost > his_HMI_TotalTimeCost) {
+                    hisData.put("HMI_TotalTimeCost", HMI_TotalTimeCost);
+                }
+                if ( HMI_Volume > his_HMI_Volume) {
+                    hisData.put("HMI_Volume", HMI_Volume);
+                }
+                if ( HMI_CurPrintLayer > his_HMI_CurPrintLayer) {
+                    hisData.put("HMI_CurPrintLayer", HMI_CurPrintLayer);
+                }
+                if ( HMI_Thickness > his_HMI_Thickness) {
+                    hisData.put("HMI_Thickness", HMI_Thickness);
+                }
+                //logger.info("设备编号:"+deviceId+ " |JobID:"+cur_HMI_JobID +" |总层数："+HMI_TotalLayer+" |当前打印层数:"+HMI_CurPrintLayer+" |Beijing-time:"+Timestamp_Local+" |UTC-time:"+time);
+            }
+            //JSONObject rows2 = array.getJSONObject(0).getJSONObject("rows");
+//            List<DeviceHistorySituationVO> deviceHistorySituationVO = callHistoryInterface1(historySituationAO.getDeviceId(), jeDeviceEntity.getModelId(), paramMap);
+//            PageInfo<DeviceHistorySituationVO> deviceHistorySituationVOPageInfo = this.queryPageInfo(skip, limit, deviceHistorySituationVO);
+
+        }catch (Exception ex)
+        {
+            logger.error("调用平台查询实时工况信息error", ex);
+        }
+//        JSONObject metric = get4StaueCountInstance("","",null,new Date(),new Date());
+//        String key = "temperature";
+//        Object[] objects = getMetricByKey(metric, key);
+
+
+        List<Map<String,Object>> todayList = resultMap.values().stream()
+                .filter(x->today.equals(MapUtils.getString(x, "cloudtime"))).collect(Collectors.toList());
+        List<Map<String,Object>> yestodayList = resultMap.values().stream()
+                .filter(x->yestoday.equals(MapUtils.getString(x, "cloudtime"))).collect(Collectors.toList());
+        List<Map<String,Object>> tomorrowList = resultMap.values().stream()
+                .filter(x->tomorrow.equals(MapUtils.getString(x, "cloudtime"))).collect(Collectors.toList());
+        Set<String> excludeJobIds = new HashSet<>();
+        for (Map<String,Object> todayData: todayList) {
+            String jobId = MapUtils.getString(todayData, "HMI_JobID");
+            float HMI_Volume = getFloat(todayData, "HMI_Volume");
+            if (yestodayList.stream().anyMatch(x->{
+                if(jobId.equals(MapUtils.getString(x, "HMI_JobID"))
+                        && HMI_Volume <= getFloat(x,"HMI_Volume")){
+                    return true;}else{return false;}})) {
+                excludeJobIds.add(jobId);
+            }else if (tomorrowList.stream().anyMatch(x->{
+                if(jobId.equals(MapUtils.getString(x, "HMI_JobID"))
+                        && HMI_Volume < getFloat(x,"HMI_Volume")){
+                    return true;}else{return false;}})) {
+                excludeJobIds.add(jobId);
+            }
+        }
+
+        Double dyhs = 0d;
+        Double dyTime =0d;
+        Double ghjhl =0d;
+        List<Map<String,Object>> resultList = resultMap.values().stream()
+                .filter(x-> today.equals(MapUtils.getString(x, "cloudtime"))
+                        &&!excludeJobIds.contains(MapUtils.getString(x, "HMI_JobID"))).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(resultList)) {
+            dyhs = resultList.stream().mapToDouble(x -> getFloat(x, "HMI_TotalTimeCost")).sum();
+            dyTime = resultList.stream().mapToDouble(x -> getDyxl(x)).average().orElse(0d);
+            ghjhl = resultList.stream().mapToDouble(x -> getBtl(x)).average().orElse(0d);
+        }
+        logger.error("计算过程：resultMap：{},excludeJobIds:{}", resultMap,excludeJobIds);
+        PrinterEfficiencyWorkVO newWorkVO = new PrinterEfficiencyWorkVO(deviceId, deviceTypeId)
+                .dyhs(dyhs.floatValue())
+                .dyTime(dyTime.floatValue())
+                .ghjhl(ghjhl.floatValue());
+        workVOS.add(newWorkVO);
+
+        return workVOS;
+    }
+
+
+    /** 打印体积、产量数据*/
+    public void run2(LocalDate calendar) throws Exception{
+
+        int year = calendar.getYear();
+        int month = calendar.getMonthValue();
+        int day = calendar.getDayOfMonth();
+
+        // 需要从ES中查询前一天及当天的数据，因为前一天开始的有可能当天才结束
+        LocalDateTime startDatetime = LocalDateTime.of(year,month,day,0,0,0).minusHours(1);
+        LocalDateTime endDatetime = startDatetime.plusHours(26);
+
+    }
+
+
+
+    /**
+     * 布图率 = 一个打印任务最大打印体积 / （打印层厚*最大打印层数*工作箱长*工作箱宽*2）（2215、2515、2518、2218、SDream机型）
+     * 布图率 = 一个打印任务最大打印体积 / （打印层厚*最大打印层数*工作箱长*工作箱宽）（Max、1800、800、1000、2600机型）
+     * @param data
+     * @return
+     */
+    private double getBtl(Map<String, Object> data) {
+        String deviceId = MapUtils.getString(data, "deviceId");
+        return getWorkBoxSize(deviceId).map(workBoxSize -> {
+            float dycs = getFloat(data, "HMI_CurPrintLayer");
+            float dyhd = getFloat(data, "HMI_Thickness");
+            float HMI_Volume = getFloat(data, "HMI_Volume");
+            double length = workBoxSize.getLength();
+            double width = workBoxSize.getWidth();
+            logger.error(deviceId+"当前打印层数:{},层厚:{},打印体积:{},工作箱长:{},工作箱宽:{}", dycs,dyhd,HMI_Volume,length,width);
+            if (dycs * dyhd < 0.01) {
+                return 0f;
+            }
+            Double result = 0d;
+            if (!deviceId.startsWith("1800") && !deviceId.toLowerCase().startsWith("max")
+                    && !deviceId.startsWith("800")&& !deviceId.startsWith("1000")&& !deviceId.startsWith("2600")
+                    && !deviceId.startsWith("2600B")&& !deviceId.startsWith("2500")&& !deviceId.startsWith("300")&& !deviceId.startsWith("1200")) {
+                result = HMI_Volume / (dycs * dyhd * length * width * 2 * 0.01);
+                return result.floatValue();
+            } else {
+                result = HMI_Volume / (dycs * dyhd * length * width * 0.01);
+                logger.error(deviceId + "布图率:{}", result);
+                return result.floatValue();
+            }
+        }).orElse(0F);
+    }
+
+
+    private int getSequeByKey(JSONArray metric, String key) {
+        JSONArray columns = metric;
+        int keyIndex = -1;
+        for (int i=0;i<columns.size();i++) {
+            String columnName = columns.getString(i);
+            if (key.equals(columnName)) {
+                keyIndex=i;
+                break;
+            }
+        }
+        return keyIndex;
+    }
+
+    private static Object[] getMetricByKey(JSONObject metric, String key) {
+        JSONArray columns = metric.getJSONArray("columns");
+        int keyIndex = -1;
+        for (int i=0;i<columns.size();i++) {
+            String columnName = columns.getString(i);
+            if (key.equals(columnName)) {
+                keyIndex=i;
+                break;
+            }
+        }
+        JSONArray rows = metric.getJSONArray("rows");
+        Object[] objects = new Object[rows.size()];
+        for (int row=0;row<rows.size();row++) {
+            objects[row] = rows.getJSONArray(row).get(keyIndex);
+        }
+        return objects;
+    }
+
+
+
+    /**
+     *
+     * 800,1000,2600 打印效率 = 打印层数 * 打印层厚 * 工作箱长 * 工作箱宽
+     * @param data
+     * @return
+     */
+    private double getDyxl(Map<String, Object> data) {
+        String deviceId = MapUtils.getString(data, "deviceId");
+        return getWorkBoxSize(deviceId).map(workBoxSize -> {
+            float dycs = getFloat(data, "HMI_CurPrintLayer");
+            float dyhd = getFloat(data, "HMI_Thickness");
+            float dyhs = getFloat(data, "HMI_TotalTimeCost");
+            double length = workBoxSize.getLength();
+            double width = workBoxSize.getWidth();
+            logger.error(deviceId+"当前打印层数:{},层厚:{},耗时:{},工作箱长:{},工作箱宽:{}", dycs,dyhd,dyhs,length,width);
+            if (dyhs < 0.01) {
+                return 0f;
+            }
+            Double result = 0d;
+            if(deviceId.startsWith("800") || deviceId.startsWith("1000") || deviceId.startsWith("2600")
+                    || deviceId.startsWith("2600B") || deviceId.startsWith("2500") || deviceId.startsWith("300")|| deviceId.startsWith("1200")){
+                result =(dycs * dyhd * length * width * 0.01) / dyhs;
+                logger.error(deviceId + "打印效率:{}", result);
+                return result.floatValue();
+            }else if (deviceId.startsWith("1800") || deviceId.toLowerCase().startsWith("max")) {
+                result = (dycs * dyhd * length * width * 0.01)  / dyhs;
+                return result.floatValue();
+            } else {
+                result = (dycs * dyhd * length * width * 2 *0.01) /dyhs;
+                return result.floatValue();
+            }
+        }).orElse(0F);
+    }
+
+
+    /**
+     * 根据设备编号查询工作箱尺寸
+     *
+     * @param deviceId 设备编号
+     * @return 工作箱尺寸
+     */
+    private Optional<PrinterWorkBoxSize> getWorkBoxSize(String deviceId) {
+        for (String key : Constants.PRINTER_WORK_BOX_SIZE_MAP.keySet()) {
+            if (deviceId.startsWith(key)) {
+                return Optional.ofNullable(Constants.PRINTER_WORK_BOX_SIZE_MAP.get(key));
+            }
+        }
+
+        return Optional.empty();
+    }
+
+    /**
+     * 从Map中获取浮点数
+     */
+    private float getFloat(
+            Map<String, Object> map,
+            String key) {
+        Object str = map.getOrDefault(key, "0");
+        float value = 0f;
+        if (null != str && !"null".equals(str)) {
+            value = Float.parseFloat(str.toString());
+        }
+
+        return value;
+    }
+
+    public String getString(Object value){
+        if (value != null){
+            return  value.toString();
+        }
+        else
+            return "";
+    }
+    public float getFloat(Object str){
+        float value = 0f;
+        if (str != null) {
+            value = Float.parseFloat(str.toString());
+        }
+        return value;
+    }
+
+
+
+    //工厂级运维报告-开动率、效率、补图率逻辑入口函数
+    public Map<String, Object> getReportBarDataByDevice(PrinterReportDTO printerReportDTO, String tenantId, Map<String,String> printerDeviceRelationData, Map<String, Object> targetmap){
+        Map<String, Object> data = new HashMap<String, Object>();
+        if( printerReportDTO.getStartDate()==null && printerReportDTO.getEndDate()==null ){
+            return data;
+        }
+        Map<String, Object>  dyhsResult = getReportDYHSByDevice(printerReportDTO, tenantId, "",printerDeviceRelationData);
+        Map<String, Object>  dyxlResult = getReportDYXLByDevice(printerReportDTO, tenantId, "",printerDeviceRelationData,targetmap);
+        Map<String, Object>  btlResult = getReportBTLByDevice(printerReportDTO, tenantId, "",printerDeviceRelationData);
+        //星级评价
+        Map<String, Object>  starResult = new HashMap<>(20);
+//        Map<String, Object>  starResult = getReportStarEvaluation(printerReportDTO, tenantId, "",printerDeviceRelationData);
+        if( dyhsResult.isEmpty() ){
+            return data ;
+        }
+        //打印耗时
+        List<Map<String, Object>> dataListDYHS = (List)dyhsResult.get("list");
+        int length = dataListDYHS==null?0:dataListDYHS.size();
+        String[] xListDYHS = new String[length];//开动率设备结果集(x轴)
+        List<String> dyhsList = new ArrayList<String>();//开动率
+        for( int i=0; i<length;i++ ){
+            Map<String, Object> map = (Map)dataListDYHS.get(i);
+
+            xListDYHS[i]= map.get("deviceId").toString();
+            dyhsList.add(map.get("dyhs").toString());
+        }
+        data.put("xListDYHS", xListDYHS);
+        data.put("dyhsList", dyhsList);
+        data.put("avgKdlValue", dyhsResult.get("avgKdlValue"));//平均开动率
+        data.put("minKdlValue", dyhsResult.get("minKdlValue"));//设备最小开动率
+        data.put("minKdlDevice", dyhsResult.get("minKdlDevice"));//最小开动率设备
+
+
+        //打印效率
+        data.put("xListDYXL", dyxlResult.get("xList"));
+        data.put("dyxlList", dyxlResult.get("dyxlList"));
+        data.put("dyxltargetValue", dyxlResult.get("targetValue"));
+        data.put("ratelist", dyxlResult.get("ratelist"));//平均打印效率
+
+        //布图率
+        List<Map<String, Object>> dataListBTL = (List)btlResult.get("list");
+        String[] xListBTL = new String[dataListBTL==null?0:dataListBTL.size()];//布图率设备结果集(x轴)
+        List<String> btlList = new ArrayList<String>();//布图率
+        for( int i=0; dataListBTL!=null && i<dataListBTL.size();i++ ){
+            Map<String, Object> map = (Map)dataListBTL.get(i);
+
+            xListBTL[i]= map.get("deviceId").toString();
+            btlList.add(map.get("btl").toString());
+        }
+        data.put("xListBTL", xListBTL);
+        data.put("btlList", btlList);
+        data.put("avgBtlValue", btlResult.get("avgBtlValue"));//平均空间利用率
+        data.put("minBtlValue", btlResult.get("minBtlValue"));//设备最小空间利用率
+        data.put("minBtlDevice", btlResult.get("minBtlDevice"));//最小空间利用率设备
+
+        //星级评价
+        List<Map<String, Object>> dataListStar = (List)starResult.get("list");
+        int length2 = dataListStar==null?0:dataListStar.size();
+        String[] xListStar = new String[length2];//结果集(x轴)
+        List<String> staryList = new ArrayList<String>();//
+        for( int i=0; i<length2;i++ ){
+            Map<String, Object> map = (Map)dataListStar.get(i);
+            xListStar[i]= map.get("deviceid").toString();
+            staryList.add(map.get("score").toString());
+        }
+        data.put("xListStar", xListStar);
+        data.put("ystarList", staryList);
+        data.put("avgstarValue", starResult.get("avgstarValue"));
+        data.put("top3DeviceStar", starResult.get("top3Device"));
+        data.put("end3DeviceStar", starResult.get("end3Device"));
+
+        return data;
+    }
+
+    //产线-打印耗时
+    public Map<String, Object> getReportDYHSByDevice(PrinterReportDTO printerReportDTO, String tenantId, String pUid, Map<String,String> printerDeviceRelationData){
+        Map<String, Object> result = new HashMap<String, Object>();
+        if( printerReportDTO.getStartDate()==null && printerReportDTO.getEndDate()==null ){
+            return result;
+        }
+
+        List<Map<String, Object>> list = printerEfficiencyWorkDao.getReportDYHSByDevice(printerReportDTO);
+        if( list==null || list.size()==0 ){
+            return result;
+        }
+        list = PlatformDeviceTransUtil.repalceDevice(printerDeviceRelationData, list);
+
+        // 数据结果转换成前台需要的格式[#打印机开动率 dyhs  布图率 btl	打印效率 dyxl		开动率=打印时间/(21*28)	]
+        List<Map<String, Object>> dataList = list.stream().map(item -> {
+            Map<String, Object> map = new HashMap<>(3);
+
+            int jsTime = 21*28*12 ;//默认按年查询
+            if( printerReportDTO.getQueryedType()==1 ){//按周查询
+                jsTime = 21*7 ;
+            }else if(printerReportDTO.getQueryedType()==3){//按季度查询
+                jsTime = 21*28*3 ;
+            }else if(printerReportDTO.getQueryedType()==2){//按月查询
+                jsTime = 21*28 ;
+            }else if(printerReportDTO.getQueryedType()==5){//按时间段
+                int day = 1;
+                try {
+                    day = DateUtils.getDayDifference(printerReportDTO.getStartDate(), printerReportDTO.getEndDate());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                jsTime = 21*day ;
+            }
+
+            float dyhs = Float.parseFloat(item.getOrDefault("dyhs", "0").toString());
+            map.put("dyhs", String.format("%.4f", dyhs / jsTime));
+
+            map.put("deviceId", item.get("device_id"));
+            return map;
+        }).collect(Collectors.toList());
+
+        //计算平均值
+        int jsTime = 21*28*12 ;//默认按年查询
+        if( printerReportDTO.getWeek()!=null && printerReportDTO.getWeek()>0 ){//按周查询
+            jsTime = 21*7 ;
+        }else if(printerReportDTO.getQuarter()!=null && printerReportDTO.getQuarter()>0){//按季度查询
+            jsTime = 21*28*3 ;
+        }else if(printerReportDTO.getMonth()!=null && printerReportDTO.getMonth()>0){//按月查询
+            jsTime = 21*28 ;
+        }
+
+        float total_dyhs=0;
+        String ave_dyhs="0.00";
+        Float minKdlValue = null; //设备最小开动率
+        String minKdlDevice = ""; //最小开动率设备
+        Map<String, Map<String, Object>> deviceMap = new HashMap<String, Map<String, Object>>();
+        Map<String, Map<String, Object>> deviceTypeMap = new HashMap<String, Map<String, Object>>();
+        logger.info("开动率结果：{}", JSON.toJSONString(dataList == null?"":dataList));
+        for( Map<String, Object> item : dataList ){
+
+            float dyhs = Float.parseFloat(item.getOrDefault("dyhs", "0").toString());
+
+            String device = item.get("deviceId").toString();
+
+            if(minKdlValue==null || minKdlValue > dyhs) {
+                minKdlValue = dyhs;
+                minKdlDevice = device;
+            }
+
+            total_dyhs += dyhs;
+        }
+        if( dataList!=null && dataList.size()>0 ){
+            ave_dyhs =  String.format("%.4f", total_dyhs/dataList.size());
+        }
+        Map<String, Object> ave_map = new HashMap<String, Object>();
+        ave_map.put("dyhs", ave_dyhs);
+        ave_map.put("deviceId", "平均值");
+        dataList.add(ave_map);
+
+        result.put("list", dataList);
+        result.put("avgKdlValue", ave_dyhs);//平均开动率
+        result.put("minKdlValue", minKdlValue==null?0F:minKdlValue);
+        result.put("minKdlDevice", minKdlDevice);
+
+        return result;
+    }
+    //产线-打印效率
+    public Map<String, Object> getReportDYXLByDevice(PrinterReportDTO printerReportDTO, String tenantId, String pUid, Map<String,String> printerDeviceRelationData, Map<String, Object> targetmap){
+        Map<String, Object> result = new HashMap<String, Object>();
+        if( printerReportDTO.getStartDate()==null && printerReportDTO.getEndDate()==null ){
+            return result;
+        }
+
+        List<Map<String, Object>> list = printerEfficiencyWorkDao.getReportDYXLByDevice(printerReportDTO);
+        if( list==null || list.size()==0 ){
+            return result;
+        }
+        list = PlatformDeviceTransUtil.repalceDevice(printerDeviceRelationData, list);
+
+        // 数据结果转换成前台需要的格式[#打印效率 dyxl]
+        List<Map<String, Object>> dataList = list.stream().map(item -> {
+            Map<String, Object> map = new HashMap<>(3);
+
+            float dyxl = Float.parseFloat(item.getOrDefault("dyxl", "0").toString());
+            map.put("dyxl", String.format("%.2f", dyxl));
+
+            map.put("deviceId", item.get("device_id"));
+
+            return map;
+        }).collect(Collectors.toList());
+
+        //从配置表中获取
+        Optional<ConfigVO> configVOOptional = configService.findOne(PRINTER_DEVICE_TYPE);
+        if (!configVOOptional.isPresent()) {
+            logger.error("{}配置项不存在", PRINTER_DEVICE_TYPE);
+        }
+        String deviceTypes = configVOOptional.get().getValue();
+
+        return  PlatformDeviceTransUtil.groupByDeviceType(deviceTypes.split(","), dataList, targetmap);
+    }
+    //产线-补图率
+    public Map<String, Object> getReportBTLByDevice(PrinterReportDTO printerReportDTO, String tenantId, String pUid, Map<String,String> printerDeviceRelationData){
+        Map<String, Object> result = new HashMap<String, Object>();
+        if( printerReportDTO.getStartDate()==null && printerReportDTO.getEndDate()==null ){
+            return result;
+        }
+
+        List<Map<String, Object>> list = printerEfficiencyWorkDao.getReportBTLByDevice(printerReportDTO);
+        if( list==null || list.size()==0 ){
+            return result;
+        }
+        list = PlatformDeviceTransUtil.repalceDevice(printerDeviceRelationData, list);
+
+        // 数据结果转换成前台需要的格式[#打印机布图率 btl]
+        List<Map<String, Object>> dataList = list.stream().map(item -> {
+            Map<String, Object> map = new HashMap<>(3);
+
+            float btl = Float.parseFloat(item.getOrDefault("btl", "0").toString());
+            map.put("btl", String.format("%.4f", btl));
+            map.put("deviceId", item.get("device_id"));
+
+            return map;
+        }).collect(Collectors.toList());
+
+        float total_btl=0;
+        String ave_btl="0.00";
+        Float minBtlValue = null; //设备最小率
+        String minBtlDevice = ""; //最小设备
+        logger.info("空间利用率结果：{}", JSON.toJSONString(dataList == null?"":dataList));
+        for( Map<String, Object> item : list ){
+            String device = item.get("device_id").toString();
+
+
+            float btl = Float.parseFloat(item.getOrDefault("btl", "0").toString());
+
+            if(minBtlValue==null || minBtlValue > btl) {
+                minBtlValue = btl;
+                minBtlDevice = device;
+            }
+            total_btl += btl ;
+        }
+        if( list!=null && list.size()>0 ){
+            ave_btl =  String.format("%.4f", total_btl/list.size());
+        }
+        Map<String, Object> ave_map = new HashMap<String, Object>();
+        ave_map.put("btl", ave_btl);
+        ave_map.put("deviceId", "平均值");
+        dataList.add(ave_map);
+
+        result.put("list", dataList);
+        result.put("avgBtlValue", ave_btl);//平均
+        result.put("minBtlValue", minBtlValue==null?0f:minBtlValue);
+        result.put("minBtlDevice", minBtlDevice);
+        return result;
+    }
+    //产线-星级评价
+    public Map<String, Object> getReportStarEvaluation(PrinterReportDTO printerReportDTO, String tenantId, String pUid, Map<String,String> printerDeviceRelationData){
+        Map<String, Object> result = new HashMap<String, Object>();
+        if( printerReportDTO.getStartDate()==null && printerReportDTO.getEndDate()==null ){
+            return result;
+        }
+        //取当前设备的数据
+        double d1 = 0;
+        double d1_weight = 0;
+        double d2 =0;
+        double d2_weight = 0;
+        double d3 =0;
+        double d3_weight = 0;
+        double d4 =0;
+        double d4_weight = 0;
+        double d5 =0;
+        double d5_weight = 0;
+        double d6 =0;
+        double d6_weight = 0;
+        double d7 =0;
+        double d7_weight = 0;
+        double d8 =0;
+        double d8_weight = 0;
+        double endD =0;
+
+        Map<String, Object> query = new HashMap<String, Object>();
+        query.put("officeid", printerReportDTO.getOfficeId());
+        query.put("data_year", printerReportDTO.getYear());
+        query.put("data_month", printerReportDTO.getMonth());
+        String officeid =printerReportDTO.getOfficeId();
+        String data_year =printerReportDTO.getYear().toString();
+        String data_month = printerReportDTO.getMonth().toString();
+
+        List<RepMttDataVO> listAlls = new ArrayList<>();
+        List<Map<String, Object>> dataList = new ArrayList<Map<String, Object>>();
+
+        //可以是指定机构或者全部机构
+        List<Map<String, String>> deviceList = starEvaluateDAO.selectDistinctDeviceList(query);
+        for(int i = 0; i< deviceList.size(); i++)
+        {
+            Map<String, String> map = deviceList.get(i);
+            String cur_device = map.get("deviceid");
+            //取当前设备的数据
+            d1 = 0;
+            d1_weight = 0;
+            d2 =0;
+            d2_weight = 0;
+            d3 =0;
+            d3_weight = 0;
+            d4 =0;
+            d4_weight = 0;
+            d5 =0;
+            d5_weight = 0;
+            d6 =0;
+            d6_weight = 0;
+            d7 =0;
+            d7_weight = 0;
+            d8 =0;
+            d8_weight = 0;
+            endD =0;
+            //1. 不指定机构所有设备 或者  指定机构下的设备
+            List<RepStarEvaluateVO> ListData = starEvaluateDAO.QueryDeviceInfo(officeid,"","5719",data_year,data_month);
+            for(int k = 0; k< ListData.size(); k++)
+            {
+
+                String curdevice  =ListData.get(k).getDeviceid();
+                if(cur_device.equals(curdevice))
+                {
+                    String statistics_type = ListData.get(k).getStatistics_type();
+                    if(statistics_type.equals("GZTJL")) //d1
+                    {
+                        d1 = ListData.get(k).getResult_score().doubleValue();
+                        d1_weight = ListData.get(k).getTarget_weight().doubleValue();
+                    }
+                    if(statistics_type.equals("DYXLLYL")) //d2
+                    {
+                        d2 = ListData.get(k).getResult_score().doubleValue();
+                        d2_weight = ListData.get(k).getTarget_weight().doubleValue();
+                    }
+                    if(statistics_type.equals("FPL")) //d3
+                    {
+                        d3 = ListData.get(k).getResult_score().doubleValue();
+                        d3_weight = ListData.get(k).getTarget_weight().doubleValue();
+                    }
+                    if(statistics_type.equals("CNLYV")) //d4
+                    {
+                        d4 = ListData.get(k).getResult_score().doubleValue();
+                        d4_weight = ListData.get(k).getTarget_weight().doubleValue();
+                    }
+                    if(statistics_type.equals("QDHGL")) //d5
+                    {
+                        d5 = ListData.get(k).getResult_score().doubleValue();
+                        d5_weight = ListData.get(k).getTarget_weight().doubleValue();
+                    }
+                    if(statistics_type.equals("SIZEHGL")) //d6
+                    {
+                        d6 = ListData.get(k).getResult_score().doubleValue();
+                        d6_weight = ListData.get(k).getTarget_weight().doubleValue();
+                    }
+                    if(statistics_type.equals("OUTWARDHGL")) //d7
+                    {
+                        d7 = ListData.get(k).getResult_score().doubleValue();
+                        d7_weight = ListData.get(k).getTarget_weight().doubleValue();
+                    }
+                    if(statistics_type.equals("PRECISIONHGL")) //d8
+                    {
+                        d8 = ListData.get(k).getResult_score().doubleValue();
+                        d8_weight = ListData.get(k).getTarget_weight().doubleValue();
+                    }
+                }
+            }
+            //计算当前设备的最终的评分
+//				endD = d1 * d1_weight + d2 * d2_weight + d3 * d3_weight;
+//            endD = d1  + d2  + d3 ;
+            endD = d1  + d2  + d3 + d4  + d5 + d6 + d7 + d8 ;
+            //以上计算该机构下所有的设备的评分
+            RepMttDataVO vo = new RepMttDataVO();
+            vo.setName(cur_device);
+            vo.setText(cur_device);
+            vo.setStrValue1("评分");
+            String strScore = String.format("%.2f", endD);
+            vo.setValue11(Double.parseDouble(strScore));
+            listAlls.add(vo);
+
+//            Map<String, Object> data = new HashMap<String, Object>();
+//            data.put("deviceid", cur_device);
+//            data.put("score", Double.parseDouble(strScore));
+//            dataList.add((Map<String, Object>) data);
+        }
+        //前三、后三
+        String top3Device ="";
+        String end3Device ="";
+        listAlls = listAlls.stream().sorted((Comparator.comparingDouble(RepMttDataVO::getValue11).reversed())).collect(Collectors.toList());
+        if(listAlls.size() >0)
+        {
+
+            //从大到小排序
+            for(int i=0;i<listAlls.size();i++)
+            {
+                Map<String, Object> data = new HashMap<String, Object>();
+                data.put("deviceid", listAlls.get(i).getName());
+                data.put("score", listAlls.get(i).getValue11());
+                dataList.add((Map<String, Object>) data);
+                if(i<2)
+                {
+                    top3Device += listAlls.get(i).getName()+"、";
+                }
+                if(i==2)
+                    top3Device += listAlls.get(i).getName();
+
+                if(i>=listAlls.size()-3 && i<listAlls.size()-1)
+                    end3Device += listAlls.get(i).getName()+"、";
+                if(i==listAlls.size()-1)
+                    end3Device += listAlls.get(i).getName();
+            }
+        }
+
+        float total_score=0;
+        int hasscore=0;
+        for( Map<String, Object> item : dataList ){
+
+            float score = Float.parseFloat(item.getOrDefault("score", "0").toString());
+            String device = item.get("deviceid").toString();
+            total_score += score;
+
+            if(score !=0.0)
+                hasscore++;
+        }
+        String ave_score="0.00";
+        if( dataList!=null && dataList.size()>0 ){
+            ave_score =  String.format("%.2f", total_score / hasscore);  //平均评分
+        }
+        Map<String, Object> ave_map = new HashMap<String, Object>();
+        ave_map.put("score", ave_score);
+        ave_map.put("deviceid", "平均值");
+        dataList.add(ave_map);
+
+        result.put("list", dataList);
+        result.put("avgstarValue", ave_score);//平均得分
+        result.put("top3Device", top3Device);
+        result.put("end3Device", end3Device);
+        return result;
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepCustomerServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepCustomerServiceImpl.java
new file mode 100644
index 0000000..30f49c5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepCustomerServiceImpl.java
@@ -0,0 +1,94 @@
+package com.rootcloud.service.impl;
+
+
+import com.rootcloud.common.JsonResult2;
+import com.rootcloud.domain.dao.CustomerDao;
+import com.rootcloud.domain.dao.NxDeviceDao;
+import com.rootcloud.domain.vo.CustomerVO;
+import com.rootcloud.domain.vo.DeviceListVO;
+import com.rootcloud.service.RepCustomerService;
+import com.rootcloud.service.condition.QueryUserReportCondition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Service("customerServices")
+public class RepCustomerServiceImpl implements RepCustomerService {
+
+    private static final Logger logger = LoggerFactory.getLogger(PrinterEfficiencyServiceImpl.class);
+
+    @Autowired
+    private CustomerDao nxCustomerDao;
+    @Autowired
+    private NxDeviceDao nxDeviceDao;
+
+
+    //获取所有客户信息列表
+    public JsonResult2 getAllCustomerList(String tenantId) throws Exception{
+
+        JsonResult2 jsonResult=new JsonResult2();
+        QueryUserReportCondition vo =new QueryUserReportCondition();
+        List<CustomerVO> customers = nxCustomerDao.getAllCustomer(vo);
+        try
+        {
+            if(customers.size() >0)
+            {
+                jsonResult.setData(customers);
+            }
+        }catch (Exception ex){}
+        return  jsonResult;
+    }
+
+
+    //查询指定客户(机构)下所有的设备列表
+    public JsonResult2 getCustomerListByUserId(String tenantId, String user_id) throws Exception{
+
+        JsonResult2 jsonResult=new JsonResult2();
+//        CustomerVO vo =new CustomerVO();
+//        vo.setUserCode(user_id);
+        List<CustomerVO> customers = nxCustomerDao.getCustomerListByUserId(user_id);
+        try
+        {
+            if(customers.size() >0)
+            {
+                jsonResult.setData(customers);
+            }
+        }catch (Exception ex){}
+        return  jsonResult;
+    }
+
+
+    //查询指定客户(机构)下所有的设备列表
+    public JsonResult2 getDeviceListByCustomerCode(String tenantId, String officeId) throws Exception{
+
+        JsonResult2 jsonResult=new JsonResult2();
+        List<DeviceListVO> deviceList = nxDeviceDao.getDeviceListByCustomerId(officeId, tenantId);
+        if(deviceList!=null && deviceList.size()>0){
+            jsonResult.setData(deviceList);
+        }
+        return  jsonResult;
+    }
+
+    //查询指定客户(机构)下所有的设备编号列表
+    public JsonResult2 getDeviceCodeListByCustomerCode(String tenantId, String officeId) throws Exception{
+
+        JsonResult2 jsonResult=new JsonResult2();
+        List<String> officeIds = new ArrayList<>(Arrays.asList(officeId));
+        List<String> deviceCodeList = nxDeviceDao.getDeviceCodeListByCustomerCode(officeIds, tenantId); //查询设备编号（单项）
+        Object[] deviceArray = new String[deviceCodeList.size()];
+        for (int i = 0; i < deviceCodeList.size(); i++) {
+            String[] spString = deviceCodeList.get(i).toString().split("\\s+"); //按照空格分隔
+            deviceArray[i] = spString[0].toString();//截取空格前面的部分
+        }
+        jsonResult.setData(deviceArray);
+        return  jsonResult;
+    }
+
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterReportServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterReportServiceImpl.java
new file mode 100644
index 0000000..6594cc0
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterReportServiceImpl.java
@@ -0,0 +1,2195 @@
+package com.rootcloud.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.github.pagehelper.PageInfo;
+import com.rootcloud.common.*;
+import com.rootcloud.common.enums.HttpRequestMethedEnum;
+import com.rootcloud.common.util.DateUtils;
+import com.rootcloud.common.vo.PrinterWorkBoxSize;
+import com.rootcloud.domain.dao.*;
+import com.rootcloud.domain.vo.*;
+import com.rootcloud.service.*;
+import com.rootcloud.service.condition.QueryUserReportCondition;
+import com.rootcloud.web.dto.ChanNengLiYongLvDto;
+import com.rootcloud.web.dto.GuHuaJiDanHaoDto;
+import com.rootcloud.web.dto.PinJunDaYinGaoDuDto;
+import com.rootcloud.web.dto.PrinterReportDTO;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+//import org.apache.http.client.utils.DateUtils;
+
+@Service("reportService")
+public class RepPrinterReportServiceImpl implements RepPrinterReportService {
+
+    private static final Logger logger = LoggerFactory.getLogger(RepPrinterReportServiceImpl.class);
+    @Autowired
+    private NxDeviceDao nxDeviceDao;
+    @Autowired
+    private CustomerDao nxCustomerDao;
+    @Autowired
+    private RepPrinterSandPercentDAO2 sandDAO;
+    @Autowired
+    private RepPrinterSandPercentDAO repPrinterSandPercentDAO; //打印过程表DAO  产创的设备
+    @Autowired
+    private RepPrinterSandPercentDAO2 repPrinterSandPercentDAO2; //打印过程表DAO 全部设备跑批
+    @Autowired
+    private PrinterEfficiencyWorkDao printerEfficiencyWorkDao;
+
+    @Autowired
+    private RepPrinterReportDAO nxReportDao;
+    @Autowired
+    private RepPrinterReportItemDao repPrinterReportItemDao;
+
+    @Resource(name = "configServices")
+    private ConfigService configService;
+    @Resource(name = "targetService")
+    private RepPrinterTargetDicService repPrinterTargetDicService;
+    @Resource(name = "efficiency")
+    private PrinterEfficiencyService printerEfficiencyService;
+    @Resource(name = "repPrinterServices")
+    private RepPrinterService repPrinterService;
+    @Resource(name = "sandPercentServices")
+    private RepPrinterSandPercentService repPrinterSandPercentService ;
+    @Resource(name = "emailServices")
+    private EmailService emailService;
+    
+    
+    @Autowired
+    private TokenUtil tokenUtil;
+    @Value("${os.iam.domain}")
+    private String reqUrl;
+    public static final String DATE_FORMAT_YYYY_MM_DD = "yyyy-MM-dd HH:mm:ss";
+
+    //用于过滤产创砂密度设置
+    private List<String> CYCXZX_DEVICES = Arrays.asList("2215-18","Max-A","Max-B","Max-C","2215-12","2215-27","2215-7","2215-17","2215-10", "2600A-1",
+            "1800-4","1800-7","1800-8","1800-10","1800-11","1800-12","1800-14","1800-15","1800-16","2500-2","300-2","2215-24",
+            "2215-13","2215-16","2215-19","2500-11");
+
+
+    //跑批产线级过程统计表
+    public void run(Calendar calendar) throws Exception {
+        Integer year = calendar.get(Calendar.YEAR);
+        Integer month = calendar.get(Calendar.MONTH) + 1;
+        Integer day = calendar.get(Calendar.DAY_OF_MONTH);
+
+        LocalDateTime startDatetime = LocalDateTime.of(year,month,day,0,0,0).minusDays(1);
+        LocalDateTime endDatetime = startDatetime.plusDays(2).plusHours(1);
+
+        Optional<ConfigVO> printerDevices = configService.findOne(PRINTER_DEVICE_RELATION);
+        if (!printerDevices.isPresent()) {
+            logger.error("{}配置项不存在", PRINTER_DEVICE_RELATION);
+            throw new Exception(PRINTER_DEVICE_RELATION + "配置项不存在");
+        }
+        //产创的设备
+        List<Map> deviceList = JSONObject.parseArray(printerDevices.get().getValue(),Map.class);
+        /*
+        //DEVICE_SBLX-设备类型CODE --5719    DEVICE_SBLX_NAME-设备类型名称  --3DP打印机
+        NxDeviceVO v = new NxDeviceVO();
+//        v.setDEVICE_SBLX("5719");
+//        v.setDEVICE_SBLX_NAME("3DP打印机");
+        v.setDeviceTypeId("5719");
+        v.setDeviceTypeName("3DP打印机");
+        //1.取出打印机所有的设备编号
+        List<NxDeviceVO> list = nxDeviceDao.getDeviceList(v);
+        */
+        // 对每一个设备型号进行处理
+        List<RepPrinterSandPercentVO> resultList = new ArrayList<>(16);
+
+        for (Map device: deviceList) {
+            Object deviceId = device.get("device");
+            if (deviceId != null) {
+                NxDeviceVO v = new NxDeviceVO();
+                v.setDeviceTypeId("5719");
+                v.setDeviceTypeName("3DP打印机");
+                v.setDeviceCode(deviceId.toString());
+                List<NxDeviceVO> list1 = nxDeviceDao.getDeviceById(v); //返回只有一条记录
+
+                if(list1.size() >0){
+                    String deviceTypeId = list1.get(0).getDeviceTypeId();
+                    deviceId =  list1.get(0).getDeviceCode();
+                    String modelId = list1.get(0).getModeID();
+                    String thingId = list1.get(0).getThingID();
+                    resultList.addAll(processResultByGK(LocalDate.of(year,month,day), startDatetime, endDatetime,
+                            deviceTypeId,deviceId.toString().trim(),modelId,thingId));
+                }
+            }
+        }
+/*
+        for(int i=0;i<list.size();i++)
+        {
+//            String deviceCode=list.get(i).getDEVICE_SBBM();
+//            String modelId=list.get(i).getMODEL_ID();
+//            String thingId=list.get(i).getNX_JE_DEVICE_ID();
+            String deviceId=list.get(i).getDeviceCode();
+            String modelId=list.get(i).getModeID();
+            String thingId=list.get(i).getThingID();
+            String deviceTypeId=list.get(i).getDeviceTypeId();
+
+            resultList.addAll(processResultByGK(LocalDate.of(year,month,day), startDatetime, endDatetime,
+                    deviceTypeId,deviceId.toString().trim(),modelId,thingId));
+        }
+        */
+        if (CollectionUtils.isEmpty(resultList)) {
+            return;
+        }
+
+        logger.info("统计打印机工况数据结果 {}-{}-{} size：{}", year,month,day,resultList==null?"0":resultList.size());
+        List<RepPrinterSandPercentVO> saveResultList = resultList.stream()
+                .filter(x->year.equals(x.getDataYear()) && month.equals(x.getDataMonth()) && day.equals(x.getDataDay()))
+                .collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(saveResultList)) {
+            logger.info("统计打印机工况数据结果爲空");
+            return;
+        }
+        logger.info("统计打印机工况数据结果待保存的 {}-{}-{} size：{}", year,month,day,saveResultList==null?"0":saveResultList.size());
+        //将计算的结果存储到结果表中去，需要将之前的数据清空
+        repPrinterSandPercentDAO.clear(year, month, day);
+        repPrinterSandPercentDAO.batchAdd(saveResultList, year, month, day);
+    }
+
+    //跑批所有单台机过程统计表
+    public void run1(Calendar calendar) throws Exception {
+        Integer year = calendar.get(Calendar.YEAR);
+        Integer month = calendar.get(Calendar.MONTH) + 1;
+        Integer day = calendar.get(Calendar.DAY_OF_MONTH);
+
+        LocalDateTime startDatetime = LocalDateTime.of(year,month,day,0,0,0).minusDays(1);
+        LocalDateTime endDatetime = startDatetime.plusDays(2).plusHours(1);
+
+        //DEVICE_SBLX-设备类型CODE --5719    DEVICE_SBLX_NAME-设备类型名称  --3DP打印机
+        NxDeviceVO v = new NxDeviceVO();
+//        v.setDEVICE_SBLX("5719");
+//        v.setDEVICE_SBLX_NAME("3DP打印机");
+        v.setDeviceTypeId("5719");
+        v.setDeviceTypeName("3DP打印机");
+        //1.取出打印机所有的设备编号
+        List<NxDeviceVO> list = nxDeviceDao.getDeviceList(v);
+        // 对每一个设备型号进行处理
+        List<RepPrinterSandPercentVO> resultList = new ArrayList<>(16);
+        for(int i=0;i<list.size();i++)
+        {
+//            String deviceCode=list.get(i).getDEVICE_SBBM();
+//            String modelId=list.get(i).getMODEL_ID();
+//            String thingId=list.get(i).getNX_JE_DEVICE_ID();
+            String deviceId=list.get(i).getDeviceCode();
+            String modelId=list.get(i).getModeID();
+            String thingId=list.get(i).getThingID();
+            String deviceTypeId=list.get(i).getDeviceTypeId();
+            resultList.addAll(processResultByGK(LocalDate.of(year,month,day), startDatetime, endDatetime,
+                    deviceTypeId,deviceId.toString().trim(),modelId,thingId));
+        }
+        if (CollectionUtils.isEmpty(resultList)) {
+            return;
+        }
+
+        logger.info("统计打印机工况数据结果 {}-{}-{} size：{}", year,month,day,resultList==null?"0":resultList.size());
+        List<RepPrinterSandPercentVO> saveResultList = resultList.stream()
+                .filter(x->year.equals(x.getDataYear()) && month.equals(x.getDataMonth()) && day.equals(x.getDataDay()))
+                .collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(saveResultList)) {
+            logger.info("统计打印机工况数据结果爲空");
+            return;
+        }
+        logger.info("统计打印机工况数据结果待保存的 {}-{}-{} size：{}", year,month,day,saveResultList==null?"0":saveResultList.size());
+        //将计算的结果存储到结果表中去，需要将之前的数据清空
+        repPrinterSandPercentDAO2.clear(year, month, day);
+        repPrinterSandPercentDAO2.batchAdd(saveResultList, year, month, day);
+    }
+
+
+    /**
+     * 处理每一个设备型号
+     *  Timestamp_Local	设备本地数据采集时间
+     *  HMI_JobID	打印编号
+     *	HMI_BeginTime	开始打印时间
+     *	HMI_EndTime	打印结束时间
+     *  HMI_TotalTimeCost 打印耗时
+     *  HMI_CurPrintLayer 当前打印层数
+     *  树脂耗量(SB_BinderCost)
+     *  打印体积(HMI_Volume)
+     *  A砂用量 (SB_MX_ASandLv)
+     *  B砂用量 (SB_MX_BSandLv)
+     *  混砂计数(SB_MX_MixingTimes)
+     *  计算公式：
+     *	树脂加入比 = 树脂用量/（打印体积*1.5 ）
+     *	新旧砂加入占比 = A砂用量 / B砂用量  数据显示用3/7、4/6、5/5这种类型展示数据
+     *	漏砂量=混砂计数*（A砂用量 + B砂用量） - 打印体积*1.5）
+     *
+     *  同一设备 同一打印编码 打印体积最大
+     *
+     */
+    private Collection<RepPrinterSandPercentVO> processResultByGK(
+            LocalDate localDate,
+            LocalDateTime startDatetime,
+            LocalDateTime endDatetime,
+            String deviceTypeId,
+            String deviceId,String modelId,String thingId){
+
+        int from = 0, total = 0;
+        String DATE_FORMAT_YYYY_MM_DD = "yyyy-MM-dd HH:mm:ss";
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern(DATE_FORMAT_YYYY_MM_DD);
+        List<RepPrinterSandPercentVO> resultList = new ArrayList<>(16);
+        Map<String, Map<String, Object>> resultMap = new HashMap<>(16);
+        Map<String, Map<String, Object>> resultMap1 = new HashMap<>(16);
+        List<Map<String, Object>> sortedList = new ArrayList<>();
+
+        Set<String> jobIds = new HashSet<>();
+        float lastVolume = 0f;
+        float lastTotalTimeCost = 0f;
+        String DATE_FORMAT_DAY = "yyyy-MM-dd";
+        DateTimeFormatter dtfDay = DateTimeFormatter.ofPattern(DATE_FORMAT_DAY);
+        String currDate = startDatetime.toLocalDate().format(dtfDay);
+        String today = localDate.format(dtfDay);
+        String yestoday = localDate.minusDays(1).format(dtfDay);
+        String tomorrow = localDate.plusDays(1).format(dtfDay);
+
+        //调用API
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Authorization", "Bearer " + tokenUtil.getToken());
+        String errorPos ="";
+        int sumCount =0;
+        try
+        {
+            DateTimeFormatter dfs = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            String startTime =startDatetime.plusHours(-8).format(dfs);
+            String endTime=   endDatetime.plusHours(-8).format(dfs);
+            startTime = DateUtil.handlerTime(startTime);
+            endTime = DateUtil.handlerTime(endTime);
+
+            //http://openapi.zengcaicloud.com/historian-manage/v1/historian/models/197ZUeGcXkY/things/199DK04jaWA?startTime=2022-05-01T02:30:00.000Z&endTime=2022-05-06T03:20:30.000Z
+            String resp = HttpClientUtil.sendHttp(HttpRequestMethedEnum.HttpGet, reqUrl + "/historian-manage/v1/historian/models/"
+                    + modelId + "/things/" + thingId+""+"?startTime="+startTime+"&endTime="+endTime+"&skip=0&limit=20000", null, headers);
+//            logger.info("平台历史工况接口返回数据：{}", resp);
+            JSONObject jsonObject = JSONObject.parseObject(resp);
+            JSONArray array = jsonObject.getJSONArray("payload");
+            JSONArray colums = array.getJSONObject(0).getJSONArray("columns");
+            JSONArray rows = array.getJSONObject(0).getJSONArray("rows");
+
+            //取出需要分析的属性字段的下标
+            int jobid_serque = getSequeByKey(colums, "HMI_JobID");
+            int time_serque = getSequeByKey(colums, "time");
+            int HMI_TotalLayer_seq = getSequeByKey(colums, "HMI_TotalLayer");
+            int HMI_CurPrintLayer_seq = getSequeByKey(colums, "HMI_CurPrintLayer");
+            int HMI_Volume_seq = getSequeByKey(colums, "HMI_Volume");
+            int HMI_Thicknessr_seq = getSequeByKey(colums, "HMI_Thickness");
+            int HMI_TotalTimeCost_seq = getSequeByKey(colums, "HMI_TotalTimeCost");
+            int HMI_BeginTime_req = getSequeByKey(colums, "HMI_BeginTime");
+            int HMI_EndTime_req = getSequeByKey(colums, "HMI_EndTime");
+//            int GK_SC_DY_BeginTime_req= getSequeByKey(colums, "GK_SC_DY_BeginTime");
+//            int GK_SC_DY_EndTime_req = getSequeByKey(colums, "GK_SC_DY_EndTime");
+            int SB_BinderCost_req= getSequeByKey(colums, "SB_BinderCost"); //树脂耗量
+            int SB_ActivatorCost_req =getSequeByKey(colums, "SB_ActivatorCost"); //固化剂耗量
+            int SB_CleanerCost_req= getSequeByKey(colums, "SB_CleanerCost"); //清洗剂耗量
+            int SB_MX_SandTotal_A_req = getSequeByKey(colums, "SB_MX_SandTotal_A"); //B56 A砂累计用量
+            int SB_MX_SandTotal_B_req = getSequeByKey(colums, "SB_MX_SandTotal_B");  //B57 B砂累计用量
+            int SB_MX_MixingTimes_req =getSequeByKey(colums, "SB_MX_MixingTimes");  //混砂计数
+            int HMI_Binder_add_req = getSequeByKey(colums, "HMI_Binder_add");  //树脂加入量
+            int HMI_LayerCostTime_req = getSequeByKey(colums, "HMI_LayerCostTime");  //打印层耗时  B18
+
+
+//            for (int dx=1;dx< rows.size();dx++)
+//            {
+//                if(dx%20 == 0)
+//                {
+//                    String Timestamp_Local ="";  //当前工况时间
+//                    String UTCtimeStr = getString(rows.getJSONArray(dx).get(time_serque)); //UTC 格式的时间
+//                    Timestamp_Local =  DateUtil.UTCtoBeijing(UTCtimeStr);//UTC转换为北京时间   Timestamp_Local
+//                    logger.info(Timestamp_Local);
+//                }
+//            }
+            //由于4.0工况中某个批次打印结束的阶段，可能会出现打印编号、A砂累计用量 值为空值 出现跳空甚至值为null的情况，为了延续前后两条记录之间是同一批次，
+            // 则要记录上一次有效的数据序号last_idx，以便于前后两条记录之间的比较
+            int last_idx =0;
+            for (int idx=1;idx< rows.size();idx++ ) {
+//                if(idx%10 != 0)  //每间隔10条记录输出一条
+//                {
+//                    continue;
+//                }
+                sumCount++;
+                errorPos = String.valueOf(idx);
+                String cur_HMI_JobID = getString(rows.getJSONArray(idx).get(jobid_serque));//HMI_JobID	打印编号
+                if( StringUtils.isBlank(cur_HMI_JobID))
+                {
+                    continue;
+                }
+                if(idx == 1)
+                    last_idx = 0; //记录上一条有效的记录
+
+    //			if(cur_HMI_JobID.contains("试块") || cur_HMI_JobID.contains("调试")||
+    //					cur_HMI_JobID.contains("测试")|| cur_HMI_JobID.contains("实验")
+    //					|| cur_HMI_JobID.contains("调整"))
+    //			{
+    //				continue;
+    //				//试块、调试的打印任务自动过滤掉
+    //			}
+                //打印体积(HMI_Volume)
+                float HMI_Volume = getFloat(rows.getJSONArray(idx).get(HMI_Volume_seq)); //HMI_Volume
+                //HMI_CurPrintLayer 当前打印层数
+                float HMI_CurPrintLayer = getFloat(rows.getJSONArray(idx).get(HMI_CurPrintLayer_seq)); //HMI_CurPrintLayer
+
+                float HMI_TotalTimeCost = getFloat(rows.getJSONArray(idx).get(HMI_TotalTimeCost_seq));// HMI_TotalTimeCost
+                String last_HMI_JobID = getString(rows.getJSONArray(last_idx).get(jobid_serque)); //idx-1
+                //MapUtils.getString(lastData, "HMI_JobID", MapUtils.getString(data, "GK_SC_DY_JobID"));
+                if( !cur_HMI_JobID.equals(last_HMI_JobID))
+                {
+                    float last_HMI_Volume = getFloat(rows.getJSONArray(last_idx).get(HMI_Volume_seq)); //"HMI_Volume"  前一条  idx-1
+                    float last_HMI_CurPrintLayer = getFloat(rows.getJSONArray(last_idx).get(HMI_CurPrintLayer_seq));// "HMI_CurPrintLayer" 前一条 idx-1
+                    float last_HMI_TotalTimeCost = getFloat(rows.getJSONArray(last_idx).get(HMI_TotalTimeCost_seq)); //"HMI_TotalTimeCost" 前一条 idx-1
+                    if ( HMI_Volume == last_HMI_Volume || HMI_CurPrintLayer ==  last_HMI_CurPrintLayer
+                            ||  HMI_TotalTimeCost == last_HMI_TotalTimeCost)
+                    {
+                        lastVolume = last_HMI_Volume;
+                        lastTotalTimeCost = last_HMI_TotalTimeCost;
+                        last_idx =idx; //记录上一条有效的记录
+                        continue;
+                    }else{
+                        lastVolume = 0;
+                        lastTotalTimeCost = 0;
+                    }
+                }
+                else if( lastVolume == HMI_Volume || lastTotalTimeCost == HMI_TotalTimeCost)
+                {
+                    last_idx =idx; //记录上一条有效的记录
+                    continue;
+                }
+
+                jobIds.add(cur_HMI_JobID);
+                String Timestamp_Local ="";  //当前工况时间
+                String UTCtimeStr = getString(rows.getJSONArray(idx).get(time_serque)); //UTC 格式的时间
+                Timestamp_Local =  DateUtil.UTCtoBeijing(UTCtimeStr);//UTC转换为北京时间   Timestamp_Local
+                String cloudtime = Timestamp_Local;//  MapUtils.getString(data, "cloudtime");
+                String key = Timestamp_Local.substring(0,10) + "-" + cur_HMI_JobID ;//设备编码和打印编码 表示一条打印记录
+                Map<String, Object> hisData = resultMap.computeIfAbsent(cur_HMI_JobID, m -> new HashMap<>(16));
+                Map<String, Object> hisData1 = resultMap1.computeIfAbsent(key, m -> new HashMap<>(16));
+                hisData.put("cloudtime", Timestamp_Local.substring(0,10));
+                hisData1.put("cloudtime", Timestamp_Local.substring(0,10));
+                hisData.put("deviceId", deviceId);
+                hisData.put("HMI_JobID", cur_HMI_JobID);
+                hisData1.put("HMI_JobID", cur_HMI_JobID);
+                hisData.put("GK_SC_DY_JobID", "");
+                hisData.put("Timestamp_Local",Timestamp_Local);
+                hisData.put("HMI_BeginTime", getString(rows.getJSONArray(idx).get(HMI_BeginTime_req)));
+                hisData.put("GK_SC_DY_BeginTime", "");
+                hisData.put("HMI_EndTime", getString(rows.getJSONArray(idx).get(HMI_EndTime_req)));
+                hisData.put("GK_SC_DY_EndTime", "");
+
+                if (HMI_Volume > getFloat(hisData,"HMI_Volume")) {
+                    hisData.put("HMI_Volume",HMI_Volume);
+                }
+                if (HMI_Volume > getFloat(hisData1,"HMI_Volume")) {
+                    hisData1.put("HMI_Volume", HMI_Volume);
+                }
+                if (HMI_TotalTimeCost > getFloat(hisData,"HMI_TotalTimeCost")) {
+                    hisData.put("HMI_TotalTimeCost", HMI_TotalTimeCost);
+                }
+                if (HMI_CurPrintLayer > getFloat(hisData,"HMI_CurPrintLayer")) {
+                    hisData.put("HMI_CurPrintLayer", HMI_CurPrintLayer);
+                }
+                float SB_BinderCost = getFloat(rows.getJSONArray(idx).get(SB_BinderCost_req));// SB_BinderCost
+                float SB_ActivatorCost = getFloat(rows.getJSONArray(idx).get(SB_ActivatorCost_req));// SB_ActivatorCost
+                float SB_CleanerCost = getFloat(rows.getJSONArray(idx).get(SB_CleanerCost_req));// SB_CleanerCost
+
+                if (SB_BinderCost > getFloat(hisData,"SB_BinderCost")) {  //树脂耗量
+                    hisData.put("SB_BinderCost", SB_BinderCost);
+                }
+                if (SB_ActivatorCost > getFloat(hisData,"SB_ActivatorCost")) { //固化剂耗量
+                    hisData.put("SB_ActivatorCost", SB_ActivatorCost);
+                }
+                if (SB_CleanerCost > getFloat(hisData,"SB_CleanerCost")) {  //清洗剂耗量
+                    hisData.put("SB_CleanerCost", SB_CleanerCost);
+                }
+                float SB_MX_SandTotal_A = getFloat(rows.getJSONArray(idx).get(SB_MX_SandTotal_A_req));// B56  A砂累积用量
+                float SB_MX_SandTotal_A_last = getFloat(rows.getJSONArray(last_idx).get(SB_MX_SandTotal_A_req));//  idx-1
+                float SB_MX_SandTotal_B = getFloat(rows.getJSONArray(idx).get(SB_MX_SandTotal_B_req));// B57  B砂累积用量
+                float SB_MX_SandTotal_B_last = getFloat(rows.getJSONArray(last_idx).get(SB_MX_SandTotal_B_req));// idx-1
+                float HMI_CurPrintLayer_last = getFloat(rows.getJSONArray(last_idx).get(HMI_CurPrintLayer_seq)); //HMI_CurPrintLayer  idx-1
+                /*
+                if (last_HMI_JobID.equals(cur_HMI_JobID))
+                {
+                    if ( SB_MX_SandTotal_A >= SB_MX_SandTotal_A_last && HMI_CurPrintLayer >= HMI_CurPrintLayer_last) {
+                        float B56_ALL = SB_MX_SandTotal_A + getFloat(hisData,"B56_SUM_");
+                        hisData.put("B56", B56_ALL);
+                        hisData.put("SB_MX_ASandLv", B56_ALL);//A砂累积用量
+                    }
+                    else if (HMI_CurPrintLayer >= HMI_CurPrintLayer_last  && SB_MX_SandTotal_A <= SB_MX_SandTotal_A_last ) {  // /2
+                        float  B56_SUM_ = getFloat(hisData,"B56_SUM_") + SB_MX_SandTotal_A_last;
+                        hisData.put("B56_SUM_", B56_SUM_);
+                    }
+                    if (SB_MX_SandTotal_B >= SB_MX_SandTotal_B_last && HMI_CurPrintLayer >= HMI_CurPrintLayer_last) {
+                        float B57_ALL = SB_MX_SandTotal_B + getFloat(hisData,"B57_SUM_");
+                        hisData.put("B57", B57_ALL);
+                        hisData.put("SB_MX_BSandLv", B57_ALL);//B砂累积用量
+                    }else if (HMI_CurPrintLayer > HMI_CurPrintLayer_last && SB_MX_SandTotal_B <= SB_MX_SandTotal_B_last ) {   // /2
+                        float  B57_SUM_ = getFloat(hisData,"B57_SUM_") + SB_MX_SandTotal_B_last;
+                        hisData.put("B57_SUM_", B57_SUM_);
+                    }
+                }
+                */
+
+//                hisData.put("B56", SB_MX_SandTotal_A);
+//                hisData.put("SB_MX_ASandLv", SB_MX_SandTotal_A);//A砂累积用量
+//
+//                hisData.put("B57", SB_MX_SandTotal_B);
+//                hisData.put("SB_MX_BSandLv", SB_MX_SandTotal_B);//A砂累积用量
+//                if(cur_HMI_JobID.equals("")&& last_HMI_JobID.equals("X25D21.cli") && SB_MX_SandTotal_A >= 3000 && HMI_CurPrintLayer >=1355){
+//                    String str = "";
+//                }
+                if (last_HMI_JobID.equals(cur_HMI_JobID))
+                {
+//                    if(last_HMI_JobID.equals("X25L07.cli") && HMI_CurPrintLayer == 1559){
+//                        String id ="X25L07.cli";
+//                    }
+//                    if(last_HMI_JobID.equals("X25D21.cli")){
+//                        String id ="X25D21.cli";
+//                    }
+//                    if(last_HMI_JobID.equals("X25D21.cli") && SB_MX_SandTotal_A >= 3000 && HMI_CurPrintLayer >=1355){
+//                        String id ="X25D21.cli";
+//                    }
+                    //if ...比较当前记录和上一条有效记录之间的大小关系，正常的上升情况则记录当前的值为该批次打印任务的最新值
+                    //else...SB_MX_SandTotal_A=0,SB_MX_SandTotal_A_last =3412,则当前记录跳空或者异常，则要把上一条有效值作为该批次打印任务当前的最新值
+                    float sum56 = getFloat(hisData,"B56_SUM_"); //A砂总累计数据
+                    float sum57 = getFloat(hisData,"B57_SUM_"); //B砂总累计数据
+                    if ( SB_MX_SandTotal_A >= SB_MX_SandTotal_A_last && HMI_CurPrintLayer >= HMI_CurPrintLayer_last && SB_MX_SandTotal_A >= sum56) {
+                        float B56_ALL = SB_MX_SandTotal_A + getFloat(hisData,"B56_SUM_");
+                        hisData.put("B56", B56_ALL);
+                        hisData.put("SB_MX_ASandLv", B56_ALL);//A砂累积用量
+                    }else if (HMI_CurPrintLayer >= HMI_CurPrintLayer_last && SB_MX_SandTotal_A < SB_MX_SandTotal_A_last ) {  // /2
+                        float  B56_SUM_ = getFloat(hisData,"B56_SUM_") + SB_MX_SandTotal_A_last;
+                        hisData.put("B56_SUM_", B56_SUM_);
+                    }
+                    if (SB_MX_SandTotal_B >= SB_MX_SandTotal_B_last && HMI_CurPrintLayer >= HMI_CurPrintLayer_last && SB_MX_SandTotal_B >= sum57) {
+                        float B57_ALL = SB_MX_SandTotal_B + getFloat(hisData,"B57_SUM_");
+                        hisData.put("B57", B57_ALL);
+                        hisData.put("SB_MX_BSandLv", B57_ALL);//B砂累积用量
+                    }else if (HMI_CurPrintLayer >= HMI_CurPrintLayer_last && SB_MX_SandTotal_B < SB_MX_SandTotal_B_last ) {   // /2
+                        float  B57_SUM_ = getFloat(hisData,"B57_SUM_") + SB_MX_SandTotal_B_last;
+                        hisData.put("B57_SUM_", B57_SUM_);
+                    }
+                }
+                float SB_MX_MixingTimes = getFloat(rows.getJSONArray(idx).get(SB_MX_MixingTimes_req));//混砂计数
+                float HMI_Binder_add = getFloat(rows.getJSONArray(idx).get(HMI_Binder_add_req));//B58 树脂加入量
+                float HMI_LayerCostTime = getFloat(rows.getJSONArray(idx).get(HMI_LayerCostTime_req));//B18 打印层耗时
+                float HMI_Thickness = getFloat(rows.getJSONArray(idx).get(HMI_Thicknessr_seq));//HMI_Thickness
+
+                if (SB_MX_MixingTimes > 0) {//混砂计数
+                    hisData.put("SB_MX_MixingTimes",SB_MX_MixingTimes);
+                }
+                if (HMI_Binder_add > 0) {  //B58 树脂加入量 --HMI_Binder_add
+                    hisData.put("B58",HMI_Binder_add);
+                }
+                if (HMI_LayerCostTime > 0) {   //B18 层打印耗时 HMI_LayerCostTime
+                    hisData.put("B18",HMI_LayerCostTime);
+                }
+                if (HMI_Thickness > getFloat(hisData,"HMI_Thickness")){  //打印层厚
+                    hisData.put("HMI_Thickness", HMI_Thickness);
+                }
+                hisData.put("cloudtime", cloudtime);
+                last_idx =idx; //记录上一条有效的记录
+                //logger.info("设备编号:"+deviceId+ " |JobID:"+cur_HMI_JobID +" |总层数："+HMI_TotalLayer+" |当前打印层数:"+HMI_CurPrintLayer+" |Beijing-time:"+Timestamp_Local+" |UTC-time:"+time);
+            }
+            //JSONObject rows2 = array.getJSONObject(0).getJSONObject("rows");
+//            List<DeviceHistorySituationVO> deviceHistorySituationVO = callHistoryInterface1(historySituationAO.getDeviceId(), jeDeviceEntity.getModelId(), paramMap);
+//            PageInfo<DeviceHistorySituationVO> deviceHistorySituationVOPageInfo = this.queryPageInfo(skip, limit, deviceHistorySituationVO);
+        }catch (Exception ex)
+        {
+            logger.info(errorPos);
+            logger.error("调用平台查询实时工况信息error", ex);
+        }
+        logger.info("有效取数次数:"+sumCount);
+        List<Map<String,Object>> todayList = resultMap1.values().stream()
+                .filter(x->today.equals(MapUtils.getString(x, "cloudtime"))).collect(Collectors.toList());
+        List<Map<String,Object>> yestodayList = resultMap1.values().stream()
+                .filter(x->yestoday.equals(MapUtils.getString(x, "cloudtime"))).collect(Collectors.toList());
+        List<Map<String,Object>> tomorrowList = resultMap1.values().stream()
+                .filter(x->tomorrow.equals(MapUtils.getString(x, "cloudtime"))).collect(Collectors.toList());
+        Set<String> includeJobIds = new HashSet<>();
+        for (Map<String,Object> todayData: todayList)
+        {
+            String jobId = MapUtils.getString(todayData, "HMI_JobID");
+            boolean include = true;
+            float HMI_Volume = getFloat(todayData, "HMI_Volume");
+            if (yestodayList.stream().anyMatch(x->{
+                if(jobId.equals(MapUtils.getString(x, "HMI_JobID"))&& HMI_Volume <= getFloat(x,"HMI_Volume"))
+                {
+                    return true;
+                }
+                else {
+                    return false;
+                }}))
+            {
+                include=false;
+            }
+            else if (tomorrowList.stream().anyMatch(x->{
+                if(jobId.equals(MapUtils.getString(x, "HMI_JobID"))&& HMI_Volume < getFloat(x,"HMI_Volume"))
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }}))
+            {
+                include=false;
+            }
+            if (include)
+            {
+                includeJobIds.add(jobId);
+            }
+        }
+
+        if( CollectionUtils.isEmpty(includeJobIds) ) {
+            return resultList;
+        }
+        //将结果排序
+        Collection<Map<String, Object>> collection = resultMap.values().stream()
+                .filter(x->includeJobIds.contains(MapUtils.getString(x, "HMI_JobID"))).collect(Collectors.toList());
+        if(logger.isDebugEnabled()){
+            logger.debug("--->collection:{}", JSON.toJSONString(collection));
+        }
+        if( CollectionUtils.isEmpty(collection) ) {
+            return resultList;
+        }
+        int year = localDate.getYear();
+        int month = localDate.getMonthValue();
+        int day = localDate.getDayOfMonth();
+
+        for(Map<String, Object> data: collection)
+        {
+            //打印体积(HMI_Volume)
+            float HMI_Volume = getFloat(data, "HMI_Volume");
+            if (HMI_Volume < 5) {
+                continue;
+            }
+            //HMI_CurPrintLayer 当前打印层数
+            int HMI_CurPrintLayer = 0;
+            try{
+                HMI_CurPrintLayer = new Float(getFloat(data,"HMI_CurPrintLayer")).intValue();
+            }catch(Exception e){}
+            //低于200层的是垃圾数据
+            if( HMI_CurPrintLayer < 200 ){
+                continue;
+            }
+            //A砂累积用量 (SB_MX_ASandLv)
+            float SB_MX_ASandLv = getFloat(data, "SB_MX_ASandLv");
+            //HMI_JobID	打印编号
+            String HMI_JobID = MapUtils.getString(data, "HMI_JobID");
+
+            //HMI_BeginTime	开始打印时间
+            String HMI_BeginTime = MapUtils.getString(data, "HMI_BeginTime", MapUtils.getString(data, "GK_SC_DY_BeginTime"));
+            //HMI_EndTime	打印结束时间
+            String HMI_EndTime = MapUtils.getString(data, "HMI_EndTime", MapUtils.getString(data, "GK_SC_DY_EndTime"));
+            //HMI_TotalTimeCost 打印耗时
+            float HMI_TotalTimeCost = getFloat(data, "HMI_TotalTimeCost");
+
+
+            //树脂耗量(SB_BinderCost)
+            float sB_BinderCost = getFloat(data, "SB_BinderCost");
+
+            //B砂累积用量 (SB_MX_BSandLv)
+            float SB_MX_BSandLv = getFloat(data, "SB_MX_BSandLv");
+            //混砂计数(SB_MX_MixingTimes)
+            float SB_MX_MixingTimes = getFloat(data, "SB_MX_MixingTimes");
+            //树脂加入量
+            float b58 = getFloat(data, "B58");
+            float HMI_Thickness = getFloat(data, "HMI_Thickness");
+            float SB_ActivatorCost = getFloat(data, "SB_ActivatorCost"); //固化剂耗量
+            float SB_CleanerCost = getFloat(data, "SB_CleanerCost"); //清洗剂耗量
+            float b18 = getFloat(data, "B18"); //层打印耗时
+
+            /*
+             *  计算公式：
+             *	树脂加入比 = 树脂用量/（打印体积*1.5 ）
+             *	新砂占比计算公式=A砂累计用量/（A砂累计用量+B砂累计用量）
+             *	漏砂量=混砂计数*（A砂用量 + B砂用量） - 打印体积*1.5）
+             */
+            //gkScDyLsl漏砂量
+            double gkScWsysl =  getWsySL(data);
+            double gkScDyLsl =  getLSL(data,gkScWsysl);
+
+            //gkScDyXjszb新旧砂加入占比
+            String gkScDyXjszb = "0";
+            if (SB_MX_ASandLv+SB_MX_BSandLv > 0.01) {
+                gkScDyXjszb = new DecimalFormat("0.000").format(SB_MX_ASandLv/(SB_MX_ASandLv+SB_MX_BSandLv));
+            }
+
+            RepPrinterSandPercentVO vo = new RepPrinterSandPercentVO(deviceId,deviceTypeId)
+                    .officeId("")
+                    .dataYear(year)
+                    .dataMonth(month)
+                    .dataDay(day)
+                    .gkScDyLsl(BigDecimal.valueOf(gkScDyLsl < 0?0:gkScDyLsl))
+                    .gkScDyWsysl(BigDecimal.valueOf(gkScWsysl < 0?0:gkScWsysl))
+                    .gkScDySxmd(BigDecimal.valueOf(b58)) //树脂加入量
+                    .gkScDyXjszb(gkScDyXjszb)
+                    .sbBindercost(BigDecimal.valueOf(sB_BinderCost))
+                    .sbMxAsandlv(BigDecimal.valueOf(SB_MX_ASandLv))
+                    .sbMxBsandlv(BigDecimal.valueOf(SB_MX_BSandLv))
+                    .sbMxMixingtimes(BigDecimal.valueOf(SB_MX_MixingTimes))
+                    .hmiVolume(BigDecimal.valueOf(HMI_Volume))
+                    .hmiJobid(HMI_JobID)
+                    .hmiBegintime(HMI_BeginTime)
+                    .hmiEndtime(HMI_EndTime)
+                    .hmiTotaltimecost(BigDecimal.valueOf(HMI_TotalTimeCost))
+                    .hmiLayercosttime(BigDecimal.valueOf(b18)) //层打印耗时
+                    .hmiCurprintlayer(HMI_CurPrintLayer)
+                    .hmiThickness(BigDecimal.valueOf(HMI_Thickness))
+                    .sbActivatorcost(BigDecimal.valueOf(SB_ActivatorCost))
+                    .hmiCleanerCost(BigDecimal.valueOf(SB_CleanerCost));
+
+            resultList.add(vo);
+        }
+        return  resultList;
+    }
+
+    public String getString(Object value){
+        if (value != null){
+            return  value.toString();
+        }
+        else
+            return "";
+    }
+    public float getFloat(Object str){
+        float value = 0f;
+        if (str != null) {
+            value = Float.parseFloat(str.toString());
+        }
+        return value;
+    }
+
+
+
+    /**
+     * 未使用砂量=（A砂累计用量+B砂累计用量）-2*打印机工作箱长*工作箱宽*打印层厚*(打印层数+12)*1.5
+     * 以上计算公式为2215、2515、2518、SDream、2218机型的计算公式，Max、1800机型的计算公式中无*2
+     * @param data 工况数据
+     * @return 打印效率
+     */
+    private float getWsySL(Map<String, Object> data) {
+        // 新模型时进行计算，计算逻辑见doc/打印机模型切换需求整理.md
+        String deviceId = MapUtils.getString(data, "deviceId");
+        String jobID = MapUtils.getString(data, "HMI_JobID");
+        final float ratio2 = CYCXZX_DEVICES.contains(deviceId)?1.4f:1.5f;
+        float rat = 0f;
+        //创业中心设备 && 陶粒砂1.5
+        if(jobID.indexOf("陶粒砂") > 0 && CYCXZX_DEVICES.contains(deviceId))
+        {
+            rat = 1.5f;
+        }
+        else
+        {
+            rat = 1.4f;
+        }
+        final float ratio = rat;
+        return getWorkBoxSize(deviceId).map(workBoxSize -> {
+            float dycs = getFloat(data, "HMI_CurPrintLayer");
+            float dyhd = getFloat(data, "HMI_Thickness");
+            float aSandLv = getFloat(data, "SB_MX_ASandLv"); //A砂用量
+            float bSandLv = getFloat(data, "SB_MX_BSandLv"); //B砂用量
+            double length = workBoxSize.getLength();
+            double width = workBoxSize.getWidth();
+            if (aSandLv+bSandLv < 0.01) {
+                return 0f;
+            }
+            Double result = 0d;
+
+            // 2215 2515 2518 2218 SDream 共5类双箱机型
+            if (deviceId.startsWith("2215") || deviceId.startsWith("2515") || deviceId.startsWith("2518")
+                    ||deviceId.startsWith("2218")||deviceId.startsWith("SDream")) {
+                result = (aSandLv + bSandLv ) - ((dycs+12) * dyhd * length * width * 2 * ratio)/100F;
+                return result.floatValue();
+            } else {
+                result = (aSandLv + bSandLv ) - ((dycs+12) * dyhd * length * width * ratio)/100F;
+                return result.floatValue();
+            }
+
+//            if (!deviceId.startsWith("1800") && !deviceId.startsWith("Max")
+//                    && !deviceId.startsWith("800")&& !deviceId.startsWith("1000")&& !deviceId.startsWith("2600")) {
+//                result = (aSandLv + bSandLv ) - ((dycs+12) * dyhd * length * width * 2 * ratio)/100F;
+//                return result.floatValue();
+//            } else {
+//                result = (aSandLv + bSandLv ) - ((dycs+12) * dyhd * length * width * ratio)/100F;
+//                return result.floatValue();
+//            }
+        }).orElse(0F);
+    }
+
+
+    /**
+     * 砂利用率=（混砂用量 - 未使用砂量）/ 混砂用量
+     * @param data 工况数据
+     * @return 打印效率
+     */
+    private float getLSL(Map<String, Object> data,double gkScWsysl) {
+        // 新模型时进行计算，计算逻辑见doc/打印机模型切换需求整理.md
+        Double result = 0d;
+        float aSandLv = getFloat(data, "SB_MX_ASandLv");
+        float bSandLv = getFloat(data, "SB_MX_BSandLv");
+        if (aSandLv + bSandLv < 0.1) {
+            return 0;
+        }
+        result = (aSandLv + bSandLv - gkScWsysl)/(aSandLv + bSandLv);
+        return result.floatValue();
+    }
+
+
+    /**
+     * 根据设备编号查询工作箱尺寸
+     *
+     * @param deviceId 设备编号
+     * @return 工作箱尺寸
+     */
+    private Optional<PrinterWorkBoxSize> getWorkBoxSize(String deviceId) {
+        for (String key : Constants.PRINTER_WORK_BOX_SIZE_MAP_slyl.keySet()) {
+            if (deviceId.startsWith(key)) {
+                return Optional.ofNullable(Constants.PRINTER_WORK_BOX_SIZE_MAP_slyl.get(key));
+            }
+        }
+
+        return Optional.empty();
+    }
+
+    private int getSequeByKey(JSONArray metric, String key) {
+        JSONArray columns = metric;
+        int keyIndex = -1;
+        for (int i=0;i<columns.size();i++) {
+            String columnName = columns.getString(i);
+            if (key.equals(columnName)) {
+                keyIndex=i;
+                break;
+            }
+        }
+        return keyIndex;
+    }
+
+
+    /**
+     * 从Map中获取浮点数
+     */
+    private float getFloat(
+            Map<String, Object> map,
+            String key) {
+        Object str = map.getOrDefault(key, "0");
+        float value = 0f;
+        if (null != str && !"null".equals(str)) {
+            value = Float.parseFloat(str.toString());
+        }
+        return value;
+    }
+
+
+    public void createUserReportV2(QueryUserReportCondition c) throws Exception{
+
+        String param = JSON.toJSONString(c);
+        logger.info("method : createUserReport,  param : "+ param);
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        //获得客户信息
+        List<CustomerVO> customers = nxCustomerDao.getAllCustomer(c);
+        if(customers==null || customers.size()==0) {
+            logger.info("未查询到客户信息，生成打印机用户报告失败，请联系管理员！！！");
+            return;
+        }
+        logger.info("method : createUserReport,  param : "+ param+" customers.size="+customers.size());
+        //查询报表各个指标目标值
+        Map<String, Object> targetmap = new HashMap<String, Object>();
+        List<RepPrinterTargetDicVO> targets = repPrinterTargetDicService.groupByPrinterTargetDic();
+
+        //从配置表中获取平台设备编码及用户设备编码关系，加载 配置表中的关系
+        Map<String,String>	printerDeviceRelationData =	getPrinterDeviceRelation();
+        logger.info("method : createUserReport,  param : "+ param+" printerDeviceRelationData="+printerDeviceRelationData);
+
+        Date now = new Date();
+        String md = DateUtil.format(now, "MM-dd");
+        String d = DateUtil.format(now, "dd");
+        int day = now.getDay();//周几
+
+        //系统当前时间
+        Calendar calendar = Calendar.getInstance();
+        calendar.setFirstDayOfWeek(Calendar.MONDAY);//设置星期一为一周开始的第一天
+        calendar.setTimeInMillis(System.currentTimeMillis());//获得当前的时间戳
+        int year = calendar.get(Calendar.YEAR);//获得当前的年
+        int month = calendar.get(Calendar.MONTH)+1;//获得当前的月
+        int weekOfYear = calendar.get(Calendar.WEEK_OF_YEAR);//获得当前日期属于今年的第几周
+
+        String startDate = c.getStartDt();
+        String endDate = c.getEndDt() ;
+        int createType = c.getCreateType()==null?5:c.getCreateType() ;
+        int dataYear = c.getDataYear()==null?0:c.getDataYear() ;
+        int dataQuarter = c.getDataQuarter()==null?0:c.getDataQuarter();
+        int dataMonth = c.getDataMonth()==null?0:c.getDataMonth();
+        int dataWeek = c.getDataWeek()==null?0:c.getDataWeek() ;
+        if( StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate) ){
+            logger.info("method : createUserReport, 指定开始日期结束日期，生成该时间段数据. startDate:"+startDate+"  endDate:"+endDate);
+            c.setCreateType(5);
+        }else{
+            logger.info("method : createUserReport,根据系统时间生成报告");
+        }
+
+        List<RepPrinterReportVO> reports = new ArrayList<RepPrinterReportVO>();
+        for(CustomerVO customer : customers) {
+            if(c.getCreateCustomerCode()!=null && !c.getCreateCustomerCode().equals(customer.getCustomerCode())) {
+                logger.info("method : createUserReport,  param : create customer code="+ c.getCreateCustomerCode() +" customer code ="+customer.getCustomerCode());
+                continue;
+            }
+//            if(StringUtils.isBlank(customer.getOfficeId())) {
+//                logger.info("method : createUserReport,  param : customer code ="+customer.getCustomerCode()+" officeId is null");
+//                continue;
+//            }
+            for(RepPrinterTargetDicVO v : targets.stream().filter(
+                    x->customer.getCustomerCode().equals(x.getCustomerId())).collect(Collectors.toList())) {
+                String key = v.getStatisticsType();
+                if(!targetmap.containsKey(key)) {
+                    targetmap.put(key, v);
+                }
+            }
+            logger.info("method : createUserReport,  param : "+ param+" targetmap="+targetmap);
+            //CreateType 1为周，2为月，3为季，4为年 5指定时间段 (生成报告)
+            if(c.getCreateType()==5) {
+                Map<String, Object> query = new HashMap<String, Object>();
+                query.put("customerId", customer.getCustomerCode());
+                query.put("startDate", c.getStartDt());
+                query.put("endDate", c.getEndDt());
+                logger.info("getPrinterUserReports select date query="+query.toString());
+                RepPrinterReportVO v = createPrinterUserReport( targetmap, customer,  5,  year,  null,  month,
+                        weekOfYear-1, c.getStartDt(), c.getEndDt(), printerDeviceRelationData);
+                reports.add(v);
+                continue;
+            }
+
+        }
+    }
+
+    private RepPrinterReportVO createPrinterUserReport(Map<String, Object> targetmap, CustomerVO c, Integer type, Integer year, Integer quarter, Integer month, Integer week, String startDate, String endDate,Map<String, String> printerDeviceRelationData) throws Exception {
+        RepPrinterReportVO vo = new RepPrinterReportVO();
+        DecimalFormat df =new DecimalFormat("0.0");
+        vo.setEmails(null);
+        String reportType = year+"年"+week+"周";
+        if(type == 1) {
+            //默认周
+        } else if(type == 2) {
+            reportType = year+"年"+month+"月";
+        }else if(type == 3) {
+            reportType = year+"年"+quarter+"季";
+        }else if(type==4) {
+            reportType = year+"年";
+        }  else if(type == 5) {
+            reportType = startDate+"至"+endDate;
+        }
+        String title = c.getCustomerName()+reportType+"打印机运维报告";
+        vo.setTitle(title);
+        vo.setCreateType(type);
+        vo.setTenantId(c.getTenantId());
+        vo.setCustomerId(c.getCustomerCode());
+        vo.setCustomerName(c.getCustomerName());
+//        vo.setOfficeId(c.getOfficeId());
+//        vo.setOfficeName(c.getOfficeName());
+        vo.setOfficeId(c.getCustomerCode());
+        vo.setOfficeName(c.getCustomerName());
+        vo.setDataYear(year);
+        vo.setDataQuarter(quarter);
+        vo.setDataMonth(month);
+        vo.setDataWeek(week);
+        vo.setStartDate(startDate);
+        vo.setEndDate(endDate);
+
+        JSONArray dicArray = new JSONArray();
+        for (Map.Entry<String, Object> entry : targetmap.entrySet()) {
+            JSONObject json = new JSONObject();
+            String key = entry.getKey();
+            RepPrinterTargetDicVO dic = (RepPrinterTargetDicVO) entry.getValue();
+            json.put("statistics_type", key);
+            json.put("target_value", dic.getTargetValue());
+            json.put("target_show", dic.getTargetShow());
+            json.put("start_date", DateUtils.formatDate(dic.getStartDate()));
+            json.put("end_date", DateUtils.formatDate(dic.getEndDate()));
+            dicArray.add(json);
+        }
+        vo.setTargetValues(dicArray.toJSONString());
+
+        PrinterReportDTO printerReportDTO = setPrinterReportDTO(c, vo);
+        if (CollectionUtils.isEmpty(printerReportDTO.getDeviceIdList())) {
+            logger.info("未找到此客户的设备列表,结束报告创建。");
+            return null;
+        }
+        String reportParam = JSON.toJSONString(printerReportDTO);
+        logger.info("method : createPrinterUserReport-printerEfficiencyService.getReportBarDataByDevice ,  param : "+reportParam);
+        //打印机效率（开动率/布图率打印效率）
+        Map<String, Object> efficiencyData = printerEfficiencyService.getReportBarDataByDevice(printerReportDTO, c.getTenantId(),printerDeviceRelationData,targetmap);
+        logger.info("method : createPrinterUserReport-printerEfficiencyService.getReportBarDataByDevice ,  param : "+reportParam+" res="+efficiencyData);
+        String avgKdlValue = "0", minKdlDevice="", ratelist = "";
+        String avgBtlValue = "0", minBtlDevice="";
+        Float minKdlValue = 0F;
+        Float minBtlValue = 0F;
+        Double dyhsTargetValue = null;
+        Double btlTargetValue = null;
+        String avgStarValue = ""; //星级评价均分
+        String top3DeviceStar = ""; //星级评价最高分3台设备
+        String end3DeviceStar = ""; //星级评价最低分3台设备
+        if( !efficiencyData.isEmpty() ){
+            avgStarValue =  efficiencyData.get("avgstarValue")==null?"":efficiencyData.get("avgstarValue").toString();//星级评价平均分
+            top3DeviceStar =  efficiencyData.get("top3DeviceStar")==null?"":efficiencyData.get("top3DeviceStar").toString();
+            end3DeviceStar =  efficiencyData.get("end3DeviceStar")==null?"":efficiencyData.get("end3DeviceStar").toString();
+            avgKdlValue = efficiencyData.get("avgKdlValue")==null?"":efficiencyData.get("avgKdlValue").toString();//平均开动率
+            minKdlValue = efficiencyData.get("minKdlValue")==null?0F:Float.parseFloat(efficiencyData.get("minKdlValue").toString());//设备最小开动率
+            minKdlDevice = (String) efficiencyData.get("minKdlDevice");//最小开动率设备
+            avgBtlValue = efficiencyData.get("avgBtlValue")==null?"0":efficiencyData.get("avgBtlValue").toString();//平均空间利用率
+            minBtlValue = efficiencyData.get("minBtlValue")==null?0F:Float.parseFloat(efficiencyData.get("minBtlValue").toString());//设备最小空间利用率
+            minBtlDevice = (String) efficiencyData.get("minBtlDevice");//最小空间利用率设备
+            ratelist = (String) efficiencyData.get("ratelist");//平均打印效率
+
+            RepPrinterTargetDicVO SBKDL = (RepPrinterTargetDicVO) targetmap.get("SBKDL");
+            RepPrinterTargetDicVO BTL = (RepPrinterTargetDicVO) targetmap.get("BTL");
+
+            try{
+                dyhsTargetValue = Double.parseDouble( df.format(SBKDL.getTargetValue()) );
+            }catch(Exception e){}
+            try{
+                btlTargetValue = Double.parseDouble( df.format(BTL.getTargetValue()) );
+            }catch(Exception e){}
+
+            String[] xListDYHS = (String[])efficiencyData.get("xListDYHS");
+            if( xListDYHS!=null && xListDYHS.length>0 ){
+                List<String> dyhsList = (List<String>)efficiencyData.get("dyhsList");//开动率
+
+                //设备开动率统计
+                Map<String, Object> dyhsData = new HashMap<String, Object>();
+                dyhsData.put("xList", xListDYHS);
+                dyhsData.put("dyhsList", dyhsList);
+                dyhsData.put("targetValue", dyhsTargetValue);
+                vo.setData1( JSONObject.toJSONString(dyhsData) );
+            }
+
+            List<String> xListDYXL = (List<String>)efficiencyData.get("xListDYXL");
+            if( xListDYXL!=null && xListDYXL.size()>0 ){
+                List<String> dyxlList = (List<String>)efficiencyData.get("dyxlList");//打印效率
+                //打印效率
+                Map<String, Object> dyxlData = new HashMap<String, Object>();
+                dyxlData.put("xList", xListDYXL);
+                dyxlData.put("dyxlList", dyxlList);
+                dyxlData.put("targetValue", efficiencyData.get("dyxltargetValue"));
+                vo.setData3( JSONObject.toJSONString(dyxlData) );
+            }
+
+
+            String[] xListBTL = (String[])efficiencyData.get("xListBTL");
+            if( xListBTL!=null && xListBTL.length>0 ){
+                List<String> btlList = (List<String>)efficiencyData.get("btlList");//布图率
+                //布图率
+                Map<String, Object> btlData = new HashMap<String, Object>();
+                btlData.put("xList", xListBTL);
+                btlData.put("btlList", btlList);
+                btlData.put("targetValue", btlTargetValue);
+                vo.setData2( JSONObject.toJSONString(btlData) );
+            }
+
+        }
+
+        logger.info("method : createPrinterUserReport-repPrinterService.sumDeviceProductWasteData ,  param : "+reportParam);
+        Map<String, Object> deviceProductWasteData = repPrinterService.sumDeviceProductWasteData(printerReportDTO, c.getTenantId(),printerDeviceRelationData);
+        logger.info("method : createPrinterUserReport-repPrinterService.sumDeviceProductWasteData ,  param : "+reportParam+" res="+deviceProductWasteData);
+        String avgFpl = "0", avgDevFpl = "0", top3DevfplDevices = "";
+        Double valueMaker = null;
+        if( !deviceProductWasteData.isEmpty() ){
+            String[] categories4 = (String[]) deviceProductWasteData.get("deviceArray");
+            Object[] clArray  = (Object[]) deviceProductWasteData.get("clArray");
+            Object[] hglArray  = (Object[]) deviceProductWasteData.get("hglArray");
+            Object[] fplArray  = (Object[]) deviceProductWasteData.get("fplArray");
+            Object[] devfplArray  = (Object[]) deviceProductWasteData.get("devfplArray");
+
+            avgFpl = (String) deviceProductWasteData.get("avgFpl");
+            avgDevFpl = (String) deviceProductWasteData.get("avgDevFpl");
+            top3DevfplDevices = (String) deviceProductWasteData.get("top3DevfplDevices");
+
+            RepPrinterTargetDicVO FPL = (RepPrinterTargetDicVO) targetmap.get("FPL");
+            try{
+                //valueMaker = Double.parseDouble( df.format(FPL.getTargetValue()) );
+                valueMaker = FPL.getTargetValue().doubleValue();
+            }catch(Exception e){}
+
+            //合格率
+            Map<String, Object> jsonData = new HashMap<String, Object>();
+            jsonData.put("xArray", categories4);
+            jsonData.put("clArray", clArray);
+            jsonData.put("hglArray", hglArray);
+            jsonData.put("fplArray", fplArray);
+            jsonData.put("devfplArray", devfplArray);
+            jsonData.put("targetValue", valueMaker);
+            vo.setData4( JSONObject.toJSONString(jsonData) );
+        }
+
+        logger.info("method : createPrinterUserReport-repPrinterService.sumWastereasonData ,  param : "+reportParam);
+        Map<String, Object> wastereasonData =repPrinterService.sumWastereasonData(printerReportDTO, c.getTenantId(),printerDeviceRelationData);
+        logger.info("method : createPrinterUserReport-repPrinterService.sumWastereasonData ,  param : "+reportParam+" res="+wastereasonData);
+        String top3WastereasonTypes = "";
+        if( !wastereasonData.isEmpty() ){
+            String[] categories5 = (String[]) wastereasonData.get("types");
+            Object[] datas5 = (String[]) wastereasonData.get("proportions");
+            top3WastereasonTypes = (String) wastereasonData.get("top3WastereasonTypes");
+            //废品原因统计
+            Map<String, Object> jsonData = new HashMap<String, Object>();
+            jsonData.put("xArray", categories5);
+            jsonData.put("array", datas5);
+            vo.setData5( JSONObject.toJSONString(jsonData) );
+        }
+
+
+        logger.info("method : createPrinterUserReport-repPrinterService.sumPrinterSandPassrateData ,  param : "+reportParam);
+        RepPrinterTargetDicVO SXMDHGL = (RepPrinterTargetDicVO) targetmap.get("SXMDHGL");
+        Double sandPassrateTargetValue = null;
+        try{
+            sandPassrateTargetValue = SXMDHGL.getTargetValue().doubleValue();
+        }catch(Exception e){}
+        printerReportDTO.setSandPassrateTargetValue(sandPassrateTargetValue);
+        Map<String, Object> sxmdData =repPrinterService.sumPrinterSandPassrateData(printerReportDTO, c.getTenantId(),printerDeviceRelationData);
+        logger.info("method : createPrinterUserReport-repPrinterService.sumPrinterSandPassrateData ,  param : "+reportParam+" res="+sxmdData);
+        String avgSxmd = "0", top3MdbhgDevices = "";
+        if( !sxmdData.isEmpty() ){
+            String[] categories6 = (String[]) sxmdData.get("deviceArray");
+            Object[] datas6 = (Object[]) sxmdData.get("rateArray");
+            Object[] aveArray = (Object[]) sxmdData.get("aveArray");
+            avgSxmd = (String) sxmdData.get("avgSxmd");
+            top3MdbhgDevices = (String) sxmdData.get("top3MdbhgDevices");
+            //砂型密度
+            Map<String, Object> jsonData = new HashMap<String, Object>();
+            jsonData.put("xArray", categories6);
+            jsonData.put("rateArray", datas6);
+            jsonData.put("aveArray", aveArray);
+            jsonData.put("targetValue", sandPassrateTargetValue);
+            vo.setData6( JSONObject.toJSONString(jsonData));
+        }
+
+        //打印机树脂加入比/新旧砂加入占比/漏砂量统计
+        logger.info("method : createPrinterUserReport-repPrinterSandPercentService.getRepPrinterSandPercentBarData ,  param : "+reportParam);
+        Map<String, Object> sandPercentData = repPrinterSandPercentService.getRepPrinterSandPercentBarData(printerReportDTO, c.getTenantId(),printerDeviceRelationData);
+        logger.info("method : createPrinterUserReport-repPrinterSandPercentService.getRepPrinterSandPercentBarData ,  param : "+reportParam+" res="+sandPercentData);
+
+        Double xjszbTargetValue = null;
+        Double lslTargetValue = null;
+        if( !sandPercentData.isEmpty() ){
+            RepPrinterTargetDicVO DYJSZJRB = (RepPrinterTargetDicVO) targetmap.get("DYJSZJRB");
+            RepPrinterTargetDicVO XJSJRZB = (RepPrinterTargetDicVO) targetmap.get("XJSJRZB");
+            RepPrinterTargetDicVO LSL = (RepPrinterTargetDicVO) targetmap.get("LSL");
+
+            Double dyjszjrbTargetValue = null;
+            try{
+                dyjszjrbTargetValue = DYJSZJRB.getTargetValue().doubleValue();
+            }catch(Exception e){}
+            try{
+                xjszbTargetValue = XJSJRZB.getTargetValue().doubleValue();
+            }catch(Exception e){}
+            try{
+                lslTargetValue = LSL.getTargetValue().doubleValue();
+            }catch(Exception e){}
+
+            String[] sandPercentCategories = (String[])sandPercentData.get("xListSXMD");
+            if( sandPercentCategories!=null && sandPercentCategories.length>0 ){
+                List<String> sxmdList = (List<String>)sandPercentData.get("sxmdList");//打印机树脂加入比
+                List<String> xjszbList = (List<String>)sandPercentData.get("xjszbList");//新旧砂加入占比
+
+                //打印机树脂加入比
+                Map<String, Object> jsonData7 = new HashMap<String, Object>();
+                jsonData7.put("xArray", sandPercentData.get("xListSXMD"));
+                jsonData7.put("sxmdArray", sxmdList);
+                jsonData7.put("targetValue", dyjszjrbTargetValue * 100);
+                vo.setData7( JSONObject.toJSONString(jsonData7) );
+
+                //新旧砂加入占比
+                Map<String, Object> jsonData8 = new HashMap<String, Object>();
+                jsonData8.put("xArray", sandPercentData.get("xListXJSZB"));
+                jsonData8.put("xjszbArray", xjszbList);
+                jsonData8.put("targetValue", xjszbTargetValue);
+                vo.setData8( JSONObject.toJSONString(jsonData8) );
+
+                //漏砂量
+                Map<String, Object> jsonData9 = new HashMap<String, Object>();
+                jsonData9.put("xArray", sandPercentData.get("xListLSL"));
+                jsonData9.put("slylArray", sandPercentData.get("slylArray"));
+                jsonData9.put("hszlArray", sandPercentData.get("hszlArray"));
+                jsonData9.put("wsyslArray", sandPercentData.get("wsyslArray"));
+                jsonData9.put("avgArray", sandPercentData.get("avgArray"));
+                jsonData9.put("targetValue", lslTargetValue);
+                vo.setData9( JSONObject.toJSONString(jsonData9) );
+            }
+        }
+
+        //喷头寿命
+        logger.info("method : createPrinterUserReport-getRepPrinterSprinklerBarData ,  param : "+reportParam);
+        //暂时预留
+        vo.setData10("");
+        vo.setValue8("");
+
+        //产能利用率 = 产量 / 产能，其中，产能=产能目标值 * 运维报告所取天数；产量为导入废品量时导入的总打印量
+        List<ChanNengLiYongLvDto> chanNengLiYongLvData =repPrinterService.chanNengLiYongLv(printerReportDTO,
+                c.getTenantId(),printerDeviceRelationData,targetmap);
+        if (chanNengLiYongLvData != null &&  !chanNengLiYongLvData.isEmpty()) {
+            JSONObject data11 = new JSONObject();
+            data11.put("xArray",chanNengLiYongLvData.stream().map(ChanNengLiYongLvDto::getDeviceId).collect(Collectors.toList()));
+            data11.put("chanLiang",chanNengLiYongLvData.stream().map(x->df.format(x.getChanLiang())).collect(Collectors.toList()));
+            data11.put("chanNeng",chanNengLiYongLvData.stream().map(x->df.format(x.getChanNeng())).collect(Collectors.toList()));
+            data11.put("liYongLv",chanNengLiYongLvData.stream().map(x->df.format(x.getLiYongLv()*100)).collect(Collectors.toList()));
+            data11.put("avg",chanNengLiYongLvData.stream().map(x->df.format(x.getAvg()*100)).collect(Collectors.toList()));
+            vo.setData11(data11.toJSONString());
+            Double avg = chanNengLiYongLvData.stream().mapToDouble(ChanNengLiYongLvDto::getLiYongLv).average().orElse(0d);
+            vo.setRate12(avg.floatValue());
+            int size = chanNengLiYongLvData.size();
+            String top3Device = chanNengLiYongLvData.stream().sorted(Comparator.comparing(ChanNengLiYongLvDto::getLiYongLv))
+                    .map(ChanNengLiYongLvDto::getDeviceId).limit(size >= 3?3:size).collect(Collectors.joining("、"));
+            String top3LiYongLv = chanNengLiYongLvData.stream().sorted(Comparator.comparing(ChanNengLiYongLvDto::getLiYongLv)).map(x->{
+                Double d = x.getLiYongLv() * 100;
+                return df.format(d)+"%";
+            }).limit(size >= 3?3:size).collect(Collectors.joining("、"));
+            vo.setValue12("其中产能利用率最低的三台设备为<span class='xh'> "+top3Device+
+                    " </span>；产能利用率分别为<span class='xh'> "+top3LiYongLv+" </span>；");
+        }else{
+            vo.setValue12("其中产能利用率最低的三台设备为____、____、____；产能利用率分别为____、____、____；");
+        }
+
+
+        //平均打印高度 = = 打印层厚 * 最大打印层数. 按每日打印的批次计算当日平均值，再计算运维报告所取天数计算平均值
+        List<PinJunDaYinGaoDuDto> pinJunDaYinGaoDu = repPrinterSandPercentService.pinJunDaYinGaoDu(printerReportDTO, c.getTenantId(),printerDeviceRelationData);
+        if (pinJunDaYinGaoDu != null &&  !pinJunDaYinGaoDu.isEmpty()) {
+            PinJunDaYinGaoDuDto last = pinJunDaYinGaoDu.get(pinJunDaYinGaoDu.size() - 1);
+            RepPrinterTargetDicVO avghight = (RepPrinterTargetDicVO) targetmap.get("AVGHIGHT");
+            String[] target = new String[pinJunDaYinGaoDu.size()+1];
+            Arrays.fill(target,df.format(avghight.getTargetValue()));
+            Double avg = pinJunDaYinGaoDu.stream().mapToDouble(PinJunDaYinGaoDuDto::getHeight).average().orElse(0d);
+            PinJunDaYinGaoDuDto avgObj = new PinJunDaYinGaoDuDto("平均值",avg,0d,0d);
+            pinJunDaYinGaoDu.add(avgObj);
+            JSONObject data12 = new JSONObject();
+            data12.put("xArray",pinJunDaYinGaoDu.stream().map(PinJunDaYinGaoDuDto::getDeviceId).collect(Collectors.toList()));
+            data12.put("height",pinJunDaYinGaoDu.stream().map(x->df.format(x.getHeight())).collect(Collectors.toList()));
+            data12.put("target", target);
+            vo.setData12(data12.toJSONString());
+            vo.setRate13(avg.floatValue());
+            vo.setValue13("<span class='xh'> " +last.getDeviceId()+" </span>的平均打印高度最低，为<span class='xh'>  "
+                    +last.getHeight()+" </span> cm；");
+        }else{
+            vo.setValue13("________的平均打印高度最低，为______cm；");
+        }
+
+        //砂芯强度合格率统计报表,与砂芯密度合格率报表导入模板一致（换一下字段名称即可），该报表为手动导入数据报表
+        logger.info("method : createPrinterUserReport-repPrinterService.sumPrinterSandPassrateQiangDuData ,  param : "+reportParam);
+        RepPrinterTargetDicVO SXQDHGL = (RepPrinterTargetDicVO) targetmap.get("SXQDHGL");
+        Double sandPassrateQiangDuTargetValue = null;
+        try{
+            sandPassrateQiangDuTargetValue = SXQDHGL.getTargetValue().doubleValue();
+        }catch(Exception e){}
+        Map<String, Object> sxmdData1 =repPrinterService.sumPrinterSandPassrateData1(printerReportDTO, c.getTenantId(),printerDeviceRelationData);
+        logger.info("method : createPrinterUserReport-repPrinterService.sumPrinterSandPassrateData ,  param : "+reportParam+" res="+sxmdData1);
+        String avgSxmd1 = "0", top3MdbhgDevices1 = "";
+        if( !sxmdData1.isEmpty() ){
+            String[] categories6 = (String[]) sxmdData1.get("deviceArray");
+            Object[] datas6 = (Object[]) sxmdData1.get("rateArray");
+            Object[] aveArray = (Object[]) sxmdData1.get("aveArray");
+            avgSxmd1 = (String) sxmdData1.get("avgSxmd");
+            top3MdbhgDevices1 = (String) sxmdData1.get("top3MdbhgDevices");
+            //砂型强度
+            Map<String, Object> jsonData = new HashMap<String, Object>();
+            jsonData.put("xArray", categories6);
+            jsonData.put("rateArray", datas6);
+            jsonData.put("aveArray", aveArray);
+            jsonData.put("targetValue", sandPassrateQiangDuTargetValue);
+            vo.setData13( JSONObject.toJSONString(jsonData) );
+        }
+
+        //维修费用统计,统计运维报告所选时间区间内，每台设备维修单中维修换件的总价
+//        vo.setData14("");
+//        vo.setRate14(0d);
+        vo.setValue14("");
+
+        //固化剂单耗 = 打印一批次最大固化剂耗量（取工况字段）/ （最大打印体积*密度1.5）,单位：kg / T
+        List<GuHuaJiDanHaoDto> guHuaJiDanHao =repPrinterSandPercentService.guHuaJiDanHao(printerReportDTO, c.getTenantId(),printerDeviceRelationData);
+        if (guHuaJiDanHao != null &&  !guHuaJiDanHao.isEmpty()) {
+            GuHuaJiDanHaoDto first = guHuaJiDanHao.get(0);
+            RepPrinterTargetDicVO ghjdh = (RepPrinterTargetDicVO) targetmap.get("GHJDH");
+            String[] target = new String[guHuaJiDanHao.size()+1];
+            Arrays.fill(target, df.format(ghjdh.getTargetValue()));
+            Double avg = guHuaJiDanHao.stream().mapToDouble(GuHuaJiDanHaoDto::getActivatorCost).average().orElse(0d);
+            GuHuaJiDanHaoDto avgObj = new GuHuaJiDanHaoDto("平均值",avg,0d,0d);
+            guHuaJiDanHao.add(avgObj);
+            JSONObject data15 = new JSONObject();
+            data15.put("xArray",guHuaJiDanHao.stream().map(GuHuaJiDanHaoDto::getDeviceId).collect(Collectors.toList()));
+            data15.put("activatorCost",guHuaJiDanHao.stream().map(x->df.format(x.getActivatorCost())).collect(Collectors.toList()));
+            data15.put("target", target);
+            vo.setData15(data15.toJSONString());
+            vo.setRate15(avg.floatValue());
+            vo.setValue15("固化剂单耗最大为<span class='xh'>" +first.getActivatorCost()+
+                    "</span>kg/T砂芯，固化剂单耗最大的设备是<span class='xh'>" +first.getDeviceId()+"</span>；");
+        }else{
+            vo.setValue15("固化剂单耗最大为_______kg/T砂芯，固化剂单耗最大的设备是_________；");
+        }
+
+        //换线时间
+        String[] XTimeArray = null;
+        String[] YTimeArray = null;
+        ArrayList devList = new ArrayList();
+        List<String> strCurLists = printerReportDTO.getDeviceIdList();
+
+        int valid_dayNum =0; //有效的设备个数
+        for(int i=0;i<strCurLists.size();i++)
+        {
+            String curdevid = strCurLists.get(i).toString();
+            List<RepPrinterSandPercentVO> PrintListObj = sandDAO.getPrintJobTaskinfo(curdevid,startDate+" "+"00:00:00",endDate+" "+"23:59:59");
+            if(PrintListObj.size()> 0)
+            {
+                valid_dayNum++;
+                devList.add(curdevid);
+            }
+        }
+        XTimeArray = new String[valid_dayNum+1];
+        YTimeArray= new String[valid_dayNum+1];
+        List<RepMttDataVO> changetimelistAlls = new ArrayList<>();
+        Double sumchangeTime =0.0;
+        for(int i=0;i< devList.size();i++)
+        {
+            String cur_devid = devList.get(i).toString();
+//			if(cur_devid.equals("2500-2"))
+//			{
+//				cur_devid =cur_devid;
+//			}
+            List<RepPrinterSandPercentVO> PrintJobListDataObj = sandDAO.getPrintJobTaskinfo(cur_devid,startDate+" "+"00:00:00",endDate+" "+"23:59:59");
+            List datelist = new ArrayList();
+            for(int j= PrintJobListDataObj.size()-1; j >=0 ;j--)
+            {
+                String sy = PrintJobListDataObj.get(j).getDataYear().toString();
+                String sm = PrintJobListDataObj.get(j).getDataMonth().toString();
+                if(Integer.parseInt(sm)<10)
+                    sm ="0"+sm;
+                String sd = PrintJobListDataObj.get(j).getDataDay().toString();
+                if(Integer.parseInt(sd)<10)
+                    sd ="0"+sd;
+                String cur_day = sy+"-"+ sm+"-"+ sd;
+
+                if (!datelist.contains(cur_day))
+                {
+                    datelist.add(cur_day);
+                }
+            }
+            if(PrintJobListDataObj.size()> 0)
+            {
+                int valid_days =0;
+                Double totalchangeTime =0.0;
+//				for(int j= PrintJobListDataObj.size()-1; j >=0 ;j--)
+                for(int j= datelist.size()-1; j >=0 ;j--)
+                {
+//					String sy = PrintJobListDataObj.get(j).getDataYear().toString();
+//					String sm = PrintJobListDataObj.get(j).getDataMonth().toString();
+//					if(Integer.parseInt(sm)<10)
+//						sm ="0"+sm;
+//					String sd = PrintJobListDataObj.get(j).getDataDay().toString();
+//					if(Integer.parseInt(sm)<10)
+//						sd ="0"+sd;
+//					String cur_day = sy+"-"+ sm+"-"+ sd;
+                    String cur_day = datelist.get(j).toString();  //取出所有不重复的日期
+                    String cur_day_changeTime="";
+                    double cur_changeTime=0d;
+                    boolean curday_isnotExist = false;
+                    int curday_hasCountNum =0; //记录当日的记录数目
+                    LocalDateTime ksT1 =  LocalDateTime.now(); //记录当日的开始时间（任务结束时间）
+                    int cur_index=0; //记录当前索引
+
+                    for(int k= PrintJobListDataObj.size()-1; k >=0 ;k--)
+                    {
+                        //任务结束时间
+                        String printEndTime = PrintJobListDataObj.get(k).getHmiEndtime();
+                        LocalDateTime t2 = LocalDateTime.parse(printEndTime , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                        if(!printEndTime.substring(0,10).equals(cur_day))
+                        {
+                            continue;  //过滤不是同一天的数据
+                        }
+                        if(!printEndTime.substring(0,10).equals(cur_day)) //判断当日是否存在打印记录
+                        {
+                            //当日不存在记录，则当日换线时间为0
+                            curday_isnotExist = true;
+                        }
+                        else
+                        {
+                            if(printEndTime.substring(0,10).equals(cur_day))
+                            {
+                                curday_hasCountNum++;
+                                ksT1 = t2;  //任务结束时间 -即 计算的起始时间
+                                cur_index = k;
+                            }
+                        }
+                    }
+                    if(!curday_isnotExist)
+                    {
+                        cur_changeTime = 0;
+                    }
+                    if(curday_hasCountNum == 1)//当日记录1条记录,则当日换线时间后推一天计算（最多24H）
+                    {
+                        LocalDateTime t1 = ksT1; //开始时间
+                        if(cur_index == 0) //当月数据不够用，则往后推一个月取该月的最后1条记录
+                        {
+                            LocalDateTime Starttime1 = LocalDateTime.parse(startDate+" "+"00:00:00"  , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).plusMonths(1);
+                            LocalDateTime Endtime1 = LocalDateTime.parse(endDate +" "+"23:59:59" , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).plusMonths(1);
+                            String startDate1 =  DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(Starttime1);
+                            String endDate1 =  DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(Endtime1);
+                            List<RepPrinterSandPercentVO> PrintJobListDataObj1 = sandDAO.getPrintJobTaskinfo(cur_devid,startDate1,endDate1);
+                            if(PrintJobListDataObj1.size() >0)
+                            {
+                                int k1 = PrintJobListDataObj1.size() - 1;//当天第一条（唯一）/时间最小的，索引最大
+                                String str1 = PrintJobListDataObj1.get(k1).getHmiBegintime();
+                                LocalDateTime printStartTime1 = LocalDateTime.parse(str1 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+                                DateTimeFormatter dfs = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                                String cur_time_1 = dateDiff(dfs.format(t1),dfs.format(printStartTime1),"yyyy-MM-dd HH:mm:ss"); //换线时间h
+                                if(Double.valueOf(cur_time_1) > 24 || Double.valueOf(cur_time_1) < 0)
+                                    cur_changeTime += 0.0;
+                                else
+                                    cur_changeTime += Double.valueOf(cur_time_1);
+                            }
+
+                        }
+                        else
+                        {
+                            //后1条 开始时间
+                            String str1 = PrintJobListDataObj.get(cur_index-1).getHmiBegintime();
+                            LocalDateTime t1_1 = LocalDateTime.parse(str1 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+                            DateTimeFormatter dfs = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                            String cur_time1 = dateDiff(dfs.format(t1),dfs.format(t1_1),"yyyy-MM-dd HH:mm:ss"); //换线时间h
+                            if(Double.valueOf(cur_time1) > 24 || Double.valueOf(cur_time1) < 0)
+                                cur_changeTime += 0.0;
+                            else
+                                cur_changeTime += Double.valueOf(cur_time1);
+                        }
+                    }
+                    if(curday_hasCountNum ==2)
+                    {
+                        double changeTime_temp =0.0;
+                        //后1条 开始时间
+
+                        String str1 = PrintJobListDataObj.get(cur_index+1).getHmiEndtime();
+                        LocalDateTime t1 = LocalDateTime.parse(str1 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));//第2条的结束时间  -起算时间点
+
+                        String str2 = PrintJobListDataObj.get(cur_index).getHmiBegintime();
+                        LocalDateTime t1_1 = LocalDateTime.parse(str2 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+                        DateTimeFormatter dfs = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                        String cur_time1 = dateDiff(dfs.format(t1),dfs.format(t1_1),"yyyy-MM-dd HH:mm:ss"); //换线时间h
+                        if(Double.valueOf(cur_time1) > 24 || Double.valueOf(cur_time1) < 0)
+                            changeTime_temp += 0.0;
+                        else
+                            changeTime_temp += Double.valueOf(cur_time1);
+
+                        String str3 = PrintJobListDataObj.get(cur_index).getHmiEndtime();
+                        LocalDateTime t2 = LocalDateTime.parse(str3 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));//换算成第2条的开始时间 -起算时间点
+
+                        if(cur_index == 0) //当月数据不够用，则往后推一个月取该月的最后1条记录
+                        {
+                            LocalDateTime Starttime1 = LocalDateTime.parse(startDate+" "+"00:00:00"  , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).plusMonths(1);
+                            LocalDateTime Endtime1 = LocalDateTime.parse(endDate +" "+"23:59:59" , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).plusMonths(1);
+                            String startDate1 =  DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(Starttime1);
+                            String endDate1 =  DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(Endtime1);
+
+                            List<RepPrinterSandPercentVO> PrintJobListDataObj1 = sandDAO.getPrintJobTaskinfo(cur_devid,startDate1,endDate1);
+                            if(PrintJobListDataObj1.size() >0)
+                            {
+                                int k1 =PrintJobListDataObj1.size()-1;//当天第一条（唯一）/时间最小的，索引最大
+                                String stT1 = PrintJobListDataObj1.get(k1).getHmiBegintime();
+                                LocalDateTime printStartTime1 = LocalDateTime.parse(stT1 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+                                String cur_time_1 = dateDiff(dfs.format(t2),dfs.format(printStartTime1),"yyyy-MM-dd HH:mm:ss"); //换线时间h
+                                if(Double.valueOf(cur_time_1) > 24 || Double.valueOf(cur_time_1) < 0)
+                                    changeTime_temp += 0.0;
+                                else
+                                    changeTime_temp += Double.valueOf(cur_time_1);
+                            }
+
+                        }
+                        else
+                        {
+                            //LocalDateTime t2_1 = pageInfo.getList().get(cur_index-1).getPrintStartTime();//往后推1条的开始时间
+                            String stT1 = PrintJobListDataObj.get(cur_index-1).getHmiBegintime();
+                            LocalDateTime t2_1 =LocalDateTime.parse(stT1 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                            String cur_time2 = dateDiff(dfs.format(t2),dfs.format(t2_1),"yyyy-MM-dd HH:mm:ss"); //换线时间h
+                            if(Double.valueOf(cur_time2) > 24 || Double.valueOf(cur_time2) < 0 )
+                                changeTime_temp += 0.0;
+                            else
+                                changeTime_temp += Double.valueOf(cur_time2);
+                        }
+                        changeTime_temp = changeTime_temp / 2;
+                        cur_changeTime += changeTime_temp;
+                    }
+                    if(curday_hasCountNum==3)
+                    {
+                        double changeTime_temp =0.0;
+                        //1  后1条 开始时间
+
+                        String stT1 = PrintJobListDataObj.get(cur_index+2).getHmiEndtime(); //第3条的结束时间 -起算时间点
+                        LocalDateTime t1 = LocalDateTime.parse(stT1 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));//第3条的结束时间 -起算时间点
+
+                        String strT2 =PrintJobListDataObj.get(cur_index+1).getHmiBegintime();
+                        LocalDateTime t1_1 = LocalDateTime.parse(strT2 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));;
+                        DateTimeFormatter dfs = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+                        String cur_time1 = dateDiff(dfs.format(t1),dfs.format(t1_1),"yyyy-MM-dd HH:mm:ss"); //换线时间h
+
+                        if(Double.valueOf(cur_time1) > 24 || Double.valueOf(cur_time1) < 0)
+                            changeTime_temp += 0.0;
+                        else
+                            changeTime_temp += Double.valueOf(cur_time1);
+
+
+                        String stT11 = PrintJobListDataObj.get(cur_index+1).getHmiEndtime(); //第2条的开始时间
+                        LocalDateTime t2 = LocalDateTime.parse(stT11 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));//第2条的开始时间
+
+                        String strT22 = PrintJobListDataObj.get(cur_index).getHmiBegintime();
+                        LocalDateTime t2_1 = LocalDateTime.parse(strT22 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+                        String cur_time2 = dateDiff(dfs.format(t2),dfs.format(t2_1),"yyyy-MM-dd HH:mm:ss"); //换线时间h
+                        if(Double.valueOf(cur_time2) > 24 || Double.valueOf(cur_time2) < 0)
+                            changeTime_temp += 0.0;
+                        else
+                            changeTime_temp += Double.valueOf(cur_time2);
+
+                        String stT3 = PrintJobListDataObj.get(cur_index).getHmiEndtime();
+                        LocalDateTime t3 = LocalDateTime.parse(stT3 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));//第2条的开始时间
+                        if(cur_index == 0) //当月数据不够用，则往后推一个月取该月的最后1条记录
+                        {
+                            LocalDateTime Starttime1 = LocalDateTime.parse(startDate+" "+"00:00:00"  , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).plusMonths(1);
+                            LocalDateTime Endtime1 = LocalDateTime.parse(endDate +" "+"23:59:59" , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).plusMonths(1);
+                            String startDate1 =  DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(Starttime1);
+                            String endDate1 =  DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(Endtime1);
+
+                            List<RepPrinterSandPercentVO> PrintJobListDataObj1 = sandDAO.getPrintJobTaskinfo(cur_devid,startDate1,endDate1);
+
+
+                            if(PrintJobListDataObj1.size() >0)
+                            {
+                                int k1 =PrintJobListDataObj1.size()-1;//当天第一条（唯一）/时间最小的，索引最大
+                                //LocalDateTime printStartTime1 = pageInfo1.getList().get(k1).getPrintStartTime();
+                                String stTemp = PrintJobListDataObj1.get(k1).getHmiBegintime(); //取下一月的第一条记录 修改 PrintJobListDataObj
+                                LocalDateTime printStartTime1 = LocalDateTime.parse(stTemp , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+                                String cur_time_1 = dateDiff(dfs.format(t3),dfs.format(printStartTime1),"yyyy-MM-dd HH:mm:ss"); //换线时间h
+                                if(Double.valueOf(cur_time_1) > 24 || Double.valueOf(cur_time_1) < 0)
+                                    changeTime_temp += 0.0;
+                                else
+                                    changeTime_temp += Double.valueOf(cur_time_1);
+                            }
+
+                        }
+                        else
+                        {
+                            String stTemp = PrintJobListDataObj.get(cur_index-1).getHmiBegintime();
+                            LocalDateTime t3_1 = LocalDateTime.parse(stTemp , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+                            String cur_time3 = dateDiff(dfs.format(t3),dfs.format(t3_1),"yyyy-MM-dd HH:mm:ss"); //换线时间h
+                            if(Double.valueOf(cur_time3) > 24 || Double.valueOf(cur_time3) < 0)
+                                changeTime_temp += 0.0;
+                            else
+                                changeTime_temp += Double.valueOf(cur_time3);
+                        }
+
+                        changeTime_temp = changeTime_temp /3;
+                        cur_changeTime +=changeTime_temp;
+                    }
+
+                    if(curday_hasCountNum==4)
+                    {
+                        double changeTime_temp =0.0;
+                        //1  后1条 开始时间
+                        String stTemp1 = PrintJobListDataObj.get(cur_index+3).getHmiEndtime();
+                        LocalDateTime t1 = LocalDateTime.parse(stTemp1 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));//第4条的结束时间 -起算时间点
+
+                        String stTemp_1 = PrintJobListDataObj.get(cur_index+2).getHmiEndtime();
+                        LocalDateTime t1_1 = LocalDateTime.parse(stTemp_1 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));//第4条的结束时间 -起算时间点
+
+                        DateTimeFormatter dfs = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                        String cur_time1 = dateDiff(dfs.format(t1),dfs.format(t1_1),"yyyy-MM-dd HH:mm:ss"); //换线时间h
+
+                        if(Double.valueOf(cur_time1) > 24 || Double.valueOf(cur_time1) < 0)
+                            changeTime_temp += 0.0;
+                        else
+                            changeTime_temp += Double.valueOf(cur_time1);
+
+                        String stTemp2 = PrintJobListDataObj.get(cur_index+2).getHmiEndtime();
+                        LocalDateTime t2 = LocalDateTime.parse(stTemp2 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));//第4条的结束时间 -起算时间点
+
+                        String stTemp_2 = PrintJobListDataObj.get(cur_index+1).getHmiBegintime();
+                        LocalDateTime t2_1 = LocalDateTime.parse(stTemp_2 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+
+                        String cur_time2 = dateDiff(dfs.format(t2),dfs.format(t2_1),"yyyy-MM-dd HH:mm:ss"); //换线时间h
+                        if(Double.valueOf(cur_time2) > 24 || Double.valueOf(cur_time2) < 0)
+                            changeTime_temp += 0.0;
+                        else
+                            changeTime_temp += Double.valueOf(cur_time2);
+
+
+                        String stTemp3 = PrintJobListDataObj.get(cur_index+1).getHmiEndtime();
+                        LocalDateTime t3 = LocalDateTime.parse(stTemp3 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));//第4条的结束时间 -起算时间点
+
+                        String stTemp_3 = PrintJobListDataObj.get(cur_index).getHmiBegintime();
+                        LocalDateTime t3_1 = LocalDateTime.parse(stTemp_3 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+                        String cur_time3 = dateDiff(dfs.format(t3),dfs.format(t3_1),"yyyy-MM-dd HH:mm:ss"); //换线时间h
+                        if(Double.valueOf(cur_time3) > 24 || Double.valueOf(cur_time3) < 0)
+                            changeTime_temp += 0.0;
+                        else
+                            changeTime_temp += Double.valueOf(cur_time3);
+
+                        String stTemp4 = PrintJobListDataObj.get(cur_index).getHmiEndtime();
+                        LocalDateTime t4 = LocalDateTime.parse(stTemp4 , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+                        if(cur_index == 0) //当月数据不够用，则往后推一个月取该月的最后1条记录
+                        {
+                            LocalDateTime Starttime1 = LocalDateTime.parse(startDate+" "+"00:00:00"  , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).plusMonths(1);
+                            LocalDateTime Endtime1 = LocalDateTime.parse(endDate +" "+"23:59:59" , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).plusMonths(1);
+                            String startDate1 =  DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(Starttime1);
+                            String endDate1 =  DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(Endtime1);
+                            List<RepPrinterSandPercentVO> PrintJobListDataObj1 = sandDAO.getPrintJobTaskinfo(cur_devid,startDate1,endDate1);
+
+                            if(PrintJobListDataObj1.size() >0)
+                            {
+                                int k1 =PrintJobListDataObj1.size()-1;//当天第一条（唯一）/时间最小的，索引最大
+                                //LocalDateTime printStartTime1 = pageInfo1.getList().get(k1).getPrintStartTime();
+
+                                String stTemp = PrintJobListDataObj1.get(k1).getHmiBegintime(); //修改 PrintJobListDataObj
+                                LocalDateTime printStartTime1 = LocalDateTime.parse(stTemp , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+                                String cur_time_1 = dateDiff(dfs.format(t4),dfs.format(printStartTime1),"yyyy-MM-dd HH:mm:ss"); //换线时间h
+                                if(Double.valueOf(cur_time_1) > 24 || Double.valueOf(cur_time_1) < 0)
+                                    changeTime_temp += 0.0;
+                                else
+                                    changeTime_temp += Double.valueOf(cur_time_1);
+                            }
+
+                        }
+                        else
+                        {
+                            String stTemp = PrintJobListDataObj.get(cur_index-1).getHmiBegintime();
+                            LocalDateTime t4_1 = LocalDateTime.parse(stTemp , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+                            String cur_time4 = dateDiff(dfs.format(t4),dfs.format(t4_1),"yyyy-MM-dd HH:mm:ss"); //换线时间h
+                            if(Double.valueOf(cur_time4) > 24 || Double.valueOf(cur_time4) < 0)
+                                changeTime_temp += 0.0;
+                            else
+                                changeTime_temp += Double.valueOf(cur_time4);
+                        }
+                        changeTime_temp = changeTime_temp /4;
+                        cur_changeTime += changeTime_temp;
+                    }
+
+                    //当日的换线时间
+                    cur_day_changeTime = String.valueOf(cur_changeTime);
+                    String strYArry = String.valueOf(String.format("%.2f",Double.valueOf(cur_day_changeTime)));
+                    if(Double.valueOf(cur_day_changeTime) > 0)
+                    {
+                        totalchangeTime += Double.valueOf(cur_day_changeTime);
+                        valid_days++;
+                    }
+
+                }
+
+                //对当前设备进行求均值
+                if(valid_days != 0)
+                    totalchangeTime = totalchangeTime / valid_days;
+                else
+                    totalchangeTime = 0.0;
+
+                //获取用户设备编码[含设备位置]
+                String userDeviceId = printerDeviceRelationData.get(cur_devid)==null?cur_devid:printerDeviceRelationData.get(cur_devid);
+//				XTimeArray[i] =userDeviceId;//cur_devid;
+//				YTimeArray[i] = String.format("%.2f",totalchangeTime);
+                sumchangeTime += totalchangeTime;
+
+                RepMttDataVO mtt = new RepMttDataVO();
+                mtt.setName(userDeviceId);
+                mtt.setValue11(Double.valueOf(String.format("%.2f",totalchangeTime)));
+                changetimelistAlls.add(mtt);
+            }
+        }
+        if(changetimelistAlls.size() > 0)
+        {
+            //从大到小排序
+            changetimelistAlls = changetimelistAlls.stream().sorted((Comparator.comparingDouble(RepMttDataVO::getValue11).reversed())).collect(Collectors.toList());
+            String maxtime_device = changetimelistAlls.get(0).getName();
+            String maxtime_device_time = String.valueOf(changetimelistAlls.get(0).getValue11());
+            for(int i=0;i<changetimelistAlls.size();i++)
+            {
+                XTimeArray[i] = changetimelistAlls.get(i).getName();
+                YTimeArray[i] = String.valueOf(changetimelistAlls.get(i).getValue11());
+            }
+            sumchangeTime = sumchangeTime /devList.size();
+            XTimeArray[devList.size()] = "平均值"; //添加列
+            YTimeArray[devList.size()] = String.valueOf(String.format("%.2f",sumchangeTime));  //添加列
+
+            Double ChangeJobTimeTarget = null;
+            RepPrinterTargetDicVO ChangeTime = (RepPrinterTargetDicVO) targetmap.get("ChangeJobTimeTarget");
+            try{
+                ChangeJobTimeTarget = Double.parseDouble( df.format(ChangeTime.getTargetValue()) );
+            }catch(Exception e){}
+
+            Map<String, Object> changtimeData = new HashMap<String, Object>();
+            changtimeData.put("xList", XTimeArray);
+            changtimeData.put("yList", YTimeArray);
+//		if(ChangeJobTimeTarget == 4)
+//		{
+//			changtimeData.put("targetValue", ChangeJobTimeTarget);//ChangeJobTimeTarget
+//		}
+//		else
+//			changtimeData.put("targetValue", "4");//ChangeJobTimeTarget
+            changtimeData.put("targetValue", "4");//ChangeJobTimeTarget
+            vo.setData16(JSONObject.toJSONString(changtimeData));
+            vo.setValue16(String.valueOf(String.format("%.2f",sumchangeTime)));//平均换线时长
+            vo.setValue17(maxtime_device);//换线时长最高的设备
+            vo.setValue18(maxtime_device_time);//换线时长最高的设备的时长
+        }
+
+
+        //---------MTBF MTTR MTTF指标------------------
+//        vo.setValue24("所有设备平均星级评价得分为____分,其中得分最高的三台设备是____、____、____,得分最低的三台设备是____、____、____。");
+
+        vo.setRate1(Float.parseFloat(avgKdlValue));
+        vo.setRate10(Float.parseFloat(avgBtlValue));
+        vo.setRate2(minKdlValue);
+        vo.setRate3(Float.parseFloat(avgFpl));
+        vo.setRate4(Float.parseFloat(avgDevFpl));
+        vo.setRate5(Float.parseFloat(avgSxmd));
+        vo.setRate11(Float.parseFloat(avgSxmd1));
+        vo.setRate6(Float.parseFloat(sandPercentData.get("rate6")==null?"0":sandPercentData.get("rate6").toString()));
+        vo.setRate7(Float.parseFloat(sandPercentData.get("rate7")==null?"0":sandPercentData.get("rate7").toString()));
+        vo.setRate8(Float.parseFloat(sandPercentData.get("rate8")==null?"0":sandPercentData.get("rate8").toString()));
+        vo.setRate9(Float.parseFloat(sandPercentData.get("rate9")==null?"0":sandPercentData.get("rate9").toString()));
+
+        String value0 = "<span class='xh'>"+(minKdlDevice==null?"":minKdlDevice)+"</span>的开动率最低，为"+"<span class='xh'>"+(minKdlValue==null?"":String.format("%.1f%%", minKdlValue*100))+"</span>；";
+        String value9 = "<span class='xh'>"+(minBtlDevice==null?"":minBtlDevice)+"</span>的布图率最低，为"+"<span class='xh'>"+(minBtlValue==null?"":String.format("%.1f%%", minBtlValue*100))+"</span>；";
+        vo.setValue0(value0);
+        vo.setValue9(value9);
+        vo.setValue1(top3WastereasonTypes==null?"":top3WastereasonTypes);
+        vo.setValue2(top3DevfplDevices==null?"":top3DevfplDevices);
+        vo.setValue3(top3MdbhgDevices==null?"":top3MdbhgDevices);
+        vo.setValue11(top3MdbhgDevices1==null?"":top3MdbhgDevices1);
+        vo.setValue4(sandPercentData.get("value4")==null?"":sandPercentData.get("value4").toString());
+        vo.setValue5(sandPercentData.get("value5")==null?"":sandPercentData.get("value5").toString());
+        vo.setValue5_1(sandPercentData.get("value5_1")==null?"":sandPercentData.get("value5_1").toString());
+        vo.setValue6(sandPercentData.get("value6")==null?"":sandPercentData.get("value6").toString());
+        vo.setValue6_1(sandPercentData.get("value6_1")==null?"":sandPercentData.get("value6_1").toString());
+//        vo.setValue7(workTimeData.get("aveWorkTime")==null?"":workTimeData.get("aveWorkTime").toString());  //喷头
+        vo.setRatelist(ratelist==null?"":ratelist);
+
+        String targetValue1 = dyhsTargetValue==null			?"":String.format("%.1f", dyhsTargetValue*100);
+        String targetValue2 = btlTargetValue==null			?"":String.format("%.1f", btlTargetValue*100);
+        String targetValue3 = sandPassrateTargetValue==null	?"":String.format("%.1f", sandPassrateTargetValue*1.0);
+        String targetValue4 = valueMaker==null				?"":String.format("%.1f", valueMaker*100);
+        String targetValue8 = xjszbTargetValue==null		?"":String.format("%.1f", xjszbTargetValue*100);
+
+        vo.setRemark1("周开动率=本周打印时间之和/(21*7)。月开动率=本周打印时间之和/(21*28)，目标值"+targetValue1+"%");
+        vo.setRemark2("布图率=打印体积/（打印高度*工作箱长*宽*2）；Max、800、1800机型布图率=打印体积/（打印层厚*打印层数*工作箱长*宽）,"+targetValue2+"%目标");
+        vo.setRemark3("打印效率=（打印层厚*打印层数*工作箱长*宽*2）/打印耗时；Max、800、1800机型打印效率=（打印层厚*打印层数*工作箱长*宽）/打印耗时；（单位：升/小时）");
+        vo.setRemark4("产量=打印体积*1.5(T)；每周理论值2.5*7(T),每月理论值2.5*28(T)；设备废品率指标"+targetValue4+"%");
+        vo.setRemark5("");
+        vo.setRemark6("密度合格率=每台设备密度合格试块数量/送检试块总数*100%，密度标准值："+targetValue3+"g/cm^3");
+        vo.setRemark7("树脂加入比=树脂用量/打印量*100%");
+        vo.setRemark8("新砂占比=新砂占总用砂的比例，目标值"+targetValue8+"%");
+        vo.setRemark9("未使用砂量=（新砂累计用量+旧砂累计用量）-2*打印机工作箱长*工作箱宽*打印层厚*打印层数*1.5 ；数据为每个打印批次的平均值");
+        vo.setRemark10("喷头使用时长=喷头更换时间-喷头安装时间（喷头的一次使用时长）；工作时长为打印喷墨工作时长");
+        vo.setRemark11("");//砂型强度合格率最低的三台的设备
+        vo.setRemark12("");//产能利用率最低的三台设备
+        vo.setRemark13("密度合格率=每台设备强度合格试块数量/送检试块总数*100%，强度标准值：6mPa");
+        vo.setRemark14("");//维修费用最高三台的设备
+        vo.setRemark15("固化剂单耗=固化剂耗量之和 / 砂芯重量之和");
+        vo.setRemark16("废品率、打印效率利用率、故障率分别以40%、30%、30%权重计算星级评价得分");
+        nxReportDao.insert(vo);
+        batchAddItemVOs(vo);
+        return vo;
+    }
+
+    private void batchAddItemVOs(RepPrinterReportVO vo) {
+        List<RepPrinterReportItemVO> vos = new ArrayList<RepPrinterReportItemVO>();
+        RepPrinterReportItemVO item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data1");
+        item.setReportData(vo.getData1());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data2");
+        item.setReportData(vo.getData2());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data3");
+        item.setReportData(vo.getData3());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data4");
+        item.setReportData(vo.getData4());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data5");
+        item.setReportData(vo.getData5());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data6");
+        item.setReportData(vo.getData6());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data7");
+        item.setReportData(vo.getData7());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data8");
+        item.setReportData(vo.getData8());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data9");
+        item.setReportData(vo.getData9());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data10");
+        item.setReportData(vo.getData10());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data11");
+        item.setReportData(vo.getData11());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data12");
+        item.setReportData(vo.getData12());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data13");
+        item.setReportData(vo.getData13());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data14");
+        item.setReportData(vo.getData14());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data15");
+        item.setReportData(vo.getData15());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data16");
+        item.setReportData(vo.getData16());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data17");
+        item.setReportData(vo.getData17());
+        vos.add(item);
+
+        item = new RepPrinterReportItemVO();
+        item.setReportId(vo.getId());
+        item.setReportType("data18");
+        item.setReportData(vo.getData18());
+        vos.add(item);
+
+        repPrinterReportItemDao.add(vos);
+    }
+
+
+
+
+
+    /**
+     * 分页查找用户报告列表
+     */
+    public JsonResult2 reportPageList(String tenantId, String user_id, QueryUserReportCondition c) throws Exception {
+        Integer pageNum = StringUtils.isNotBlank(c.getPageNo())?Integer.parseInt(c.getPageNo()):1;
+        Integer pageSize = StringUtils.isNotBlank(c.getPageSize())?Integer.parseInt(c.getPageSize()):10;
+
+        JsonResult2 jsonResult=new JsonResult2();
+        Map<String,Object> query = new HashMap<String,Object>();
+        query.put("tenantId", ""); //""
+        query.put("emails", c.getEmails());
+        query.put("officeId", c.getOfficeId());
+
+        QueryUserReportCondition vo =new QueryUserReportCondition();
+        vo.setCustomerId(c.getCustomerId());
+        List<CustomerVO> customers = nxCustomerDao.getAllCustomer(vo);
+        List<String> officeIds = new ArrayList<>();
+        for(int i=0;i<customers.size();i++)
+        {
+            officeIds.add(customers.get(i).getCustomerCode());
+            query.put("officeIds", officeIds);
+        }
+//        if(StringUtils.isBlank(c.getOfficeId())) {
+//            JsonResult jr = baseClient.getOfficesByUser(tenantId, user_id);
+//            List<Map<String, Object>> orgList = FeignClientUtil.getResult(jr);
+//            List<String> officeIds = orgList.stream().map(item -> item.get("id").toString()).collect(Collectors.toList());
+//            query.put("officeIds", officeIds);
+//        }
+        query.put("officeName", c.getOfficeName());
+        query.put("customerId", c.getCustomerId());
+        query.put("customerName", c.getCustomerName());
+        query.put("dataYear", c.getDataYear());
+        query.put("dataQuarter", c.getDataQuarter());
+        query.put("dataMonth", c.getDataMonth());
+        query.put("dataWeek", c.getDataWeek());
+
+
+        int startIndex  = (pageNum -1 ) * pageSize;
+        query.put("startNo", startIndex);
+        query.put("endNo", pageNum * pageSize);
+        List<RepPrinterReportVO> list = nxReportDao.getPrinterUserReportsList(query);
+        Integer count = nxReportDao.getPrinterUserReportsCount(query).size();
+        PageInfo<RepPrinterReportVO> pageInfo = new PageInfo<>(list);
+        pageInfo.setPageNum(pageNum);
+        pageInfo.setPageSize(pageSize);
+        pageInfo.setTotal(count);
+        return new JsonResult2(pageInfo);
+    }
+
+    /**
+     * 	根据租户id与用户报告ID 得到用户报告
+     */
+    public RepPrinterReportVO getUserReport(Map<String, Object> params) throws Exception {
+        if(params.get("reportId")==null || "".equals(params.get("reportId").toString().trim())) {
+            throw new Exception("用户报告id为空");
+        }
+//        if(params.get("tenantId")==null || "".equals(params.get("tenantId").toString().trim())) {
+//            throw new Exception("租户id为空");
+//        }
+        List<RepPrinterReportVO> reports = nxReportDao.getPrinterUserReports(params);
+        RepPrinterReportVO v = null;
+
+        if(reports!=null&&reports.size()>0) {
+            DecimalFormat df =new DecimalFormat("0.0");
+            v = reports.get(0);
+            v.setRate1Str( 	df.format(v.getRate1()*100)	+"%");
+            v.setRate3Str( 	df.format(v.getRate3()*100)	+"%");
+            v.setRate4Str( 	df.format(v.getRate4()*100)	+"%" );
+            v.setRate5Str( 	df.format(v.getRate5()*100)	+"%" );
+            v.setRate11Str( 	df.format(v.getRate11()*100)	+"%" );
+            v.setRate12Str( 	df.format(v.getRate12()*100)	+"%" );
+            v.setRate6Str( 	df.format(v.getRate6())	+"%");
+            v.setRate7Str(  df.format(v.getRate7())		+"%");
+            v.setRate8Str(  df.format(v.getRate8()*100)	+"%" );
+            v.setRate10Str( df.format(v.getRate10()*100)	+"%");
+            v.setRate13(Math.round(v.getRate13()*10)/10.0f);
+            v.setRate14(Math.round(v.getRate14()*10)/10.0f);
+            v.setRate15(Math.round(v.getRate15()*10)/10.0f);
+            v = setPrinterReportItem(v);
+        }
+        return v;
+    }
+
+
+    private RepPrinterReportVO setPrinterReportItem(RepPrinterReportVO v) throws Exception {
+        RepPrinterReportItemVO vo = new RepPrinterReportItemVO();
+        vo.setReportId(v.getId());
+        List<RepPrinterReportItemVO> list = repPrinterReportItemDao.list(vo);
+        if(list!=null && list.size()>0) {
+            for(RepPrinterReportItemVO bean : list) {
+                if("data1".equals(bean.getReportType())) {
+                    v.setData1(bean.getReportData());
+                }else if("data2".equals(bean.getReportType())) {
+                    v.setData2(bean.getReportData());
+                }else if("data3".equals(bean.getReportType())) {
+                    v.setData3(bean.getReportData());
+                }else if("data4".equals(bean.getReportType())) {
+                    v.setData4(bean.getReportData());
+                }else if("data5".equals(bean.getReportType())) {
+                    v.setData5(bean.getReportData());
+                }else if("data6".equals(bean.getReportType())) {
+                    v.setData6(bean.getReportData());
+                }else if("data7".equals(bean.getReportType())) {
+                    v.setData7(bean.getReportData());
+                }else if("data8".equals(bean.getReportType())) {
+                    v.setData8(bean.getReportData());
+                }else if("data9".equals(bean.getReportType())) {
+                    v.setData9(bean.getReportData());
+                }else if("data10".equals(bean.getReportType())) {
+                    v.setData10(bean.getReportData());
+                }else if("data11".equals(bean.getReportType())) {
+                    v.setData11(bean.getReportData());
+                }else if("data12".equals(bean.getReportType())) {
+                    v.setData12(bean.getReportData());
+                }else if("data13".equals(bean.getReportType())) {
+                    v.setData13(bean.getReportData());
+                }else if("data14".equals(bean.getReportType())) {
+                    v.setData14(bean.getReportData());
+                }else if("data15".equals(bean.getReportType())) {
+                    v.setData15(bean.getReportData());
+                }else if("data16".equals(bean.getReportType())) {
+                    v.setData16(bean.getReportData());
+                }else if("data17".equals(bean.getReportType())) {
+                    v.setData17(bean.getReportData());
+                }else if("data18".equals(bean.getReportType())) {
+                    v.setData18(bean.getReportData());
+                }
+            }
+        }
+        return v;
+    }
+
+
+    public List<RepPrinterReportItemVO> getReportItem(Long reportId) {
+        RepPrinterReportItemVO vo = new RepPrinterReportItemVO();
+        vo.setReportId(reportId);
+        return repPrinterReportItemDao.list(vo);
+    }
+
+    public void updateReportItem(List<RepPrinterReportItemVO> items) {
+        if (!CollectionUtils.isEmpty(items)) {
+            repPrinterReportItemDao.update(items);
+        }
+    }
+
+    public void updateUserReportValue(RepPrinterReportVO vo) {
+        nxReportDao.updateUserReportValue(vo);
+    }
+
+
+    /**
+     * 产线级-指定邮箱发送打印机用户运维报告
+     * @throws Exception
+     */
+    public String sendUserReportByUser(Map<String, Object> params) throws Exception {
+        if(params.get("reportId")==null || "".equals(params.get("reportId").toString().trim())) {
+            throw new Exception("用户报告id为空");
+        }
+        if(params.get("emails")==null || "".equals(params.get("emails").toString().trim())) {
+            throw new Exception("发送邮箱为空");
+        }
+        if(params.get("tenantId")==null || "".equals(params.get("tenantId").toString().trim())) {
+            throw new Exception("租户id为空");
+        }
+        Long reportId = (Long) params.get("reportId");
+        Map<String, Object> query = new HashMap<String, Object>();
+        query.put("reportId", reportId);
+        query.put("tenantId", params.get("tenantId"));
+        List<RepPrinterReportVO> reports = nxReportDao.getPrinterUserReports(query);
+        String link = "";
+        if(reports!=null && reports.size()>0) {
+            RepPrinterReportVO v = reports.get(0);
+            String emails = params.get("emails").toString();
+            String vEmails = v.getEmails();
+            String[] emailArray = emails.split(",");
+            for(String e : emailArray) {
+                if(v.getEmails()==null) {
+                    vEmails = e + ",";
+                }else if(vEmails.indexOf(e)==-1) {
+                    vEmails = vEmails + e + ",";
+                }
+            }
+            params.put("emails", vEmails);
+
+            v.setEmails(emails);
+            link = emailService.mailUserReport(v);
+            //发送成功后将成功的邮箱记录下来
+            params.put("id", reportId);
+            nxReportDao.updateEmailsById(params);
+        }
+        return link;
+    }
+
+
+    public List<JSONObject> queryUserReport(String tenantId, QueryUserReportCondition c) throws Exception {
+        List<CustomerVO> customers = nxCustomerDao.getAllCustomer(c);
+        if (CollectionUtils.isEmpty(customers)) {
+            return new ArrayList<>();
+        }
+        CustomerVO customer = customers.get(0);
+        //从配置表中获取平台设备编码及用户设备编码关系
+        Map<String,String>	printerDeviceRelationData =	getPrinterDeviceRelation();
+
+        List<String> deviceIdList = nxCustomerDao.getRegisterDeviceByUser(Arrays.asList(customer.getOfficeId()), tenantId);
+
+        if (CollectionUtils.isEmpty(deviceIdList)) {
+            return new ArrayList<>();
+        }
+
+        PrinterReportDTO printerReportDTO = new PrinterReportDTO();
+        printerReportDTO.setDeviceIdList(deviceIdList);
+        printerReportDTO.setStartDate(c.getStartDt());
+        printerReportDTO.setEndDate(c.getEndDt());
+
+        int day = DateUtils.getDayDifference(printerReportDTO.getStartDate(), printerReportDTO.getEndDate());
+
+        List<Map<String, Object>> dyhsList = printerEfficiencyWorkDao.getReportDYHSByDevice(printerReportDTO);
+        Map<String, Object> kdlMap = new HashMap<>();
+        Map<String, Object> dyxlMap = new HashMap<>();
+        Map<String, Object> sxmdMap = new HashMap<>();
+        if (!CollectionUtils.isEmpty(dyhsList)) {
+            dyhsList.forEach(item -> {
+                Map<String, Object> map = new HashMap<>(3);
+                float dyhs = Float.parseFloat(item.getOrDefault("dyhs", "0").toString());
+                kdlMap.put(item.get("device_id").toString(),String.format("%.2f", dyhs*100 / (21*day)));
+            });
+        }
+        List<Map<String, Object>> dyxlList = printerEfficiencyWorkDao.getReportDYXLByDevice(printerReportDTO);
+        if (!CollectionUtils.isEmpty(dyxlList)) {
+            dyxlList.forEach(
+                    x->{
+                        dyxlMap.put(x.get("device_id").toString(), String.format("%.2f",x.get("dyxl")));
+                    }
+            );
+        }
+        List<Map<String, Object>> sxmdList = repPrinterSandPercentDAO.getRepPrinterSandSXMDList(printerReportDTO);
+        if (!CollectionUtils.isEmpty(sxmdList)) {
+            sxmdList.forEach(
+                    x->{
+                        sxmdMap.put(x.get("device_id").toString(), String.format("%.2f",x.get("sxmd")));
+                    }
+            );
+        }
+        List<JSONObject> result = new ArrayList<>();
+        deviceIdList.forEach(
+                x->{
+                    JSONObject json = new JSONObject();
+                    json.put("deviceId", printerDeviceRelationData.getOrDefault(x,x));
+                    json.put("kdl", kdlMap.getOrDefault(x, null));
+                    json.put("dyxl", dyxlMap.getOrDefault(x, null));
+                    json.put("szjrb", sxmdMap.getOrDefault(x, null));
+                    result.add(json);
+                }
+        );
+        logger.debug("result:{}",JSON.toJSONString(result));
+        return result;
+    }
+
+
+    /**
+     * 	根据id删除用户报告
+     */
+    public JsonResult2 deleteReportById(Long reportId){
+        JsonResult2 jsonResult=new JsonResult2();
+        try {
+            Map<String,Object> params = new HashMap<String,Object>();
+            params.put("reportId", reportId);
+            nxReportDao.deleteReportById(params);
+            repPrinterReportItemDao.deleteByReportId(params);
+        }catch(Exception e) {
+            return new JsonResult2(JsonResultStatus.DEVICE_FAIL.getRet(), "产线运维报告删除失败！");
+        }
+        return jsonResult;
+    }
+
+
+    private static final String PRINTER_DEVICE_RELATION = "printer_device_relation";
+    //从配置表中获取平台设备编码及用户设备编码关系
+    public Map<String,String> getPrinterDeviceRelation() throws Exception{
+
+        Map<String, String> data= new HashMap();
+        Optional<ConfigVO> configVOOptional = configService.findOne(PRINTER_DEVICE_RELATION);
+        if (!configVOOptional.isPresent()) {
+            //logger.error("{}配置项不存在", PRINTER_TENANT_ID);
+            throw new Exception(PRINTER_DEVICE_RELATION + "配置项不存在");
+        }
+
+        String printerDeviceRelation = configVOOptional.get().getValue();
+        if(StringUtils.isNotBlank(printerDeviceRelation)){
+            JSONArray array =  JSONObject.parseArray(printerDeviceRelation);
+            for( int i=0; array!=null&&i<array.size(); i++ ){
+                JSONObject jobj = array.getJSONObject(i);
+                String  device= jobj.get("device")==null?"":jobj.get("device").toString();
+                String  code= jobj.get("code")==null?"":jobj.get("code").toString();
+                String  loc= jobj.get("loc")==null?"":jobj.get("loc").toString();
+                if( StringUtils.isNotBlank(loc) ){
+                    code = code+"("+loc+")";
+                }
+                data.put(device, code);
+            }
+        }
+        return data;
+    }
+
+    /**
+     * 组装查询条件的数据
+     */
+    private PrinterReportDTO setPrinterReportDTO(CustomerVO c, RepPrinterReportVO vo) {
+        PrinterReportDTO printerReportDTO = new PrinterReportDTO();
+        printerReportDTO.setOfficeId(c.getOfficeId());
+        printerReportDTO.setYear(vo.getDataYear());
+        printerReportDTO.setQuarter(vo.getDataQuarter());
+        printerReportDTO.setMonth(vo.getDataMonth());
+        printerReportDTO.setWeek(vo.getDataWeek());
+        printerReportDTO.setStartDate( vo.getStartDate() );
+        printerReportDTO.setEndDate( vo.getEndDate() );
+        printerReportDTO.setQueryedType( vo.getCreateType() );
+
+        // 如果需要根据机构查询，则需要调用query服务查询该机构下的所有设备；
+//        String officeId = c.getOfficeId();
+        String officeId = c.getCustomerCode();
+        if (StringUtils.isNotBlank(officeId)) {
+            List<String> officeIds = new ArrayList<String>();
+            officeIds.add(officeId);
+            List<String> deviceIdList = nxCustomerDao.getRegisterDeviceByUser(officeIds, c.getTenantId()); //编码转换可能会有问题
+            if( deviceIdList!=null && deviceIdList.size()>0 ) {
+                printerReportDTO.setDeviceIdList(deviceIdList);
+            } else {
+                printerReportDTO.setDeviceIdList(null);
+            }
+            printerReportDTO.setOfficeId(c.getCustomerCode());
+            printerReportDTO.setQueryedDeviceIdList(1);//每个统计查询里是否需要再设置设备id串的标识
+        }
+        return printerReportDTO;
+    }
+
+    private String  dateDiff(String startTime, String endTime, String format) throws Exception {
+        //按照传入的格式生成一个simpledateformate对象
+        SimpleDateFormat sd = new SimpleDateFormat(format);
+        long nd = 1000*24*60*60;//一天的毫秒数
+        long nh = 1000*60*60;//一小时的毫秒数
+        long nm = 1000*60;//一分钟的毫秒数
+        long ns = 1000;//一秒钟的毫秒数
+        long diff;
+        //获得两个时间的毫秒时间差异
+        diff = sd.parse(endTime).getTime() - sd.parse(startTime).getTime();
+//		long day = diff/nd;//计算差多少天
+        double diff2 = (double) diff;
+        double hour =diff2 /(1000 * 60 * 60);//计算差多少小时
+        String result = String.format("%.2f",hour);
+
+//		long hour = diff%nd/nh;//计算差多少小时
+//		long min = diff%nd%nh/nm;//计算差多少分钟
+//		long sec = diff%nd%nh%nm/ns;//计算差多少秒//输出结果
+//		System.out.println("时间相差："+day+"天"+hour+"小时"+min+"分钟"+sec+"秒。");
+        return result ;
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterSandPercentServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterSandPercentServiceImpl.java
new file mode 100644
index 0000000..1189c03
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterSandPercentServiceImpl.java
@@ -0,0 +1,393 @@
+package com.rootcloud.service.impl;
+
+import com.rootcloud.common.util.PlatformDeviceTransUtil;
+import com.rootcloud.domain.dao.RepPrinterSandPercentDAO;
+import com.rootcloud.service.RepPrinterSandPercentService;
+import com.rootcloud.web.dto.GuHuaJiDanHaoDto;
+import com.rootcloud.web.dto.PinJunDaYinGaoDuDto;
+import com.rootcloud.web.dto.PrinterReportDTO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service("sandPercentServices")
+public class RepPrinterSandPercentServiceImpl implements RepPrinterSandPercentService {
+
+    private static final Logger logger = LoggerFactory.getLogger(PlatformDeviceTransUtil.class);
+
+    @Resource
+    private RepPrinterSandPercentDAO repPrinterSandPercentDAO;
+
+
+    public Map<String, Object> getRepPrinterSandPercentBarData(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData)throws Exception{
+        Map<String, Object> data = new HashMap<String, Object>();
+        if( printerReportDTO.getStartDate()==null && printerReportDTO.getEndDate()==null ){
+            return data;
+        }
+
+        Map<String, Object> result = this.getRepPrinterSandPercentList(printerReportDTO, tenantId, "",printerDeviceRelationData);
+        if( result.isEmpty() ){
+            return data ;
+        }
+        //树脂加入比
+        List<Map<String, Object>> dataListSXMD = (List)result.get("dataListSXMD");
+        int length = dataListSXMD==null?0:dataListSXMD.size();
+        String[] xListSXMD = new String[length];//设备结果集(x轴)
+        List<String> sxmdList = new ArrayList<String>();//树脂加入比
+        for( int i=0; i<length;i++ ){
+            Map<String, Object> map = (Map)dataListSXMD.get(i);
+
+            xListSXMD[i]= map.get("deviceId").toString();
+            sxmdList.add(map.get("sxmd").toString());
+        }
+        data.put("xListSXMD", xListSXMD);
+        data.put("sxmdList", sxmdList);
+
+        //漏砂量
+        List<Map<String, Object>> dataListLSL = (List)result.get("dataListLSL");
+        if (!CollectionUtils.isEmpty(dataListLSL)) {
+            float[] avgArray = new float[dataListLSL.size()];
+            Arrays.fill(avgArray,(float)result.get("rate9"));
+            data.put("xListLSL", dataListLSL.stream().map(x->x.getOrDefault("deviceId","")).collect(Collectors.toList()));
+            data.put("hszlArray", dataListLSL.stream().map(x->x.getOrDefault("hszl",0)).collect(Collectors.toList()));
+            data.put("wsyslArray", dataListLSL.stream().map(x->x.getOrDefault("wsysl",0)).collect(Collectors.toList()));
+            data.put("slylArray", dataListLSL.stream().map(x->x.getOrDefault("slyl",0)).collect(Collectors.toList()));
+            data.put("avgArray", avgArray);
+        }
+
+        //新旧砂加入占比
+        List<Map<String, Object>> dataListXJSZB = (List)result.get("dataListXJSZB");
+        length = dataListXJSZB==null?0:dataListXJSZB.size();
+        String[] xListXJSZB = new String[length];//设备结果集(x轴)
+        List<String> xjszbList = new ArrayList<String>();//新旧砂加入占比
+        for( int i=0; i<length;i++ ){
+            Map<String, Object> map = (Map)dataListXJSZB.get(i);
+            xListXJSZB[i]= map.get("deviceId").toString();
+            xjszbList.add(map.get("xjszb").toString());
+        }
+        data.put("xListXJSZB", xListXJSZB);
+        data.put("xjszbList", xjszbList);
+
+        data.put("rate6",  result.get("rate6"));
+        data.put("rate7",  result.get("rate7"));
+        data.put("rate8",  result.get("rate8"));
+        data.put("rate9",  result.get("rate9"));
+        data.put("value4",  result.get("value4"));
+        data.put("value5",  result.get("value5"));
+        data.put("value5_1", result.get("value5_1"));
+        data.put("value6",  result.get("value6"));
+
+        return data;
+    }
+
+    public Map<String, Object> getRepPrinterSandPercentList(PrinterReportDTO printerReportDTO, String tenantId, String pUid, Map<String, String> printerDeviceRelationData) throws Exception{
+
+        Map<String, Object> result = new HashMap<String, Object>();
+        if( printerReportDTO.getStartDate()==null && printerReportDTO.getEndDate()==null ){
+            return result;
+        }
+
+		/*
+        List<Map<String, Object>> list  =  new ArrayList();
+        for(int k=0;k<printerReportDTO.getDeviceIdList().size();k++)
+        {
+            String devicesid = printerReportDTO.getDeviceIdList().get(k).toString();
+            Double cur_totalxmd =0.0;
+            boolean ischanchuang =false;
+            String[] deviceCodeArrys ={"2215-18","Max-A","Max-B","1800-7","2215-12","2215-27","2215-7","2215-17","2215-10","1800-4","Max-C", "2600A-1",
+                    "1800-12","1800-11","1800-8","1800-10","1800-15","2500-2","2215-24","2215-13","2215-16","2215-19"};//产业创业中心\潍坊
+            if(isHave(deviceCodeArrys,devicesid))
+            {
+                ischanchuang =true;   //判断是否产业创新中心
+
+                List<String> liis = new ArrayList<>();
+                liis = Arrays.asList(devicesid);
+                PrinterReportDTO dts = new PrinterReportDTO();
+                dts.setStartDate(printerReportDTO.getStartDate());
+                dts.setEndDate(printerReportDTO.getEndDate());
+                dts.setDeviceIdList(liis);
+
+                List<Map<String, Object>> list1 = repPrinterSandPercentDAO.getRepPrinterSandSXMDListV3(dts);
+                String firtDay = getFirstDayOfMonth1(Integer.valueOf(printerReportDTO.getStartDate().substring(0,4)), Integer.valueOf(printerReportDTO.getStartDate().substring(5,7))); //2021-02-01
+                String lastDay = getLastDayOfMonth1(Integer.valueOf(printerReportDTO.getStartDate().substring(0,4)), Integer.valueOf(printerReportDTO.getStartDate().substring(5,7)));  //2021-02-28
+                //遍历该月的每一天
+                SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd");
+                Date date = new Date(); //2020-09-01
+                try {
+                    date = dateformat.parse(firtDay); //2020-09-01
+                }catch (Exception ex){}
+//              Date date = dateformat.parse(firtDay); //2020-09-01
+                Calendar cal = Calendar.getInstance();
+                cal.setTime(date);//month 为指定月份任意日期
+                int year1 = cal.get(Calendar.YEAR);
+                int m = cal.get(Calendar.MONTH) + 1;
+                //int dayNumOfMonth = getDaysByYearMonth(year1, m);
+//			    int dayNumOfMonth = getDaysOfMonth(year, month);
+                int dayNumOfMonth = getDaysByYearMonth2(Integer.valueOf(printerReportDTO.getStartDate().substring(0,4)), Integer.valueOf(printerReportDTO.getStartDate().substring(5,7)));
+                cal.set(Calendar.DAY_OF_MONTH, 1);// 从一号开始
+                int curday_Ncount =0;
+                for (int i = 0; i < dayNumOfMonth; i++, cal.add(Calendar.DATE, 1))
+                {
+                    Date d = cal.getTime();
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                    String cur_date = simpleDateFormat.format(d);
+
+                    Double szjrb = 0.0; //当日的树脂加入比
+                    int curday_count =0;
+                    for(int j=0;j<list1.size();j++)
+                    {
+                        String cur_year = list1.get(j).getOrDefault("data_year","0").toString();
+                        String cur_month = list1.get(j).getOrDefault("data_month","0").toString();
+                        String cur_day = list1.get(j).getOrDefault("data_day","0").toString();
+                        if(Integer.valueOf(cur_month) <10)
+                            cur_month ="0"+cur_month;
+                        if(Integer.valueOf(cur_day)<10)
+                            cur_day ="0"+cur_day;
+                        String cur_dt = cur_year+"-"+cur_month+"-"+cur_day;
+                        if(cur_date.equals(cur_dt))
+                        {
+                            curday_count++;
+
+                            String hmi_jobid = list1.get(j).getOrDefault("hmi_jobid","0").toString();
+                            if(hmi_jobid.indexOf("陶粒砂") > 0)
+                            {
+                                Double gk_sc_dy_sxmd = Double.valueOf(list1.get(j).getOrDefault("gk_sc_dy_sxmd","0").toString());
+                                Double hmi_volume = Double.valueOf(list1.get(j).getOrDefault("hmi_volume","0").toString());
+                                szjrb += 100* (gk_sc_dy_sxmd * hmi_volume * 1.5 * 10) /(hmi_volume * 1.5 * 1000);
+                            }
+                            else
+                            {
+                                Double gk_sc_dy_sxmd = Double.valueOf(list1.get(j).getOrDefault("gk_sc_dy_sxmd","0").toString());
+                                Double hmi_volume = Double.valueOf(list1.get(j).getOrDefault("hmi_volume","0").toString());
+                                szjrb += 100* (gk_sc_dy_sxmd * hmi_volume * 1.4 * 10) /(hmi_volume * 1.4 * 1000);
+                            }
+                        }
+                    }
+                    //list.get(j).getOrDefault("hmi_jobid","0").toString();
+                    //当日的树脂加入比
+                    if(curday_count > 0)
+                    {
+                        szjrb = szjrb / curday_count;
+                        cur_totalxmd += Double.valueOf(String.valueOf(szjrb));
+                        curday_Ncount++;
+                    }
+
+                }
+                //所有天数的求均值
+                String avg_xmd ="";
+                if(curday_Ncount > 0)
+                {
+                    avg_xmd =  String.format("%.1f", cur_totalxmd / curday_Ncount);
+                    Map map = new HashMap();
+                    map.put("device_id",devicesid);
+                    map.put("sxmd",avg_xmd);
+                    list.add(map); //重组集合
+                }
+//                else
+//                    avg_xmd ="0";
+            }
+            else
+            {
+
+                List<String> lis = new ArrayList<>();
+                lis = Arrays.asList(devicesid);
+                PrinterReportDTO dto = new PrinterReportDTO();
+                dto.setStartDate(printerReportDTO.getStartDate());
+                dto.setEndDate(printerReportDTO.getEndDate());
+                dto.setDeviceIdList(lis);
+                //树脂加入比
+                List<Map<String, Object>> list1 = repPrinterSandPercentDAO.getRepPrinterSandSXMDList(dto);
+                if(list1.size() > 0)
+                {
+                    Map map = new HashMap();
+                    map.put("device_id",list1.get(0).getOrDefault("device_id","0").toString());
+                    map.put("sxmd",list1.get(0).getOrDefault("sxmd","0").toString());
+                    list.add(map); //重组集合
+                }
+
+            }
+        }
+        */
+
+        //树脂加入比
+        List<Map<String, Object>> list = repPrinterSandPercentDAO.getRepPrinterSandSXMDList(printerReportDTO);
+        if( list==null || list.size()==0 ){
+//        	return result; //bug, 无树脂的时候直接返回
+        }
+//        list.sort(Comparator.comparingDouble(str -> Double.parseDouble(str.get("sxmd").toString())));//顺序
+//        Collections.sort(list,Collections.reverseOrder()); //倒序
+
+        list = PlatformDeviceTransUtil.repalceDevice(printerDeviceRelationData, list);//平台编码转用户编码
+        // 数据结果转换成前台需要的格式
+        List<Map<String, Object>> dataListSXMD = list.stream().map(item -> {
+            Map<String, Object> map = new HashMap<>(3);
+            // 树脂加入比
+            float dyhs = Float.parseFloat(item.getOrDefault("sxmd", "0").toString());
+            map.put("sxmd", String.format("%.1f", dyhs));
+            map.put("deviceId", item.get("device_id"));
+            return map;
+        }).collect(Collectors.toList());
+        //计算平均值
+        float total_sxmd=0;
+        String ave_sxmd="0.0";//平均树脂加入占比
+        float max_sxmd=0;//树脂最大加入占比
+        int i=0;
+        String maxDeviece = "";//树脂最大加入占比的设备
+        for( Map<String, Object> item : list ){
+            // 树脂加入比
+            float sxmd = Float.parseFloat(item.getOrDefault("sxmd", "0").toString());
+            total_sxmd +=sxmd;
+            if(i==0) {
+                max_sxmd = sxmd;
+                maxDeviece = item.get("device_id").toString();
+            }
+            i++;
+        }
+        if( list!=null && list.size()>0 ){
+            ave_sxmd =  String.format("%.1f", total_sxmd/list.size());
+        }
+        Map<String, Object> ave_map = new HashMap<String, Object>();
+        ave_map.put("sxmd", ave_sxmd);
+        ave_map.put("deviceId", "平均值");
+        dataListSXMD.add(ave_map);
+
+        //新砂占比
+        list = repPrinterSandPercentDAO.getRepPrinterSandXJSZBList(printerReportDTO);
+        if( list==null || list.size()==0 ){
+            //return result;  //bug, 无A、B砂用量的时候直接返回造成树脂占比缺失，不能直接返回
+        }
+        list = PlatformDeviceTransUtil.repalceDevice(printerDeviceRelationData, list);//平台编码转用户编码
+        // 数据结果转换成前台需要的格式
+        List<Map<String, Object>> dataListXJSZB = list.stream().map(item -> {
+            Map<String, Object> map = new HashMap<>(3);
+
+            //新旧砂加入占比
+            float dyxl = Float.parseFloat(item.getOrDefault("xjszb", "0").toString());
+            map.put("xjszb", String.format("%.4f", dyxl));
+            map.put("deviceId", item.get("device_id"));
+
+            return map;
+        }).collect(Collectors.toList());
+        //计算平均值
+        float total_xjszb=0;
+        String ave_xjszb="0.0";
+        int j=0;
+        String xjszbTopTree = "";
+        //新旧砂占比最高三台机器的xjszb值  2020-12-1加
+        String TopXjszbTree = "";
+        for( Map<String, Object> item : list ){
+            //新旧砂加入占比
+            float xjszb = Float.parseFloat(item.getOrDefault("xjszb", "0").toString());
+            total_xjszb += xjszb ;
+            if(j<3) {
+                xjszbTopTree += item.get("device_id").toString()+"、";
+                TopXjszbTree += item.getOrDefault("xjszb", "0").toString()+"、";
+            }
+            j++;
+        }
+        logger.info("总新旧砂占比为"+ total_xjszb + "；漏砂量前三的设备："+xjszbTopTree+"，这三台设备的漏砂量为"+TopXjszbTree+";" );
+        if( list!=null && list.size()>0 ){
+            ave_xjszb =  String.format("%.3f", total_xjszb/list.size());
+        }
+        Map<String, Object> ave_mapXJSZB = new HashMap<String, Object>();
+        ave_mapXJSZB.put("xjszb", ave_xjszb);
+        ave_mapXJSZB.put("deviceId", "平均值");
+        dataListXJSZB.add(ave_mapXJSZB);
+
+        //漏砂量
+        list = repPrinterSandPercentDAO.getRepPrinterSandLSLList(printerReportDTO);
+        list = PlatformDeviceTransUtil.repalceDevice(printerDeviceRelationData, list);//平台编码转用户编码
+        // 数据结果转换成前台需要的格式
+        List<Map<String, Object>> dataListLSL = list.stream().map(item -> {
+            Map<String, Object> map = new HashMap<>(3);
+            //漏砂总量
+            float hszl = Float.parseFloat(item.getOrDefault("hszl", "0").toString());
+            float wsysl = Float.parseFloat(item.getOrDefault("wsysl", "0").toString());
+            float slyl = Float.parseFloat(item.getOrDefault("slyl", "0").toString());
+            map.put("hszl", String.format("%.1f", hszl));
+            map.put("wsysl", String.format("%.2f", wsysl));
+            map.put("slyl", String.format("%.1f", slyl));
+            map.put("deviceId", item.get("device_id"));
+            return map;
+        }).collect(Collectors.toList());
+
+//        //计算平均值
+        float tota_lsl=0;
+        String ave_lsl="0.0";
+        int k=0;
+        String lslTopTree = "";
+        //漏砂量前三设备的lsl值  2020-12-1加
+        String ToplslTree = "";
+
+        for( Map<String, Object> item : list ){
+            //漏砂量
+            float wsysl = Float.parseFloat(item.getOrDefault("wsysl", "0").toString());
+            tota_lsl += wsysl ;
+
+            if(k >= list.size()-3) {
+                lslTopTree = item.get("device_id").toString()+"、"+lslTopTree;
+                ToplslTree = item.getOrDefault("wsysl", "0").toString()+"、"+ToplslTree;
+            }
+            k++;
+        }
+        logger.info("总漏砂量为"+ tota_lsl + "；漏砂量前三的设备："+lslTopTree+"，这三台设备的漏砂量为"+ToplslTree+";" );
+        if( list!=null && list.size()>0 ){
+            ave_lsl =  String.format("%.2f", tota_lsl/list.size());
+        }
+
+        result.put("dataListSXMD", dataListSXMD);
+        result.put("dataListXJSZB", dataListXJSZB);
+        result.put("dataListLSL", dataListLSL);
+
+        result.put("rate6",  Float.parseFloat(ave_sxmd));
+        result.put("rate7",  max_sxmd);
+        result.put("rate8",  Float.parseFloat(ave_xjszb));
+        result.put("rate9",  Float.parseFloat(ave_lsl));
+        result.put("value4",  maxDeviece);
+        result.put("value5",  xjszbTopTree.endsWith("、")?xjszbTopTree.substring(0, xjszbTopTree.length()-1):xjszbTopTree); //新旧砂占比最高的三台设备ID
+        result.put("value5_1",  TopXjszbTree.endsWith("、")?TopXjszbTree.substring(0, TopXjszbTree.length()-1):TopXjszbTree); //这三台设备的新旧砂占比值
+        result.put("value6",  lslTopTree.endsWith("、")?lslTopTree.substring(0, lslTopTree.length()-1):lslTopTree);  //漏砂量最高的三台设备ID
+        result.put("value6_1",  ToplslTree.endsWith("、")?ToplslTree.substring(0, ToplslTree.length()-1):ToplslTree);    //这三台设备的漏砂量
+
+        return result;
+    }
+
+
+    public List<PinJunDaYinGaoDuDto> pinJunDaYinGaoDu(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData) {
+        List<PinJunDaYinGaoDuDto> list = repPrinterSandPercentDAO.pinJunDaYinGaoDu(printerReportDTO);
+        if( list==null || list.size()==0 ){
+            return new ArrayList<>();
+        }
+        //设备编码转换
+        for (PinJunDaYinGaoDuDto dto: list) {
+            String userDeviceId = printerDeviceRelationData.get(dto.getDeviceId())==null?
+                    dto.getDeviceId():printerDeviceRelationData.get(dto.getDeviceId());
+            dto.setDeviceId(userDeviceId);
+        }
+        return list;
+    }
+
+    public List<GuHuaJiDanHaoDto> guHuaJiDanHao(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData) {
+        List<GuHuaJiDanHaoDto> list = repPrinterSandPercentDAO.guHuaJiDanHao(printerReportDTO);
+        if( list==null || list.size()==0 ){
+            return new ArrayList<>();
+        }
+        //设备编码转换
+        for (GuHuaJiDanHaoDto dto: list) {
+            String userDeviceId = printerDeviceRelationData.get(dto.getDeviceId())==null?
+                    dto.getDeviceId():printerDeviceRelationData.get(dto.getDeviceId());
+            dto.setDeviceId(userDeviceId);
+        }
+        return list;
+    }
+
+
+
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterServiceImpl.java
new file mode 100644
index 0000000..419153a
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterServiceImpl.java
@@ -0,0 +1,504 @@
+package com.rootcloud.service.impl;
+
+import com.github.pagehelper.PageInfo;
+import com.rootcloud.common.JsonResult2;
+import com.rootcloud.common.JsonResultStatus;
+import com.rootcloud.common.util.PlatformDeviceTransUtil;
+import com.rootcloud.domain.dao.RepPrinterOutputDao;
+import com.rootcloud.domain.dao.RepPrinterSandPassrateDao;
+import com.rootcloud.domain.dao.RepPrinterStarPassrateDao;
+import com.rootcloud.domain.dao.RepPrinterWastereasonDao;
+import com.rootcloud.domain.vo.*;
+import com.rootcloud.service.RepPrinterService;
+import com.rootcloud.web.dto.*;
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.CellType;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+//import com.rootcloud.saas.common.page.Paging;
+//import org.apache.commons.lang.StringUtils;
+
+//@Service("printerService")
+@Service("repPrinterServices")
+public class RepPrinterServiceImpl implements RepPrinterService {
+
+    private static final org.slf4j.Logger log = LoggerFactory.getLogger(RepPrinterServiceImpl.class);
+
+//    @Autowired
+
+    @Autowired
+    private RepPrinterOutputDao repPrinterOutputDao;
+//    @Autowired
+
+    @Autowired
+    private RepPrinterWastereasonDao repPrinterWastereasonDao;
+
+    @Autowired
+    private RepPrinterSandPassrateDao repPrinterSandPassrateDao;
+
+    @Autowired
+    private RepPrinterStarPassrateDao repPrinterStarPassrateDao;
+
+//    @Autowired
+//    private RepPrinterReportDAO repPrinterReportDAO;
+//
+
+//    @Autowired
+//    private RepPrinterSandPercentService repPrinterSandPercentService ;
+
+    public JsonResult2 deviceWastePageList(String tenantId, RepPrinterWastereasonDTO c) throws Exception {
+        Integer pageNum = StringUtils.isNotBlank(c.getPageNo())?Integer.parseInt(c.getPageNo()):1;
+        Integer pageSize = StringUtils.isNotBlank(c.getPageSize())?Integer.parseInt(c.getPageSize()):10;
+
+        JsonResult2 jsonResult=new JsonResult2();
+        int startIndex  = (pageNum -1 ) * pageSize;
+
+        RepPrinterWastereasonVO v = new RepPrinterWastereasonVO();
+        PropertyUtils.copyProperties(v, c.getVo());
+        v.setStartNo(startIndex);
+        v.setEndNo(pageNum * pageSize);
+        List<RepPrinterWastereasonVO> reasonlist = repPrinterWastereasonDao.listPage(v);
+        Integer count = repPrinterWastereasonDao.list(v).size();
+        PageInfo<RepPrinterWastereasonVO> pageInfo = new PageInfo<>(reasonlist);
+        pageInfo.setPageNum(pageNum);
+        pageInfo.setPageSize(pageSize);
+        pageInfo.setTotal(count);
+        return new JsonResult2(pageInfo);
+    }
+
+
+    public JsonResult2 sandPassratePageList(String tenantId, RepPrinterSandPassrateDTO c) throws Exception {
+        Integer pageNum = StringUtils.isNotBlank(c.getPageNo())?Integer.parseInt(c.getPageNo()):1;
+        Integer pageSize = StringUtils.isNotBlank(c.getPageSize())?Integer.parseInt(c.getPageSize()):10;
+
+        JsonResult2 jsonResult=new JsonResult2();
+        int startIndex  = (pageNum -1 ) * pageSize;
+
+        RepPrinterSandPassrateVO v = new RepPrinterSandPassrateVO();
+        PropertyUtils.copyProperties(v, c.getVo());
+        v.setStartNo(startIndex);
+        v.setEndNo(pageNum * pageSize);
+        List<RepPrinterSandPassrateVO> list = repPrinterSandPassrateDao.listPage(v);
+        Integer count = repPrinterSandPassrateDao.list(v).size();
+
+        PageInfo<RepPrinterSandPassrateVO> pageInfo = new PageInfo<>(list);
+        pageInfo.setPageNum(pageNum);
+        pageInfo.setPageSize(pageSize);
+        pageInfo.setTotal(count);
+        return new JsonResult2(pageInfo);
+    }
+//
+    public JsonResult2 outputPageList(String tenantId, RepPrinterOutputDTO c) throws Exception{
+        Integer pageNum = StringUtils.isNotBlank(c.getPageNo())?Integer.parseInt(c.getPageNo()):1;
+        Integer pageSize = StringUtils.isNotBlank(c.getPageSize())?Integer.parseInt(c.getPageSize()):10;
+
+        JsonResult2 jsonResult=new JsonResult2();
+        int startIndex  = (pageNum -1 ) * pageSize;
+
+        RepPrinterOutputVO v = new RepPrinterOutputVO();
+        PropertyUtils.copyProperties(v, c.getVo());
+        v.setStartNo(startIndex);
+        v.setEndNo(pageNum * pageSize);
+        List<RepPrinterOutputVO> list = repPrinterOutputDao.listPage(v);
+        Integer count = repPrinterOutputDao.list(v).size();
+
+        PageInfo<RepPrinterOutputVO> pageInfo = new PageInfo<>(list);
+        pageInfo.setPageNum(pageNum);
+        pageInfo.setPageSize(pageSize);
+        pageInfo.setTotal(count);
+        return new JsonResult2(pageInfo);
+    }
+
+    //砂型尺寸、外观、精度 Excel批量导入
+    public void starPassrate(MultipartFile file,Integer sxType) throws Exception {
+        HSSFWorkbook wb = new HSSFWorkbook(file.getInputStream()); // 根据页面index 获取sheet页
+
+        HSSFSheet sheet = wb.getSheetAt(0);
+
+        List<RepPrinterStarPassrateVO> repPrinterStarPassrateVOList = new ArrayList<RepPrinterStarPassrateVO>();// 实体类集合
+
+        HSSFRow row = null;
+        // 循环sesheet页中数据从第二行开始，第一行是标题
+
+        for (int i = 1; i < sheet.getPhysicalNumberOfRows(); i++) {
+            // 获取每一行数据
+            row = sheet.getRow(i);
+
+            // 单元格数据格式化
+            row.getCell(0).setCellType(CellType.STRING);
+            row.getCell(1).setCellType(CellType.STRING);
+            row.getCell(2).setCellType(CellType.STRING);
+            row.getCell(3).setCellType(CellType.STRING);
+            row.getCell(4).setCellType(CellType.STRING);
+            row.getCell(5).setCellType(CellType.STRING);
+            row.getCell(6).setCellType(CellType.STRING);
+
+            try{
+                RepPrinterStarPassrateVO repPrinterSandPassrateVO = new RepPrinterStarPassrateVO();
+                repPrinterSandPassrateVO.setSxType(sxType);
+                repPrinterSandPassrateVO.setDeviceId(row.getCell(0).getStringCellValue());
+                repPrinterSandPassrateVO.setStartDate(row.getCell(1).getStringCellValue() );
+                repPrinterSandPassrateVO.setEndDate(row.getCell(2).getStringCellValue() );
+                repPrinterSandPassrateVO.setCustomerName(row.getCell(3).getStringCellValue());
+
+                repPrinterSandPassrateVO.setItemInspect( Integer.parseInt( row.getCell(4).getStringCellValue() ) );
+                repPrinterSandPassrateVO.setItemHgnum( Integer.parseInt( row.getCell(5).getStringCellValue() ) );
+                repPrinterSandPassrateVO.setItemHglv(BigDecimal.valueOf(Float.parseFloat(row.getCell(6).getStringCellValue())));
+                repPrinterStarPassrateVOList.add(repPrinterSandPassrateVO);
+            }catch(Exception e){}
+            // 去除重复项
+//			List<RepPrinterSandPassrateVO> repPrinterSandPassrateVOS = repPrinterSandPassrateDao.list(repPrinterSandPassrateVO);
+//			if (CollectionUtils.isEmpty(repPrinterSandPassrateVOS)) {
+//				repPrinterSandPassrateVOList.add(repPrinterSandPassrateVO);
+//			}
+        }
+        if(repPrinterStarPassrateVOList!=null && repPrinterStarPassrateVOList.size()>0){
+            repPrinterStarPassrateDao.add(repPrinterStarPassrateVOList);
+        }
+
+    }
+
+    //删除精度、尺寸、外观数据
+    public JsonResult2 deleteStarPassrate(String tenantId, RepPrinterStarPassrateVO c) throws Exception{
+        JsonResult2 jsonResult=new JsonResult2();
+        try {
+            repPrinterStarPassrateDao.deleteStarPassrate(c);
+        }catch(Exception e) {
+            return new JsonResult2(JsonResultStatus.DEVICE_FAIL.getRet(), "星级评价指标数据删除失败！");
+        }
+        return jsonResult;
+    }
+    //分页查找砂型尺寸、外观、精度、合格率统计列表
+    public JsonResult2 starPassratePageList(String tenantId, RepPrinterStarPassrateDTO c) throws Exception {
+        Integer pageNum = StringUtils.isNotBlank(c.getPageNo())?Integer.parseInt(c.getPageNo()):1;
+        Integer pageSize = StringUtils.isNotBlank(c.getPageSize())?Integer.parseInt(c.getPageSize()):10;
+
+        JsonResult2 jsonResult=new JsonResult2();
+        int startIndex  = (pageNum -1 ) * pageSize;
+
+        RepPrinterStarPassrateVO v = new RepPrinterStarPassrateVO();
+        PropertyUtils.copyProperties(v, c.getVo());
+        v.setStartNo(startIndex);
+        v.setEndNo(pageNum * pageSize);
+        List<RepPrinterStarPassrateVO> list = repPrinterStarPassrateDao.listPage(v);
+
+        PageInfo<RepPrinterStarPassrateVO> pageList = new PageInfo<RepPrinterStarPassrateVO>(list);
+        Integer count = repPrinterStarPassrateDao.list(v).size();
+
+        PageInfo<RepPrinterStarPassrateVO> pageInfo = new PageInfo<>(list);
+        pageInfo.setPageNum(pageNum);
+        pageInfo.setPageSize(pageSize);
+        pageInfo.setTotal(count);
+        return new JsonResult2(pageInfo);
+    }
+
+
+    //产线运维报告- 取废品原因
+    public Map<String, Object> sumWastereasonData(PrinterReportDTO printerReportDTO, String tenantId, Map<String,String> printerDeviceRelationData) throws Exception {
+        Map<String, Object> result = new HashMap<String, Object>();
+
+        List<Map<String,Object>> list = repPrinterWastereasonDao.sumWastereasonData(printerReportDTO);
+        if( list==null || list.size()==0 ){
+            return result;
+        }
+
+        List<String> waste_types = list.stream().map(item -> item.get("waste_type").toString()).collect(Collectors.toList());
+        String[] typeArray = new String[waste_types.size()];
+        String top3Types = "";
+        for(int i=0;i<waste_types.size();i++) {
+            String type = waste_types.get(i);
+            typeArray[i] = type;
+            if(i<3) {
+                top3Types += type +"、";
+            }
+        }
+
+        BigDecimal total = new BigDecimal(0);
+        for(Map<String,Object> m : list) {
+            BigDecimal count = (BigDecimal) m.get("count");
+            total = total.add(count);
+        }
+        String[] countArray = new String[list.size()];
+        for(int i=0;i<list.size();i++) {
+            Map<String,Object> m = list.get(i);
+            BigDecimal count = (BigDecimal) m.get("count");
+            DecimalFormat df =new DecimalFormat("0.0");
+            countArray[i] = df.format(count.multiply(new BigDecimal(100)).divide(total, 2, BigDecimal.ROUND_HALF_UP))+"%";
+        }
+
+        result.put("types", typeArray);
+        result.put("proportions", countArray);
+        result.put("top3WastereasonTypes", top3Types.endsWith("、")?top3Types.substring(0, top3Types.length()-1):top3Types);
+        return result;
+    }
+
+    public Map<String, Object> sumDeviceProductWasteData(PrinterReportDTO printerReportDTO, String tenantId, Map<String, String> printerDeviceRelationData) throws Exception {
+        Map<String, Object> result = new HashMap<String, Object>();
+        List<Map<String,Object>> list = repPrinterOutputDao.sumDeviceProductWasteData(printerReportDTO);
+        list = PlatformDeviceTransUtil.repalceDevice(printerDeviceRelationData, list);
+        if( list==null || list.size()==0 ){
+            return result;
+        }
+        String[] deviceArray = new String[list.size()];
+        Object[] clArray = new String[list.size()];
+        Object[] hglArray = new String[list.size()];
+        Object[] fplArray = new String[list.size()];
+        Object[] devfplArray = new String[list.size()];
+
+        DecimalFormat df =new DecimalFormat("0.0");
+        DecimalFormat df1 =new DecimalFormat("0.000");
+        BigDecimal avgDevfpnum = new BigDecimal(0);
+        BigDecimal avgFpnum = new BigDecimal(0);
+        BigDecimal clSum =  new BigDecimal(0);
+
+        Map<String, Object> topThreeDevfplMap = new HashMap<String, Object>();
+
+        for(int i=0;i<list.size();i++) {
+            Map<String,Object> m = list.get(i);
+            String device_id = (String) m.get("device_id");
+            BigDecimal cl = (BigDecimal) m.get("cl");//产量
+            BigDecimal hgl = (BigDecimal) m.get("hgl");//合格量
+            BigDecimal fpl = (BigDecimal) m.get("fpl");
+            BigDecimal devfpl = (BigDecimal) m.get("devfpl");
+            BigDecimal devfpnum = (BigDecimal) m.get("devfpnum");//设备废品量
+            BigDecimal fpnum = (BigDecimal) m.get("fpnum");//总废品量
+            deviceArray[i] = device_id;
+            try {
+                clArray[i] = df.format(cl.doubleValue());
+                hglArray[i] = df.format(hgl.doubleValue());
+                fplArray[i] = df1.format(fpl.doubleValue());
+                devfplArray[i] = df1.format(devfpl.doubleValue());
+            } catch (Exception e) {
+                clArray[i] = "0";
+                hglArray[i] = "0";
+                fplArray[i] = "0";
+                devfplArray[i] = "0";
+            }
+
+            clSum = clSum.add(cl);
+            avgDevfpnum = avgDevfpnum.add(devfpnum);
+            avgFpnum = avgFpnum.add(fpnum);
+
+            topThreeDevfplMap = getTopThree(topThreeDevfplMap, devfpl.floatValue(), device_id);
+        }
+
+        result.put("deviceArray", deviceArray);
+        result.put("clArray", clArray);
+        result.put("hglArray", hglArray);
+        result.put("fplArray", fplArray);
+        result.put("devfplArray", devfplArray);
+
+        String top3Devfpl = "";
+        String[] deviceIds = (String[])topThreeDevfplMap.get("deviceIds");
+        for(String id:deviceIds ){
+            top3Devfpl += id+"、" ;
+        }
+
+        result.put("avgFpl", df1.format(avgFpnum.divide(clSum, 4, BigDecimal.ROUND_HALF_UP)));
+        result.put("avgDevFpl", df1.format(avgDevfpnum.divide(clSum, 4, BigDecimal.ROUND_HALF_UP)));
+        result.put("top3DevfplDevices", top3Devfpl.endsWith("、")?top3Devfpl.substring(0, top3Devfpl.length()-1):top3Devfpl);
+        return result;
+    }
+
+    //获取前三数据
+    private Map<String, Object> getTopThree(Map<String, Object> map, float number, String deviceId){
+        float[] topThree ;
+        String[] deviceIds ;
+        if(map.isEmpty()){
+            topThree = new float[3];
+            deviceIds = new String[3];
+            topThree[0]=number;
+            deviceIds[0]=deviceId;
+        }else{
+            topThree = (float[])map.get("topThree");
+            deviceIds = (String[])map.get("deviceIds");
+            for( int i=0;i<3;i++ ){
+                if( topThree[i]<number ){
+                    topThree[i] = number ;
+                    deviceIds[i] = deviceId ;
+                    break ;
+                }
+            }
+        }
+        //数组从小到大自排序
+        final float THRESHOLD = 0.000000f;
+        String[] newDeviceIds = new String[3];
+        float index1=topThree[0], index2=topThree[1], index3=topThree[2];
+        Arrays.sort(topThree);
+        for( int i=0;i<3;i++ ){
+            if( Math.abs(topThree[i]-index1) == THRESHOLD){
+                newDeviceIds[i]=deviceIds[0];
+            }
+            if( Math.abs(topThree[i]-index2) == THRESHOLD ){
+                newDeviceIds[i]=deviceIds[1];
+            }
+            if( Math.abs(topThree[i]-index3) == THRESHOLD ){
+                newDeviceIds[i]=deviceIds[2];
+            }
+        }
+
+        map.put("topThree", topThree);
+        map.put("deviceIds", newDeviceIds);
+        return map ;
+    }
+
+    public Map<String, Object> sumPrinterSandPassrateData(PrinterReportDTO printerReportDTO, String tenantId, Map<String,String> printerDeviceRelationData) throws Exception {
+        Map<String, Object> result = new HashMap<String, Object>();
+        List<Map<String,Object>> list = repPrinterSandPassrateDao.sumPrinterSandPassrateData(printerReportDTO);
+        if( list==null || list.size()==0 ){
+            return result;
+        }
+        list = PlatformDeviceTransUtil.repalceDevice(printerDeviceRelationData, list);
+        String[] deviceArray = new String[list.size()];
+        Object[] rateArray = new String[list.size()];
+        Object[] aveArray = new String[list.size()];
+
+        DecimalFormat df =new DecimalFormat("0.000");
+        DecimalFormat df1 =new DecimalFormat("0.00");
+        BigDecimal sxmd_total = new BigDecimal(0);
+        Long count_total = new Long(0);
+        String top3MdbhgDevices = "";
+        for(int i=0;i<list.size();i++) {
+            Map<String,Object> m = list.get(i);
+            String device_id = (String) m.get("device_id");
+            BigDecimal sxmd = (BigDecimal) m.get("sxmd");
+            BigDecimal sxmdAve = (BigDecimal) m.get("sxmdAve");
+            Long count = (Long) m.get("count");
+            deviceArray[i] = device_id;
+            rateArray[i] = df.format(sxmd.divide(new BigDecimal(count), 3, BigDecimal.ROUND_HALF_UP));
+            aveArray[i] = df1.format(sxmdAve.divide(new BigDecimal(count), 3, BigDecimal.ROUND_HALF_UP));
+            sxmd_total = sxmd_total.add(sxmd);
+            count_total = count_total + count;
+            if (i >= list.size() -3) {
+                top3MdbhgDevices = "、"+device_id+top3MdbhgDevices;
+            }
+        }
+        result.put("deviceArray", deviceArray);
+        result.put("rateArray", rateArray);//合格率
+        result.put("aveArray", aveArray);//密度平均值
+        result.put("top3MdbhgDevices", top3MdbhgDevices.startsWith("、")?top3MdbhgDevices.substring(1):top3MdbhgDevices);
+        result.put("avgSxmd", df.format(sxmd_total.divide(new BigDecimal(count_total), 2, BigDecimal.ROUND_HALF_UP)));
+        return result;
+    }
+
+    public List<ChanNengLiYongLvDto> chanNengLiYongLv(PrinterReportDTO printerReportDTO, String tenantId,
+                                                      Map<String, String> printerDeviceRelationData, Map<String, Object> targetmap) {
+        List<ChanNengLiYongLvDto> list = repPrinterOutputDao.chanNengLiYongLv(printerReportDTO);
+        if( list==null || list.size()==0 ){
+            return new ArrayList<>();
+        }
+        //设备编码转换
+        for (ChanNengLiYongLvDto dto: list) {
+            String userDeviceId = printerDeviceRelationData.get(dto.getDeviceId())==null?
+                    dto.getDeviceId():printerDeviceRelationData.get(dto.getDeviceId());
+            dto.setDeviceId(userDeviceId);
+        }
+        int days = daysDiff(printerReportDTO.getStartDate(),printerReportDTO.getEndDate());
+        for(ChanNengLiYongLvDto dto: list) {
+            String device_id = dto.getDeviceId();//设备
+            Double cl = dto.getChanLiang();//产量
+            Double cn = 0d;//产能
+            String deviceType = device_id.startsWith("SDream") ? "SDream" : device_id.split("-")[0];
+            dto.setDeviceType(deviceType);
+            RepPrinterTargetDicVO v = (RepPrinterTargetDicVO)targetmap.get("CN_" + deviceType);
+            if (v != null ) {
+                cn = days * v.getTargetValue().doubleValue();
+            }
+            if (cn > 0) {
+                dto.setLiYongLv(cl.doubleValue() / cn);
+            }
+            dto.setChanNeng(cn);
+        }
+        Map<String,List<ChanNengLiYongLvDto>> ChanNengLiYongLvMap = list.stream().collect(Collectors.groupingBy(ChanNengLiYongLvDto::getDeviceType));
+        ChanNengLiYongLvMap.forEach(
+                (x,y)->{
+                    double avg = y.stream().mapToDouble(ChanNengLiYongLvDto::getLiYongLv).average().orElse(0d);
+                    y.forEach(
+                            yy -> yy.setAvg(avg)
+                    );
+                }
+        );
+        //排序
+        Collections.sort(list,new Comparator<ChanNengLiYongLvDto>() {
+            @Override
+            public int compare(ChanNengLiYongLvDto o1, ChanNengLiYongLvDto o2) {
+                if (o1 != null && o2 != null) {
+                    if (o1.getChanLiang().equals(o2.getChanLiang())) {
+                        return o1.getDeviceId().compareTo(o2.getDeviceId());
+                    } else {
+                        return o2.getChanLiang().compareTo(o1.getChanLiang());
+                    }
+                }
+                return 0;
+            }
+        });
+        return list;
+    }
+    public Map<String, Object> sumPrinterSandPassrateData1(PrinterReportDTO printerReportDTO, String tenantId, Map<String,String> printerDeviceRelationData) throws Exception {
+        Map<String, Object> result = new HashMap<String, Object>();
+        List<Map<String,Object>> list = repPrinterSandPassrateDao.sumPrinterSandPassrateQiangDuData(printerReportDTO);
+        if( list==null || list.size()==0 ){
+            return result;
+        }
+        list = PlatformDeviceTransUtil.repalceDevice(printerDeviceRelationData, list);
+        String[] deviceArray = new String[list.size()];
+        Object[] rateArray = new String[list.size()];
+        Object[] aveArray = new String[list.size()];
+        DecimalFormat df =new DecimalFormat("0.000");
+        DecimalFormat df1 =new DecimalFormat("0.00");
+        BigDecimal sxmd_total = new BigDecimal(0);
+        Long count_total = new Long(0);
+        String top3MdbhgDevices = "";
+        for(int i=0;i<list.size();i++) {
+            Map<String,Object> m = list.get(i);
+            String device_id = (String) m.get("device_id");
+            BigDecimal sxmd = (BigDecimal) m.get("sxmd");
+            BigDecimal sxmdAve = (BigDecimal) m.get("sxmdAve");
+            Long count = (Long) m.get("count");
+            deviceArray[i] = device_id;
+            rateArray[i] = df.format(sxmd.divide(new BigDecimal(count), 3, BigDecimal.ROUND_HALF_UP));
+            aveArray[i] = df1.format(sxmdAve.divide(new BigDecimal(count), 3, BigDecimal.ROUND_HALF_UP));
+
+            sxmd_total = sxmd_total.add(sxmd);
+            count_total = count_total + count;
+
+            if (i >= list.size() -3) {
+                top3MdbhgDevices = "、"+device_id+top3MdbhgDevices;
+            }
+        }
+        result.put("deviceArray", deviceArray);
+        result.put("rateArray", rateArray);//合格率
+        result.put("aveArray", aveArray);//密度平均值
+        result.put("top3MdbhgDevices", top3MdbhgDevices.startsWith("、")?top3MdbhgDevices.substring(1):top3MdbhgDevices);
+        result.put("avgSxmd", df.format(sxmd_total.divide(new BigDecimal(count_total), 2, BigDecimal.ROUND_HALF_UP)));
+        return result;
+    }
+
+
+
+
+
+    private int daysDiff(String startDate, String endDate) {
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDate start = LocalDate.parse(startDate, dtf);
+        LocalDate end = LocalDate.parse(endDate, dtf);
+        return Period.between(start,end).getDays()+1;
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterStarEvaluateServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterStarEvaluateServiceImpl.java
new file mode 100644
index 0000000..fa98782
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterStarEvaluateServiceImpl.java
@@ -0,0 +1,1364 @@
+package com.rootcloud.service.impl;
+
+
+import com.rootcloud.domain.dao.RepPrinterStarEvaluateDAO;
+import com.rootcloud.service.RepPrinterStarEvaluateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+@Service("starPrinterServices")
+public class RepPrinterStarEvaluateServiceImpl implements RepPrinterStarEvaluateService {
+
+    @Autowired
+    private
+    RepPrinterStarEvaluateDAO starEvaluateDAO;
+
+    public void run(Calendar calendar) {
+
+        /*
+        Integer year = calendar.get(Calendar.YEAR); //2020
+        Integer month = calendar.get(Calendar.MONTH) + 1; //09 10 11
+        Integer day = calendar.get(Calendar.DAY_OF_MONTH);
+
+        String mon ="";
+        String days ="";
+        if(month <10)
+            mon = "0" + month.toString();
+        else
+            mon = month.toString();
+        if(day <10)
+            days = "0" + day.toString();
+        else
+            days = day.toString();
+
+        // 1. 从配置表中获取租户编号及设备型号
+        Optional<ConfigVO> configVOOptional = configService.findOne(PRINTER_TENANT_ID);
+        if (!configVOOptional.isPresent()) {
+            log.error("{}配置项不存在", PRINTER_TENANT_ID);
+        }
+        String tenantId = configVOOptional.get().getValue();
+        Optional<ConfigVO> deviceTypeIdOptional = configService.findOne(PRINTER_DEVICE_TYPE_ID);
+        if (!deviceTypeIdOptional.isPresent()) {
+            log.error("{}配置项不存在", PRINTER_DEVICE_TYPE_ID);
+        }
+        String deviceType = deviceTypeIdOptional.get().getValue();
+        String deviceTypeId = deviceTypeIdOptional.get().getValue();
+        String userid = "124";//params==null?null:StringUtil.getStrVal(params.get("pUid"), true, null);
+
+        String startday = getFirstDayOfMonth1(year,month);
+        String endday = getLastDayOfMonth1(year,month);
+        String statistics_type ="";
+        String statistics_type2 ="";
+        String statistics_type3 ="";
+        String statistics_type4 ="";
+        String statistics_type5 ="";
+        String statistics_type6 ="";
+        String statistics_type7 ="";
+        String statistics_type8 ="";
+
+        //I 故障停机率
+        String startTime = startday;
+        String endTime = endday;
+        List<RepMttVO> ListDataObj = repFaultDAO.byDeviceCode("","","","5719",startTime,endTime);
+
+        List<RepStarEvaluateVO> resultList = new ArrayList<>(30);
+        List<String> deviceIdList = new ArrayList<String>();
+        for(int i=0;i<ListDataObj.size();i++)
+        {
+            Double total_Hmitotaltimecost =0.0; //正常打印耗时
+            Double total_Gztotaltime =0.0;
+
+            String  jixing = String.valueOf(ListDataObj.get(i).getJixing().toString());
+            String deviceCode = String.valueOf(ListDataObj.get(i).getDeviceid().toString());
+            String officeid = String.valueOf(ListDataObj.get(i).getOfficeid().toString());
+
+            //目前只有四川共享铸造KF、装备成形工厂KM1有废品数据
+            if(officeid.equals("7b0c9a3a4e514c099569f4a37b7c7b43") || officeid.equals("9bbc696e35214674bf57e186d328f5b9"))
+            {
+                String Hmitotaltimecost = ListDataObj.get(i).getHmitotaltimecost(); //处理null值
+                if(Hmitotaltimecost == null)
+                    Hmitotaltimecost ="0";
+                else
+                    Hmitotaltimecost = String.valueOf(ListDataObj.get(i).getHmitotaltimecost().toString());
+
+                String Gztotaltime =String.valueOf(ListDataObj.get(i).getGztotaltime().toString());
+                String Gzcounts =String.valueOf(ListDataObj.get(i).getCounts().toString());
+                String officename = String.valueOf(ListDataObj.get(i).getOfficename().toString());
+                String officecode = String.valueOf(ListDataObj.get(i).getOfficeid().toString());
+                String MTBF ="0";
+                String MTTR ="0";
+                String MTTF ="0";
+                if(Gzcounts.equals("0"))
+                {
+                    MTBF = String.format("%.1f", Double.parseDouble(Hmitotaltimecost));
+                    MTTR ="0";
+                    MTTF ="0";
+                    List<RepMttVO> List1 = repFaultDAO.byDeviceCode("","",deviceCode,"5719",startTime,endTime);
+                    for(int j=0;j<List1.size();j++)
+                    {
+                        //无故障 无故障: 比如25号全天无故障   24小时  /1 = 24;
+                        LocalDateTime t1 = LocalDateTime.parse(startTime +" "+"00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                        LocalDateTime t2 = LocalDateTime.parse(endTime +" "+"23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                        String s1 = String.valueOf(Duration.between(t1,t2.plusSeconds(1)).toMinutes());
+                        Double hours = Double.valueOf(s1) / 60;  //小时数
+                        Double temp3 = hours / 1;
+                        MTTF = String.format("%.1f", temp3);
+                    }
+                }
+                if(!Gzcounts.equals("0"))
+                {
+                    Double temp = Double.parseDouble(Hmitotaltimecost)/Double.parseDouble(Gzcounts);
+                    MTBF = String.format("%.1f", temp);
+                    Double temp1 = Double.parseDouble(Gztotaltime)/Double.parseDouble(Gzcounts);
+                    MTTR = String.format("%.1f", temp1);
+
+                    if(Gzcounts.equals("1")) //有一次故障 MTTF
+                    {
+                        //查询1次故障的记录，计算此情况
+                        List<RepMttVO> listtemp = repFaultDAO.QuerySignalRecord(deviceCode,"",startTime,endTime);
+                        String gzstartdate = String.valueOf(listtemp.get(0).getGzstartdate()).substring(0,19);
+                        String gzresumedate = String.valueOf(listtemp.get(0).getGzresumedate()).substring(0,19);
+
+                        //有一次故障，比如10点钟故障，12点钟恢复正常：(10 + 12)/ 2 =12.2
+                        LocalDateTime t1 = LocalDateTime.parse(startTime +" "+"00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                        LocalDateTime t2 = LocalDateTime.parse(gzstartdate, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                        LocalDateTime t3 = LocalDateTime.parse(gzresumedate, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                        LocalDateTime t4 = LocalDateTime.parse(endTime+" "+"23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                        String s1 = String.valueOf(Duration.between(t1,t2).toMinutes());
+                        String s2 = String.valueOf(Duration.between(t3,t4.plusSeconds(1)).toMinutes());
+
+                        Double hours1 = Double.valueOf(s1)/60;
+                        Double hours2 = Double.valueOf(s2)/60;
+                        Double temp3 = (hours1 + hours2) / 2;
+                        MTTF = String.format("%.1f", temp3);
+
+                    }
+                    else // >1次
+                    {
+                        //依次取出该设备的故障开始时间
+                        String firstTempStartT ="";
+                        String startTempT="";
+                        String nextTime ="";
+                        Double TH =0.0;
+                        Double hours =0.0;
+                        //指定设备的数据
+                        List<RepMttVO> ListObj = repFaultDAO.QuerySignalRecord(deviceCode,"",startTime,endTime);//查询该机构下
+
+//						开始时间点
+//						开始1           恢复1
+//						开始2           恢复2
+//						开始3           恢复3
+//						开始4           恢复4
+//						----------------------
+//						----------------------
+//						开始n           恢复n
+//						结束时间点
+
+                        //计算指定设备的所有故障持续时长
+                        int initCount =0;
+                        for(int j=0;j<ListObj.size();j++)
+                        {
+                            if(initCount == 0) //开始
+                            {
+                                firstTempStartT =String.valueOf(ListObj.get(j).getGzstartdate()).substring(0,19);
+                                LocalDateTime t1 = LocalDateTime.parse(startTime+" "+"00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                                LocalDateTime t2 = LocalDateTime.parse(firstTempStartT, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                                String hh = String.valueOf(Duration.between(t1,t2).toMinutes());
+                                hours += Double.valueOf(hh) / 60;
+                                initCount ++;
+
+                                startTempT =String.valueOf(ListObj.get(j).getGzresumedate()).substring(0,19);
+                            }
+                            if(initCount > 0 && j >0)
+                            {
+
+                                nextTime =String.valueOf(ListObj.get(j).getGzstartdate()).substring(0,19); //开始时间
+                                LocalDateTime t1 = LocalDateTime.parse(startTempT, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                                LocalDateTime t2 = LocalDateTime.parse(nextTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                                String hh = String.valueOf(Duration.between(t1,t2).toMinutes());
+                                hours += Double.valueOf(hh) /60;
+
+                                startTempT = String.valueOf(ListObj.get(j).getGzresumedate()).substring(0,19); //下一次的开始时间
+
+                            }
+                            if(j == ListObj.size() -1) //最后一条记录
+                            {
+                                String endTempStartT =String.valueOf(ListObj.get(j).getGzresumedate()).substring(0,19);
+                                LocalDateTime t1 = LocalDateTime.parse(endTempStartT, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                                LocalDateTime t2 = LocalDateTime.parse(endTime+" "+"23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                                String hh = String.valueOf(Duration.between(t1,t2).toMinutes());
+                                hours += Double.valueOf(hh) / 60;
+                                //最后一次取数不计次数
+                            }
+                        }
+                        //求当前设备的MTTF
+                        TH = hours /(Double.valueOf(Gzcounts) + 1); //当前设备的次数
+                        MTTF = String.format("%.1f", TH);
+                    }
+                }
+
+                //读取当前机构下的指标设置  故障停机率GZTJL--------------------------------------------------
+                String currentCustomer_code ="";
+                JsonResult jsonResult = icsmClient.getOfficeInfo(tenantId,userid);
+                List<Map<String, Object>> dataList1 = (List<Map<String, Object>>)jsonResult.getData();
+                for (int j = 0; j < dataList1.size(); j++)
+                {
+                    String CurrentofficeId = org.springframework.util.StringUtils.isEmpty(dataList1.get(j).get("officeId")) ? ""
+                            : dataList1.get(j).get("officeId").toString();
+                    String customerCode = org.springframework.util.StringUtils.isEmpty(dataList1.get(j).get("customerCode")) ? ""
+                            : dataList1.get(j).get("customerCode").toString();
+                    if(CurrentofficeId.equals(officeid))
+                    {
+                        currentCustomer_code = customerCode;
+                        break;
+                    }
+                }
+                String indexname ="";
+                RepPrinterEvaluateTargetDicVO vo = repPrinterEvaluateTargetDicService.getRepPrinterEvaluateTargetDicByKey("GZTJL",currentCustomer_code);
+                BigDecimal target_value =new BigDecimal(0.0);
+                BigDecimal target_value1 =new BigDecimal(0.0);
+                BigDecimal target_value2 =new BigDecimal(0.0);
+                BigDecimal target_weight =new BigDecimal(0.0);
+
+                if(vo !=null)
+                {
+                    target_value = vo.getTargetValue(); //目标值
+                    target_weight = vo.getTargetWeight();
+                    indexname = vo.getIndexName();
+                    statistics_type = vo.getStatisticsType();
+                }
+                else
+                {
+                    continue;   //没有归属机构的设备忽略掉
+                }
+                //-----------------------------------------------------------------------------------------
+
+                double rate =0; //故障停机率
+                double currentHmiTotaltimecost =0;
+                double currentGztotaltime =0;
+                if(Hmitotaltimecost.equals("0"))
+                {
+                    currentHmiTotaltimecost =0;
+                }
+                else
+                {
+                    currentHmiTotaltimecost = Double.valueOf(Hmitotaltimecost);
+                }
+                //total_Hmitotaltimecost += Double.valueOf(String.format("%.1f", Double.valueOf(Hmitotaltimecost)));
+                if(Gztotaltime.equals(""))
+                {
+                    currentGztotaltime =0;
+                }
+                else
+                {
+                    currentGztotaltime = Double.valueOf(Gztotaltime);
+                }
+                //total_Gztotaltime += Double.valueOf(String.format("%.1f", Double.valueOf(Gztotaltime)));
+                //故障停机率 = 故障时间/故障时间+有效开动时间
+                rate = currentGztotaltime /(currentGztotaltime + currentHmiTotaltimecost); //计算结果
+
+                //故障停机率指标得分(old)
+//				double result = 40 *(rate - Double.parseDouble(target_value1.toString())) /(Double.parseDouble(target_value2.toString()) - Double.parseDouble(target_value1.toString())) + 60;
+//				result = Double.valueOf(String.format("%.2f", Double.valueOf(result)));
+//				BigDecimal D1 = new BigDecimal(result);
+
+                //计算停机故障率指标得分(new)
+//                 权重占比20分
+//                   x=0,得分20分；
+//                   x>2.5,得分20*80%* (2.5/x)
+//                   0<x<=2.5,得分20*80% + ((2.5-x)/2.5)*4
+//
+                double result = 0.0;
+                BigDecimal D1 = new BigDecimal(result);
+                double weight = Double.parseDouble(target_weight.toString()) / 100;
+                double targetvalue = Double.valueOf(target_value.toString()) / 100;
+                if(rate == 0.0)
+                {
+                    Double temp = 100 * weight;//100 *0.2 =20
+                    D1 = new BigDecimal(temp);
+                }
+                if(rate > targetvalue) //0.025 2.5%
+                {
+                    Double temp = 100 * weight;//100 *0.2 =20
+//					temp = 20 * 0.8 + rate;
+                    temp = temp * 0.8 * targetvalue / rate;
+                    D1 = new BigDecimal(temp);
+                }
+                if(rate > 0 && rate <= targetvalue) //0 <x<=0.025
+                {
+                    Double temp = 100 * weight;//100 *0.2 =20
+//					temp = 20 * 0.8 + ((2.5-rate)/2.5) * 4 ;
+                    temp = temp * 0.8 + ((targetvalue - rate)/targetvalue) * 4 ; // *6 改为 *4
+                    D1 = new BigDecimal(temp);
+                }
+//				String expression = String.valueOf(Double.valueOf(String.format("%.2f", Double.valueOf(currentGztotaltime)))) + "/" + (String.valueOf(Double.valueOf(String.format("%.2f", Double.valueOf(currentGztotaltime))))+ "+" + String.valueOf(Double.valueOf(String.format("%.2f", Double.valueOf(currentHmiTotaltimecost)))));
+                String expression = "";
+
+                RepStarEvaluateVO newWorkVO = new RepStarEvaluateVO(tenantId,
+                        deviceCode,
+                        deviceTypeId,
+                        String.valueOf(year),
+                        String.valueOf(month),
+                        indexname,
+                        statistics_type,
+                        expression,
+                        BigDecimal.valueOf(rate),
+                        new BigDecimal(targetvalue),
+                        target_value1,
+                        target_value2,
+                        new BigDecimal(weight),
+                        D1,
+                        officeid,
+                        officename,
+                        jixing,
+                        Timestamp.valueOf(LocalDateTime.now()),
+                        Timestamp.valueOf(LocalDateTime.now())
+                );
+                resultList.add(newWorkVO);
+                deviceIdList.add(deviceCode);
+            }
+        }
+
+        if(!statistics_type.equals(""))
+        {
+            starEvaluateDAO.deleteStarEvaluateByDate(String.valueOf(year),String.valueOf(month),statistics_type,deviceIdList);
+            starEvaluateDAO.batchAdd(resultList);
+        }
+
+        //II 计算打印效率利用率
+        Map<String,String> printerDeviceRelationData = new HashMap<String,String>();
+        try {
+            //从配置表中获取平台设备编码及用户设备编码关系
+            printerDeviceRelationData =	getPrinterDeviceRelation();
+        }
+        catch (Exception ex){}
+
+        List<RepStarEvaluateVO> resultList2 = new ArrayList<>(30);
+        List<String> deviceIdList2 = new ArrayList<String>();
+        for(int i=0;i<ListDataObj.size();i++)
+        {
+            String jixing = String.valueOf(ListDataObj.get(i).getJixing().toString());
+            String deviceCode = String.valueOf(ListDataObj.get(i).getDeviceid().toString());
+            String officeid = String.valueOf(ListDataObj.get(i).getOfficeid().toString());
+            String officename = String.valueOf(ListDataObj.get(i).getOfficename().toString());
+
+            //目前只有四川共享铸造KF、装备成形工厂KM1有废品数据
+            if(officeid.equals("7b0c9a3a4e514c099569f4a37b7c7b43") || officeid.equals("9bbc696e35214674bf57e186d328f5b9"))
+            {
+                //组织查询条件
+                PrinterReportDTO printerReportDTO = new PrinterReportDTO();
+                printerReportDTO.setStartDate(startTime);
+                printerReportDTO.setEndDate(endTime);
+                List<String> deviceIdsList = new ArrayList<String>();
+                deviceIdsList.add(deviceCode);
+                printerReportDTO.setDeviceIdList(deviceIdsList);
+
+                //查询该设备在该段时间内的逐日打印效率,然后求平均值
+                List<Map<String, Object>> list = printerEfficiencyWorkDao.getReportDYXLByDeviceV2(printerReportDTO);
+                if( list!=null || list.size()!=0 )
+                {
+//				list = PlatformDeviceTransUtil.repalceDevice(printerDeviceRelationData, list);//不做设备编号转换
+                    // 数据结果转换成前台需要的格式[#打印效率 dyxl]
+                    List<Map<String, Object>> dataList = list.stream().map(item -> {
+                        Map<String, Object> map = new HashMap<>(3);
+                        float dyxl = Float.parseFloat(item.getOrDefault("dyxl", "0").toString());
+                        map.put("dyxl", String.format("%.2f", dyxl));
+                        map.put("deviceId", item.get("device_id"));
+                        map.put("day", item.get("data_day")); //日期
+                        return map;
+                    }).collect(Collectors.toList());
+
+                    float tota_dyxl=0;
+                    int index = 0;
+                    for( Map<String, Object> item : dataList )
+                    {
+                        float dyxl = Float.parseFloat(item.getOrDefault("dyxl", "0").toString());
+                        tota_dyxl += dyxl ;
+                        String device = item.get("deviceId").toString();
+                        index++;
+                    }
+                    //求当月的平均效率
+                    String xl_ave = String.format("%.2f", index==0?0:tota_dyxl/index);
+
+                    BigDecimal targetXL = new BigDecimal(0);
+                    jixing = GetJixing(deviceCode);  //机型
+
+                    //读取当前机构下的指标设置  打印效率利用率DYXLLYL--------------------------------------------------
+                    String currentCustomer_code ="";
+                    JsonResult jsonResult = icsmClient.getOfficeInfo(tenantId,userid);
+                    List<Map<String, Object>> dataList1 = (List<Map<String, Object>>)jsonResult.getData();
+                    for (int j = 0; j < dataList1.size(); j++)
+                    {
+                        String CurrentofficeId = org.springframework.util.StringUtils.isEmpty(dataList1.get(j).get("officeId")) ? ""
+                                : dataList1.get(j).get("officeId").toString();
+                        String customerCode = org.springframework.util.StringUtils.isEmpty(dataList1.get(j).get("customerCode")) ? ""
+                                : dataList1.get(j).get("customerCode").toString();
+                        if(CurrentofficeId.equals(officeid))
+                        {
+                            currentCustomer_code = customerCode;
+                            break;
+                        }
+                    }
+                    RepPrinterEvaluateTargetDicVO vo2 = repPrinterEvaluateTargetDicService.getRepPrinterEvaluateTargetDicByKey("DYXLLYL",currentCustomer_code);
+                    BigDecimal target_value_2 =new BigDecimal(0.0);
+                    BigDecimal target_value1_2 =new BigDecimal(0.0);
+                    BigDecimal target_value2_2 =new BigDecimal(0.0);
+                    BigDecimal target_weight_2 =new BigDecimal(0.0);
+                    String indexname2 ="";
+                    if(vo2 !=null)
+                    {
+                        target_value_2 = vo2.getTargetValue();
+                        target_weight_2 = vo2.getTargetWeight();
+
+                        indexname2 = vo2.getIndexName();
+                        statistics_type2 = vo2.getStatisticsType();
+                    }
+                    else
+                    {
+                        continue;   //没有归属机构的设备忽略掉
+                    }
+                    //找到对应机构下的设置的打印机打印效率目标值
+                    RepPrinterTargetDicVO target = repPrinterTargetDicService.getRepPrinterTargetDicByKey("DYXL"+jixing,currentCustomer_code);
+                    if(target!=null)
+                    {
+                        targetXL = target.getTargetValue(); //目标效率
+                    }
+                    else
+                    {
+                        continue;
+                    }
+                    //d2  打印效率利用率 = 打印效率/打印效率指标值
+                    double rate2 = Double.valueOf(xl_ave) / Double.parseDouble(targetXL.toString());//计算结果
+                    //打印效率利用率指标得分(old)
+//					double result2 = 40 *(rate2 - Double.parseDouble(target_value1_2.toString())) /(Double.parseDouble(target_value2_2.toString()) - Double.parseDouble(target_value1_2.toString())) + 60;
+//					result2 = Double.valueOf(String.format("%.2f", Double.valueOf(result2)));
+//					BigDecimal D2 = new BigDecimal(result2);
+
+//                    //打印效率利用率指标得分(new)
+//                     权重10分
+//                       x>=100,得分10分；
+//                       x<100,得分10 * x
+//
+                    double result = 0.0;
+                    BigDecimal D2 = new BigDecimal(result);
+                    double weight = Double.parseDouble(target_weight_2.toString()) / 100;
+                    double targetvalue = Double.valueOf(target_value_2.toString()) / 100;
+                    if(rate2 >= targetvalue) // x >=100%
+                    {
+                        Double temp = 100 * weight;//100 *0.1
+                        D2 = new BigDecimal(temp);
+                    }
+                    if(rate2 < targetvalue) // x <100%
+                    {
+                        Double temp = 100 * weight;//100 *0.1
+                        //Double temp = 10 * rate2;
+                        temp = temp * rate2;
+                        D2 = new BigDecimal(temp);
+                    }
+//					String expression = xl_ave +"/"+targetXL.toString();
+                    String expression ="";
+                    RepStarEvaluateVO newWorkVO2 = new RepStarEvaluateVO(tenantId,
+                            deviceCode,
+                            deviceTypeId,
+                            String.valueOf(year),
+                            String.valueOf(month),
+                            indexname2,
+                            statistics_type2,
+                            expression,
+                            BigDecimal.valueOf(rate2),
+                            new BigDecimal(targetvalue),
+                            target_value1_2,
+                            target_value2_2,
+                            new BigDecimal(weight),
+                            D2,
+                            officeid,
+                            officename,
+                            jixing,
+                            Timestamp.valueOf(LocalDateTime.now()),
+                            Timestamp.valueOf(LocalDateTime.now())
+                    );
+                    resultList2.add(newWorkVO2);
+                    deviceIdList2.add(deviceCode);
+                }
+            }
+        }
+        if(!statistics_type2.equals(""))
+        {
+            starEvaluateDAO.deleteStarEvaluateByDate(String.valueOf(year),String.valueOf(month),statistics_type2,deviceIdList2);
+            starEvaluateDAO.batchAdd(resultList2);
+        }
+
+
+        //III 计算废品率 FPL
+        List<RepStarEvaluateVO> resultList3 = new ArrayList<>(30);
+        List<String> deviceIdList3 = new ArrayList<String>();
+        DecimalFormat df1 =new DecimalFormat("0.000");
+        for(int i=0;i<ListDataObj.size();i++)
+        {
+            String jixing = String.valueOf(ListDataObj.get(i).getJixing().toString());
+            String deviceCode = String.valueOf(ListDataObj.get(i).getDeviceid().toString());
+            String officeid = String.valueOf(ListDataObj.get(i).getOfficeid().toString());
+            String officename = String.valueOf(ListDataObj.get(i).getOfficename().toString());
+
+            //目前只有四川共享铸造KF、装备成形工厂KM1有废品数据
+            if(officeid.equals("7b0c9a3a4e514c099569f4a37b7c7b43") || officeid.equals("9bbc696e35214674bf57e186d328f5b9"))
+            {
+                //组织查询条件
+                PrinterReportDTO printerReportDTO = new PrinterReportDTO();
+                printerReportDTO.setStartDate(startTime);
+                printerReportDTO.setEndDate(endTime);
+                List<String> deviceIdsList = new ArrayList<String>();
+                deviceIdsList.add(deviceCode);
+                printerReportDTO.setDeviceIdList(deviceIdsList);
+
+                //取当前设备的废品率数据
+                List<Map<String,Object>> list = repPrinterOutputDao.sumDeviceProductWasteData(printerReportDTO);
+                list = PlatformDeviceTransUtil.repalceDevice(printerDeviceRelationData, list);
+                double rate3 = 0;
+                if( list==null || list.size()==0 ){
+                    //没有废品率如产业创新中心等，默认计算0没有废品吧。不计废品总比有废品强
+                    rate3 = 0.0;
+                }
+                for(int j=0;j<list.size();j++)
+                {
+                    Map<String,Object> m = list.get(j);
+                    String device_id = (String) m.get("device_id");
+                    BigDecimal fpl = (BigDecimal) m.get("fpl");
+                    try {
+                        rate3 = fpl.doubleValue();
+                    } catch (Exception e) {
+                        rate3 = 0.0;
+                    }
+                }
+                BigDecimal targetFPL = new BigDecimal(0);
+                jixing = GetJixing(deviceCode);  //机型
+                //读取当前机构下的指标设置 --------------------------------------------------
+                String currentCustomer_code ="";
+                JsonResult jsonResult = icsmClient.getOfficeInfo(tenantId,userid);
+                List<Map<String, Object>> dataList1 = (List<Map<String, Object>>)jsonResult.getData();
+                for (int j = 0; j < dataList1.size(); j++)
+                {
+                    String CurrentofficeId = org.springframework.util.StringUtils.isEmpty(dataList1.get(j).get("officeId")) ? ""
+                            : dataList1.get(j).get("officeId").toString();
+                    String customerCode = org.springframework.util.StringUtils.isEmpty(dataList1.get(j).get("customerCode")) ? ""
+                            : dataList1.get(j).get("customerCode").toString();
+                    if(CurrentofficeId.equals(officeid))
+                    {
+                        currentCustomer_code = customerCode;
+                        break;
+                    }
+                }
+                RepPrinterEvaluateTargetDicVO vo3 = repPrinterEvaluateTargetDicService.getRepPrinterEvaluateTargetDicByKey("FPL",currentCustomer_code);
+                BigDecimal target_value_3 =new BigDecimal(0.0);
+                BigDecimal target_value1_3 =new BigDecimal(0.0);
+                BigDecimal target_value2_3 =new BigDecimal(0.0);
+                BigDecimal target_weight_3 =new BigDecimal(0.0);
+                String indexname3 ="";
+                if(vo3 !=null)
+                {
+                    target_value_3 =vo3.getTargetValue();
+                    target_weight_3 = vo3.getTargetWeight();
+                    indexname3 = vo3.getIndexName();
+                    statistics_type3 = vo3.getStatisticsType();
+                }
+                else
+                {
+                    continue;   //没有归属机构的设备忽略掉
+                }
+
+//                //废品率指标得分(new)
+//                  权重20
+//                 *  x = 0,得分20分；
+//                 *  x > 5,得分 20*80% * 5/x
+//                 *  0< x <=5,得分 20*80% + ((5-x)/5) * 6
+//                 *  *
+                double result = 0.0;
+                BigDecimal D3 = new BigDecimal(result);
+                double weight = Double.parseDouble(target_weight_3.toString()) / 100;
+                double targetvalue = Double.valueOf(target_value_3.toString()) / 100;
+                if(rate3 == 0.0)
+                {
+                    Double temp = 100 * weight;//100 *0.2
+                    D3 = new BigDecimal(temp);
+                }
+                if(rate3 > targetvalue) //x>0.05 5%
+                {
+                    Double temp = 100 * weight;//100 *0.2
+                    //Double temp = 20 * 0.8 * 5/x;
+                    temp = temp * 0.8 * targetvalue / rate3;
+                    D3 = new BigDecimal(temp);
+                }
+                if(rate3 > 0 && rate3 <= targetvalue)// 0<x<=0.05
+                {
+                    Double temp = 100 * weight;//100 *0.2
+                    //Double temp = 20 * 0.8 + ((5-x)/5) * 6;
+                    temp = temp * 0.8 + ((targetvalue - rate3) / targetvalue) * 6; // *8 改为 *6
+                    D3 = new BigDecimal(temp);
+                }
+//				String expression = "pfl/"+String.valueOf(rate3);
+                String expression = "";
+
+                RepStarEvaluateVO newWorkVO2 = new RepStarEvaluateVO(tenantId,
+                        deviceCode,
+                        deviceTypeId,
+                        String.valueOf(year),
+                        String.valueOf(month),
+                        indexname3,
+                        statistics_type3,
+                        expression,
+                        BigDecimal.valueOf(rate3),
+                        new BigDecimal(targetvalue),
+                        target_value1_3,
+                        target_value2_3,
+                        new BigDecimal(weight),
+                        D3,
+                        officeid,
+                        officename,
+                        jixing,
+                        Timestamp.valueOf(LocalDateTime.now()),
+                        Timestamp.valueOf(LocalDateTime.now())
+                );
+                resultList3.add(newWorkVO2);
+                deviceIdList3.add(deviceCode);
+            }
+
+        }
+        if(!statistics_type3.equals(""))
+        {
+            starEvaluateDAO.deleteStarEvaluateByDate(String.valueOf(year),String.valueOf(month),statistics_type3,deviceIdList3);
+            starEvaluateDAO.batchAdd(resultList3);
+        }
+
+        //4.产能利用率
+        List<RepStarEvaluateVO> resultList4 = new ArrayList<>(30);
+        List<String> deviceIdList4 = new ArrayList<String>();
+        for(int i=0;i<ListDataObj.size();i++)
+        {
+            String jixing = String.valueOf(ListDataObj.get(i).getJixing().toString());
+            String deviceCode = String.valueOf(ListDataObj.get(i).getDeviceid().toString());
+            String officeid = String.valueOf(ListDataObj.get(i).getOfficeid().toString());
+            String officename = String.valueOf(ListDataObj.get(i).getOfficename().toString());
+            //目前只有四川共享铸造KF、装备成形工厂KM1有废品数据
+            if(officeid.equals("7b0c9a3a4e514c099569f4a37b7c7b43") || officeid.equals("9bbc696e35214674bf57e186d328f5b9"))
+            {
+                //读取当前机构下的指标设置  打印效率利用率DYXLLYL--------------------------------------------------
+                String currentCustomer_code ="";
+                JsonResult jsonResult = icsmClient.getOfficeInfo(tenantId,userid);
+                List<Map<String, Object>> dataList1 = (List<Map<String, Object>>)jsonResult.getData();
+                for (int j = 0; j < dataList1.size(); j++)
+                {
+                    String CurrentofficeId = org.springframework.util.StringUtils.isEmpty(dataList1.get(j).get("officeId")) ? ""
+                            : dataList1.get(j).get("officeId").toString();
+                    String customerCode = org.springframework.util.StringUtils.isEmpty(dataList1.get(j).get("customerCode")) ? ""
+                            : dataList1.get(j).get("customerCode").toString();
+                    if(CurrentofficeId.equals(officeid))
+                    {
+                        currentCustomer_code = customerCode;
+                        break;
+                    }
+                }
+
+                //计算月产量
+                Map<String, Object>  params = new HashMap<
+                        >(20);
+                params.put("expReportName", "");
+                params.put("yieldTrendRepByDevice", "");
+                params.put("tenantId", tenantId);
+
+                String deviceIds = deviceCode;
+                List<String> list0 = Arrays.stream(deviceIds.split(",")).collect(Collectors.toList());
+                params.put("deviceIdList", list0);
+
+                params.put("year", String.valueOf(year));
+                params.put("month", String.valueOf(mon));
+                params.put("day", "");
+                List<DevWorkInfoVO> deviceYieldList = repdao.getDeviceYields(params);
+                if( deviceYieldList==null || deviceYieldList.size()==0 ){
+                    continue;
+                }
+                List<ChanNengLiYongLvDto> list = new ArrayList<ChanNengLiYongLvDto>();
+                double rate4 = 0;
+                for(int k=0;k<deviceYieldList.size();k++)
+                {
+                    ChanNengLiYongLvDto dto = new ChanNengLiYongLvDto();
+                    String device_id = deviceYieldList.get(k).getDeviceId();//设备
+                    String device_Type = device_id.startsWith("SDream") ? "SDream" : device_id.split("-")[0];
+                    dto.setDeviceType(device_Type);
+                    dto.setDeviceId(device_id);
+                    dto.setDay(deviceYieldList.get(k).getSdate()); //标记日期
+                    Double cl = deviceYieldList.get(k).getVolumn();//产量
+
+                    //找到对应机构下的设置的打印机打印效率目标值
+                    RepPrinterTargetDicVO targetL = repPrinterTargetDicService.getRepPrinterTargetDicByKey("CN_"+device_Type,currentCustomer_code);
+                    Double cn = 0d;//产能
+                    if (targetL != null ) {
+                        //逐日的产能
+                        cn = 1 * targetL.getTargetValue().doubleValue();//cn = days * v.getTargetValue().doubleValue();
+                    }
+                    else
+                    {
+                        log.info("当前设备"+ device_id +"产能目标值:" + "CN_"+deviceType +" 读取异常...");
+                    }
+                    if (cn > 0) {
+                        dto.setLiYongLv(cl.doubleValue() / cn); //产能利用率
+                    }
+                    dto.setChanLiang(cl);
+                    dto.setChanNeng(cn);
+                    list.add(dto);
+                }
+                //计算该设备当前月的产能利用率
+                if(list.size() >0)
+                {
+                    rate4 = list.stream().mapToDouble(ChanNengLiYongLvDto::getLiYongLv).average().getAsDouble(); //单台设备当前余月份数据的均值
+                }
+                else
+                    rate4 =0.0;
+
+                RepPrinterEvaluateTargetDicVO vo4 = repPrinterEvaluateTargetDicService.getRepPrinterEvaluateTargetDicByKey("CNLYV",currentCustomer_code);
+                BigDecimal target_value_4 =new BigDecimal(0.0);
+                BigDecimal target_value1_4 =new BigDecimal(0.0);
+                BigDecimal target_value2_4 =new BigDecimal(0.0);
+                BigDecimal target_weight_4 =new BigDecimal(0.0);
+                String indexname4 ="";
+                if(vo4 !=null)
+                {
+                    target_value_4 =vo4.getTargetValue();
+                    target_weight_4 = vo4.getTargetWeight();
+                    indexname4 = vo4.getIndexName();
+                    statistics_type4 = vo4.getStatisticsType();
+                }
+                else
+                {
+                    continue;   //没有归属机构的设备忽略掉
+                }
+//                //产能率指标得分(new)
+//                  权重10
+//                   x >1 ,得分10分；
+//                   x < 1,得分 10 * x
+//
+                double result = 0.0;
+                BigDecimal D4 = new BigDecimal(result);
+                double weight = Double.parseDouble(target_weight_4.toString()) / 100;
+                double targetvalue = Double.valueOf(target_value_4.toString()) / 100;
+
+                if(rate4 >= targetvalue) //x>= 100%  权重10分
+                {
+                    Double temp = 10.0;
+                    D4 = new BigDecimal(temp);
+                }
+                if(rate4 < targetvalue)// x < 100%
+                {
+                    Double temp = 0.0;
+                    temp = 10 * rate4;
+                    D4 = new BigDecimal(temp);
+                }String expression = "";
+
+                RepStarEvaluateVO newWorkVO2 = new RepStarEvaluateVO(tenantId,
+                        deviceCode,
+                        deviceTypeId,
+                        String.valueOf(year),
+                        String.valueOf(month),
+                        indexname4,
+                        statistics_type4,
+                        expression,
+                        BigDecimal.valueOf(rate4),
+                        new BigDecimal(targetvalue),
+                        target_value1_4,
+                        target_value2_4,
+                        new BigDecimal(weight),
+                        D4,
+                        officeid,
+                        officename,
+                        jixing,
+                        Timestamp.valueOf(LocalDateTime.now()),
+                        Timestamp.valueOf(LocalDateTime.now())
+                );
+                resultList4.add(newWorkVO2);
+                deviceIdList4.add(deviceCode);
+            }
+        }
+        if(!statistics_type4.equals(""))
+        {
+            starEvaluateDAO.deleteStarEvaluateByDate(String.valueOf(year),String.valueOf(month),statistics_type4,deviceIdList4);
+            starEvaluateDAO.batchAdd(resultList4);
+        }
+
+        //5. 强度合格率
+        List<RepStarEvaluateVO> resultList5 = new ArrayList<>(30);
+        List<String> deviceIdList5 = new ArrayList<String>();
+        for(int i=0;i<ListDataObj.size();i++)
+        {
+            String jixing = String.valueOf(ListDataObj.get(i).getJixing().toString());
+            String deviceCode = String.valueOf(ListDataObj.get(i).getDeviceid().toString());
+            String officeid = String.valueOf(ListDataObj.get(i).getOfficeid().toString());
+            String officename = String.valueOf(ListDataObj.get(i).getOfficename().toString());
+            //目前只有四川共享铸造KF、装备成形工厂KM1有废品数据
+            if (officeid.equals("7b0c9a3a4e514c099569f4a37b7c7b43") || officeid.equals("9bbc696e35214674bf57e186d328f5b9"))
+            {
+                //读取当前机构下的指标设置  打印效率利用率DYXLLYL--------------------------------------------------
+                String currentCustomer_code ="";
+                JsonResult jsonResult = icsmClient.getOfficeInfo(tenantId,userid);
+                List<Map<String, Object>> dataList1 = (List<Map<String, Object>>)jsonResult.getData();
+                for (int j = 0; j < dataList1.size(); j++)
+                {
+                    String CurrentofficeId = org.springframework.util.StringUtils.isEmpty(dataList1.get(j).get("officeId")) ? ""
+                            : dataList1.get(j).get("officeId").toString();
+                    String customerCode = org.springframework.util.StringUtils.isEmpty(dataList1.get(j).get("customerCode")) ? ""
+                            : dataList1.get(j).get("customerCode").toString();
+                    if(CurrentofficeId.equals(officeid))
+                    {
+                        currentCustomer_code = customerCode;
+                        break;
+                    }
+                }
+                //
+
+                String startTime5 = getFirstDayOfMonth1(year,Integer.parseInt(mon)); //当月第1天
+                String endTime5 = getLastDayOfMonth1(year,Integer.parseInt(mon));//当月最后1天
+
+                Map<String, Object> params =new HashMap<>(20);
+                params.put("tenantId", tenantId);
+                params.put("user_id", userid);
+                params.put("startDate", startTime5);
+                params.put("endDate", endTime5);
+                params.put("deviceId", deviceCode);
+
+                Map<String, Object> result = new HashMap<String, Object>();
+                List<Map<String,Object>> list5 = repPrinterSandPassrateDao.sumPrinterSandPassrateQiangDuDataStarEvaluate(params);
+                if( list5==null || list5.size()==0 ){
+                    continue;
+                }
+                String[] deviceArray = new String[list5.size()];
+                Object[] rateArray = new String[list5.size()];
+                Object[] aveArray = new String[list5.size()];
+                DecimalFormat df =new DecimalFormat("0.000");
+                DecimalFormat df11 =new DecimalFormat("0.00");
+                for(int k=0;k<list5.size();k++)
+                {
+                    Map<String,Object> m = list5.get(k);
+                    String device_id = (String) m.get("device_id");
+                    BigDecimal sxmd = (BigDecimal) m.get("sxmd");
+                    BigDecimal sxmdAve = (BigDecimal) m.get("sxmdAve");
+                    Long count = (Long) m.get("count");
+                    deviceArray[k] = device_id;
+                    rateArray[k] = df.format(sxmd.divide(new BigDecimal(count), 3, BigDecimal.ROUND_HALF_UP)); //合格率
+                    aveArray[k] = df11.format(sxmdAve.divide(new BigDecimal(count), 3, BigDecimal.ROUND_HALF_UP));//平均值
+                }
+                if(rateArray.length == 0)
+                {
+                    continue;
+                }
+                double rate5 = 0;
+                for(int m=0;m<rateArray.length;m++)
+                {
+                    rate5+= Double.parseDouble(rateArray[m].toString());
+                }
+//				if(rateArray.length >0)
+//				{
+//					rate5 = rate5/rateArray.length; //单台设备当前余月份数据的均值
+//				}
+//				else
+//					rate5 =0.0;
+                rate5 = rateArray.length==0?0:rate5/rateArray.length;
+//				rate5 = Double.valueOf(rateArray[0].toString()); //单台设备单集合
+                RepPrinterEvaluateTargetDicVO vo5 = repPrinterEvaluateTargetDicService.getRepPrinterEvaluateTargetDicByKey("QDHGL",currentCustomer_code);
+                BigDecimal target_value_5 =new BigDecimal(0.0);
+                BigDecimal target_value1_5 =new BigDecimal(0.0);
+                BigDecimal target_value2_5 =new BigDecimal(0.0);
+                BigDecimal target_weight_5 =new BigDecimal(0.0);
+                String indexname5 ="";
+                if(vo5 !=null)
+                {
+                    target_value_5 =vo5.getTargetValue();
+                    target_weight_5 = vo5.getTargetWeight();
+                    indexname5 = vo5.getIndexName();
+                    statistics_type5 = vo5.getStatisticsType();
+                }
+                else
+                {
+                    continue;   //没有归属机构的设备忽略掉
+                }
+                double result5 = 0.0;
+                BigDecimal D5 = new BigDecimal(result5);
+                double weight = Double.parseDouble(target_weight_5.toString()) / 100;
+                double targetvalue = Double.valueOf(target_value_5.toString()) / 100;
+
+                if(rate5 >= targetvalue) //x>= 90%  10分
+                {
+                    Double temp = 10.0;
+                    D5 = new BigDecimal(temp);
+                }
+                if(rate5 < targetvalue)// x < 90%
+                {
+                    Double temp = 0.0;
+                    temp = 10 * rate5;
+                    D5 = new BigDecimal(temp);
+                }String expression = "";
+
+                RepStarEvaluateVO newWorkVO2 = new RepStarEvaluateVO(tenantId,
+                        deviceCode,
+                        deviceTypeId,
+                        String.valueOf(year),
+                        String.valueOf(month),
+                        indexname5,
+                        statistics_type5,
+                        expression,
+                        BigDecimal.valueOf(rate5),
+                        new BigDecimal(targetvalue),
+                        target_value1_5,
+                        target_value2_5,
+                        new BigDecimal(weight),
+                        D5,
+                        officeid,
+                        officename,
+                        jixing,
+                        Timestamp.valueOf(LocalDateTime.now()),
+                        Timestamp.valueOf(LocalDateTime.now())
+                );
+                resultList5.add(newWorkVO2);
+                deviceIdList5.add(deviceCode);
+
+            }
+        }
+        if(!statistics_type5.equals(""))
+        {
+            starEvaluateDAO.deleteStarEvaluateByDate(String.valueOf(year),String.valueOf(month),statistics_type5,deviceIdList5);
+            starEvaluateDAO.batchAdd(resultList5);
+        }
+
+        //6. 尺寸、外观、精度合格率
+        List<RepStarEvaluateVO> resultList6 = new ArrayList<>(30);
+        List<String> deviceIdList6 = new ArrayList<String>();
+        List<RepStarEvaluateVO> resultList7 = new ArrayList<>(30);
+        List<String> deviceIdList7 = new ArrayList<String>();
+        List<RepStarEvaluateVO> resultList8 = new ArrayList<>(30);
+        List<String> deviceIdList8 = new ArrayList<String>();
+        //6.1 尺寸合格率
+        for(int i=0;i<ListDataObj.size();i++)
+        {
+            String jixing = String.valueOf(ListDataObj.get(i).getJixing().toString());
+            String deviceCode = String.valueOf(ListDataObj.get(i).getDeviceid().toString());
+            String officeid = String.valueOf(ListDataObj.get(i).getOfficeid().toString());
+            String officename = String.valueOf(ListDataObj.get(i).getOfficename().toString());
+            //目前只有四川共享铸造KF、装备成形工厂KM1有废品数据
+            if (officeid.equals("7b0c9a3a4e514c099569f4a37b7c7b43") || officeid.equals("9bbc696e35214674bf57e186d328f5b9"))
+            {
+                //读取当前机构下的指标设置  打印效率利用率DYXLLYL--------------------------------------------------
+                String currentCustomer_code ="";
+                JsonResult jsonResult = icsmClient.getOfficeInfo(tenantId,userid);
+                List<Map<String, Object>> dataList1 = (List<Map<String, Object>>)jsonResult.getData();
+                for (int j = 0; j < dataList1.size(); j++)
+                {
+                    String CurrentofficeId = org.springframework.util.StringUtils.isEmpty(dataList1.get(j).get("officeId")) ? ""
+                            : dataList1.get(j).get("officeId").toString();
+                    String customerCode = org.springframework.util.StringUtils.isEmpty(dataList1.get(j).get("customerCode")) ? ""
+                            : dataList1.get(j).get("customerCode").toString();
+                    if(CurrentofficeId.equals(officeid))
+                    {
+                        currentCustomer_code = customerCode;
+                        break;
+                    }
+                }
+                //
+                String startTime6 = getFirstDayOfMonth1(year,Integer.parseInt(mon)); //当月第1天
+                String endTime6 = getLastDayOfMonth1(year,Integer.parseInt(mon));//当月最后1天
+                Map<String, Object> params =new HashMap<>(20);
+                params.put("tenantId", tenantId);
+                params.put("user_id", userid);
+                params.put("startDate", startTime6);
+                params.put("endDate", endTime6);
+                params.put("deviceId", deviceCode);
+                params.put("sxType", "0");
+
+                List<Map<String,Object>> list6 = repPrinterStarPassrateDao.sumPrinterStarPassrateDataEvaluate(params);
+                if( list6==null || list6.size()==0 ){
+                    continue;
+                }
+                String[] deviceArray = new String[list6.size()];
+                Object[] rateArray = new String[list6.size()];
+                Object[] aveArray = new String[list6.size()];
+                DecimalFormat df =new DecimalFormat("0.000");
+                for(int k=0;k<list6.size();k++)
+                {
+                    Map<String,Object> m = list6.get(k);
+                    String device_id = (String) m.get("device_id");
+                    BigDecimal itemHglv = (BigDecimal) m.get("itemHglv");
+                    Long count = (Long) m.get("count");
+                    deviceArray[k] = device_id;
+                    rateArray[k] = df.format(itemHglv.divide(new BigDecimal(count), 3, BigDecimal.ROUND_HALF_UP)); //合格率
+                }
+                if(rateArray.length == 0)
+                {
+                    continue;
+                }
+                double rate6 = 0;//计算该设备当前月的尺寸合格率
+//				rate6 = Double.valueOf(rateArray[0].toString()); //单台设备单集合
+                for(int m=0;m<rateArray.length;m++)
+                {
+                    rate6+= Double.parseDouble(rateArray[m].toString());
+                }
+                rate6 = rateArray.length==0?0:rate6/rateArray.length;
+
+                RepPrinterEvaluateTargetDicVO vo6 = repPrinterEvaluateTargetDicService.getRepPrinterEvaluateTargetDicByKey("SIZEHGL",currentCustomer_code);
+                BigDecimal target_value_6 =new BigDecimal(0.0);
+                BigDecimal target_value1_6 =new BigDecimal(0.0);
+                BigDecimal target_value2_6 =new BigDecimal(0.0);
+                BigDecimal target_weight_6 =new BigDecimal(0.0);
+                String indexname6 ="";
+                if(vo6 !=null)
+                {
+                    target_value_6 =vo6.getTargetValue();
+                    target_weight_6 = vo6.getTargetWeight();
+                    indexname6 = vo6.getIndexName();
+                    statistics_type6 = vo6.getStatisticsType();
+                }
+                else
+                {
+                    continue;   //没有归属机构的设备忽略掉
+                }
+                double result6 = 0.0;
+                BigDecimal D6 = new BigDecimal(result6);
+                double weight = Double.parseDouble(target_weight_6.toString()) / 100;
+                double targetvalue = Double.valueOf(target_value_6.toString()) / 100;
+
+                if(rate6 >= targetvalue) //x>= 90%  10分
+                {
+                    Double temp = 10.0;
+                    D6 = new BigDecimal(temp);
+                }
+                if(rate6 < targetvalue)// x < 90%
+                {
+                    Double temp = 0.0;
+                    temp = 10 * rate6;
+                    D6 = new BigDecimal(temp);
+                }String expression = "";
+
+                RepStarEvaluateVO newWorkVO2 = new RepStarEvaluateVO(tenantId,
+                        deviceCode,
+                        deviceTypeId,
+                        String.valueOf(year),
+                        String.valueOf(month),
+                        indexname6,
+                        statistics_type6,
+                        expression,
+                        BigDecimal.valueOf(rate6),
+                        new BigDecimal(targetvalue),
+                        target_value1_6,
+                        target_value2_6,
+                        new BigDecimal(weight),
+                        D6,
+                        officeid,
+                        officename,
+                        jixing,
+                        Timestamp.valueOf(LocalDateTime.now()),
+                        Timestamp.valueOf(LocalDateTime.now())
+                );
+                resultList6.add(newWorkVO2);
+                deviceIdList6.add(deviceCode);
+            }
+        }
+
+        //6.2外观合格率
+        for(int i=0;i<ListDataObj.size();i++)
+        {
+            String jixing = String.valueOf(ListDataObj.get(i).getJixing().toString());
+            String deviceCode = String.valueOf(ListDataObj.get(i).getDeviceid().toString());
+            String officeid = String.valueOf(ListDataObj.get(i).getOfficeid().toString());
+            String officename = String.valueOf(ListDataObj.get(i).getOfficename().toString());
+            //目前只有四川共享铸造KF、装备成形工厂KM1有废品数据
+            if (officeid.equals("7b0c9a3a4e514c099569f4a37b7c7b43") || officeid.equals("9bbc696e35214674bf57e186d328f5b9"))
+            {
+                //读取当前机构下的指标设置  打印效率利用率DYXLLYL--------------------------------------------------
+                String currentCustomer_code ="";
+                JsonResult jsonResult = icsmClient.getOfficeInfo(tenantId,userid);
+                List<Map<String, Object>> dataList1 = (List<Map<String, Object>>)jsonResult.getData();
+                for (int j = 0; j < dataList1.size(); j++)
+                {
+                    String CurrentofficeId = org.springframework.util.StringUtils.isEmpty(dataList1.get(j).get("officeId")) ? ""
+                            : dataList1.get(j).get("officeId").toString();
+                    String customerCode = org.springframework.util.StringUtils.isEmpty(dataList1.get(j).get("customerCode")) ? ""
+                            : dataList1.get(j).get("customerCode").toString();
+                    if(CurrentofficeId.equals(officeid))
+                    {
+                        currentCustomer_code = customerCode;
+                        break;
+                    }
+                }
+
+                // 外观
+                String startTime7 = getFirstDayOfMonth1(year,Integer.parseInt(mon)); //当月第1天
+                String endTime7 = getLastDayOfMonth1(year,Integer.parseInt(mon));//当月最后1天
+                Map<String, Object> params7 =new HashMap<>(20);
+                params7.put("tenantId", tenantId);
+                params7.put("user_id", userid);
+                params7.put("startDate", startTime7);
+                params7.put("endDate", endTime7);
+                params7.put("deviceId", deviceCode);
+                params7.put("sxType", "1");
+
+                List<Map<String,Object>> list7 = repPrinterStarPassrateDao.sumPrinterStarPassrateDataEvaluate(params7);
+                if( list7==null || list7.size()==0 ){
+                    continue;
+                }
+                String[] deviceArray7 = new String[list7.size()];
+                Object[] rateArray7 = new String[list7.size()];
+                DecimalFormat df7 =new DecimalFormat("0.000");
+                for(int k=0;k<list7.size();k++)
+                {
+                    Map<String,Object> m = list7.get(k);
+                    String device_id = (String) m.get("device_id");
+                    BigDecimal itemHglv = (BigDecimal) m.get("itemHglv");
+                    Long count = (Long) m.get("count");
+                    deviceArray7[k] = device_id;
+                    rateArray7[k] = df7.format(itemHglv.divide(new BigDecimal(count), 3, BigDecimal.ROUND_HALF_UP)); //合格率
+                }
+                if(rateArray7.length == 0)
+                {
+                    continue;
+                }
+                double rate7 = 0;//计算该设备当前月的尺寸合格率
+//				rate7 = Double.valueOf(rateArray7[0].toString()); //单台设备单集合
+                for(int m=0;m<rateArray7.length;m++)
+                {
+                    rate7+= Double.parseDouble(rateArray7[m].toString());
+                }
+                rate7 = rateArray7.length==0?0:rate7/rateArray7.length;
+
+                RepPrinterEvaluateTargetDicVO vo7 = repPrinterEvaluateTargetDicService.getRepPrinterEvaluateTargetDicByKey("OUTWARDHGL",currentCustomer_code);
+                BigDecimal target_value_7 =new BigDecimal(0.0);
+                BigDecimal target_value1_7 =new BigDecimal(0.0);
+                BigDecimal target_value2_7 =new BigDecimal(0.0);
+                BigDecimal target_weight_7 =new BigDecimal(0.0);
+                String indexname7 ="";
+                if(vo7 !=null)
+                {
+                    target_value_7 =vo7.getTargetValue();
+                    target_weight_7 = vo7.getTargetWeight();
+                    indexname7 = vo7.getIndexName();
+                    statistics_type7 = vo7.getStatisticsType();
+                }
+                else
+                {
+                    continue;   //没有归属机构的设备忽略掉
+                }
+                double result7 = 0.0;
+                BigDecimal D7 = new BigDecimal(result7);
+                double weight7 = Double.parseDouble(target_weight_7.toString()) / 100;
+                double targetvalue7 = Double.valueOf(target_value_7.toString()) / 100;
+
+                if(rate7 >= targetvalue7) //x>= 90%  10分
+                {
+                    Double temp = 10.0;
+                    D7 = new BigDecimal(temp);
+                }
+                if(rate7 < targetvalue7)// x < 90%
+                {
+                    Double temp = 0.0;
+                    temp = 10 * rate7;
+                    D7 = new BigDecimal(temp);
+                }
+                String expression = "";
+
+                RepStarEvaluateVO newWorkVO7 = new RepStarEvaluateVO(tenantId,
+                        deviceCode,
+                        deviceTypeId,
+                        String.valueOf(year),
+                        String.valueOf(month),
+                        indexname7,
+                        statistics_type7,
+                        expression,
+                        BigDecimal.valueOf(rate7),
+                        new BigDecimal(targetvalue7),
+                        target_value1_7,
+                        target_value2_7,
+                        new BigDecimal(weight7),
+                        D7,
+                        officeid,
+                        officename,
+                        jixing,
+                        Timestamp.valueOf(LocalDateTime.now()),
+                        Timestamp.valueOf(LocalDateTime.now())
+                );
+                resultList7.add(newWorkVO7);
+                deviceIdList7.add(deviceCode);
+            }
+        }
+
+        //6.3精度合格率
+        for(int i=0;i<ListDataObj.size();i++)
+        {
+            String jixing = String.valueOf(ListDataObj.get(i).getJixing().toString());
+            String deviceCode = String.valueOf(ListDataObj.get(i).getDeviceid().toString());
+            String officeid = String.valueOf(ListDataObj.get(i).getOfficeid().toString());
+            String officename = String.valueOf(ListDataObj.get(i).getOfficename().toString());
+            //目前只有四川共享铸造KF、装备成形工厂KM1有废品数据
+            if (officeid.equals("7b0c9a3a4e514c099569f4a37b7c7b43") || officeid.equals("9bbc696e35214674bf57e186d328f5b9"))
+            {
+                //读取当前机构下的指标设置  打印效率利用率DYXLLYL--------------------------------------------------
+                String currentCustomer_code ="";
+                JsonResult jsonResult = icsmClient.getOfficeInfo(tenantId,userid);
+                List<Map<String, Object>> dataList1 = (List<Map<String, Object>>)jsonResult.getData();
+                for (int j = 0; j < dataList1.size(); j++)
+                {
+                    String CurrentofficeId = org.springframework.util.StringUtils.isEmpty(dataList1.get(j).get("officeId")) ? ""
+                            : dataList1.get(j).get("officeId").toString();
+                    String customerCode = org.springframework.util.StringUtils.isEmpty(dataList1.get(j).get("customerCode")) ? ""
+                            : dataList1.get(j).get("customerCode").toString();
+                    if(CurrentofficeId.equals(officeid))
+                    {
+                        currentCustomer_code = customerCode;
+                        break;
+                    }
+                }
+
+                // 精度
+                String startTime8 = getFirstDayOfMonth1(year,Integer.parseInt(mon)); //当月第1天
+                String endTime8 = getLastDayOfMonth1(year,Integer.parseInt(mon));//当月最后1天
+                Map<String, Object> params8 =new HashMap<>(20);
+                params8.put("tenantId", tenantId);
+                params8.put("user_id", userid);
+                params8.put("startDate", startTime8);
+                params8.put("endDate", endTime8);
+                params8.put("deviceId", deviceCode);
+                params8.put("sxType", "2");
+
+                List<Map<String,Object>> list8 = repPrinterStarPassrateDao.sumPrinterStarPassrateDataEvaluate(params8);
+                if( list8==null || list8.size()==0 ){
+                    continue;
+                }
+                String[] deviceArray8 = new String[list8.size()];
+                Object[] rateArray8 = new String[list8.size()];
+                DecimalFormat df8 =new DecimalFormat("0.000");
+                for(int k=0;k<list8.size();k++)
+                {
+                    Map<String,Object> m = list8.get(k);
+                    String device_id = (String) m.get("device_id");
+                    BigDecimal itemHglv = (BigDecimal) m.get("itemHglv");
+                    Long count = (Long) m.get("count");
+                    deviceArray8[k] = device_id;
+                    rateArray8[k] = df8.format(itemHglv.divide(new BigDecimal(count), 3, BigDecimal.ROUND_HALF_UP)); //合格率
+                }
+                if(rateArray8.length == 0)
+                {
+                    continue;
+                }
+                double rate8 = 0;//计算该设备当前月的精度合格率
+//				rate8 = Double.valueOf(rateArray8[0].toString()); //单台设备单集合
+                for(int m=0;m<rateArray8.length;m++)
+                {
+                    rate8+= Double.parseDouble(rateArray8[m].toString());
+                }
+                rate8 = rateArray8.length==0?0:rate8/rateArray8.length;
+
+                RepPrinterEvaluateTargetDicVO vo8 = repPrinterEvaluateTargetDicService.getRepPrinterEvaluateTargetDicByKey("PRECISIONHGL",currentCustomer_code);
+                BigDecimal target_value_8 =new BigDecimal(0.0);
+                BigDecimal target_value1_8 =new BigDecimal(0.0);
+                BigDecimal target_value2_8 =new BigDecimal(0.0);
+                BigDecimal target_weight_8 =new BigDecimal(0.0);
+                String indexname8 ="";
+                if(vo8 !=null)
+                {
+                    target_value_8 =vo8.getTargetValue();
+                    target_weight_8 = vo8.getTargetWeight();
+                    indexname8 = vo8.getIndexName();
+                    statistics_type8 = vo8.getStatisticsType();
+                }
+                else
+                {
+                    continue;   //没有归属机构的设备忽略掉
+                }
+                double result8 = 0.0;
+                BigDecimal D8 = new BigDecimal(result8);
+                double weight8 = Double.parseDouble(target_weight_8.toString()) / 100;
+                double targetvalue8 = Double.valueOf(target_value_8.toString()) / 100;
+
+                if(rate8 >= targetvalue8) //x>= 90%  10分
+                {
+                    Double temp = 10.0;
+                    D8 = new BigDecimal(temp);
+                }
+                if(rate8 < targetvalue8)// x < 90%
+                {
+                    Double temp = 0.0;
+                    temp = 10 * rate8;
+                    D8 = new BigDecimal(temp);
+                }
+                String expression = "";
+
+                RepStarEvaluateVO newWorkVO8 = new RepStarEvaluateVO(tenantId,
+                        deviceCode,
+                        deviceTypeId,
+                        String.valueOf(year),
+                        String.valueOf(month),
+                        indexname8,
+                        statistics_type8,
+                        expression,
+                        BigDecimal.valueOf(rate8),
+                        new BigDecimal(targetvalue8),
+                        target_value1_8,
+                        target_value2_8,
+                        new BigDecimal(weight8),
+                        D8,
+                        officeid,
+                        officename,
+                        jixing,
+                        Timestamp.valueOf(LocalDateTime.now()),
+                        Timestamp.valueOf(LocalDateTime.now())
+                );
+                resultList8.add(newWorkVO8);
+                deviceIdList8.add(deviceCode);
+            }
+        }
+        if(!statistics_type6.equals("")) //尺寸
+        {
+            starEvaluateDAO.deleteStarEvaluateByDate(String.valueOf(year),String.valueOf(month),statistics_type6,deviceIdList6);
+            starEvaluateDAO.batchAdd(resultList6);
+        }
+        if(!statistics_type7.equals(""))//外观
+        {
+            starEvaluateDAO.deleteStarEvaluateByDate(String.valueOf(year),String.valueOf(month),statistics_type7,deviceIdList7);
+            starEvaluateDAO.batchAdd(resultList7);
+        }
+        if(!statistics_type8.equals(""))//精度
+        {
+            starEvaluateDAO.deleteStarEvaluateByDate(String.valueOf(year),String.valueOf(month),statistics_type8,deviceIdList8);
+            starEvaluateDAO.batchAdd(resultList8);
+        }
+*/
+
+    }
+
+
+    public static String getLastDayOfMonth1(int year, int month) {
+        Calendar cal = Calendar.getInstance();
+        //设置年份
+        cal.set(Calendar.YEAR, year);
+        //设置月份
+        cal.set(Calendar.MONTH, month-1);
+        //获取某月最大天数
+        int lastDay = cal.getActualMaximum(Calendar.DATE);
+        //设置日历中月份的最大天数
+        cal.set(Calendar.DAY_OF_MONTH, lastDay);
+        //格式化日期
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(cal.getTime());
+    }
+    public static String getFirstDayOfMonth1(int year, int month) {
+        Calendar cal = Calendar.getInstance();
+        //设置年份
+        cal.set(Calendar.YEAR, year);
+        //设置月份
+        cal.set(Calendar.MONTH, month-1);
+        //获取某月最小天数
+        int firstDay = cal.getMinimum(Calendar.DATE);
+        //设置日历中月份的最小天数
+        cal.set(Calendar.DAY_OF_MONTH,firstDay);
+        //格式化日期
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(cal.getTime());
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterTargetDicServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterTargetDicServiceImpl.java
new file mode 100644
index 0000000..51ce155
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/service/impl/RepPrinterTargetDicServiceImpl.java
@@ -0,0 +1,97 @@
+package com.rootcloud.service.impl;
+
+import com.github.pagehelper.PageInfo;
+import com.rootcloud.common.JsonResult2;
+import com.rootcloud.domain.dao.RepPrinterTargetDicDAO;
+import com.rootcloud.domain.vo.RepPrinterTargetDicVO;
+import com.rootcloud.service.RepPrinterTargetDicService;
+import com.rootcloud.service.condition.QueryRepPrinterTargetDicCondition;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service("targetService")
+public class RepPrinterTargetDicServiceImpl implements RepPrinterTargetDicService {
+
+    @Resource
+    private RepPrinterTargetDicDAO repPrinterTargetDicDAO;
+
+    @Override
+    public JsonResult2 insert(RepPrinterTargetDicVO vo) {
+        JsonResult2 jr = new JsonResult2();
+
+        repPrinterTargetDicDAO.insert(vo);
+
+        return jr ;
+    }
+
+    @Override
+    public JsonResult2 update(RepPrinterTargetDicVO vo) {
+        repPrinterTargetDicDAO.update(vo);
+        return new JsonResult2();
+    }
+
+    @Override
+    public JsonResult2 deleteById(Long id) {
+        repPrinterTargetDicDAO.deleteById(id);
+
+        return new JsonResult2();
+    }
+
+    @Override
+    public RepPrinterTargetDicVO getRepPrinterTargetDicById(Long id) {
+        return repPrinterTargetDicDAO.getRepPrinterTargetDicById(id);
+    }
+
+    @Override
+    public RepPrinterTargetDicVO getRepPrinterTargetDicByKey(String statisticsType,String customerId) {
+        return repPrinterTargetDicDAO.getRepPrinterTargetDicByKey(statisticsType,customerId);
+    }
+
+    @Override
+    public JsonResult2  getRepPrinterTargetDicList(String tenantId, QueryRepPrinterTargetDicCondition c) {
+
+        JsonResult2 jsonResult=new JsonResult2();
+        try{
+            Integer pageNum = StringUtils.isNotBlank(c.getPageNo())?Integer.parseInt(c.getPageNo()):1;
+            Integer pageSize = StringUtils.isNotBlank(c.getPageSize())?Integer.parseInt(c.getPageSize()):10;
+
+            int startIndex  = (pageNum -1 ) * pageSize;
+            Map<String,Object> params = new HashMap<String,Object>();
+//            params.put("tenantId", tenantId);
+            params.put("statisticsType", c.getStatisticsType());
+            params.put("customerId", c.getCustomerId());
+            params.put("customerId", c.getCustomerId());
+            params.put("startNo", startIndex);
+            params.put("endNo",pageNum * pageSize);
+
+            List<RepPrinterTargetDicVO> list = repPrinterTargetDicDAO.getRepPrinterTargetDicList(params);
+            PageInfo<RepPrinterTargetDicVO> pageInfo = new PageInfo<RepPrinterTargetDicVO>(list);
+
+            Integer count = repPrinterTargetDicDAO.getRepPrinterTargetDicListCount(params).size();
+            pageInfo.setPageNum(pageNum);
+            pageInfo.setPageSize(pageSize);
+            pageInfo.setTotal(count);
+
+        }catch (Exception e){
+            e.printStackTrace();
+//            JsonResult2.setRet(JsonResultStatus.DEVICE_FAIL.getRet());
+//            JsonResult2.setMsg(JsonResultStatus.DEVICE_FAIL.getMsg());
+        }
+        return jsonResult;
+    }
+
+    @Override
+    public List<RepPrinterTargetDicVO> groupByPrinterTargetDic() {
+        return repPrinterTargetDicDAO.groupByPrinterTargetDic();
+    }
+
+    @Override
+    public List<RepPrinterTargetDicVO> getRepPrinterTargetDicList(Map<String, Object> params) {
+        return repPrinterTargetDicDAO.getRepPrinterTargetDicList(params);
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/timer/MainTimer.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/timer/MainTimer.java
new file mode 100644
index 0000000..36dc3a6
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/timer/MainTimer.java
@@ -0,0 +1,161 @@
+package com.rootcloud.timer;
+
+import com.rootcloud.common.JsonResult2;
+import com.rootcloud.common.util.DateUtils;
+import com.rootcloud.service.PrinterEfficiencyService;
+import com.rootcloud.service.RepPrinterReportService;
+import com.rootcloud.service.RepPrinterStarEvaluateService;
+import jline.internal.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Calendar;
+import java.util.Date;
+
+@Component
+public class MainTimer {
+
+    private static final Logger logger = LoggerFactory.getLogger(MainTimer.class);
+
+    @Resource(name = "efficiency")
+    private PrinterEfficiencyService printerEfficiencyService;
+    @Resource(name = "reportService")
+    private RepPrinterReportService repPrinterReportService;
+    @Resource(name = "starPrinterServices")
+    private RepPrinterStarEvaluateService starEvaluateServices;
+
+
+
+//    /** 2点整开始执行批任务- 有效打印时间、打印效率*/
+//    @Scheduled(cron = "0 30 4 * * ?")
+//    public void runDayEfficiencyService() {
+//
+//        Calendar c = Calendar.getInstance();
+//        c.add(Calendar.DAY_OF_MONTH, -1);
+        // 2022-09-16  由温海龙那边跑p统一处理
+//        try{
+//            logger.info("2点整开始执行批任务- 按照批次计算 有效打印时间、打印效率、补图率...");
+//            printerEfficiencyService.run0((Calendar) c.clone());
+//            //跑完后，需要统计一下月时长
+//            printerEfficiencyService.run0_statistics_month((Calendar) c.clone());
+//        }catch (Exception ex1){
+//            logger.error("出现异常2点整开始执行批任务- 按照批次计算 有效打印时间、打印效率、补图率...");
+//        }
+
+        // 2022-12-13 由温海龙提出注掉
+//        try {
+//            logger.info("定时生成按批次跑批工作时长、打印效率、布图率(rep_printer_efficiency)等报表数据...");
+//            printerEfficiencyService.run1((Calendar) c.clone());
+//        } catch (Exception ex2) {
+//            logger.error("定时生成按批次跑批工作时长、打印效率、布图率(rep_printer_efficiency)等报表数据失败...",ex2);
+//        }
+//        try {
+//            logger.info("定时生成工作时长(IROOTECH/gk_day_wktime_info、gk_day_volume_info表)报表时长、产量数据...");
+//            printerEfficiencyService.run2(LocalDate.now().minusDays(1));
+//        } catch (Exception ex) {
+//            logger.error("定时生成工作时长、产量报表数据失败...", ex);
+//        }
+//    }
+
+    /** 7点整开始执行批任务- 海外奥钢联设备 按照批次计算 有效打印时间、打印效率、补图率*/
+    // 2022-09-16  由温海龙那边跑p统一处理
+//    @Scheduled(cron = "0 0 7 * * ?")
+//    public void runDayEfficiencyService2() {
+//        Calendar c = Calendar.getInstance();
+//        c.add(Calendar.DAY_OF_MONTH, -1);//前一天
+//        try {
+//            //定时生成单日打印耗时 24H内（每日01:00:00定时执行 rep_printer_efficiency2）-单台机运维报告统计单日开动率用
+//            printerEfficiencyService.runEurop0((Calendar) c.clone());
+//            //跑完后，需要统计一下月时长
+//            printerEfficiencyService.run0_statistics_month((Calendar) c.clone());
+//        } catch (Exception e) {
+//            logger.error("定时生成打印机单日打印耗时数据失败...", e);
+//        }
+//    }
+
+    // 2022-12-13 由温海龙提出注掉 定时任务
+    /** 2点30分整开始执行批任务- 产创设备密度过滤详细数据*/
+//    @Scheduled(cron = "0 30 2 * * ?")
+//    public void runDayPrinteProcessDataService() {
+//        Calendar c = Calendar.getInstance();
+//        c.add(Calendar.DAY_OF_MONTH, -1);
+//        try {
+//            logger.info("定时生成按批次跑批打印耗时、树脂加入、漏砂、打印体积、AB砂、打印耗时、打印层数、固化剂等(rep_printer_sand_percent)等报表数据...");
+//            repPrinterReportService.run((Calendar) c.clone());
+//        } catch (Exception ex) {
+//            logger.error("定时生成按批次跑批打印耗时、树脂加入、漏砂、打印体积、AB砂、打印耗时、打印层数、固化剂等(rep_printer_sand_percent)等报表数据失败...", ex);
+//        }
+//    }
+//    /** 2点50分整开始执行批任务- 全部设备打印过程详细数据*/
+//    @Scheduled(cron = "0 50 2 * * ?")
+//    public void runDayPrinteProcessDataService2() {
+//        Calendar c = Calendar.getInstance();
+//        c.add(Calendar.DAY_OF_MONTH, -1);
+//        try {
+//            logger.info("定时生成按批次跑批打印耗时、树脂加入、漏砂、打印体积、AB砂、打印耗时、打印层数、固化剂等(rep_printer_sand_percent2)等报表数据...");
+//            repPrinterReportService.run1((Calendar) c.clone());
+//        } catch (Exception ex) {
+//            logger.error("定时生成按批次跑批打印耗时、树脂加入、漏砂、打印体积、AB砂、打印耗时、打印层数、固化剂等(rep_printer_sand_percent2)等报表数据失败...", ex);
+//        }
+//    }
+//
+//    /**
+//     * 跑批设备星级评价 统计数据 （每日05:00:00定时执行）
+//     * @Scheduled(cron = "0 0/5 0-23 * * ?")
+//     */
+//    @Scheduled(cron = "0 0 5 * * ?")
+//    public void runstarEvaluateReport() {
+//        try {
+//            Calendar c = Calendar.getInstance();
+//            c.add(Calendar.DAY_OF_MONTH, -1); //前一天
+//            starEvaluateServices.run((Calendar) c.clone());
+//            logger.info("定时任务生成星级评价统计数据成功...");
+//        } catch (Exception e) {
+//            logger.error("定时任务设备星级评价统计跑批失败...", e);
+//        }
+//    }
+//
+//
+//
+//
+//
+//    /**
+//     * 30分钟检查一次运行状态
+//     */
+//    @Scheduled(cron = "0 */30 * * * ?")
+//    public void checkWorkData() {
+//        try {
+//
+//            Date dtNow = new Date();
+//            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//            try
+//            {
+//                String nowString = formatter.format(dtNow);
+//                logger.info("正在检测系统运行状态......"+nowString);
+////                logger.info("正在检测设备工况数据......"+new Date());
+////                logger.info("正在检测设备工况数据1......"+nowString);
+////                logger.info("正在检测设备工况数据2......"+new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+//            }catch (Exception ex){}
+//
+//        } catch (Exception e) {
+//            logger.error("工况检查失败", e);
+//        }
+//    }
+//
+//    /**
+//     * 2分钟检查一次
+//     */
+//    @Scheduled(cron = "0 0/10 8-20 * * ?")
+//    public void cron() {
+//        try {
+////            logger.info("cron打印时间......"+new Date());
+//        } catch (Exception e) {
+//            logger.error("工况检查失败", e);
+//        }
+//    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/timer/ServicePlanTimer.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/timer/ServicePlanTimer.java
new file mode 100644
index 0000000..2830654
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/timer/ServicePlanTimer.java
@@ -0,0 +1,60 @@
+package com.rootcloud.timer;
+
+import com.rootcloud.domain.service.sp.ServicePlanService;
+import jline.internal.Log;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * @author lujiumin
+ * @date 2023/1/9
+ * 描述：
+ */
+@Component
+@Slf4j
+@EnableScheduling
+public class ServicePlanTimer {
+
+    @Resource(name = "servicePlanServiceImpl")
+    ServicePlanService planService;
+
+
+    /**
+     * 定时处理设置了触发条件为系统时间的
+     */
+    @Scheduled(cron = "0 0 5,6,7,8,14 * * ?")
+    public void scheduledProcessing(){
+        log.info("服务计划自动触发定时任务开始....");
+        planService.scheduledProcessing();
+        log.info("服务计划自动触发定时任务结束....");
+    }
+
+    /**
+     * 定时修改服务状态
+     */
+    @Scheduled(cron = "0 0 7,23 * * ?")
+    public void updateStatusScheduled(){
+        planService.updateStatusScheduled();
+    }
+
+
+
+    //@Scheduled(cron = "0 0 10 * * ?")
+    public void execute(){
+        planService.execute();
+    }
+
+
+    /**
+     * 定时查询报警
+     */
+    @Scheduled(cron = "0 0/15 * * * ?")
+    public void queryAlarm(){
+        planService.queryAlarmQz();
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/timer/SparePartTimer.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/timer/SparePartTimer.java
new file mode 100644
index 0000000..7242a71
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/timer/SparePartTimer.java
@@ -0,0 +1,53 @@
+package com.rootcloud.timer;
+
+import com.rootcloud.domain.service.fittings.SparePartService;
+import io.swagger.annotations.ApiOperation;
+import jline.internal.Log;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import javax.annotation.Resource;
+
+/**
+ * @author lujiumin
+ * @date 2023/1/11
+ * 描述：
+ */
+@Component
+@EnableScheduling
+public class SparePartTimer {
+
+    @Resource(name = "sparePartServiceImpl")
+    private SparePartService sparePartService;
+
+    /**
+     * 定时处理设置了触发条件为系统时间的
+     */
+    @Scheduled(cron = "0 */5 * * * ?")
+    public void scheduledProcessing() {
+        Log.info("自动填充租户ID定时任务启动....");
+        try {
+            sparePartService.paddingZhid();
+        } catch (Exception e) {
+            Log.error("自动填充租户失败，失败原因：" + e.getMessage());
+        }
+        Log.info("自动填充租户ID定时任务结束....");
+    }
+
+    @Scheduled(cron = "0 0 23 * * ?")
+    public void partLifeWarning() {
+        Log.info("备件寿命预警定时任务启动....");
+        sparePartService.uptPartSmyj();
+        Log.info("备件寿命预警定时任务启动....");
+    }
+    @Scheduled(cron = "0 0 6 * * ?")
+    public void syncWorkingTime(){    //2024-06whl 20231012 小时改天数
+        Log.info("同步备件工作时长开始");
+        sparePartService.syncWorkingTime();
+        Log.info("同步备件工作时长结束");
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/validate/annotation/NotBlank.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/validate/annotation/NotBlank.java
new file mode 100644
index 0000000..aa1c8c5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/validate/annotation/NotBlank.java
@@ -0,0 +1,21 @@
+package com.rootcloud.validate.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 效验属性不可以为空
+ * @author yang yin bo
+ *
+ *2017年4月17日 下午2:47:02
+ */
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface NotBlank {
+
+	String message() default "参数不可以为空";
+	
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/validate/annotation/Validate.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/validate/annotation/Validate.java
new file mode 100644
index 0000000..5cf718e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/validate/annotation/Validate.java
@@ -0,0 +1,18 @@
+package com.rootcloud.validate.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 标记该类是否需要效验参数
+ * @author yang yin bo
+ *
+ *2017年4月17日 下午3:14:12
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Validate {
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/UserLogin.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/UserLogin.java
new file mode 100644
index 0000000..afffdd9
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/UserLogin.java
@@ -0,0 +1,76 @@
+package com.rootcloud.vo;
+
+
+import org.hibernate.validator.constraints.NotBlank;
+
+import java.io.Serializable;
+
+public class UserLogin implements Serializable {
+
+    private String userName;
+    private String desEncrypt;
+
+    @NotBlank(message = "用户名不能为空")
+    private String username;
+    @NotBlank(message = "密码不能为空")
+    private String password;
+    private String smsCode;
+    private String key;
+    private String code;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getDesEncrypt() {
+        return desEncrypt;
+    }
+
+    public void setDesEncrypt(String desEncrypt) {
+        this.desEncrypt = desEncrypt;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getSmsCode() {
+        return smsCode;
+    }
+
+    public void setSmsCode(String smsCode) {
+        this.smsCode = smsCode;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/UserLogout.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/UserLogout.java
new file mode 100644
index 0000000..8b5d003
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/UserLogout.java
@@ -0,0 +1,82 @@
+package com.rootcloud.vo;
+
+
+
+import java.io.Serializable;
+
+public class UserLogout implements Serializable {
+
+    private String access_token;
+    private String token_type;
+    private String refresh_token;
+    private String isSystemAdmin;
+    private String tenantId;
+    private String jti;
+    private String expires_in;
+    private String scope;
+
+
+    public String getAccess_token() {
+        return access_token;
+    }
+
+    public void setAccess_token(String access_token) {
+        this.access_token = access_token;
+    }
+
+    public String getToken_type() {
+        return token_type;
+    }
+
+    public void setToken_type(String token_type) {
+        this.token_type = token_type;
+    }
+
+    public String getRefresh_token() {
+        return refresh_token;
+    }
+
+    public void setRefresh_token(String refresh_token) {
+        this.refresh_token = refresh_token;
+    }
+
+    public String getIsSystemAdmin() {
+        return isSystemAdmin;
+    }
+
+    public void setIsSystemAdmin(String isSystemAdmin) {
+        this.isSystemAdmin = isSystemAdmin;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getJti() {
+        return jti;
+    }
+
+    public void setJti(String jti) {
+        this.jti = jti;
+    }
+
+    public String getExpires_in() {
+        return expires_in;
+    }
+
+    public void setExpires_in(String expires_in) {
+        this.expires_in = expires_in;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public void setScope(String scope) {
+        this.scope = scope;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/app/AdviceResultVo.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/app/AdviceResultVo.java
new file mode 100644
index 0000000..6e3ae41
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/app/AdviceResultVo.java
@@ -0,0 +1,22 @@
+package com.rootcloud.vo.app;
+
+import com.rootcloud.domain.entity.MyAdviceEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AdviceResultVo {
+
+    @ApiModelProperty("数量")
+    private String adviceCount;
+
+    @ApiModelProperty("消息list")
+    List<MyAdviceEntity> adviceEntityList;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/app/MessageResultVo.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/app/MessageResultVo.java
new file mode 100644
index 0000000..54bd76e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/app/MessageResultVo.java
@@ -0,0 +1,22 @@
+package com.rootcloud.vo.app;
+
+import com.rootcloud.domain.entity.MyMessageEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MessageResultVo {
+
+    @ApiModelProperty("数量")
+    private String messageCount;
+
+    @ApiModelProperty("消息list")
+    List<MyMessageEntity> messageEntityList;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/BaseDeviceVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/BaseDeviceVO.java
new file mode 100644
index 0000000..0f9e635
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/BaseDeviceVO.java
@@ -0,0 +1,45 @@
+package com.rootcloud.vo.device;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName DeviceHistorySituationVO
+ * @Description TODO
+ * @Author w-liuyi01
+ * @Date 2022/4/21 14:19
+ * @Version 1.0
+ */
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BaseDeviceVO {
+
+    @ApiModelProperty("设备ID")
+    private String deviceId;
+
+    @ApiModelProperty("模型Id")
+    private String modelId;
+
+    @ApiModelProperty("设备编号DEVICE_SBBM")
+    private String deviceSbbm;
+
+    @ApiModelProperty("设备名称DEVICE_SBMC")
+    private String deviceSbmc;
+
+    @ApiModelProperty("设备类型DEVICE_SBLX")
+    private String deviceSblx;
+
+    @ApiModelProperty("设备型号DEVICE_SBXH")
+    private String deviceSbxh;
+
+    @ApiModelProperty("设备更新时间")
+    private String updateTime;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/CameraParam.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/CameraParam.java
new file mode 100644
index 0000000..253a1d3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/CameraParam.java
@@ -0,0 +1,33 @@
+package com.rootcloud.vo.device;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/5/7 10:30
+ */
+@Data
+public class CameraParam {
+    @Size(max = 100,message = "名称字符只能在100长度之内")
+    @NotNull(message = "名称不能为空")
+    private String name;
+    @Pattern(regexp = "((^[A-Za-z0-9_-]+$))", message = "序列号只能有数字、字母、特殊符号")
+    @NotNull(message = "序列号不能为空")
+    private String sno;
+    @Pattern(regexp = "(([0-9]*))", message = "通道号只能有数字")
+    @NotNull(message = "通道号不能为空")
+    private String cno;
+    private String model;
+    private String factoryName;
+    private String id;
+    private String deviceId;
+    private Integer orderIndex;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/CommonDeviceHistorySituationVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/CommonDeviceHistorySituationVO.java
new file mode 100644
index 0000000..50ebb7c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/CommonDeviceHistorySituationVO.java
@@ -0,0 +1,29 @@
+package com.rootcloud.vo.device;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName CommonDeviceHistorySituationVO
+ * @Description TODO
+ * @Author w-liuyi01
+ * @Date 2022/4/24 16:01
+ * @Version 1.0
+ */
+@Data
+public class CommonDeviceHistorySituationVO {
+
+    @ApiModelProperty("基础设备数据")
+    private List<BaseDeviceVO> baseDeviceVOList;
+
+    @ApiModelProperty("历史工况属性")
+    private List<Map<String,Object>> mapList;
+
+    @ApiModelProperty("总数")
+    private Integer totalPage;
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceHistorySituationVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceHistorySituationVO.java
new file mode 100644
index 0000000..364d604
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceHistorySituationVO.java
@@ -0,0 +1,65 @@
+package com.rootcloud.vo.device;
+
+import com.rootcloud.domain.model.WorkStatusMonitorModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName DeviceHistorySituationVO
+ * @Description TODO
+ * @Author w-liuyi01
+ * @Date 2022/4/21 14:19
+ * @Version 1.0
+ */
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeviceHistorySituationVO {
+
+    @ApiModelProperty("设备ID")
+    private String deviceId;
+
+    @ApiModelProperty("模型Id")
+    private String modelId;
+
+    @ApiModelProperty("设备编号DEVICE_SBBM")
+    private String deviceSbbm;
+
+    @ApiModelProperty("设备名称DEVICE_SBMC")
+    private String deviceSbmc;
+
+    @ApiModelProperty("设备类型DEVICE_SBLX")
+    private String deviceSblx;
+
+    @ApiModelProperty("设备型号DEVICE_SBXH")
+    private String deviceSbxh;
+
+    /**
+     * 设备类型
+     */
+    @ApiModelProperty("设备类型名称")
+    private String deviceSblxName;
+    /**
+     * 设备型号
+     */
+    @ApiModelProperty("设备型号名称")
+    private String deviceSbxhName;
+
+    @ApiModelProperty("设备更新时间")
+    private String updateTime;
+
+    private Map<String,Object> map;
+
+    Map<String, List<WorkStatusMonitorModel>> groupMap;
+
+
+    Map<String,Map<String, List<WorkStatusMonitorModel>>> groupByTypeMap;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceInfo.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceInfo.java
new file mode 100644
index 0000000..ae36615
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceInfo.java
@@ -0,0 +1,66 @@
+package com.rootcloud.vo.device;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 17:26
+ */
+@Data
+@ApiModel("设备信息")
+@Builder
+public class DeviceInfo {
+    @ApiModelProperty("设备id")
+    private String id;
+    //设备详情：设备编号、设备名称，地址详情、定位时间、在线时间、在线时长、设备别名、设备监控、设备在线状态
+    @ApiModelProperty("设备编号")
+    private String code;
+    @ApiModelProperty("设备名称")
+    private String name;
+    private String typeName;
+    private String modelName;
+    @ApiModelProperty("地址详情")
+    private String address;
+    @ApiModelProperty("定位时间")
+    private Timestamp locationTime;
+    @ApiModelProperty("在线时间")
+    private String onlineTime;
+    @ApiModelProperty("设备别名")
+    private String alias;
+    private String clientUserName;
+    @ApiModelProperty("设备监控")
+    private String monitor;
+    @ApiModelProperty("设备在线状态")
+    private Integer status;
+    @ApiModelProperty(value = "设备经纬度",example = "[123.2,22]")
+    private String[] location;
+    @ApiModelProperty("设备联网状态")
+    private Integer networkStatus;
+    @ApiModelProperty("设备入云时间")
+    private String cloudTime;
+
+
+    @ApiModelProperty("维保结束时间")
+    private String warrantyTime;
+
+    @ApiModelProperty("保修状态")
+    private String warrantyStatus;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("设备出厂日期")
+    private String deviceStartTime;
+
+    @ApiModelProperty("设备状态")
+    private String deviceStatus;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceMonthWorkTimeLineChart.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceMonthWorkTimeLineChart.java
new file mode 100644
index 0000000..2f1b626
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceMonthWorkTimeLineChart.java
@@ -0,0 +1,25 @@
+package com.rootcloud.vo.device;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 17:17
+ */
+@Data
+@Builder
+public class DeviceMonthWorkTimeLineChart {
+    @ApiModelProperty("X轴")
+    private List<Object> xData;
+    @ApiModelProperty("Y轴")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private List<Object> data;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceMonthWorkTimeStatistics.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceMonthWorkTimeStatistics.java
new file mode 100644
index 0000000..2c137d6
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceMonthWorkTimeStatistics.java
@@ -0,0 +1,30 @@
+package com.rootcloud.vo.device;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 17:14
+ */
+@Data
+@Builder
+public class DeviceMonthWorkTimeStatistics {
+    @ApiModelProperty("本月总工时")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private BigDecimal total;
+    @ApiModelProperty("今日工时")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private BigDecimal todayWorkTime;
+    @ApiModelProperty("昨天工时")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private BigDecimal yesterdayWorkTime;
+}
+
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceStatusStatistics.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceStatusStatistics.java
new file mode 100644
index 0000000..c65baef
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceStatusStatistics.java
@@ -0,0 +1,27 @@
+package com.rootcloud.vo.device;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 17:13
+ */
+@Data
+@Builder
+public class DeviceStatusStatistics {
+    @ApiModelProperty("设备总数")
+    private Integer deviceTotal;
+    @ApiModelProperty("设备在线数")
+    private Integer onlineCount;
+    @ApiModelProperty("设备离线数")
+    private Integer offlineCount;
+    @ApiModelProperty("设备故障数")
+    private Integer fault;
+    @ApiModelProperty(value = "设备在线率",notes = "在线数除以设备总数")
+    private Float onlineRate;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceStatusVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceStatusVO.java
new file mode 100644
index 0000000..5f416ac
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceStatusVO.java
@@ -0,0 +1,19 @@
+package com.rootcloud.vo.device;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("设备状态")
+public class DeviceStatusVO {
+
+    @ApiModelProperty("1.打印中 2.待机 3.离线")
+    private String deviceStatus;
+
+
+    @ApiModelProperty("报警")
+    private Boolean alarm;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceTypeVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceTypeVO.java
new file mode 100644
index 0000000..36ae1a7
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceTypeVO.java
@@ -0,0 +1,90 @@
+package com.rootcloud.vo.device;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+
+@Data
+@ApiModel("设备首页详情")
+public class DeviceTypeVO {
+
+    @ApiModelProperty("设备名称")
+    private String  deviceName;
+
+    @ApiModelProperty("设备类型")
+    private String  deviceType;
+
+    @ApiModelProperty("设备编码")
+    private String  deviceCode;
+
+
+    @ApiModelProperty("设备型号")
+    private String  deviceSbxh;
+
+    @ApiModelProperty("设备运行时长")
+    private String  onlineTime;
+
+    @ApiModelProperty("设备出厂日期")
+    private String deviceFactoryDate;
+
+    @ApiModelProperty("任务名称")
+    private String  taskName;
+
+    @ApiModelProperty("开始时间")
+    private String  startTime;
+
+    @ApiModelProperty("结束时间")
+    private String  endTime;
+
+    @ApiModelProperty("打印耗时")
+    private String  printTime;
+
+    @ApiModelProperty("打印层厚")
+    private String  printLayer;
+
+    @ApiModelProperty("打印体积")
+    private String  printVolume;
+
+    @ApiModelProperty("打印层耗时")
+    private String  printLayerTime;
+
+    @ApiModelProperty("打印总层数")
+    private String  printAllLayer;
+
+    @ApiModelProperty("当前打印层数")
+    private String nowPrintLayer;
+
+    @ApiModelProperty("任务进度= 当前打印层数/打印总层数 *100%")
+    private String  taskProgress;
+
+
+    @ApiModelProperty("1.打印中 2.待机 3.离线")
+    private String deviceStatus;
+
+
+    @ApiModelProperty("报警")
+    private Boolean alarm;
+
+
+    @ApiModelProperty("设备来源")
+    private String deviceSource;
+
+
+    public String getTaskProgress(){
+        if(StringUtils.isNotBlank(this.printAllLayer)  && StringUtils.isNotBlank(this.nowPrintLayer)){
+            if(new BigDecimal(this.printAllLayer).compareTo(BigDecimal.ZERO)  == 0){
+                return "0%";
+            }else{
+                BigDecimal divide = new BigDecimal(this.nowPrintLayer).divide(new BigDecimal(this.printAllLayer), 4, RoundingMode.HALF_UP);
+                return divide.multiply(new BigDecimal(100)).setScale( 2, BigDecimal.ROUND_HALF_UP) + "%";
+            }
+        }
+        return "0%";
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceVO.java
new file mode 100644
index 0000000..abf07f0
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceVO.java
@@ -0,0 +1,24 @@
+package com.rootcloud.vo.device;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 15:30
+ */
+@Data
+@ApiModel("设备展示")
+@Builder
+public class DeviceVO {
+    @ApiModelProperty("设备信息")
+    private DeviceInfo deviceInfo;
+    @ApiModelProperty("折现图")
+    private DeviceMonthWorkTimeLineChart deviceMonthWorkTimeLineChart;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceView.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceView.java
new file mode 100644
index 0000000..2e3ee89
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceView.java
@@ -0,0 +1,22 @@
+package com.rootcloud.vo.device;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 16:03
+ */
+@Data
+public class DeviceView {
+    private List<DeviceInfo> devices;
+    @ApiModelProperty("设备状态总览")
+    private DeviceStatusStatistics deviceStatusStatistics;
+    @ApiModelProperty("设备工时总览")
+    private List<DeviceWorkTimeStatistics> deviceWorkTimeStatistics;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceWorkTimeStatistics.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceWorkTimeStatistics.java
new file mode 100644
index 0000000..47835c6
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/DeviceWorkTimeStatistics.java
@@ -0,0 +1,29 @@
+package com.rootcloud.vo.device;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 17:13
+ */
+@Data
+@Builder
+public class DeviceWorkTimeStatistics {
+    @ApiModelProperty("设备名称")
+    private String name;
+    @ApiModelProperty("设备总工时")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private BigDecimal workTotalTime;
+    @ApiModelProperty("设备总工时百分比")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private BigDecimal workTotalTimeRate;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/NetWorkParam.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/NetWorkParam.java
new file mode 100644
index 0000000..e22a31b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/NetWorkParam.java
@@ -0,0 +1,20 @@
+package com.rootcloud.vo.device;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/28 16:18
+ */
+@Data
+public class NetWorkParam {
+    private String networkId;
+    private List<String> userIds;
+    private String yhJs;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/NxDeviceParam.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/NxDeviceParam.java
new file mode 100644
index 0000000..24498b7
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/NxDeviceParam.java
@@ -0,0 +1,17 @@
+package com.rootcloud.vo.device;
+
+import lombok.Data;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/18 15:30
+ */
+@Data
+public class NxDeviceParam {
+    private String no;
+    private String name;
+    private String type;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/ServicePlanCalendarDetailsVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/ServicePlanCalendarDetailsVO.java
new file mode 100644
index 0000000..068b3d5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/ServicePlanCalendarDetailsVO.java
@@ -0,0 +1,41 @@
+package com.rootcloud.vo.device;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ServicePlanCalendarDetailsVO {
+
+    @ApiModelProperty("设备编号")
+    private String deviceCode;
+
+
+    @ApiModelProperty("任务计划名称")
+    private String serviceName;
+
+
+    @ApiModelProperty("设备名称")
+    private String dviceName;
+
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("完成时间节点【几天内】")
+    private Integer  finishTimeNode;
+
+    @ApiModelProperty("任务起始日期")
+    private String planStartTime;
+
+
+    @ApiModelProperty("任务结束日期")
+    private String planEndTime;
+
+    @ApiModelProperty("日期状态:1进行中，2已经完成，0暂停")
+    private String  dateStatus;
+
+    @ApiModelProperty("订单状态:1正常，0删除")
+    private String  orderStatus;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/ServicePlanCalendarList.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/ServicePlanCalendarList.java
new file mode 100644
index 0000000..c30c965
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/ServicePlanCalendarList.java
@@ -0,0 +1,31 @@
+package com.rootcloud.vo.device;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("任务日历List数据")
+public class ServicePlanCalendarList {
+
+    @ApiModelProperty("日历日期")
+    private String  calendarDate;
+
+    @ApiModelProperty("订单状态:1正常，0删除")
+    private String  orderStatus;
+
+    @ApiModelProperty("日期状态:1进行中，2已经完成，0暂停")
+    private String  dateStatus;
+
+
+    @ApiModelProperty("详情")
+    private ServicePlanCalendarDetailsVO servicePlanCalendarDetailsVO;
+
+
+    @ApiModelProperty("详情List")
+    private List<ServicePlanCalendarDetailsVO> lists;
+
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/ServicePlanCalendarVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/ServicePlanCalendarVO.java
new file mode 100644
index 0000000..98e3ea5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/ServicePlanCalendarVO.java
@@ -0,0 +1,20 @@
+package com.rootcloud.vo.device;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("任务日历")
+public class ServicePlanCalendarVO {
+
+    @ApiModelProperty("完成率")
+    private  String finishRate;
+
+
+    @ApiModelProperty("当前月份数据")
+    private List<ServicePlanCalendarList> list;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/ServicePlanDetailVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/ServicePlanDetailVO.java
new file mode 100644
index 0000000..8d17833
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/ServicePlanDetailVO.java
@@ -0,0 +1,118 @@
+package com.rootcloud.vo.device;
+
+import com.rootcloud.domain.entity.sp.NxTriggerConditionEntity;
+import com.rootcloud.vo.service.MaintenanceListVo;
+import com.rootcloud.vo.service.NxUserInfoVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("计划任务详情")
+public class ServicePlanDetailVO {
+
+    @ApiModelProperty("服务计划主键")
+    private String servicePlanId;
+
+    @ApiModelProperty("设备编码")
+    private String  deviceCode;
+
+    @ApiModelProperty("计划名称")
+    private String  planName;
+
+    @ApiModelProperty("计划类型")
+    private String  planType;
+
+    @ApiModelProperty("设备类型")
+    private String  deviceType;
+
+    @ApiModelProperty("设备型号")
+    private String  deviceSbxh;
+
+    @ApiModelProperty("设备类型名称")
+    private String  deviceTypeName;
+
+    @ApiModelProperty("设备型号名称")
+    private String dviceModelName;
+
+    @ApiModelProperty("计划周期【1：日2：周3：月4：年】")
+    private Integer  planCycle;
+
+    @ApiModelProperty("计划间隔")
+    private Integer  planInterval;
+
+    @ApiModelProperty("计划状态【0：待启动1：进行中2：已完成3：已暂停】")
+    private Integer  planStatus;
+
+    @ApiModelProperty("创建时间")
+    private String  createTime;
+
+    @ApiModelProperty("计划时间段开始时间")
+    private String  planStartTime;
+
+    @ApiModelProperty("计划时间段结束时间")
+    private String  planEndTime;
+
+    @ApiModelProperty("是否超时【0：未超时 1：已超时】")
+    private Integer  isTimeout;
+
+    @ApiModelProperty("提醒方式【0：邮件1：短信 2：站内信")
+    private String  planRemindWay;
+
+    @ApiModelProperty("完成时间节点【几天内】")
+    private Integer  finishTimeNode;
+
+    @ApiModelProperty("保养")
+    private String  maintainContent;
+
+    @ApiModelProperty("起停状态0停止1启动")
+    private Integer  isStart;
+
+    @ApiModelProperty("处理状态【0.不需要处理，1.需要处理】")
+    private Integer detailStatus;
+
+    @ApiModelProperty("下一个周期时间")
+    private String nextCycleTime;
+
+    @ApiModelProperty("计划类型名称")
+    private String planTypeName;
+
+    @ApiModelProperty("计划周期名称")
+    private String planCycleName;
+
+    @ApiModelProperty("计划状态名称")
+    private String planStatusName;
+
+    @ApiModelProperty("是否超时名称")
+    private String isTimeoutName;
+
+    @ApiModelProperty("提醒方式名称")
+    private String planRemindWayName;
+
+    @ApiModelProperty("保养内容名称")
+    private String maintainContentName;
+
+    @ApiModelProperty("临时触发时间")
+    private String  planLscfsj;
+
+    @ApiModelProperty("保养类型：一级保养、二级保养、三级保养、专项保养")
+    private String maintenanceType;
+
+
+    @ApiModelProperty("触发条件集合")
+    private NxTriggerConditionEntity condition;
+
+    @ApiModelProperty("设置提醒用户信息")
+    private NxUserInfoVo nxUserInfoVo;
+
+
+    @ApiModelProperty("服务项目名称")
+    private List<MaintenanceListVo> maintenanceListVo;
+
+    @ApiModelProperty("设备ID")
+    private String  deviceId;
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/SituationColumnsVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/SituationColumnsVO.java
new file mode 100644
index 0000000..d2067b6
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/device/SituationColumnsVO.java
@@ -0,0 +1,53 @@
+package com.rootcloud.vo.device;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName SituationColumnsVO
+ * @Description 工况详情列列
+ * @Author w-liuyi01
+ * @Date 2022/4/21 14:33
+ * @Version 1.0
+ */
+@Data
+public class SituationColumnsVO {
+
+    private String time;
+    private String onlineconnected;
+    private String SBLJBLCylinderLock;
+    private String locationcountry;
+    private String locationstate;
+    private String locationcity;
+    private String locationdistrict;
+    private String locationstreet;
+    private String locationlongitude;
+    private String locationlatitude;
+    private String locationelevation;
+    private String locationaccuracy;
+    private String locationlocationSource;
+    private String workingStatus;
+    private String GKSCDYBjdm;
+    private String test;
+    private String SBRJBRCylinderLock;
+    private String testunit;
+//                "time",
+//                "__online__.connected",
+//                "SB_LJB_LCylinderLock",
+//                "__location__.country",
+//                "__location__.state",
+//                "__location__.city",
+//                "__location__.district",
+//                "__location__.street",
+//                "__location__.longitude",
+//                "__location__.latitude",
+//                "__location__.elevation",
+//                "__location__.accuracy",
+//                "__location__.locationSource",
+//                "__workingStatus__",
+//                "GK_SC_DY_Bjdm",
+//                "test",
+//                "SB_RJB_RCylinderLock",
+//                "test_unit"
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/faultcode/FaultCodeDetailVo.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/faultcode/FaultCodeDetailVo.java
new file mode 100644
index 0000000..7b1525f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/faultcode/FaultCodeDetailVo.java
@@ -0,0 +1,33 @@
+package com.rootcloud.vo.faultcode;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class FaultCodeDetailVo {
+
+    @ApiModelProperty("适用设备类型")
+    private String faultcodeSblx;
+
+    @ApiModelProperty("故障码")
+    private String faultcodeGzm;
+
+    @ApiModelProperty("描述")
+    private String faultcodeGzms;
+
+    @ApiModelProperty("故障等级")
+    private String faultcodeGzdj;
+
+
+    @ApiModelProperty("故障处理方法")
+    private String faultcodeGzclff;
+
+
+    @ApiModelProperty("故障附件")
+    private String faultcodeFj;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/faultcode/FaultCodeVo.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/faultcode/FaultCodeVo.java
new file mode 100644
index 0000000..5b90375
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/faultcode/FaultCodeVo.java
@@ -0,0 +1,42 @@
+package com.rootcloud.vo.faultcode;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class FaultCodeVo {
+
+    @ApiModelProperty("故障码")
+    private String faultcodeGzm;
+
+
+    @ApiModelProperty("故障名称")
+    private String faultcodeGzmc;
+
+
+    @ApiModelProperty("适用设备类型")
+    private String faultcodeSblx;
+
+    @ApiModelProperty("适用设备类型码")
+    private String faultcodeSblxcode;
+
+    @ApiModelProperty("设备型号")
+    private String faultcodeSbxh;
+
+
+    @ApiModelProperty("描述")
+    private String faultcodeGzms;
+
+
+    @ApiModelProperty("故障等级")
+    private String faultcodeGzdj;
+
+
+    @ApiModelProperty("知识库主键")
+    private String NxZskFaultcodeId;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/network/NetWorkUserWeekVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/network/NetWorkUserWeekVO.java
new file mode 100644
index 0000000..0e81a34
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/network/NetWorkUserWeekVO.java
@@ -0,0 +1,21 @@
+package com.rootcloud.vo.network;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @author wei.liao
+ * @version 1.0
+ * @date 2022/4/28 16:25
+ */
+@Data
+public class NetWorkUserWeekVO {
+
+    private String name;
+    private String remark;
+    private String imageUrl;
+    List<String> networkUserStatusWeek;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/order/DeviceDataVo.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/order/DeviceDataVo.java
new file mode 100644
index 0000000..8346500
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/order/DeviceDataVo.java
@@ -0,0 +1,27 @@
+package com.rootcloud.vo.order;
+
+import lombok.Data;
+
+/**
+ * @author lujiumin
+ * @date 2023/7/5
+ * 描述：
+ */
+@Data
+public class DeviceDataVo {
+
+    private String sblbSbbm;
+    private String sblbSbmc;
+    private String sblbSblxName;
+    private String sblbSbxhName;
+    private String sblbBxztCode;
+    private String sblbSbxxdz;
+    private String sblbWbjsrq;
+    private String sblbJd;
+    private String sblbWd;
+    private String sblbKhmc;
+    private String sblbKhlxr;
+    private String sblbLxfs;
+    private String sblbKhid;
+    private String nxJcxxSblbId;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/order/OrderLcinfoParam.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/order/OrderLcinfoParam.java
new file mode 100644
index 0000000..85f6422
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/order/OrderLcinfoParam.java
@@ -0,0 +1,21 @@
+package com.rootcloud.vo.order;
+
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+@Data
+public class OrderLcinfoParam {
+    @JSONField(ordinal = 1)
+    private Integer id;
+    @JSONField(ordinal = 2)
+    private String name;
+    @JSONField(ordinal = 3)
+    private String userName;
+    @JSONField(ordinal = 4)
+    private String userId;
+    @JSONField(ordinal = 5)
+    private String endDate;
+    @JSONField(ordinal = 6)
+    private String icon;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/order/OrderParam.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/order/OrderParam.java
new file mode 100644
index 0000000..27f3677
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/order/OrderParam.java
@@ -0,0 +1,36 @@
+package com.rootcloud.vo.order;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lujiumin
+ * @date 2023/7/5
+ * 描述：
+ */
+@Data
+@ApiModel(value = "生成订单入参")
+public class OrderParam {
+
+    @ApiModelProperty("服务类型  001 维修,002 保养")
+    private String orderServicetypeCode;
+    @ApiModelProperty("预约时间")
+    private String orderApplydate;
+    @ApiModelProperty("保养内容")
+    private String orderBynr;
+    @ApiModelProperty("需求描述")
+    private String orderDemanddescription;
+    @ApiModelProperty("订单状态")
+    private String orderOrderstatusCode;
+    @ApiModelProperty("待派工")
+    private String orderOrderstatusName;
+    @ApiModelProperty("设备id,多个逗号隔开")
+    private String deviceIds;
+    @ApiModelProperty("登录账号")
+    private String loginName;
+    @ApiModelProperty("登录密码")
+    private String loginPassword;
+    @ApiModelProperty("uid")
+    private String uid;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/order/OrderSignInParam.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/order/OrderSignInParam.java
new file mode 100644
index 0000000..43a80b5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/order/OrderSignInParam.java
@@ -0,0 +1,42 @@
+package com.rootcloud.vo.order;
+
+
+import com.rootcloud.common.NotBlank;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "APP订单签到入参")
+public class OrderSignInParam {
+
+    @ApiModelProperty("签到时间")
+    private String orderSigntime;
+
+
+    @ApiModelProperty(value = "签到地址", required = true)
+    @NotBlank(message="签到地址不能为空")
+    private String orderSignaddress;
+
+
+    @ApiModelProperty(value = "签到地址_经度", required = true)
+    @NotBlank(message="签到地址经度不能为空")
+    private String orderSignaddressLongitude;
+
+
+    @ApiModelProperty(value = "签到地址_维度", required = true)
+    @NotBlank(message="签到地址维度不能为空")
+    private String orderSignaddressDimension;
+
+
+    @ApiModelProperty("签到图片")
+    private String orderSignfile;
+
+
+    @ApiModelProperty(value = "订单主键", required = true)
+    @NotBlank(message="订单主键不能为空")
+    private String nxOrderId;
+
+    @ApiModelProperty("订单流程对象")
+    private OrderLcinfoParam orderLcinfo;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/resp/AppDeviceAlarmResp.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/resp/AppDeviceAlarmResp.java
new file mode 100644
index 0000000..cbda139
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/resp/AppDeviceAlarmResp.java
@@ -0,0 +1,22 @@
+package com.rootcloud.vo.resp;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * APP端规则报警查询回参
+ */
+@Data
+@ApiModel(value = "",description = "")
+public class AppDeviceAlarmResp {
+    //最近报警事件
+    private String alarmTime;
+    //报警代码
+    private String alarmCode;
+    //报警描述
+    private String alarmDesc;
+    //报警次数
+    private Integer alarmTimes;
+    //报警等级
+    private String alaramLevel;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/resp/DeviceCodeAlarmModel.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/resp/DeviceCodeAlarmModel.java
new file mode 100644
index 0000000..dc7b9f4
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/resp/DeviceCodeAlarmModel.java
@@ -0,0 +1,25 @@
+package com.rootcloud.vo.resp;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "故障码报警",description = "")
+public class DeviceCodeAlarmModel {
+    //报警时间
+    private String alarmTime;
+    //报警代码
+    private String alarmCode;
+    //报警名称
+    private String alarmName;
+    //报警描述
+    private String alarmDesc;
+    //报警级别
+    private String alarmLevel;
+    //设备类型
+    private String deviceType;
+    //报警解决知识库
+    private String alarmSlnWiki;
+    //故障码主键
+    private String nxZskFaultcodeId;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/resp/DeviceRuleAlarmModel.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/resp/DeviceRuleAlarmModel.java
new file mode 100644
index 0000000..bab475b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/resp/DeviceRuleAlarmModel.java
@@ -0,0 +1,21 @@
+package com.rootcloud.vo.resp;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "规则报警",description = "")
+public class DeviceRuleAlarmModel {
+    //报警时间
+    private String alarmTime;
+    //报警描述
+    private String alarmDesc;
+    //报警级别
+    private String alarmLevel;
+    //状态
+    private String alarmStatus;
+    //报警参数
+    private String alarmName;
+    private String alarmCode;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/resp/OtherDeviceResp.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/resp/OtherDeviceResp.java
new file mode 100644
index 0000000..63ce560
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/resp/OtherDeviceResp.java
@@ -0,0 +1,20 @@
+package com.rootcloud.vo.resp;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "工况趋势设备2回参")
+public class OtherDeviceResp {
+
+
+    @ApiModelProperty("设备编码")
+    private String deviceSbbm;
+
+    @ApiModelProperty("设备ID")
+    private String deviceId;
+
+    @ApiModelProperty("设备名称")
+    private String deviceName;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/rest/AppDeviceAlarmParam.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/rest/AppDeviceAlarmParam.java
new file mode 100644
index 0000000..a20ceb6
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/rest/AppDeviceAlarmParam.java
@@ -0,0 +1,36 @@
+package com.rootcloud.vo.rest;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.NonNull;
+
+/**
+ * @author:xxxxx
+ * @create: 2022-05-12 11:01
+ * @Description: APP端报警查询入参
+ */
+@Data
+@ApiModel(value = "APP端报警查询入参",description = "")
+public class AppDeviceAlarmParam {
+    //报警类别 1 规则报警 2故障码报警 二选一
+    @NonNull
+    private String alarmType;
+    //设备ID
+    private String deviceId;
+    //当前页
+    private Integer currentPage;
+    //每页页数
+    private Integer pageSize;
+    //故障码
+    private String code;
+    //故障描述
+    private String alarmDesc;
+    //开始时间
+    private String startTime;
+    //结束时间
+    private String endTime;
+
+    public AppDeviceAlarmParam(){
+
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/rest/DeviceAlarmParam.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/rest/DeviceAlarmParam.java
new file mode 100644
index 0000000..a9f423b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/rest/DeviceAlarmParam.java
@@ -0,0 +1,39 @@
+package com.rootcloud.vo.rest;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.NonNull;
+
+@Data
+@ApiModel(value = "规则报警查询入参", description = "")
+public class DeviceAlarmParam {
+    //页签 1 待处理报警 2历史报警
+    private String tag;
+    //报警类别 1 规则报警 2故障码报警 二选一
+    @NonNull
+    private String alarmRule;
+    //设备ID
+    private String deviceId;
+    //报警时间 ”yyyy-MM-dd HH:mm:ss~yyyy-MM-dd HH:mm:ss“
+    private String time;
+    //报警级别 1-5
+    private String severityLevel;
+    //报警状态 1-3
+    private String alarmStatus;
+    //确认情况 1-3
+   // private String ackedState;
+    //报警标签 待开发
+  //  private String categoryId;
+    //当前页
+    private Integer currentPage;
+    //每页页数
+    private Integer pageSize;
+    //故障码
+    private String code;
+
+    private String sbxhId;
+
+    public DeviceAlarmParam() {
+
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/rest/DevicePropertyValueParam.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/rest/DevicePropertyValueParam.java
new file mode 100644
index 0000000..7b93583
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/rest/DevicePropertyValueParam.java
@@ -0,0 +1,12 @@
+package com.rootcloud.vo.rest;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+@Data
+@ApiModel(value = "根据入参查工况属性值", description = "")
+public class DevicePropertyValueParam {
+    private String deviceId;
+    private List<String> propertyIds;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/rest/DeviceTrendParam.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/rest/DeviceTrendParam.java
new file mode 100644
index 0000000..6066a98
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/rest/DeviceTrendParam.java
@@ -0,0 +1,31 @@
+package com.rootcloud.vo.rest;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NonNull;
+
+@Data
+@ApiModel(value = "工况趋势查询入参model")
+public class DeviceTrendParam {
+    @NonNull
+    @ApiModelProperty("设备1的ID（必填）")
+    private String deviceId1;
+    @ApiModelProperty("设备2的ID（选填）")
+    private String deviceId2;
+
+    @ApiModelProperty("工况属性1")
+    private String property1;
+    @ApiModelProperty("工况属性2")
+    private String property2;
+    @ApiModelProperty("工况属性3")
+    private String property3;
+    @ApiModelProperty("工况属性4")
+    private String property4;
+    @ApiModelProperty("时间")
+    private String time;
+
+    public DeviceTrendParam() {
+
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/MaintenanceListVo.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/MaintenanceListVo.java
new file mode 100644
index 0000000..5ed1ec6
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/MaintenanceListVo.java
@@ -0,0 +1,20 @@
+package com.rootcloud.vo.service;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MaintenanceListVo {
+
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
+
+    @ApiModelProperty("项目内容")
+    private String projectContent;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/NxUserInfoVo.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/NxUserInfoVo.java
new file mode 100644
index 0000000..be6b04c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/NxUserInfoVo.java
@@ -0,0 +1,32 @@
+package com.rootcloud.vo.service;
+
+import com.rootcloud.domain.entity.sp.NxUserInfoEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class NxUserInfoVo  extends NxUserInfoEntity {
+
+
+    @ApiModelProperty("部门名称")
+    private String departmentName;
+
+    @ApiModelProperty("用户名称")
+    private String userName;
+
+    @ApiModelProperty("角色名称")
+    private String roleName;
+
+    @ApiModelProperty("主要联系人")
+    private String mainContact;
+
+    @ApiModelProperty("主要联系人电话")
+    private String mainPhone;
+
+    @ApiModelProperty("提醒方式")
+    private String reminderMethod;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/OutletsVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/OutletsVO.java
new file mode 100644
index 0000000..539b355
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/OutletsVO.java
@@ -0,0 +1,21 @@
+package com.rootcloud.vo.service;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OutletsVO {
+
+
+    @ApiModelProperty("网点服务经理userName")
+    private String userNames;
+
+
+    @ApiModelProperty("网点服务经理userId")
+    private String userIds;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/ServicePlanInfoVO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/ServicePlanInfoVO.java
new file mode 100644
index 0000000..a220b0c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/ServicePlanInfoVO.java
@@ -0,0 +1,114 @@
+package com.rootcloud.vo.service;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ServicePlanInfoVO {
+
+    private String servicePlanId;
+
+    @ApiModelProperty("设备编码")
+    private String  deviceCode;
+
+    @ApiModelProperty("计划名称")
+    private String  planName;
+
+    @ApiModelProperty("计划类型")
+    private String  planType;
+
+    @ApiModelProperty("设备类型")
+    private String  deviceType;
+
+    @ApiModelProperty("设备型号")
+    private String  deviceSbxh;
+
+    @ApiModelProperty("设备类型名称")
+    private String  deviceTypeName;
+
+    @ApiModelProperty("设备型号名称")
+    private String dviceModelName;
+
+    @ApiModelProperty("计划周期【1：日2：周3：月4：年】")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer  planCycle;
+
+    @ApiModelProperty("计划间隔")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer  planInterval;
+
+    @ApiModelProperty("计划状态【0：待启动1：进行中2：已完成3：已暂停】")
+    private Integer  planStatus;
+
+    @ApiModelProperty("创建时间")
+    private String  createTime;
+
+    @ApiModelProperty("计划时间段开始时间")
+    private String  planStartTime;
+
+    @ApiModelProperty("计划时间段结束时间")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String  planEndTime;
+
+    @ApiModelProperty("是否超时【0：未超时 1：已超时】")
+    private Integer  isTimeout;
+
+    @ApiModelProperty("提醒方式【0：邮件1：短信 2：站内信")
+    private String  planRemindWay;
+
+    @ApiModelProperty("完成时间节点【几天内】")
+    private Integer  finishTimeNode;
+
+    @ApiModelProperty("保养")
+    private String  maintainContent;
+
+    @ApiModelProperty("起停状态0停止1启动")
+    private Integer  isStart;
+
+    @ApiModelProperty("处理状态【0.不需要处理，1.需要处理】")
+    private Integer detailStatus;
+
+    @ApiModelProperty("下一个周期时间")
+    private String nextCycleTime;
+
+    @ApiModelProperty("计划类型名称")
+    private String planTypeName;
+
+    @ApiModelProperty("计划周期名称")
+    private String planCycleName;
+
+    @ApiModelProperty("计划状态名称")
+    private String planStatusName;
+
+    @ApiModelProperty("是否超时名称")
+    private String isTimeoutName;
+
+    @ApiModelProperty("提醒方式名称")
+    private String planRemindWayName;
+
+    @ApiModelProperty("保养内容名称")
+    private String maintainContentName;
+
+    @ApiModelProperty("保养类型：一级保养、二级保养、三级保养、专项保养")
+    private String maintenanceType;
+
+    @ApiModelProperty("最新触发时间")
+    private String latestTriggerTime;
+
+    @ApiModelProperty("是否解决")
+    private String planSfjj;
+
+    @ApiModelProperty("设备名称")
+    private String deviceName;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/ServicePlanVo.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/ServicePlanVo.java
new file mode 100644
index 0000000..28ba23a
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/service/ServicePlanVo.java
@@ -0,0 +1,71 @@
+package com.rootcloud.vo.service;
+
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ServicePlanVo {
+
+    @TableId
+    private String servicePlanId;
+
+    @ApiModelProperty("设备编码")
+    private String  deviceCode;
+
+    @ApiModelProperty("计划名称")
+    private String  planName;
+
+    @ApiModelProperty("计划类型")
+    private String  planType;
+
+    @ApiModelProperty("设备类型")
+    private String  deviceType;
+
+    @ApiModelProperty("设备型号")
+    private String  deviceSbxh;
+
+    @ApiModelProperty("计划周期【1：日2：周3：月4：年】")
+    private Integer  planCycle;
+
+    @ApiModelProperty("计划间隔")
+    private Integer  planInterval;
+
+    @ApiModelProperty("计划状态【0：待启动1：进行中2：已完成3：已暂停】")
+    private Integer  planStatus;
+
+    @ApiModelProperty("创建时间")
+    private String  createTime;
+
+    @ApiModelProperty("计划时间段开始时间")
+    private String  planStartTime;
+
+    @ApiModelProperty("计划时间段结束时间")
+    private String  planEndTime;
+
+    @ApiModelProperty("是否超时【0：未超时 1：已超时】")
+    private Integer  isTimeout;
+
+    @ApiModelProperty("提醒方式【0：邮件1：短信 2：站内信")
+    private Integer  planRemindWay;
+
+    @ApiModelProperty("完成时间节点【几天内】")
+    private Integer  finishTimeNode;
+
+    @ApiModelProperty("保养")
+    private String  maintainContent;
+
+    @ApiModelProperty("起停状态0停止1启动")
+    private Integer  isStart;
+
+    @ApiModelProperty("设置系统时间")
+    private String   setValue;
+
+    @ApiModelProperty("临时触发时间")
+    private String  planLscfsj;
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/todo/TodoVo.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/todo/TodoVo.java
new file mode 100644
index 0000000..5ed96cf
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/vo/todo/TodoVo.java
@@ -0,0 +1,126 @@
+package com.rootcloud.vo.todo;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TodoVo {
+
+    @ApiModelProperty(value = "设备编码")
+    private String deviceCode;
+
+    @ApiModelProperty(value = "设备类型")
+    private String deviceType;
+
+    @ApiModelProperty(value = "设备型号")
+    private String deviceSbxh;
+
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+    @ApiModelProperty(value = "主题")
+    private String title;
+
+    @ApiModelProperty(value = "操作")
+    private String operation;
+
+    @ApiModelProperty(value = "时间")
+    private String time;
+
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "主键ID")
+    private String nxTodoLibraryId;
+
+    @ApiModelProperty(value = "服务类型")
+    private String serveType;
+
+
+    //1：已经解决（关闭） 其他未解决
+
+    @ApiModelProperty(value = "待办状态")
+    private String status;
+
+    @ApiModelProperty(value = "服务计划主键")
+    private String servicePlanId;
+
+    @ApiModelProperty(value = "用户主键")
+    private String userid;
+
+    @ApiModelProperty(value = "订单主键")
+    private String nxOrderId;
+
+    @ApiModelProperty(value = "服务时间")
+    private  String serviceTime;
+
+
+    @ApiModelProperty("通知类型Code")
+    private String adviceCode;
+
+    @ApiModelProperty("区分标志")
+    private String signData;
+
+    @ApiModelProperty("消息码")
+    private String typeCode;
+
+    @ApiModelProperty(value = "设备ID")
+    private String deviceId;
+
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+
+    @TableField(exist = false)
+    private String engineerId;
+    @TableField(exist = false)
+    private String engineerName;
+
+    private String sn;
+
+    @ApiModelProperty("安装位号")
+    private String partAzwh;
+
+    @ApiModelProperty("工作时长")
+    private String partGzsc;
+
+    @ApiModelProperty("计划名称")
+    private String  planName;
+
+    @ApiModelProperty("计划完成时间")
+    private String  planEndTime;
+
+    @ApiModelProperty("系统模块")
+    private String  partXtmk;
+
+    @ApiModelProperty("迁入代办库时间")
+    private String  creatTime;
+
+    @ApiModelProperty("备件名称")
+    private String  partBjmc;
+
+    @ApiModelProperty("报警编码")
+    private String bjbm;
+
+    @ApiModelProperty("故障等级")
+    private String gzdj;
+
+    @ApiModelProperty("报警时间")
+    private String bjsj;
+
+    @ApiModelProperty("订单编号")
+    private String ddbh;
+
+    @ApiModelProperty("指派工程师")
+    private String gcs;
+
+    @ApiModelProperty("需求描述")
+    private String xqms;
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/web/PrinterEfficiencyController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/PrinterEfficiencyController.java
new file mode 100644
index 0000000..2dce8d2
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/PrinterEfficiencyController.java
@@ -0,0 +1,169 @@
+package com.rootcloud.web;
+
+
+import com.rootcloud.common.IgnoreSecurity;
+import com.rootcloud.common.JsonResult2;
+import com.rootcloud.common.util.DateUtils;
+import com.rootcloud.domain.service.fittings.SparePartService;
+import com.rootcloud.service.PrinterEfficiencyService;
+import groovy.util.logging.Slf4j;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import jline.internal.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Calendar;
+import java.util.Date;
+
+
+@Api(tags = "历史工况跑批控制器")
+@RestController
+@Slf4j
+@RequestMapping("/runHistortGK")
+public class PrinterEfficiencyController {
+
+    private static final Logger logger = LoggerFactory.getLogger(PrinterEfficiencyController.class);
+
+
+    @Resource(name = "efficiency")
+    private PrinterEfficiencyService efficiencyService;
+    @Resource(name = "sparePartServiceImpl")
+    private SparePartService sparePartService;
+
+    @ApiOperation("同步备件工作时长")
+    @PostMapping("/runWorkingTime")
+    public void syncWorkingTime(){
+        Log.info("同步备件工作时长开始");
+        sparePartService.syncWorkingTime();
+        Log.info("同步备件工作时长结束");
+    }
+
+    @ApiOperation("开动率效率补图率指定日期跑批")
+    @PostMapping("/getHisdataByDate")
+    public JsonResult2 runHistoryGKData(@RequestParam("startDate") String startDate)
+    {
+        Calendar startCalendar = Calendar.getInstance();
+        Date date = DateUtils.parseDate("yyyy-MM-dd", startDate);
+        if (null == date) {
+            logger.error("开始日期不能为空");
+            return new JsonResult2("500", "开始日期不能为空");
+        }
+        startCalendar.setTime(date);
+        try {
+            Calendar nowCalendar = Calendar.getInstance();
+            nowCalendar.add(Calendar.DAY_OF_MONTH, -1);
+            efficiencyService.run1((Calendar) startCalendar.clone());
+            return new JsonResult2();
+        }
+        catch (Exception ex){
+            return new JsonResult2("500", "跑批失败...");
+        }
+    }
+
+    @ApiOperation("开动率效率补图率指定时间段跑批")
+    @PostMapping("/getHisdataBySpanTime")
+    public JsonResult2 getHisdataBySpanTime(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDateStr)
+    {
+
+        Calendar startCalendar = Calendar.getInstance();
+        Date date = DateUtils.parseDate("yyyy-MM-dd", startDate);
+        if (null == date) {
+            logger.error("开始日期不能为空");
+            return new JsonResult2("500", "开始日期不能为空");
+        }
+        startCalendar.setTime(date);
+        Calendar nowCalendar = Calendar.getInstance();
+        Date endDate = DateUtils.parseDate("yyyy-MM-dd", endDateStr);
+        if (null == endDate) {
+            logger.error("结束日期不能为空");
+            return new JsonResult2("500", "结束日期不能为空");
+        }
+        nowCalendar.setTime(endDate);
+        // 从开始日期开始跑批直到结束日期
+        do {
+            try {
+                efficiencyService.run1((Calendar) startCalendar.clone());
+            } catch (Exception e) {
+                logger.error("跑批失败", e);
+                return new JsonResult2("500", e.getMessage());
+            }
+            logger.info("---> 日期{}，打印机效率跑批结束",startCalendar.toInstant());
+            startCalendar.add(Calendar.DAY_OF_MONTH, 1);
+        } while (startCalendar.before(nowCalendar));
+        return new JsonResult2();
+
+    }
+
+//2022-09-16  由温海龙那边跑p统一处理
+//    @GetMapping("/runDayEfficiencyBatch")
+//    @ApiOperation("按打印批次24H内，指定日期 开动率(打印耗时)跑批(NX_DEVICE_WORKING_TIMES_DAY)")
+//    public JsonResult2 runBatch2(@RequestParam("startDate") String startDate) {
+//        Calendar startCalendar = Calendar.getInstance();
+//        Date date = DateUtils.parseDate("yyyy-MM-dd", startDate);
+//        if (null == date) {
+//            Log.error("开始日期不能为空");
+//            return new JsonResult2("500", "开始日期不能为空");
+//        }
+//        startCalendar.setTime(date);
+//        try {
+//            Calendar nowCalendar = Calendar.getInstance();
+//            nowCalendar.add(Calendar.DAY_OF_MONTH, -1);
+//            efficiencyService.run0((Calendar) startCalendar.clone());
+//            //统计月
+//            try {
+//                efficiencyService.run0_statistics_month((Calendar) startCalendar.clone());
+//            } catch (Exception ee) {
+//                Log.error("统计月时长报错,"+ee.getMessage());
+//            }
+//            return new JsonResult2();
+//        } catch (Exception ex) {
+//            return new JsonResult2("500", "跑批失败...");
+//        }
+//    }
+
+//2022-09-16  由温海龙那边跑p统一处理
+//    @GetMapping("/runEuropeEfficiency24Batch")
+//    @ApiOperation("海外 按打印批次24H内，指定日期 开动率(打印耗时)跑批(NX_DEVICE_WORKING_TIMES_DAY)")
+//    public JsonResult2 runEuropeEfficiency24Batch(@RequestParam("startDate") String startDate) {
+//        Calendar startCalendar = Calendar.getInstance();
+//        Date date = DateUtils.parseDate("yyyy-MM-dd", startDate);
+//        if (null == date) {
+//            logger.error("开始日期不能为空");
+//            return new JsonResult2("500", "开始日期不能为空");
+//        }
+//        startCalendar.setTime(date);
+//        try {
+//            efficiencyService.runEurop0((Calendar) startCalendar.clone());
+//            //统计月
+//            try {
+//                efficiencyService.run0_statistics_month((Calendar) startCalendar.clone());
+//            } catch (Exception ee) {
+//                Log.error("统计月时长报错,"+ee.getMessage());
+//            }
+//            return new JsonResult2();
+//        }
+//        catch (Exception ex){
+//            return new JsonResult2("500", "跑批失败...");
+//        }
+//    }
+
+
+    @GetMapping("/runStatisticsMonth")
+    @ApiOperation("统计月的时长")
+    public JsonResult2 runBatch2() {
+        Calendar startCalendar = Calendar.getInstance();
+        //统计月
+        try {
+            efficiencyService.run0_statistics_month((Calendar) startCalendar.clone());
+        } catch (Exception ee) {
+            Log.error("统计月时长报错,"+ee.getMessage());
+            new JsonResult2("500", "统计月时长报错...");
+        }
+        return new JsonResult2();
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/web/PrinterReportController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/PrinterReportController.java
new file mode 100644
index 0000000..99d4fec
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/PrinterReportController.java
@@ -0,0 +1,401 @@
+package com.rootcloud.web;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.rootcloud.common.JsonResult;
+import com.rootcloud.common.JsonResult2;
+import com.rootcloud.common.JsonResultStatus;
+import com.rootcloud.common.util.DateUtils;
+import com.rootcloud.domain.dao.RepPrinterSandPercentDAO2;
+import com.rootcloud.domain.vo.RepPrinterReportItemVO;
+import com.rootcloud.domain.vo.RepPrinterReportVO;
+import com.rootcloud.domain.vo.RepPrinterTargetDicVO;
+import com.rootcloud.service.RepPrinterReportService;
+import com.rootcloud.service.RepPrinterTargetDicService;
+import com.rootcloud.service.condition.*;
+import com.rootcloud.service.constant.ExceptionStatus;
+import groovy.util.logging.Slf4j;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+
+@Api(tags = "运维报告报表、打印过程分析统计服务控制器")
+@RestController
+@Slf4j
+@RequestMapping("/reportService")
+public class PrinterReportController {
+
+    private static final Logger logger = LoggerFactory.getLogger(PrinterReportController.class);
+
+    @Resource(name = "reportService")
+    private RepPrinterReportService service;
+    @Resource(name = "targetService")
+    private RepPrinterTargetDicService repPrinterTargetDicService;
+
+    @Resource
+    private RepPrinterSandPercentDAO2 repPrinterSandPercentDAO2;
+
+
+    @GetMapping("/runPrintingProcessBatch")
+    @ApiOperation("指定日期 打印过程统计(打印机树脂加入比、新旧砂加入占比、漏砂量等）跑批")
+    public JsonResult2 runPrintingProcessBatch(@RequestParam("startDate") String startDate) {
+        Calendar startCalendar = Calendar.getInstance();
+        Date date = DateUtils.parseDate("yyyy-MM-dd", startDate);
+        if (null == date) {
+            logger.error("开始日期不能为空");
+            return new JsonResult2("500", "开始日期不能为空");
+        }
+        startCalendar.setTime(date);
+        Calendar nowCalendar = Calendar.getInstance();
+        nowCalendar.add(Calendar.DAY_OF_MONTH, -1);
+        // 从开始日期开始跑批直到当前日期的的前一天
+        try {
+            service.run((Calendar) startCalendar.clone());
+        } catch (Exception ex) {
+            logger.error("打印过程统计跑批失败...", ex.toString());
+            return new JsonResult2("500", ex.getMessage());
+        }
+        return new JsonResult2();
+    }
+
+    @GetMapping("/runPrintingProcessSpanTimeBatch")
+    @ApiOperation("时间段 打印过程统计(打印机树脂加入比、新旧砂加入占比、漏砂量等）跑批")
+    public JsonResult2 runPrintingProcessSpanTimeBatch(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDateStr) {
+
+        Calendar startCalendar = Calendar.getInstance();
+        Date date = DateUtils.parseDate("yyyy-MM-dd", startDate);
+        if (null == date) {
+            logger.error("开始日期不能为空");
+            return new JsonResult2("500", "开始日期不能为空");
+        }
+        startCalendar.setTime(date);
+        Calendar nowCalendar = Calendar.getInstance();
+        Date endDate = DateUtils.parseDate("yyyy-MM-dd", endDateStr);
+        if (null == endDate) {
+            logger.error("结束日期不能为空");
+            return new JsonResult2("500", "结束日期不能为空");
+        }
+        nowCalendar.setTime(endDate);
+        // 从开始日期开始跑批直到结束日期
+        do {
+            try {
+                service.run((Calendar) startCalendar.clone());
+            } catch (Exception e) {
+                logger.error("跑批失败", e);
+                return new JsonResult2("500", e.getMessage());
+            }
+            logger.info("---> 日期{}，打印机效率跑批结束",startCalendar.toInstant());
+            startCalendar.add(Calendar.DAY_OF_MONTH, 1);
+        } while (startCalendar.before(nowCalendar));
+        return new JsonResult2();
+    }
+
+
+//    @GetMapping("/runPrintingProcessBatch2")
+//    @ApiOperation("当天打印过程统计(打印机树脂加入比、新旧砂加入占比、漏砂量等）跑批")
+//    public JsonResult2 runPrintingProcessBatch2() {
+//        Calendar c = Calendar.getInstance();
+//        c.add(Calendar.DAY_OF_MONTH, -1);
+//        try {
+//            logger.info("定时生成按批次跑批打印耗时、树脂加入、漏砂、打印体积、AB砂、打印耗时、打印层数、固化剂等(rep_printer_sand_percent)等报表数据...");
+//            service.run((Calendar) c.clone());
+//        } catch (Exception ex) {
+//            logger.error("定时生成按批次跑批打印耗时、树脂加入、漏砂、打印体积、AB砂、打印耗时、打印层数、固化剂等(rep_printer_sand_percent)等报表数据失败...", ex);
+//        }
+//        return new JsonResult2();
+//    }
+
+    /**
+     * 手动触发生成产线运维报告
+     */
+    @ApiOperation(value="手动触发生成产线运维报告", notes="手动触发生成产线运维报告")
+    @PostMapping("/createUserReport")
+    public JsonResult2 createUserReport(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("user_id") String user_id, @RequestBody QueryUserReportCondition condition) {
+        String param = JSON.toJSONString(condition);
+        logger.info("start method : createUserReport, tenant_id ="+tenant_id+" user_id = "+user_id+" param : "+ param);
+        try {
+            JsonResult2 jsonResult = new JsonResult2();
+            service.createUserReportV2(condition);
+
+            jsonResult.setData(true);
+            logger.info("end method : createUserReport,  tenant_id ="+tenant_id+" user_id = "+user_id+" param : "+ param+" result: "+JSON.toJSONString(jsonResult));
+            return jsonResult;
+        } catch (Exception e) {
+            logger.error("method : createUserReport, tenant_id ="+tenant_id+" user_id = "+user_id+" param : "+ param+ " exception", e);
+            String msg = e.getMessage()!=null?e.getMessage(): JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+
+    /**
+     * 分页查找用户运维报告列表
+     * @param tenant_id
+     * @return
+     */
+    @ApiOperation(value="分页查找用户运维报告列表", notes="分页查找用户运维报告列表")
+    @PostMapping("/reportPageList")
+    public JsonResult2 reportPageList(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("user_id") String user_id, @RequestBody QueryUserReportCondition c) {
+        String param = JSON.toJSONString(c);
+        logger.info("start method : reportPageList, tenant_id ="+tenant_id+" user_id = "+user_id+" param : "+ param);
+        try {
+            JsonResult2 res = service.reportPageList(tenant_id, user_id, c);
+            logger.info("end method : reportPageList,  tenant_id ="+tenant_id+" user_id = "+user_id+" param : "+ param+" result: "+JSON.toJSONString(res));
+            return res;
+        } catch (Exception e) {
+            logger.error("method : reportPageList, tenant_id ="+tenant_id+" user_id = "+user_id+" param : "+ param + " exception:", e);
+            String msg = e.getMessage()!=null?e.getMessage():JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+    /**
+     * 	根据租户id与用户报告ID 得到用户报告
+     */
+    @ApiOperation(value="根据租户id与用户报告ID 得到用户报告", notes="根据租户id与用户报告ID 得到用户报告")
+    @PostMapping("/getUserReportById")
+    public JsonResult2 getUserReportById(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("user_id") String user_id, @RequestBody QueryUserReportCondition c) {
+        String param = JSON.toJSONString(c);
+        logger.info("start method : getUserReportById, tenant_id ="+tenant_id+" user_id = "+user_id+" param : "+ param);
+        JsonResult2 jsonResult = new JsonResult2();
+        try {
+            Map<String,Object> query = new HashMap<String,Object>();
+            query.put("reportId", c.getId());
+            query.put("tenantId", "");
+            RepPrinterReportVO data = service.getUserReport(query);
+
+            jsonResult.setData(data);
+            logger.info("end method : getUserReportById, tenant_id ="+tenant_id+" user_id = "+user_id+" param : "+ param +" res: "+JSON.toJSONString(jsonResult));
+            return jsonResult;
+        } catch (Exception e) {
+            logger.error("method : getUserReportById, tenant_id ="+tenant_id+" user_id = "+user_id+" param : "+ param+" exception:", e);
+            String msg = e.getMessage()!=null?e.getMessage():JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+
+    /**
+     * 根据id删除报告
+     */
+    @ApiOperation(value="根据id删除报告-3DP产线", notes="根据id删除报告-3DP产线")
+    @PostMapping("/deleteReportById")
+    public JsonResult2 deleteReportById(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("user_id") String user_id, @RequestParam Long reportId) {
+        logger.info("start method : deleteReportById, tenant_id ="+tenant_id+" user_id = "+user_id+" reportId : "+ reportId);
+        try {
+            JsonResult2 res = service.deleteReportById(reportId);
+            logger.info("end method : deleteReportById,  tenant_id ="+tenant_id+" user_id = "+user_id+" reportId : "+ reportId+" result: "+JSON.toJSONString(res));
+            return res;
+        } catch (Exception e) {
+            logger.error("method : deleteReportById, tenant_id ="+tenant_id+" user_id = "+user_id+" reportId : "+ reportId + " exception:", e);
+            String msg = e.getMessage()!=null?e.getMessage():JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+
+    /**
+     * 	查询产线报告详情
+     */
+    @ApiOperation(value="查询报告详情", notes="查询报告详情")
+    @PostMapping("/getReportItem")
+    public List<RepPrinterReportItemVO> getReportItem(Long reportId){
+        return service.getReportItem(reportId);
+    }
+    /**
+     * 	更新产线报告详情
+     */
+    @ApiOperation(value="更新报告详情", notes="更新报告详情")
+    @PostMapping("/updateReportItem")
+    public JsonResult2 updateReportItem(@RequestBody List<RepPrinterReportItemVO> items){
+        service.updateReportItem(items);
+        return new JsonResult2();
+    }
+
+    /**
+     * 修改用户报告备注
+     */
+    @ApiOperation(value="修改用户报告备注", notes="修改用户报告备注")
+    @PostMapping("/updateUserReportValue")
+    public JsonResult2 updateUserReportValue( @RequestBody RepPrinterReportVO vo) {
+        try {
+            JsonResult2 jsonResult = new JsonResult2();
+            service.updateUserReportValue(vo);
+            jsonResult.setData(true);
+            return jsonResult;
+        } catch (Exception e) {
+            String msg = e.getMessage()!=null?e.getMessage():JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+
+    /**
+     * 新增打印机目标值
+     * @param request
+     * @param condition
+     * @return
+     */
+    @ApiOperation(value = "新增目标值", notes = "新增目标值",httpMethod="POST",
+            response=JsonResult2.class,produces="application/json",consumes="application/json",protocols="HTTP/1.1")
+    @RequestMapping(value="/addResPrinterTargetDic",method=RequestMethod.POST)
+    public JsonResult2 addResPrinterTargetDic(HttpServletRequest request,
+                                             @RequestBody AddRepPrinterTargetDicCondition condition) {
+
+        RepPrinterTargetDicVO bean = new RepPrinterTargetDicVO();
+        BeanUtils.copyProperties(condition, bean);
+        if(StringUtils.isNotBlank(condition.getStartDate())) {
+            Date startDate = DateUtils.parseDate("yyyy-MM-dd", condition.getStartDate());
+            bean.setStartDate(startDate);
+        }
+        if(StringUtils.isNotBlank(condition.getEndDate())) {
+            Date endDate = DateUtils.parseDate("yyyy-MM-dd", condition.getEndDate());
+            bean.setEndDate(endDate);
+        }
+        return repPrinterTargetDicService.insert(bean);
+    }
+    /**
+     * 根据ID删除目标值
+     * @param condition
+     * @return
+     */
+    @ApiOperation(value = "根据ID删除目标值", notes = "根据ID删除目标值",httpMethod="POST",response= JsonResult.class,produces="application/json",consumes="application/json",protocols="HTTP/1.1")
+    @RequestMapping(value="/deleteResPrinterTargetDic",method=RequestMethod.POST)
+    public JsonResult2 deleteResPrinterTargetDic(HttpServletRequest request,
+                                                @RequestBody DelRepPrinterTargetDicCondition condition) {
+
+        return repPrinterTargetDicService.deleteById(condition.getId());
+    }
+
+    /**
+     * 更新目标值
+     * @return
+     */
+    @ApiOperation(value = "更新目标值", notes = "更新目标值",httpMethod="POST",response= JsonResult.class,produces="application/json",consumes="application/json",protocols="HTTP/1.1")
+    @RequestMapping(value="/updateResPrinterTargetDic",method=RequestMethod.POST)
+    public JsonResult2 updateResPrinterTargetDic(HttpServletRequest request,@RequestBody UpdateRepPrinterTargetDicCondition condition){
+
+        RepPrinterTargetDicVO bean = new RepPrinterTargetDicVO();
+        BeanUtils.copyProperties(condition, bean);
+        if(StringUtils.isNotBlank(condition.getStartDate())) {
+            Date startDate = DateUtils.parseDate("yyyy-MM-dd", condition.getStartDate());
+            bean.setStartDate(startDate);
+        }
+        if(StringUtils.isNotBlank(condition.getEndDate())) {
+            Date endDate = DateUtils.parseDate("yyyy-MM-dd", condition.getEndDate());
+            bean.setEndDate(endDate);
+        }
+
+        return repPrinterTargetDicService.update(bean);
+    }
+
+    /**
+     * 通过id获取目标值
+     *
+     * @param request
+     * @param condition
+     * @return
+     */
+    @ApiOperation(value = "通过id获取目标值", notes = "通过id获取目标值", httpMethod = "POST", response = JsonResult.class, produces = "application/json", consumes = "application/json", protocols = "HTTP/1.1")
+    @RequestMapping(value = "/getResPrinterTargetDicById", method = RequestMethod.POST)
+    public JsonResult2 getResPrinterTargetDicById(HttpServletRequest request,
+                                                 @RequestBody DelRepPrinterTargetDicCondition condition) {
+        logger.debug("通过id获取目标值");
+        try {
+            RepPrinterTargetDicVO vo = repPrinterTargetDicService.getRepPrinterTargetDicById(condition.getId());
+            return new JsonResult2(vo);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("通过id获取目标值异常:" + e);
+            return new JsonResult2(ExceptionStatus.RET_EXCEPTION, ExceptionStatus.RET_EXCEPTION_CN);
+        }
+    }
+
+    /**
+     * 目标值列表
+     * @param request
+     * @return
+     */
+    @ApiOperation(value = "目标值列表", notes = "目标值列表",httpMethod="POST",response= JsonResult.class,produces="application/json",consumes="application/json",protocols="HTTP/1.1")
+    @RequestMapping(value="/getResPrinterTargetDicList",method=RequestMethod.POST)
+    public JsonResult2 getResPrinterTargetDicList(HttpServletRequest request, @RequestHeader("tenant_id") String tenant_id, @RequestBody QueryRepPrinterTargetDicCondition query ){
+        return repPrinterTargetDicService.getRepPrinterTargetDicList(tenant_id, query);
+    }
+
+    /**
+     * 	产线运维报告-指定邮箱发送用户报告
+     */
+    @ApiOperation(value="指定邮箱发送用户报告", notes="指定邮箱发送用户报告")
+    @PostMapping("/mailUserReport")
+    public JsonResult2 mailUserReport(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("user_id") String user_id, @RequestBody QueryUserReportCondition c) {
+        String param = JSON.toJSONString(c);
+        logger.info("start method : mailUserReport, tenant_id ="+tenant_id+" user_id = "+user_id+" param : "+ param);
+        JsonResult2 jsonResult = new JsonResult2();
+        try {
+            Map<String,Object> params = new HashMap<String,Object>();
+            params.put("emails", c.getEmails());
+            params.put("reportId", c.getId());
+            params.put("tenantId", tenant_id);
+            String link = service.sendUserReportByUser(params);
+
+            jsonResult.setData(link);
+            jsonResult.setMsg("链接地址是:"+link);
+            logger.info("end method : mailUserReport,  param : "+ param+" result: "+JSON.toJSONString(jsonResult));
+            return jsonResult;
+        } catch (Exception e) {
+            logger.error("method : mailUserReport, tenant_id ="+tenant_id+" user_id = "+user_id+" param : "+ param +" exception:", e);
+            String msg = e.getMessage()!=null?e.getMessage():JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+
+
+
+    /**
+     * 查询用户报告数据
+     */
+    @ApiOperation(value="查询用户报告数据", notes="查询用户报告数据")
+    @PostMapping("/queryUserReport")
+    public JsonResult2 queryUserReport(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("user_id") String user_id, @RequestBody QueryUserReportCondition condition) {
+        String param = JSON.toJSONString(condition);
+        try {
+            JsonResult2 jsonResult = new JsonResult2();
+            List<JSONObject> datas = service.queryUserReport(tenant_id,condition);
+            jsonResult.setData(datas);
+            return jsonResult;
+        } catch (Exception e) {
+            logger.error("method : createUserReport, tenant_id ="+tenant_id+" user_id = "+user_id+" param : "+ param+ " exception", e);
+            String msg = e.getMessage()!=null?e.getMessage():JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+
+
+    @ApiOperation(value = "打印过程数据-大屏用", notes = "打印过程数据-大屏用打印过程数据-大屏用")
+    @RequestMapping(method = RequestMethod.POST, value = "/getJobProcessingData")
+    public JsonResult2 getJobProcessingData(@RequestHeader("tenant_id") String tenant_id,@RequestHeader("user_id") String user_id,
+                                           @RequestHeader("device_id") String device_id,@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate) {
+
+//		String userId = userSessionUtil.getUserId(request);
+//		String tenantId = userSessionUtil.getTenantId(request);
+//		String accessToken = request.getHeader("access_token");
+//		UserInfo userInfo = userSessionUtil.getUserInfo(request);
+        Map<String, Object> params =new HashMap<>(20);
+        params.put("tenantId", tenant_id);
+        params.put("user_id", user_id);
+        params.put("startDate", startDate);
+        params.put("endDate", endDate);
+        params.put("device_id", device_id);
+
+        List<Map<String, Object>> list1 = repPrinterSandPercentDAO2.getRepPrinterProcessData(params);
+        return new JsonResult2(list1);
+
+    }
+
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/web/RepCustomerController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/RepCustomerController.java
new file mode 100644
index 0000000..daf523c
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/RepCustomerController.java
@@ -0,0 +1,93 @@
+package com.rootcloud.web;
+
+
+import com.rootcloud.common.JsonResult2;
+import com.rootcloud.common.JsonResultStatus;
+import com.rootcloud.domain.dao.CustomerDao;
+import com.rootcloud.service.RepCustomerService;
+import groovy.util.logging.Slf4j;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 4.0系统中只有客户概念，没有机构，客户和机构相当于同一类概念
+ * */
+
+@Api(tags = "客户关系数据控制器")
+@RestController
+@Slf4j
+@RequestMapping("/customer")
+public class RepCustomerController {
+
+    private static final Logger logger = LoggerFactory.getLogger(RepPrinterController.class);
+    @Autowired
+    private CustomerDao customerDao;
+
+
+    @Resource(name = "customerServices")
+    private RepCustomerService service;
+
+    @ApiOperation(value="获取所有的客户列表", notes="获取所有的客户列表")
+    @PostMapping("/getAllCustomerList")
+    public JsonResult2 getAllCustomerList(@RequestHeader("tenant_id") String tenant_id) {
+        try {
+            JsonResult2 res = service.getAllCustomerList(tenant_id);
+            return res;
+        } catch (Exception e) {
+            logger.error("客户信息列表信息获取失败", e);
+            String msg = e.getMessage()!=null?e.getMessage(): JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+
+
+    @ApiOperation(value="获取指定用户所属的客户列表", notes="客户信息列表")
+    @PostMapping("/getCustomerListByUserId")
+    public JsonResult2 getCustomerListByUserId(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("user_id") String user_id) {
+        try {
+            JsonResult2 res = service.getCustomerListByUserId(tenant_id, user_id);
+            return res;
+        } catch (Exception e) {
+            logger.error("客户信息列表信息获取失败", e);
+            String msg = e.getMessage()!=null?e.getMessage(): JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+    @ApiOperation(value="查询指定客户下所有的设备编号列表", notes="查询指定客户下所有的设备编号列表")
+    @PostMapping("/getDeviceCodeListByCustomerCode")
+    public JsonResult2 getDeviceCodeListByCustomerCode(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("customerCode") String customerCode) {
+        try {
+            //只返回设备编号
+            JsonResult2 res = service.getDeviceCodeListByCustomerCode(tenant_id, customerCode);
+            return res;
+        } catch (Exception e) {
+            logger.error("客户信息列表信息获取失败", e);
+            String msg = e.getMessage()!=null?e.getMessage(): JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+    @ApiOperation(value="查询指定客户下所有的设备列表信息", notes="查询指定客户下所有的设备列表信息")
+    @PostMapping("/getDeviceListByCustomerCode")
+    public JsonResult2 getDeviceListByCustomerCode(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("customerCode") String customerCode) {
+        try {
+            JsonResult2 res = service.getDeviceListByCustomerCode(tenant_id, customerCode);
+            return res;
+        } catch (Exception e) {
+            logger.error("客户信息列表信息获取失败", e);
+            String msg = e.getMessage()!=null?e.getMessage(): JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/web/RepPrinterController.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/RepPrinterController.java
new file mode 100644
index 0000000..313372f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/RepPrinterController.java
@@ -0,0 +1,608 @@
+package com.rootcloud.web;
+
+import com.alibaba.fastjson.JSON;
+import com.rootcloud.common.JsonResult2;
+import com.rootcloud.common.JsonResultStatus;
+import com.rootcloud.common.util.DateUtils;
+import com.rootcloud.domain.dao.RepPrinterOutputDao;
+import com.rootcloud.domain.dao.RepPrinterSandPassrateDao;
+import com.rootcloud.domain.dao.RepPrinterWastereasonDao;
+import com.rootcloud.domain.dao.TargetTypeDAO;
+import com.rootcloud.domain.vo.*;
+import com.rootcloud.service.RepPrinterService;
+import com.rootcloud.web.dto.*;
+import groovy.util.logging.Slf4j;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Api(tags = "生产过程数据上传统计控制器")
+@RestController
+@Slf4j
+@RequestMapping("/import")
+public class RepPrinterController {
+
+    private static final Logger logger = LoggerFactory.getLogger(RepPrinterController.class);
+    @Autowired
+    private RepPrinterWastereasonDao repPrinterWastereasonDao;
+    @Autowired
+    private RepPrinterOutputDao repPrinterOutputDao;
+
+    @Autowired
+    private RepPrinterSandPassrateDao repPrinterSandPassrateDao;
+
+    @Autowired
+    private TargetTypeDAO repTargetTypeDao;
+
+    @Resource(name = "repPrinterServices")
+    private RepPrinterService service;
+
+    @RequestMapping(method = RequestMethod.POST, value = "/addDeviceWastereasonBatch")
+    @ResponseBody
+    @ApiOperation("设备废品原因数据批量写入")
+    public JsonResult2 addDeviceWastereasonBatch(@RequestBody List<RepPrinterWastereasonVO> params) throws Exception {
+        try
+        {
+            List<RepPrinterWastereasonVO> repPrinterWastereasonVOList = new ArrayList<RepPrinterWastereasonVO>();// 实体类集合
+            if(!CollectionUtils.isEmpty(params)){
+                for(int i=0;i<params.size();i++)
+                {
+                    RepPrinterWastereasonVO repPrinterWastereasonVO = new RepPrinterWastereasonVO();
+                    repPrinterWastereasonVO.setStartDate(params.get(i).getStartDate());
+                    repPrinterWastereasonVO.setEndDate(params.get(i).getEndDate());
+                    repPrinterWastereasonVO.setWasteType(params.get(i).getWasteType());
+                    repPrinterWastereasonVO.setGkScDyCount(params.get(i).getGkScDyCount());
+                    repPrinterWastereasonVO.setCustomerName(params.get(i).getCustomerName());
+                    repPrinterWastereasonVO.setCustomerCode(params.get(i).getCustomerCode());
+                    repPrinterWastereasonVO.setOfficeId(params.get(i).getOfficeId());
+                    repPrinterWastereasonVOList.add(repPrinterWastereasonVO);
+                }
+
+            }
+            if( repPrinterWastereasonVOList!=null && repPrinterWastereasonVOList.size()>0 ){
+                for(int i=0;i<params.size();i++)
+                {
+                    RepPrinterWastereasonVO vo =new RepPrinterWastereasonVO();
+                    vo.setStartDate(params.get(i).getStartDate());
+                    vo.setEndDate(params.get(i).getEndDate());
+                    vo.setWasteType(params.get(i).getWasteType());
+                    vo.setCustomerName(params.get(i).getCustomerName());
+                    vo.setCustomerCode(params.get(i).getCustomerCode());
+                    vo.setOfficeId(params.get(i).getOfficeId());
+                    List<RepPrinterWastereasonVO> list = repPrinterWastereasonDao.list(vo);
+                    if(!CollectionUtils.isEmpty(list))
+                    {
+                        RepPrinterWastereasonVO vo1 =new RepPrinterWastereasonVO();
+                        vo1.setStartDate(params.get(i).getStartDate());
+                        vo1.setEndDate(params.get(i).getEndDate());
+                        vo1.setWasteType(params.get(i).getWasteType());
+                        vo1.setCustomerName(params.get(i).getCustomerName());
+                        vo1.setCustomerCode(params.get(i).getCustomerCode());
+                        vo1.setOfficeId(params.get(i).getOfficeId());
+                        vo1.setId(list.get(0).getId());
+                        repPrinterWastereasonDao.deleteDeviceWasteUpload(vo1);
+                    }
+                }
+                repPrinterWastereasonDao.add(repPrinterWastereasonVOList);
+            }
+            return new JsonResult2(JsonResultStatus.SUCCESS.getRet(), "设备废品原因写入成功！");
+        }
+        catch (Exception ex){
+            return new JsonResult2(JsonResultStatus.DEVICE_FAIL.getRet(), JsonResultStatus.DEVICE_FAIL.getMsg());
+        }
+
+    }
+
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/addDeviceWasteBacth")
+    @ResponseBody
+    @ApiOperation("设备废品率数据批量写入")
+    public JsonResult2 addDeviceWasteBach(@RequestBody List<RepPrinterOutputVO> params) throws Exception {
+        try
+        {
+            List<RepPrinterOutputVO> repPrinterOutputVOList = new ArrayList<RepPrinterOutputVO>();// 实体类集合
+            if(!CollectionUtils.isEmpty(params)){
+                for(int i=0;i<params.size();i++)
+                {
+                    RepPrinterOutputVO repPrinterOutputVO = new RepPrinterOutputVO();
+                    repPrinterOutputVO.setDeviceId(params.get(i).getDeviceId());
+                    repPrinterOutputVO.setStartDate(params.get(i).getStartDate());
+                    repPrinterOutputVO.setEndDate(params.get(i).getEndDate());
+                    repPrinterOutputVO.setGkScDyCl(params.get(i).getGkScDyCl());
+                    repPrinterOutputVO.setGkScDyHgl(params.get(i).getGkScDyHgl());
+                    repPrinterOutputVO.setGkScDyFpnum(params.get(i).getGkScDyFpnum());
+                    repPrinterOutputVO.setGkScDyDevfpnum(params.get(i).getGkScDyDevfpnum());
+                    repPrinterOutputVO.setGkScDyFpl(params.get(i).getGkScDyFpl());
+                    repPrinterOutputVO.setGkScDyDevfpl(params.get(i).getGkScDyDevfpl());
+                    repPrinterOutputVOList.add(repPrinterOutputVO);
+                }
+
+            }
+            if( repPrinterOutputVOList!=null && repPrinterOutputVOList.size()>0 ){
+                for(int i=0;i<params.size();i++)
+                {
+                    RepPrinterOutputVO vo =new RepPrinterOutputVO();
+                    vo.setDeviceId(params.get(i).getDeviceId());
+                    vo.setStartDate(params.get(i).getStartDate());
+                    vo.setEndDate(params.get(i).getEndDate());
+                    List<RepPrinterOutputVO> list = repPrinterOutputDao.list(vo);
+                    if(!CollectionUtils.isEmpty(list))
+                    {
+                        RepPrinterOutputVO vo1 =new RepPrinterOutputVO();
+                        vo1.setDeviceId(params.get(i).getDeviceId());
+                        vo1.setStartDate(params.get(i).getStartDate());
+                        vo1.setEndDate(params.get(i).getEndDate());
+                        vo1.setId(list.get(0).getId());
+                        repPrinterOutputDao.deleteOutputUpload(vo1);
+                    }
+                }
+                repPrinterOutputDao.add(repPrinterOutputVOList);
+            }
+            return new JsonResult2(JsonResultStatus.SUCCESS.getRet(), "设备废品率写入成功！");
+        }
+        catch (Exception ex){
+            return new JsonResult2(JsonResultStatus.DEVICE_FAIL.getRet(), JsonResultStatus.DEVICE_FAIL.getMsg());
+        }
+
+    }
+
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/addSandPassrateQiangDuBatch")
+    @ResponseBody
+    @ApiOperation("砂型强度数据批量写入")
+    public JsonResult2 addSandPassrateQiangDuBatch(@RequestBody List<RepPrinterSandPassrateVO> params) throws Exception {
+        try
+        {
+            List<RepPrinterSandPassrateVO> repPrinterSandPassrateVOList = new ArrayList<RepPrinterSandPassrateVO>();// 实体类集合
+            if(!CollectionUtils.isEmpty(params)){
+                for(int i=0;i<params.size();i++)
+                {
+                    RepPrinterSandPassrateVO repPrinterSandPassrateVO = new RepPrinterSandPassrateVO();
+                    repPrinterSandPassrateVO.setSxType(1); //0表示砂型密度，1表示砂型强度
+                    repPrinterSandPassrateVO.setDeviceId(params.get(i).getDeviceId());
+                    repPrinterSandPassrateVO.setStartDate(params.get(i).getStartDate());
+                    repPrinterSandPassrateVO.setEndDate(params.get(i).getEndDate());
+                    repPrinterSandPassrateVO.setSxmdHgnum(params.get(i).getSxmdHgnum());
+                    repPrinterSandPassrateVO.setSxmdTotal(params.get(i).getSxmdTotal());
+                    repPrinterSandPassrateVO.setGkScDySxmd(params.get(i).getGkScDySxmd());
+                    repPrinterSandPassrateVO.setSxmdAve(params.get(i).getSxmdAve());
+                    repPrinterSandPassrateVOList.add(repPrinterSandPassrateVO);
+                }
+            }
+            if(repPrinterSandPassrateVOList!=null && repPrinterSandPassrateVOList.size()>0){
+                for(int i=0;i<params.size();i++)
+                {
+                    RepPrinterSandPassrateVO vo =new RepPrinterSandPassrateVO();
+                    vo.setStartDate(params.get(i).getStartDate());
+                    vo.setEndDate(params.get(i).getEndDate());
+                    vo.setDeviceId(params.get(i).getDeviceId());
+                    vo.setSxType(1);
+                    List<RepPrinterSandPassrateVO> list = repPrinterSandPassrateDao.list(vo);
+                    if(!CollectionUtils.isEmpty(list))
+                    {
+                        RepPrinterSandPassrateVO vo1 =new RepPrinterSandPassrateVO();
+                        vo1.setStartDate(params.get(i).getStartDate());
+                        vo1.setEndDate(params.get(i).getEndDate());
+                        vo1.setDeviceId(params.get(i).getDeviceId());
+                        vo1.setSxType(1);
+                        vo1.setId(list.get(0).getId());
+                        repPrinterSandPassrateDao.deleteSandPassrateUpload(vo1);
+                    }
+                }
+                repPrinterSandPassrateDao.add(repPrinterSandPassrateVOList);
+            }
+            return new JsonResult2(JsonResultStatus.SUCCESS.getRet(), "砂型强度数据写入成功！");
+        }
+        catch (Exception ex){
+            return new JsonResult2(JsonResultStatus.DEVICE_FAIL.getRet(), JsonResultStatus.DEVICE_FAIL.getMsg());
+        }
+
+    }
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/addSandPassrateBatch")
+    @ResponseBody
+    @ApiOperation("砂型密度数据批量写入")
+    public JsonResult2 addSandPassrateBatch(@RequestBody List<RepPrinterSandPassrateVO> params) throws Exception {
+        try
+        {
+            List<RepPrinterSandPassrateVO> repPrinterSandPassrateVOList = new ArrayList<RepPrinterSandPassrateVO>();// 实体类集合
+            if(!CollectionUtils.isEmpty(params)){
+                for(int i=0;i<params.size();i++)
+                {
+                    RepPrinterSandPassrateVO repPrinterSandPassrateVO = new RepPrinterSandPassrateVO();
+                    repPrinterSandPassrateVO.setSxType(0);//0表示砂型密度，1表示砂型强度
+                    repPrinterSandPassrateVO.setDeviceId(params.get(i).getDeviceId());
+                    repPrinterSandPassrateVO.setStartDate(params.get(i).getStartDate());
+                    repPrinterSandPassrateVO.setEndDate(params.get(i).getEndDate());
+                    repPrinterSandPassrateVO.setSxmdHgnum(params.get(i).getSxmdHgnum());
+                    repPrinterSandPassrateVO.setSxmdTotal(params.get(i).getSxmdTotal());
+                    repPrinterSandPassrateVO.setGkScDySxmd(params.get(i).getGkScDySxmd());
+                    repPrinterSandPassrateVO.setSxmdAve(params.get(i).getSxmdAve());
+                    repPrinterSandPassrateVOList.add(repPrinterSandPassrateVO);
+                }
+
+            }
+            if(repPrinterSandPassrateVOList!=null && repPrinterSandPassrateVOList.size()>0){
+                for(int i=0;i<params.size();i++)
+                {
+                    RepPrinterSandPassrateVO vo =new RepPrinterSandPassrateVO();
+                    vo.setStartDate(params.get(i).getStartDate());
+                    vo.setEndDate(params.get(i).getEndDate());
+                    vo.setDeviceId(params.get(i).getDeviceId());
+                    vo.setSxType(0);
+                    List<RepPrinterSandPassrateVO> list = repPrinterSandPassrateDao.list(vo);
+                    if(!CollectionUtils.isEmpty(list))
+                    {
+                        RepPrinterSandPassrateVO vo1 =new RepPrinterSandPassrateVO();
+                        vo1.setStartDate(params.get(i).getStartDate());
+                        vo1.setEndDate(params.get(i).getEndDate());
+                        vo1.setDeviceId(params.get(i).getDeviceId());
+                        vo1.setSxType(0);
+                        vo1.setId(list.get(0).getId());
+                        repPrinterSandPassrateDao.deleteSandPassrateUpload(vo1);
+                    }
+                }
+                repPrinterSandPassrateDao.add(repPrinterSandPassrateVOList);
+            }
+            return new JsonResult2(JsonResultStatus.SUCCESS.getRet(), "砂型密度数据写入成功！");
+        }
+        catch (Exception ex){
+            return new JsonResult2(JsonResultStatus.DEVICE_FAIL.getRet(), JsonResultStatus.DEVICE_FAIL.getMsg());
+        }
+
+    }
+
+
+    //----------------------------运维报告目标类型变量操作 start---------------------------------------------------
+    @ApiOperation(value = "运维报告目标类型变量写入", notes = "运维报告目标类型变量写入")
+    @RequestMapping(method = RequestMethod.POST, value = "/addTargetTypeValue")
+    @ResponseBody
+    public JsonResult2 addTargetTypeValue(@RequestBody RepPrinterTargetTypeDTO condition) throws Exception {
+        try
+        {
+            TargetTypeVO vo =new TargetTypeVO();
+            vo.setTargetName(condition.getTargetName());
+            vo.setTargetCode(condition.getTargetCode());
+            List<TargetTypeVO> list = repTargetTypeDao.list(vo);
+            if(!CollectionUtils.isEmpty(list))
+            {
+                return new JsonResult2(JsonResultStatus.SUCCESS.getRet(), "当前目标类型已存在，请检查！");
+            }
+            else
+            {
+                repTargetTypeDao.insert(vo);
+                return new JsonResult2(JsonResultStatus.SUCCESS.getRet(), "目标类型写入成功！");
+            }
+        }
+        catch (Exception ex){
+            return new JsonResult2(JsonResultStatus.DEVICE_FAIL.getRet(), JsonResultStatus.DEVICE_FAIL.getMsg());
+        }
+    }
+
+    @RequestMapping(method = RequestMethod.POST, value = "/updateTargetTypeValue")
+    @ResponseBody
+    @ApiOperation("运维报告目标类型变量更新")
+    public JsonResult2 updateTargetTypeValue(@RequestBody RepPrinterTargetTypeDTO condition) throws Exception {
+
+        try
+        {
+            TargetTypeVO vo =new TargetTypeVO();
+            vo.setTargetName(condition.getTargetName());
+            vo.setTargetCode(condition.getTargetCode());
+            vo.setId(Long.valueOf(condition.getId()));
+            repTargetTypeDao.update(vo);
+            return new JsonResult2(JsonResultStatus.SUCCESS.getRet(), "目标类型更新成功！");
+        }
+        catch (Exception ex){
+            return new JsonResult2(JsonResultStatus.DEVICE_FAIL.getRet(), JsonResultStatus.DEVICE_FAIL.getMsg());
+        }
+    }
+
+    @RequestMapping(method = RequestMethod.POST, value = "/delTargetTypeValue")
+    @ResponseBody
+    @ApiOperation("运维报告目标类型变量删除")
+    public JsonResult2 delTargetTypeValue(@RequestBody RepPrinterTargetTypeDTO condition) throws Exception {
+
+        try
+        {
+            repTargetTypeDao.deleteById(Long.valueOf(condition.getId()));
+            return new JsonResult2(JsonResultStatus.SUCCESS.getRet(), "目标类型删除成功！");
+        }
+        catch (Exception ex){
+//            return new JsonResult2(JsonResultStatus.DEVICE_FAIL.getRet(), JsonResultStatus.DEVICE_FAIL.getMsg());
+            return new JsonResult2(JsonResultStatus.SUCCESS.getRet(), "目标类型删除失败！");
+        }
+    }
+
+    @RequestMapping(method = RequestMethod.POST, value = "/getTargetTypeList")
+    @ResponseBody
+    @ApiOperation("运维报告目标类型变量查询")
+    public JsonResult2 getTargetTypeList() throws Exception {
+        JsonResult2 json = new JsonResult2();
+        try
+        {
+            json.setData(repTargetTypeDao.getTargetTypeList());
+            return json;
+        }
+        catch (Exception ex){
+            return new JsonResult2(JsonResultStatus.DEVICE_FAIL.getRet(), JsonResultStatus.DEVICE_FAIL.getMsg());
+        }
+    }
+    //----------------------------运维报告目标类型变量操作 end---------------------------------------------------
+
+
+    @ApiOperation(value="分页查找废品原因统计列表", notes="分页查找废品原因统计列表")
+    @PostMapping("/deviceWastePageList")
+    public JsonResult2 deviceWastePageList(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("user_id") String user_id, @RequestBody RepPrinterWastereasonDTO c) {
+        try {
+            String startDate = c.getVo().getStartDate();
+            if(StringUtils.isNotBlank(startDate)) {
+                startDate = DateUtils.format(DateUtils.parseDate("yyyy-MM-dd", startDate), "yyyy-M-d");
+                c.getVo().setStartDate(startDate);
+            }
+            String endDate = c.getVo().getEndDate();
+            if(StringUtils.isNotBlank(endDate)) {
+                endDate = DateUtils.format(DateUtils.parseDate("yyyy-MM-dd", endDate), "yyyy-M-d");
+                c.getVo().setEndDate(endDate);
+            }
+            JsonResult2 res = service.deviceWastePageList(tenant_id, c);
+            return res;
+        } catch (Exception e) {
+            logger.error("分页查找列表失败", e);
+            String msg = e.getMessage()!=null?e.getMessage():JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+
+    @ApiOperation(value="分页查找砂型密度合格率统计列表", notes="分页查找砂型密度合格率统计列表")
+    @PostMapping("/sandPassratePageList")
+    public JsonResult2 sandPassratePageList(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("user_id") String user_id, @RequestBody RepPrinterSandPassrateDTO c) {
+        try {
+            String startDate = c.getVo().getStartDate();
+            if(StringUtils.isNotBlank(startDate)) {
+                startDate = DateUtils.format(DateUtils.parseDate("yyyy-MM-dd", startDate), "yyyy-M-d");
+                c.getVo().setStartDate(startDate);
+            }
+            String endDate = c.getVo().getEndDate();
+            if(StringUtils.isNotBlank(endDate)) {
+                endDate = DateUtils.format(DateUtils.parseDate("yyyy-MM-dd", endDate), "yyyy-M-d");
+                c.getVo().setEndDate(endDate);
+            }
+            c.getVo().setSxType(0);
+            JsonResult2 res = service.sandPassratePageList(tenant_id, c);
+            return res;
+        } catch (Exception e) {
+            logger.error("分页查找列表失败", e);
+            String msg = e.getMessage()!=null?e.getMessage():JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+
+    @ApiOperation(value="分页查找砂型强度合格率统计列表", notes="分页查找砂型密度合格率统计列表")
+    @PostMapping("/sandPassrateQiangDuPageList")
+    public JsonResult2 sandPassrateQiangDuPageList(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("user_id") String user_id, @RequestBody RepPrinterSandPassrateDTO c) {
+        try {
+            String startDate = c.getVo().getStartDate();
+            if(StringUtils.isNotBlank(startDate)) {
+                startDate = DateUtils.format(DateUtils.parseDate("yyyy-MM-dd", startDate), "yyyy-M-d");
+                c.getVo().setStartDate(startDate);
+            }
+            String endDate = c.getVo().getEndDate();
+            if(StringUtils.isNotBlank(endDate)) {
+                endDate = DateUtils.format(DateUtils.parseDate("yyyy-MM-dd", endDate), "yyyy-M-d");
+                c.getVo().setEndDate(endDate);
+            }
+            c.getVo().setSxType(1);
+            JsonResult2 res = service.sandPassratePageList(tenant_id, c);
+            return res;
+        } catch (Exception e) {
+            logger.error("分页查找列表失败", e);
+            String msg = e.getMessage()!=null?e.getMessage():JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+
+    @ApiOperation(value="分页查找打印产量统计列表", notes="分页查找打印产量统计列表")
+    @PostMapping("/outputPageList")
+    public JsonResult2 outputPageList(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("user_id") String user_id, @RequestBody RepPrinterOutputDTO c) {
+        try {
+            String startDate = c.getVo().getStartDate();
+            if(StringUtils.isNotBlank(startDate)) {
+                startDate = DateUtils.format(DateUtils.parseDate("yyyy-MM-dd", startDate), "yyyy-M-d");
+                c.getVo().setStartDate(startDate);
+            }
+            String endDate = c.getVo().getEndDate();
+            if(StringUtils.isNotBlank(endDate)) {
+                endDate = DateUtils.format(DateUtils.parseDate("yyyy-MM-dd", endDate), "yyyy-M-d");
+                c.getVo().setEndDate(endDate);
+            }
+            JsonResult2 res = service.outputPageList(tenant_id, c);
+            return res;
+        } catch (Exception e) {
+            logger.error("分页查找列表失败", e);
+            String msg = e.getMessage()!=null?e.getMessage():JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+
+
+    //-----------------------------------------星级评价合格率指标库操作-----------------------------------------------
+    @PostMapping("/starPassrateSize")
+    @ResponseBody
+    @ApiOperation("砂型尺寸导入数据")
+    public JsonResult2 starPassrateSize(@RequestParam("file") MultipartFile file) {
+        try {
+            if (file.isEmpty()) {
+                return new JsonResult2(JsonResultStatus.DEVICE_FAIL.getRet(), "文件为空！");
+            }
+            service.starPassrate(file,0);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new JsonResult2(JsonResultStatus.DEVICE_FAIL.getRet(), "读取砂型尺寸文件失败！");
+        }
+        return new JsonResult2(JsonResultStatus.SUCCESS.getRet(), "砂型尺寸导入成功！");
+
+    }
+    @PostMapping("/starPassrateOutward")
+    @ResponseBody
+    @ApiOperation("砂型外观导入数据")
+    public JsonResult2 starPassrateOutward(@RequestParam("file") MultipartFile file) {
+        try {
+            if (file.isEmpty()) {
+                return new JsonResult2(JsonResultStatus.DEVICE_FAIL.getRet(), "文件为空！");
+            }
+            service.starPassrate(file,1);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new JsonResult2(JsonResultStatus.DEVICE_FAIL.getRet(), "读取砂型外观文件失败！");
+        }
+        return new JsonResult2(JsonResultStatus.SUCCESS.getRet(), "砂型外观导入成功！");
+
+    }
+    @PostMapping("/starPassratePrecision")
+    @ResponseBody
+    @ApiOperation("砂型精度导入数据")
+    public JsonResult2 starPassratePrecision(@RequestParam("file") MultipartFile file) {
+        try {
+            if (file.isEmpty()) {
+                return new JsonResult2(JsonResultStatus.DEVICE_FAIL.getRet(), "文件为空！");
+            }
+            service.starPassrate(file,2);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new JsonResult2(JsonResultStatus.DEVICE_FAIL.getRet(), "读取砂型精度文件失败！");
+        }
+        return new JsonResult2(JsonResultStatus.SUCCESS.getRet(), "砂型精度导入成功！");
+
+    }
+    @ApiOperation(value="根据导入日期删除砂型检验的合格率", notes="根据导入日期(格式：yyyy-MM-dd)根据导入日期删除砂型检验的合格率")
+    @PostMapping("/deleteStarPassrate")
+    public JsonResult2 deleteStarPassrate(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("user_id") String user_id, @RequestBody RepPrinterStarPassrateVO c) {
+        String vc = JSON.toJSONString(c);
+        logger.info("start method : deleteStarPassrate, tenant_id ="+tenant_id+" user_id = "+user_id+" RepPrinterStarPassrateVO : "+ vc);
+        try {
+            JsonResult2 res = service.deleteStarPassrate(tenant_id, c);
+            logger.info("end method : deleteStarPassrate,  tenant_id ="+tenant_id+" user_id = "+user_id+" RepPrinterStarPassrateVO : "+ vc+" result: "+JSON.toJSONString(res));
+            return res;
+        } catch (Exception e) {
+            logger.error("method : deleteStarPassrate, tenant_id ="+tenant_id+" user_id = "+user_id+" RepPrinterStarPassrateVO : "+ vc + " exception:", e);
+            String msg = e.getMessage()!=null?e.getMessage():JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+    //-----------------------------------------------------------------------------------------------------------------------------------
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/querySandPassrateQiangDuImportDate")
+    @ResponseBody
+    @ApiOperation("查询砂型强度数据最新导入记录时间") //2021/06/26
+    public JsonResult2 querySandPassrateQiangDuImportDate()
+    {
+        List<RepMttDataVO> listAll = new ArrayList<>();
+        RepMttDataVO vo = new RepMttDataVO();
+        RepPrinterSandPassrateVO passratevo =new RepPrinterSandPassrateVO();
+        //查询最新一条导入数据的日期
+        List<RepPrinterSandPassrateVO> list = repPrinterSandPassrateDao.listnew(passratevo);
+        String startDT="";
+        String endDT="";
+        for(int i=0;i<list.size();i++)
+        {
+            startDT= list.get(i).getStartDate();
+            endDT = list.get(i).getEndDate();
+        }
+        vo.setValue1(startDT);
+        vo.setValue2(endDT);
+        listAll.add(vo);
+        return new JsonResult2(listAll);
+
+    }
+
+    @ApiOperation(value="分页查找砂型尺寸合格率统计列表", notes="分页查找砂型尺寸合格率统计列表")
+    @PostMapping("/sandPassrateSizePageList")
+    public JsonResult2 sandPassrateSizePageList(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("user_id") String user_id, @RequestBody RepPrinterStarPassrateDTO c) {
+        try {
+            String startDate = c.getVo().getStartDate();
+            if(StringUtils.isNotBlank(startDate)) {
+                startDate = DateUtils.format(DateUtils.parseDate("yyyy-MM-dd", startDate), "yyyy-M-d");
+                c.getVo().setStartDate(startDate);
+            }
+            String endDate = c.getVo().getEndDate();
+            if(StringUtils.isNotBlank(endDate)) {
+                endDate = DateUtils.format(DateUtils.parseDate("yyyy-MM-dd", endDate), "yyyy-M-d");
+                c.getVo().setEndDate(endDate);
+            }
+            c.getVo().setSxType(0);
+            JsonResult2 res = service.starPassratePageList(tenant_id, c);
+            return res;
+        } catch (Exception e) {
+            logger.error("分页查找列表失败", e);
+            String msg = e.getMessage()!=null?e.getMessage():JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+
+
+    @ApiOperation(value="分页查找砂型外观合格率统计列表", notes="分页查找砂型尺寸合格率统计列表")
+    @PostMapping("/sandPassrateOutwardPageList")
+    public JsonResult2 sandPassrateOutwardPageList(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("user_id") String user_id, @RequestBody RepPrinterStarPassrateDTO c) {
+        try {
+            String startDate = c.getVo().getStartDate();
+            if(StringUtils.isNotBlank(startDate)) {
+                startDate = DateUtils.format(DateUtils.parseDate("yyyy-MM-dd", startDate), "yyyy-M-d");
+                c.getVo().setStartDate(startDate);
+            }
+            String endDate = c.getVo().getEndDate();
+            if(StringUtils.isNotBlank(endDate)) {
+                endDate = DateUtils.format(DateUtils.parseDate("yyyy-MM-dd", endDate), "yyyy-M-d");
+                c.getVo().setEndDate(endDate);
+            }
+            c.getVo().setSxType(1);
+            JsonResult2 res = service.starPassratePageList(tenant_id, c);
+            return res;
+        } catch (Exception e) {
+            logger.error("分页查找列表失败", e);
+            String msg = e.getMessage()!=null?e.getMessage():JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+    @ApiOperation(value="分页查找砂型精度合格率统计列表", notes="分页查找砂型尺寸合格率统计列表")
+    @PostMapping("/sandPassratePrecisionPageList")
+    public JsonResult2 sandPassratePrecisionPageList(@RequestHeader("tenant_id") String tenant_id, @RequestHeader("user_id") String user_id, @RequestBody RepPrinterStarPassrateDTO c) {
+        try {
+            String startDate = c.getVo().getStartDate();
+            if(StringUtils.isNotBlank(startDate)) {
+                startDate = DateUtils.format(DateUtils.parseDate("yyyy-MM-dd", startDate), "yyyy-M-d");
+                c.getVo().setStartDate(startDate);
+            }
+            String endDate = c.getVo().getEndDate();
+            if(StringUtils.isNotBlank(endDate)) {
+                endDate = DateUtils.format(DateUtils.parseDate("yyyy-MM-dd", endDate), "yyyy-M-d");
+                c.getVo().setEndDate(endDate);
+            }
+            c.getVo().setSxType(2);
+            JsonResult2 res = service.starPassratePageList(tenant_id, c);
+            return res;
+        } catch (Exception e) {
+            logger.error("分页查找列表失败", e);
+            String msg = e.getMessage()!=null?e.getMessage():JsonResultStatus.SYS_EXCEPTION.getMsg();
+            return new JsonResult2(JsonResultStatus.SYS_EXCEPTION.getRet(), msg);
+        }
+    }
+
+
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/ChanNengLiYongLvDto.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/ChanNengLiYongLvDto.java
new file mode 100644
index 0000000..0a44a8b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/ChanNengLiYongLvDto.java
@@ -0,0 +1,106 @@
+package com.rootcloud.web.dto;
+
+public class ChanNengLiYongLvDto {
+    private String deviceId;
+    private String deviceType;
+    private Double chanLiang;
+    private Double chanNeng;
+    private Double liYongLv;
+    private Double avg;
+
+    private String day;
+    private String start_date;
+    private String end_date;
+
+    public ChanNengLiYongLvDto() {
+    }
+
+    public ChanNengLiYongLvDto(String deviceId, Double chanLiang) {
+        this.deviceId = deviceId;
+        this.chanLiang = chanLiang;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public Double getChanLiang() {
+        return chanLiang;
+    }
+
+    public void setChanLiang(Double chanLiang) {
+        this.chanLiang = chanLiang;
+    }
+
+    public Double getChanNeng() {
+        return chanNeng;
+    }
+
+    public void setChanNeng(Double chanNeng) {
+        this.chanNeng = chanNeng;
+    }
+
+    public Double getLiYongLv() {
+        return liYongLv;
+    }
+
+    public void setLiYongLv(Double liYongLv) {
+        this.liYongLv = liYongLv;
+    }
+
+    public Double getAvg() {
+        return avg;
+    }
+
+    public void setAvg(Double avg) {
+        this.avg = avg;
+    }
+
+    public String getDay() {
+        return day;
+    }
+
+    public void setDay(String day) {
+        this.day = day;
+    }
+
+    public String getStart_date() {
+        return start_date;
+    }
+
+    public void setStart_date(String start_date) {
+        this.start_date = start_date;
+    }
+
+    public String getEnd_date() {
+        return end_date;
+    }
+
+    public void setEnd_date(String end_date) {
+        this.end_date = end_date;
+    }
+
+    @Override
+    public String toString() {
+        return "ChanNengLiYongLvDto{" +
+                "deviceId='" + deviceId + '\'' +
+                ", deviceType='" + deviceType + '\'' +
+                ", chanLiang=" + chanLiang +
+                ", chanNeng=" + chanNeng +
+                ", liYongLv=" + liYongLv +
+                ", avg=" + avg +
+                '}';
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/GuHuaJiDanHaoDto.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/GuHuaJiDanHaoDto.java
new file mode 100644
index 0000000..9ba09d1
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/GuHuaJiDanHaoDto.java
@@ -0,0 +1,66 @@
+package com.rootcloud.web.dto;
+
+public class GuHuaJiDanHaoDto {
+
+    private String deviceId;
+    private Double activatorCost;
+    private Double avg;
+    private Double target;
+    private String day;
+    public GuHuaJiDanHaoDto() {
+    }
+
+    public GuHuaJiDanHaoDto(String deviceId, Double activatorCost, Double avg, Double target) {
+        this.deviceId = deviceId;
+        this.activatorCost = activatorCost;
+        this.avg = avg;
+        this.target = target;
+    }
+    public GuHuaJiDanHaoDto(String deviceId, String day,Double activatorCost, Double avg, Double target) {
+        this.deviceId = deviceId;
+        this.day = day;
+        this.activatorCost = activatorCost;
+        this.avg = avg;
+        this.target = target;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public Double getAvg() {
+        return avg;
+    }
+
+    public void setAvg(Double avg) {
+        this.avg = avg;
+    }
+
+    public Double getTarget() {
+        return target;
+    }
+
+    public void setTarget(Double target) {
+        this.target = target;
+    }
+
+    public Double getActivatorCost() {
+        return activatorCost;
+    }
+
+    public void setActivatorCost(Double activatorCost) {
+        this.activatorCost = activatorCost;
+    }
+
+    public String getDay() {
+        return day;
+    }
+
+    public void setDay(String day) {
+        this.day = day;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/PinJunDaYinGaoDuDto.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/PinJunDaYinGaoDuDto.java
new file mode 100644
index 0000000..5e4df5f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/PinJunDaYinGaoDuDto.java
@@ -0,0 +1,65 @@
+package com.rootcloud.web.dto;
+
+public class PinJunDaYinGaoDuDto {
+    private String deviceId;
+    private Double height;
+    private Double avg;
+    private Double target;
+    private String day;
+    public PinJunDaYinGaoDuDto() {
+    }
+
+    public PinJunDaYinGaoDuDto(String deviceId, Double height, Double avg, Double target) {
+        this.deviceId = deviceId;
+        this.height = height;
+        this.avg = avg;
+        this.target = target;
+    }
+
+    public PinJunDaYinGaoDuDto(String deviceId, String day,Double height, Double avg, Double target) {
+        this.deviceId = deviceId;
+        this.day= day;
+        this.height = height;
+        this.avg = avg;
+        this.target = target;
+    }
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public Double getHeight() {
+        return height;
+    }
+
+    public void setHeight(Double height) {
+        this.height = height;
+    }
+
+    public Double getAvg() {
+        return avg;
+    }
+
+    public void setAvg(Double avg) {
+        this.avg = avg;
+    }
+
+    public Double getTarget() {
+        return target;
+    }
+
+    public void setTarget(Double target) {
+        this.target = target;
+    }
+
+    public String getDay() {
+        return day;
+    }
+
+    public void setDay(String day) {
+        this.day = day;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/PrinterEfficiencyDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/PrinterEfficiencyDTO.java
new file mode 100644
index 0000000..3cbdf5b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/PrinterEfficiencyDTO.java
@@ -0,0 +1,96 @@
+package com.rootcloud.web.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * 打印机效率DTO
+ *
+ * @author LiuQI 2018/8/29 17:40
+ * @version V1.0
+ **/
+@ApiModel("打印机效率DTO")
+public class PrinterEfficiencyDTO {
+
+    @ApiModelProperty(value = "机构编号")
+    private String officeId;
+
+    @ApiModelProperty(value = "设备编号")
+    private String deviceId;
+
+    @ApiModelProperty(value = "年份", required = true)
+    private Integer year;
+
+    @ApiModelProperty("月份")
+    private Integer month;
+
+    @ApiModelProperty("日期")
+    private Integer day;
+
+    @ApiModelProperty(hidden = true)
+    private List<String> deviceIdList;
+
+    public String getOfficeId() {
+        return officeId;
+    }
+
+    public void setOfficeId(String officeId) {
+        this.officeId = officeId;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    public Integer getMonth() {
+        return month;
+    }
+
+    public void setMonth(Integer month) {
+        this.month = month;
+    }
+
+    public Integer getDay() {
+        return day;
+    }
+
+    public void setDay(Integer day) {
+        this.day = day;
+    }
+
+    public List<String> getDeviceIdList() {
+        return deviceIdList;
+    }
+
+    public void setDeviceIdList(List<String> deviceIdList) {
+        this.deviceIdList = deviceIdList;
+    }
+
+    @Override
+    public String toString() {
+        return "PrinterEfficiencyDTO{" +
+                "officeId='" + officeId + '\'' +
+                ", deviceId='" + deviceId + '\'' +
+                ", year=" + year +
+                ", month=" + month +
+                ", day=" + day +
+                ", deviceIdList=" + deviceIdList +
+                '}';
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/PrinterReportDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/PrinterReportDTO.java
new file mode 100644
index 0000000..9406943
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/PrinterReportDTO.java
@@ -0,0 +1,171 @@
+package com.rootcloud.web.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * 打印机运维报告DTO
+ *
+ * @author
+ * @version V1.0
+ **/
+@ApiModel("打印机运维报告DTO")
+public class PrinterReportDTO {
+    @ApiModelProperty(value = "机构编号")
+    private String officeId;
+
+    @ApiModelProperty(value = "设备编号")
+    private String deviceId;
+
+    private String tenantId;
+
+    @ApiModelProperty(value = "年份", required = true)
+    private Integer year;
+
+    @ApiModelProperty("季度")
+    private Integer quarter;
+
+    @ApiModelProperty("月份")
+    private Integer month;
+
+    @ApiModelProperty("星期")
+    private Integer week;
+
+    @ApiModelProperty(hidden = true)
+    private String startDate; 		//报告开始时间
+
+    @ApiModelProperty(hidden = true)
+    private String endDate; 		//报告结束日期
+
+    @ApiModelProperty(hidden = true)
+    private List<String> deviceIdList;
+
+    @ApiModelProperty(hidden = true)
+    private Integer queryedDeviceIdList;
+
+    @ApiModelProperty(hidden = true)
+    private Integer queryedType;
+
+    @ApiModelProperty(hidden = true)
+    private Double sandPassrateTargetValue;//砂型密度标准值
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public Double getSandPassrateTargetValue() {
+        return sandPassrateTargetValue;
+    }
+
+    public void setSandPassrateTargetValue(Double sandPassrateTargetValue) {
+        this.sandPassrateTargetValue = sandPassrateTargetValue;
+    }
+
+    public Integer getQueryedDeviceIdList() {
+        return queryedDeviceIdList;
+    }
+
+    public void setQueryedDeviceIdList(Integer queryedDeviceIdList) {
+        this.queryedDeviceIdList = queryedDeviceIdList;
+    }
+
+    public Integer getQueryedType() {
+        return queryedType;
+    }
+
+    public void setQueryedType(Integer queryedType) {
+        this.queryedType = queryedType;
+    }
+
+    public List<String> getDeviceIdList() {
+        return deviceIdList;
+    }
+
+    public void setDeviceIdList(List<String> deviceIdList) {
+        this.deviceIdList = deviceIdList;
+    }
+
+    public String getOfficeId() {
+        return officeId;
+    }
+
+
+    public void setOfficeId(String officeId) {
+        this.officeId = officeId;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    public Integer getMonth() {
+        return month;
+    }
+
+    public void setMonth(Integer month) {
+        this.month = month;
+    }
+
+    public Integer getQuarter() {
+        return quarter;
+    }
+
+    public void setQuarter(Integer quarter) {
+        this.quarter = quarter;
+    }
+
+    public Integer getWeek() {
+        return week;
+    }
+
+    public void setWeek(Integer week) {
+        this.week = week;
+    }
+
+    @Override
+    public String toString() {
+        return "PrinterEfficiencyDTO{" +
+                "officeId='" + officeId + '\'' +
+                ", deviceId='" + deviceId + '\'' +
+                ", year=" + year +
+                ", quarter=" + quarter +
+                ", month=" + month +
+                ", week=" + week +
+                '}';
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterOutputDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterOutputDTO.java
new file mode 100644
index 0000000..6cfa84b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterOutputDTO.java
@@ -0,0 +1,18 @@
+package com.rootcloud.web.dto;
+
+import com.rootcloud.common.vo.RepPageVO;
+import com.rootcloud.domain.vo.RepPrinterOutputVO;
+
+
+public class RepPrinterOutputDTO extends RepPageVO {
+
+    private RepPrinterOutputVO vo;
+
+    public RepPrinterOutputVO getVo() {
+        return vo;
+    }
+
+    public void setVo(RepPrinterOutputVO vo) {
+        this.vo = vo;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterSandPassrateDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterSandPassrateDTO.java
new file mode 100644
index 0000000..47f47b7
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterSandPassrateDTO.java
@@ -0,0 +1,19 @@
+package com.rootcloud.web.dto;
+
+import com.rootcloud.common.vo.RepPageVO;
+import com.rootcloud.domain.vo.RepPrinterSandPassrateVO;
+
+
+public class RepPrinterSandPassrateDTO extends RepPageVO {
+
+    private RepPrinterSandPassrateVO vo;
+
+    public RepPrinterSandPassrateVO getVo() {
+        return vo;
+    }
+
+    public void setVo(RepPrinterSandPassrateVO vo) {
+        this.vo = vo;
+    }
+
+}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterStarPassrateDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterStarPassrateDTO.java
new file mode 100644
index 0000000..0f84f30
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterStarPassrateDTO.java
@@ -0,0 +1,18 @@
+package com.rootcloud.web.dto;
+
+import com.rootcloud.common.vo.RepPageVO;
+import com.rootcloud.domain.vo.RepPrinterStarPassrateVO;
+
+public class RepPrinterStarPassrateDTO extends RepPageVO {
+
+    private RepPrinterStarPassrateVO vo;
+
+    public RepPrinterStarPassrateVO getVo() {
+        return vo;
+    }
+
+    public void setVo(RepPrinterStarPassrateVO vo) {
+        this.vo = vo;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterTargetTypeDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterTargetTypeDTO.java
new file mode 100644
index 0000000..109a61f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterTargetTypeDTO.java
@@ -0,0 +1,32 @@
+package com.rootcloud.web.dto;
+
+public class RepPrinterTargetTypeDTO {
+
+    private String targetName;			//目标类型
+    private String targetCode;			//目标类型编码
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTargetName() {
+        return targetName;
+    }
+
+    public void setTargetName(String targetName) {
+        this.targetName = targetName;
+    }
+
+    public String getTargetCode() {
+        return targetCode;
+    }
+
+    public void setTargetCode(String targetCode) {
+        this.targetCode = targetCode;
+    }
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterWastereasonDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterWastereasonDTO.java
new file mode 100644
index 0000000..690b28d
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/RepPrinterWastereasonDTO.java
@@ -0,0 +1,20 @@
+package com.rootcloud.web.dto;
+
+import com.rootcloud.common.vo.RepPageVO;
+import com.rootcloud.domain.vo.RepPrinterWastereasonVO;
+
+public class RepPrinterWastereasonDTO extends RepPageVO {
+
+    private RepPrinterWastereasonVO vo;
+
+    public RepPrinterWastereasonVO getVo() {
+        return vo;
+    }
+
+    public void setVo(RepPrinterWastereasonVO vo) {
+        this.vo = vo;
+    }
+
+
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/UpdateUserReportDTO.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/UpdateUserReportDTO.java
new file mode 100644
index 0000000..85acbd4
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/UpdateUserReportDTO.java
@@ -0,0 +1,129 @@
+package com.rootcloud.web.dto;
+
+public class UpdateUserReportDTO {
+
+    private Long id;//用户报告id
+    private String remark1;			//设备开动率统计备注
+    private String remark2;			//空间利用率备注
+    private String remark3;			//打印效率统计备注
+    private String remark4;			//打印产量统计备注
+    private String remark5;			//废品原因统计备注
+    private String remark6;			//砂型密度合格率统计备注
+    private String remark7;			//打印机树脂加入比备注
+    private String remark8;			//新旧砂加入占比备注
+    private String remark9;			//漏砂量统计备注
+    private String remark10;		//喷头寿命备注
+    private String remark11;		//喷头寿命备注
+    private String remark12;		//喷头寿命备注
+    private String remark13;		//喷头寿命备注
+    private String remark14;		//喷头寿命备注
+    private String remark15;		//喷头寿命备注
+
+    public String getRemark11() {
+        return remark11;
+    }
+
+    public void setRemark11(String remark11) {
+        this.remark11 = remark11;
+    }
+
+    public String getRemark12() {
+        return remark12;
+    }
+
+    public void setRemark12(String remark12) {
+        this.remark12 = remark12;
+    }
+
+    public String getRemark13() {
+        return remark13;
+    }
+
+    public void setRemark13(String remark13) {
+        this.remark13 = remark13;
+    }
+
+    public String getRemark14() {
+        return remark14;
+    }
+
+    public void setRemark14(String remark14) {
+        this.remark14 = remark14;
+    }
+
+    public String getRemark15() {
+        return remark15;
+    }
+
+    public void setRemark15(String remark15) {
+        this.remark15 = remark15;
+    }
+
+    public Long getId() {
+        return id;
+    }
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getRemark1() {
+        return remark1;
+    }
+    public void setRemark1(String remark1) {
+        this.remark1 = remark1;
+    }
+    public String getRemark2() {
+        return remark2;
+    }
+    public void setRemark2(String remark2) {
+        this.remark2 = remark2;
+    }
+    public String getRemark3() {
+        return remark3;
+    }
+    public void setRemark3(String remark3) {
+        this.remark3 = remark3;
+    }
+    public String getRemark4() {
+        return remark4;
+    }
+    public void setRemark4(String remark4) {
+        this.remark4 = remark4;
+    }
+    public String getRemark5() {
+        return remark5;
+    }
+    public void setRemark5(String remark5) {
+        this.remark5 = remark5;
+    }
+    public String getRemark6() {
+        return remark6;
+    }
+    public void setRemark6(String remark6) {
+        this.remark6 = remark6;
+    }
+    public String getRemark7() {
+        return remark7;
+    }
+    public void setRemark7(String remark7) {
+        this.remark7 = remark7;
+    }
+    public String getRemark8() {
+        return remark8;
+    }
+    public void setRemark8(String remark8) {
+        this.remark8 = remark8;
+    }
+    public String getRemark9() {
+        return remark9;
+    }
+    public void setRemark9(String remark9) {
+        this.remark9 = remark9;
+    }
+    public String getRemark10() {
+        return remark10;
+    }
+    public void setRemark10(String remark10) {
+        this.remark10 = remark10;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/WeiXuFeiYongTongJiDto.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/WeiXuFeiYongTongJiDto.java
new file mode 100644
index 0000000..f33a3e9
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/java/com/rootcloud/web/dto/WeiXuFeiYongTongJiDto.java
@@ -0,0 +1,78 @@
+package com.rootcloud.web.dto;
+
+public class WeiXuFeiYongTongJiDto {
+
+    private String deviceId;
+    private Double fee;
+    private Double avg;
+    private Double target;
+
+    private String year;
+    private String month;
+
+    public WeiXuFeiYongTongJiDto() {
+    }
+
+    public WeiXuFeiYongTongJiDto(String deviceId, Double fee, Double avg, Double target) {
+        this.deviceId = deviceId;
+        this.fee = fee;
+        this.avg = avg;
+        this.target = target;
+    }
+    public WeiXuFeiYongTongJiDto(String deviceId, String month,Double fee, Double avg, Double target) {
+        this.deviceId = deviceId;
+        this.month = month;
+        this.fee = fee;
+        this.avg = avg;
+        this.target = target;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public Double getFee() {
+        return fee;
+    }
+
+    public void setFee(Double fee) {
+        this.fee = fee;
+    }
+
+    public Double getAvg() {
+        return avg;
+    }
+
+    public void setAvg(Double avg) {
+        this.avg = avg;
+    }
+
+    public Double getTarget() {
+        return target;
+    }
+
+    public void setTarget(Double target) {
+        this.target = target;
+    }
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    public String getMonth() {
+        return month;
+    }
+
+    public void setMonth(String month) {
+        this.month = month;
+    }
+
+}
diff --git a/nxgx-ifsm-base/src/main/resources/banner.txt b/nxgx-ifsm-base/src/main/resources/banner.txt
new file mode 100644
index 0000000..db090f7
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/banner.txt
@@ -0,0 +1,10 @@
+
+  ${AnsiColor.GREEN}      ██╗${AnsiColor.RED} ██╗   ██╗ ████████╗ ███████╗   ██████╗ ████████╗ ████████╗ ███████╗
+  ${AnsiColor.GREEN}      ██║${AnsiColor.RED} ██║   ██║ ╚══██╔══╝ ██╔═══██╗ ██╔════╝ ╚══██╔══╝ ██╔═════╝ ██╔═══██╗
+  ${AnsiColor.GREEN}      ██║${AnsiColor.RED} ████████║    ██║    ███████╔╝ ╚█████╗     ██║    ██████╗   ███████╔╝
+  ${AnsiColor.GREEN}██╗   ██║${AnsiColor.RED} ██╔═══██║    ██║    ██╔════╝   ╚═══██╗    ██║    ██╔═══╝   ██╔══██║
+  ${AnsiColor.GREEN}╚██████╔╝${AnsiColor.RED} ██║   ██║ ████████╗ ██║       ██████╔╝    ██║    ████████╗ ██║  ╚██╗
+  ${AnsiColor.GREEN} ╚═════╝ ${AnsiColor.RED} ╚═╝   ╚═╝ ╚═══════╝ ╚═╝       ╚═════╝     ╚═╝    ╚═══════╝ ╚═╝   ╚═╝
+
+${AnsiColor.BRIGHT_BLUE}:: JHipster 🤓  :: Running Spring Boot ${spring-boot.version} ::
+:: http://www.jhipster.tech ::${AnsiColor.DEFAULT}
diff --git a/nxgx-ifsm-base/src/main/resources/config/application-k8s.yml b/nxgx-ifsm-base/src/main/resources/config/application-k8s.yml
new file mode 100644
index 0000000..9227c5e
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/config/application-k8s.yml
@@ -0,0 +1,145 @@
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.jdbc.Driver
+    username: ${MYSQLUSER}
+    password: ${MYSQLPWD}
+    url: jdbc:mysql://${MYSQLHOST}:${MYSQLPORT}/${MYSQLDB}?useUnicode=true&characterEncoding=utf8&useSSL=false
+    hikari:
+      pool-name: DatebookHikariCP
+      connection-test-query: SELECT 1
+      maximum-pool-size: 30
+      connection-timeout: 30000
+      minimum-idle: 5
+      body-source-properties:
+        cachePrepStmts: true
+        prepStmtCacheSize: 250
+        prepStmtCacheSqlLimit: 2048
+        useServerPrepStmts: true
+  mybatis-plus:
+    global-config:
+      db-config:
+        id-type: auto
+        field-strategy: not_empty
+        table-underline: true
+        db-type: mysql
+        logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+        logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+    configuration:
+      #设置当查询结果值为null时，同样映射该查询字段给map。
+      call-setters-on-nulls: true
+      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    mapper-locations: classpath:/mapper/*.xml
+  redis:
+    host: ${REDISHOST}
+    port: ${REDISPORT}
+    password: ${REDISPWD}
+    timeout: 2000
+    database: 4
+    lettuce:
+      pool:
+        max-active: 22
+        min-idle: 2
+        max-wait: 2000
+  rabbitmq:
+    port: ${RABBITPORT}
+    username: ${RABBITUSER}
+    password: ${RABBITPWD}
+    addresses: ${RABBITADDRESS}
+    listener: #消费
+      simple:
+        concurrency: 1 #最小消息监听线程数
+        max-concurrency: 1 #最大消息监听线程数
+        acknowledge-mode: auto
+  application:
+    name: nxgx-ifsm-base
+  arthas:
+    enabled: false
+  messages:
+    basename: i18n/messages/messages
+
+pagehelper:
+  helper-dialect: mysql
+  pageSizeZero: true
+  params: count=countSql
+  reasonable: true
+  support-methods-arguments: true
+logging:
+  level:
+    com.rootcloud: info
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+application:
+  source: ${ENV} #应用程序部署端
+  tenant:
+    domain: ${TENANTBASE}
+  jeboot:
+    wfHost: ${JPHOST}
+    authUrl: ${AUTHURL}
+os:
+  iam:
+    domain: ${IAMHOST}
+    clientid: ${IAMCLIENTID}
+    clientsecret: ${IAMCLIENTSECRET}
+    loginuri: account-manage/v1/auth/login
+    superToken: eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiJyY19hZG1pbiIsInVzZXIiOnsiaWQiOiIxIiwidXNlcm5hbWUiOiJyY19hZG1pbiIsImRpc3BsYXlOYW1lIjoiYWRtaW4iLCJtZXRhZGF0YSI6eyJtaWdyYXRpb24iOnRydWV9fSwiaXNTeXN0ZW1BZG1pbiI6dHJ1ZSwiaXNTeXN0ZW1Pcmdhbml6YXRpb24iOnRydWUsImFjdGl2ZUNvbXBhbnkiOnsiaWQiOiItMSIsImFkbWlucyI6WyIxIl0sInN0YXR1cyI6IlJlZ3VsYXIiLCJpc09wZXJhdG9yIjp0cnVlLCJuYW1lIjoi5qC55LqR5bmz5Y-w566h55CG57uEIiwibWV0YWRhdGEiOnsibWlncmF0aW9uIjp0cnVlLCJsZWdhY3kiOnsiYWRtaW5faWQiOiIxIn19LCJwZXJtaXNzaW9uVmVyc2lvbiI6InYyIn0sImFjdGl2ZU9yZ2FuaXphdGlvbiI6eyJpZCI6Ii0xIiwiYWRtaW5zIjpbIjEiXSwic3RhdHVzIjoiUmVndWxhciIsImlzT3BlcmF0b3IiOnRydWUsIm5hbWUiOiLmoLnkupHlubPlj7DnrqHnkIbnu4QiLCJtZXRhZGF0YSI6eyJtaWdyYXRpb24iOnRydWUsImxlZ2FjeSI6eyJhZG1pbl9pZCI6IjEifX0sInBlcm1pc3Npb25WZXJzaW9uIjoidjIifSwidGVuYW50SWQiOiItMSIsInNjb3BlIjpbInN5c3RlbSJdLCJjbGllbnRfaWQiOiJ3ZWJfcGxhdGZvcm0iLCJjcmVhdGVkQXQiOiIyMDIyLTA0LTE1VDA3OjMzOjIyLjc5NloiLCJhdXRob3JpdGllcyI6WyJST0xFX0FETUlOIiwiUk9MRV9VU0VSIl0sImlzTG9nQXMiOmZhbHNlLCJub25jZSI6IjViZTY4YmVkLWEwMzctNGQ0Ni05YmRiLWYzOGZjMGFjZTk4YyIsImFwcFZlcnNpb24iOiJ2MiIsImlhdCI6MTY1MDAwODAwMiwiZXhwIjoxOTY1MzY4MDAyfQ.YsoK6pxpL4TkgLyFfNI7wnEmFfjYoZzP01c_Elbq_hnpUBX5Ov2rWTkIzZFEwzuSHiORbg8xj3rlBWcUWURzgz5H0cWEpa4MYQoSvTt14gjWs1HGlUBqKMxBrcYmrCTpbXhI2SZjCQ7GGl_WeUhRjacmgVmDObRpfJb-5WUR6pc
+    uri: ${OS_IAM_URI}
+mail:
+  iam:
+    server_path: ${IAMSERVERPATH}
+    link_path: ${IAMLINKPATH}
+
+oauth2:
+  web-client-configuration:
+    #keep in sync with UAA configuration
+    # 4.0 平台需要新建一个 方便梧桐客户端模式认证
+    client-id: ${OAUTH_CLIENTID}
+    secret: ${OAUTH_SECRET}
+    cookie-domain: ${OAUTH_COOKIEDOMAIN}
+    serverApiPrefix: ${OAUTH_SERVICE}
+
+cms:
+  thingmodel:
+    uri: thing-model/v1/thing/thing-classes
+  modelproperty:
+    uri: thing-model/v1/thing/thing-classes/{modelId}/properties
+  thing:
+    uri: thing-instance/v1/device/device-instances
+  thingstatus:
+    uri: thing-instance/v1/device/device-instances/status
+  rulealarm:
+    uri: alarm-event/v1/historian/alarms/query/all
+  codealarm:
+    uri: alarm-event/v1/self-alarms-batch-query
+  codealarmget:
+    uri: alarm-event/v1/self-alarms
+  eventtype:
+    uri: alarm-event/v1/events/event-types
+  addrule:
+    uri: alarm-rule/v1/alarm/draft/alarm-types
+  thingdraft:
+    uri: thing-model/v1/thing/draft/thing-classes/{modelId}
+  delrule:
+    uri: alarm-rule/v1/alarm/draft/alarm-types/{alarmTypeId}
+  codealarmbatch:
+    uri: alarm-event/v1/self-alarms-batch-query
+  propertystatus:
+    uri: realtime-manage/v1/realtime/models/%s/things/%s
+  email:
+    uri: message-push/v1/messages/email
+image:
+  preview_url: ${IAMGE_PREVIEW_URL}
+
+sms:
+  server-url: ${SMS_SERVER_URL}
+  app-key: ${SMS_APP_KEY}
+  app-secret: ${SMS_APP_SECRET}
+  nonce: ${SMS_NONCE}
+  templateid: ${SMS_TEMPLATEID}
+
+unipush:
+  app-id: ${UNI_APP_ID}
+  app-key: ${UNI_APP_KEY}
+  master-secret: ${UNI_MASTER_SECRET}
+  url: ${UNI_URL}
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/resources/config/application.yml b/nxgx-ifsm-base/src/main/resources/config/application.yml
new file mode 100644
index 0000000..3709fe9
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/config/application.yml
@@ -0,0 +1,155 @@
+spring:
+  #  jackson:
+  #    time-zone: Asia/Shanghai
+  #    serialization.indent_output: true
+  #    date-format: yyyy-MM-dd HH:mm:ss
+  ##    defaultPropertyInclusion: NON_EMPTY
+  #    deserialization:
+  #      fail_on_unknown_properties: false
+  #      ACCEPT_SINGLE_VALUE_AS_ARRAY: true
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.jdbc.Driver
+#    username: irootech
+#    password: H6D8EQLaFbw4
+#    url: jdbc:mysql://10.70.40.48:3306/jepaas?useUnicode=true&characterEncoding=utf8&useSSL=false
+    username: root
+    password: 123456
+    url: jdbc:mysql://127.0.0.1:3306/jepaas0830?useUnicode=true&characterEncoding=utf8&useSSL=false
+
+    hikari:
+      pool-name: DatebookHikariCP
+      connection-test-query: SELECT 1
+      maximum-pool-size: 30
+      connection-timeout: 30000
+      minimum-idle: 5
+      body-source-properties:
+        cachePrepStmts: true
+        prepStmtCacheSize: 250
+        prepStmtCacheSqlLimit: 2048
+        useServerPrepStmts: true
+  mybatis-plus:
+    global-config:
+      db-config:
+        id-type: auto
+        field-strategy: not_empty
+        table-underline: true
+        db-type: mysql
+        logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+        logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+    configuration:
+      #设置当查询结果值为null时，同样映射该查询字段给map。
+      call-setters-on-nulls: true
+      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    mapper-locations: classpath:/mapper/*.xml
+  redis:
+#    host: 10.70.25.113
+    host: 127.0.0.1
+    port: 6379
+#    password: GypassBDN^1024
+    password: 123456
+    timeout: 2000
+    database: 1
+    lettuce:
+      pool:
+        max-active: 22
+        min-idle: 2
+        max-wait: 2000
+  rabbitmq:
+    port: 5672
+    username: admin
+    password: admin
+    addresses: 10.70.40.54
+    listener: #消费
+      simple:
+        concurrency: 1 #最小消息监听线程数
+        max-concurrency: 1 #最大消息监听线程数
+        acknowledge-mode: auto
+  application:
+    name: nxgx-ifsm-base
+  arthas:
+    enabled: false
+  messages:
+    basename: i18n/messages/messages
+
+pagehelper:
+  helper-dialect: mysql
+  pageSizeZero: true
+  params: count=countSql
+  reasonable: true
+  support-methods-arguments: true
+logging:
+  level:
+    com.rootcloud: debug
+mybatis-plus:
+  configuration-properties:
+application:
+  source: CLOUD #应用程序部署端
+  tenant:
+    domain: http://tenant-base.bdn-yunbu-dev.rootcloudapp.com
+  jeboot:
+    wfHost: http://je-boot.uwb-dev.rootcloudapp.com
+    authUrl: http://winmaster.iot3-private-dev.rootcloudapp.com/je/rbac/user/getCurrentUserInfo
+os:
+  iam:
+    domain: https://openapi-pre.rootcloudapp.com/
+    clientid: 2022041578413b61ae181695
+    clientsecret: a7ed2906927805a0f6d4fa0019ea017f
+    loginuri: account-manage/v1/auth/login
+    superToken: eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiJyY19hZG1pbiIsInVzZXIiOnsiaWQiOiIxIiwidXNlcm5hbWUiOiJyY19hZG1pbiIsImRpc3BsYXlOYW1lIjoiYWRtaW4iLCJtZXRhZGF0YSI6eyJtaWdyYXRpb24iOnRydWV9fSwiaXNTeXN0ZW1BZG1pbiI6dHJ1ZSwiaXNTeXN0ZW1Pcmdhbml6YXRpb24iOnRydWUsImFjdGl2ZUNvbXBhbnkiOnsiaWQiOiItMSIsImFkbWlucyI6WyIxIl0sInN0YXR1cyI6IlJlZ3VsYXIiLCJpc09wZXJhdG9yIjp0cnVlLCJuYW1lIjoi5qC55LqR5bmz5Y-w566h55CG57uEIiwibWV0YWRhdGEiOnsibWlncmF0aW9uIjp0cnVlLCJsZWdhY3kiOnsiYWRtaW5faWQiOiIxIn19LCJwZXJtaXNzaW9uVmVyc2lvbiI6InYyIn0sImFjdGl2ZU9yZ2FuaXphdGlvbiI6eyJpZCI6Ii0xIiwiYWRtaW5zIjpbIjEiXSwic3RhdHVzIjoiUmVndWxhciIsImlzT3BlcmF0b3IiOnRydWUsIm5hbWUiOiLmoLnkupHlubPlj7DnrqHnkIbnu4QiLCJtZXRhZGF0YSI6eyJtaWdyYXRpb24iOnRydWUsImxlZ2FjeSI6eyJhZG1pbl9pZCI6IjEifX0sInBlcm1pc3Npb25WZXJzaW9uIjoidjIifSwidGVuYW50SWQiOiItMSIsInNjb3BlIjpbInN5c3RlbSJdLCJjbGllbnRfaWQiOiJ3ZWJfcGxhdGZvcm0iLCJjcmVhdGVkQXQiOiIyMDIyLTA0LTIzVDE0OjA4OjI3LjA0MVoiLCJhdXRob3JpdGllcyI6WyJST0xFX0FETUlOIiwiUk9MRV9VU0VSIl0sImlzTG9nQXMiOmZhbHNlLCJub25jZSI6IjkxNTgxZjViLTg3OWMtNGM0ZC1hNzk2LThmNDBjZTM3MDYxNiIsImFwcFZlcnNpb24iOiJ2MiIsImlhdCI6MTY1MDcyMjkwNywiZXhwIjoxOTY2MDgyOTA3fQ.bwujDYHrGI2jCqfDHcEhKZtANFPtAGZt8CurfYjHsCVXzCEFbh81mS7LY6JmB5OP4kCmUKnxIcUGed_wHazTNJjpPQde9K_s0lj4eRvJrtxliuv7PVe2BFoiwb1uOqWSx64F2CMJo109MRmmU5zL9Q4-BhpHr3GQOeT0BoDZiQU
+    uri: http://iothub-historian.rootcloud-platform-pre.rootcloudapp.com
+mail:
+  iam:
+    server_path: http://base-notification.bdn-base-alauda-qa.irootechapp.com/api/send-mail
+    link_path: https://iof.zhuzaocloud.com/index-4.html?id={0}&tenantId={1}
+
+oauth2:
+  web-client-configuration:
+    #keep in sync with UAA configuration
+    # 4.0 平台需要新建一个 方便梧桐客户端模式认证
+    client-id: 2022041578413b61ae181695
+    secret: a7ed2906927805a0f6d4fa0019ea017f
+    cookie-domain: rootcloudapp.com
+    serverApiPrefix: https://openapi-pre.rootcloudapp.com
+cms:
+  thingmodel:
+    uri: thing-model/v1/thing/thing-classes
+  modelproperty:
+    uri: thing-model/v1/thing/thing-classes/{modelId}/properties
+  thing:
+    uri: thing-instance/v1/device/device-instances
+  thingstatus:
+    uri: thing-instance/v1/device/device-instances/status
+  rulealarm:
+    uri: alarm-event/v1/historian/alarms/query/all
+  codealarm:
+    uri: alarm-event/v1/self-alarms-batch-query
+  codealarmget:
+    uri: alarm-event/v1/self-alarms
+  eventtype:
+    uri: alarm-event/v1/events/event-types
+  addrule:
+    uri: alarm-rule/v1/alarm/draft/alarm-types
+  thingdraft:
+    uri: thing-model/v1/thing/draft/thing-classes/{modelId}
+  delrule:
+    uri: alarm-rule/v1/alarm/draft/alarm-types/{alarmTypeId}
+  codealarmbatch:
+    uri: alarm-event/v1/self-alarms-batch-query
+  propertystatus:
+    uri: realtime-manage/v1/realtime/models/%s/things/%s
+  email:
+    uri: message-push/v1/messages/email
+
+sms:
+  server-url: https://api.netease.im/sms/sendtemplate.action
+  app-key: c07da90f85bae2f0b1df469326d6a40e
+  app-secret: c30a98a99d63
+  nonce: 4tgggergigwow323t23t
+  templateid: 19519763
+
+unipush:
+  app-id: U4wShph5E16OQcRBw9QYQ7
+  app-key: 7PjMXLUJ0a6rlNJU2TifF1
+  master-secret: tPvjXYksxhAVaihZZaRPZ
+  url: http://api.getui.com/apiex.htm
diff --git a/nxgx-ifsm-base/src/main/resources/config/bootstrap.yml b/nxgx-ifsm-base/src/main/resources/config/bootstrap.yml
new file mode 100644
index 0000000..7978998
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/config/bootstrap.yml
@@ -0,0 +1,30 @@
+server:
+  port: 8080
+spring:
+  arthas:
+    enabled: false
+  application:
+    name: nxgx-ifsm-base
+#  cloud:
+#    nacos:
+#      config:
+#        server-addr: nacos.bdn-oee-iot-dev.rootcloudapp.com:80
+#        file-extension: yaml
+#        namespace: df21baa3-d49b-4c45-b4e6-253eaf8d1bec2
+#        group: SPRUCE_LOCAL_GROUP
+  profiles:
+    active: local
+pagehelper:
+  helper-dialect: mysql
+  pageSizeZero: true
+  params: count=countSql
+  reasonable: true
+  support-methods-arguments: true
+logging:
+  level:
+    com.rootcloud: info
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+      #设置当查询结果值为null时，同样映射该查询字段给map。
+      call-setters-on-nulls: true
diff --git a/nxgx-ifsm-base/src/main/resources/i18n/messages.properties b/nxgx-ifsm-base/src/main/resources/i18n/messages.properties
new file mode 100644
index 0000000..408b5b8
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/i18n/messages.properties
@@ -0,0 +1,7 @@
+# Error page
+601=\u539F\u59CB\u5BC6\u7801\u9519\u8BEF!
+602=\u7528\u6237\u4E0D\u5B58\u5728!
+603=\u8BBE\u7F6E\u65B0\u5BC6\u7801\u5B57\u7B26\u957F\u5EA6\u4E0D\u7B26\u5408\u8981\u6C42!
+604=\u79DF\u6237\u4E0B\u7528\u6237\u4E0D\u5B58\u5728
+200=\u6210\u529F
+
diff --git a/nxgx-ifsm-base/src/main/resources/i18n/messages/messages_en_US.properties b/nxgx-ifsm-base/src/main/resources/i18n/messages/messages_en_US.properties
new file mode 100644
index 0000000..3f9ea1f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/i18n/messages/messages_en_US.properties
@@ -0,0 +1,68 @@
+40000= calling platform interface failed
+13507= alarm type input parameter must be passed
+13506= equipment does not exist
+50001= no attribute found
+15001= order does not exist
+15002= only orders to be signed in can be signed in
+16001= service plan does not exist
+16002= the started service plan cannot be deleted
+16003= it is currently in stop status and no need to stop again
+16004= data in progress is required to change to completed
+16005= the plan change has been started and does not need to be started again
+16006= no task calendar for non maintenance type
+17001= sign in position is beyond the range of punch in, please sign in again
+18001= to do library notification does not exist
+18002= the resolved notification cannot be processed again, please refresh
+14001= nonexistent historical condition equipment information
+
+13504= accessory does not exist
+13508= real time working condition data of equipment does not exist
+13502= after sales parts are delivered successfully
+13505= user does not exist
+13503= parts delivery failed
+13514= insufficient spare parts inventory
+13512= parts issue succeeded
+13501= parts warehousing succeeded
+13500= failed
+200= success
+409= Import error
+
+60000= Automatic release
+60001= Manual release
+60002= Ongoing
+60003= Fault alarm
+60004= No data temporarily
+60005= Spare parts life warning reminder
+60006= Life reminder
+60007= Spare part code
+60008= Remaining duration of service life
+60009= day
+60010= hour
+60011= Real time working condition
+60012= Equipment monitoring
+60013= System messages
+60014= Maintenance reminder
+60015= dXNlcm5hbWUgb3IgcGFzc3dvcmQgZXJyb3I=
+60016= remaining duration of service life
+60017= installation tag number
+
+60018= Off-line
+60019= Standby
+60020= Printing
+
+60021= Abnormal check-in
+60022= Get current location exception
+60023= VXNlcm5hbWUgb3IgcGFzc3dvcmQgZXJyb3IgZXhjZWVkcyBbNV0sIHBsZWFzZSB0cnkgYWdhaW4gaW4gMzAgbWludXRlcyE=
+
+60024= Line,
+60025= Import data cannot be empty
+60026= The maximum number of rows that can be imported more than once is 
+60027= Invalid spare part code
+60028= Equipment code cannot be empty or does not conform to the correct format
+60029= Installation tag number cannot be empty or does not conform to the correct format
+60030= SN number cannot be empty or does not conform to the correct format
+60031= Invalid spare part codeInstallation date cannot be empty or does not conform to the correct format
+60032= Replacement date cannot be blank or does not conform to the correct format
+60033= Life alert value cannot be empty or does not conform to the correct format
+60034= Spare part status cannot be empty or does not conform to the correct format
+60035= Spare part code cannot be empty or does not conform to the correct format
diff --git a/nxgx-ifsm-base/src/main/resources/i18n/messages/messages_zh_CN.properties b/nxgx-ifsm-base/src/main/resources/i18n/messages/messages_zh_CN.properties
new file mode 100644
index 0000000..86fd130
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/i18n/messages/messages_zh_CN.properties
@@ -0,0 +1,67 @@
+40000=\u8C03\u7528\u5E73\u53F0\u63A5\u53E3\u5931\u8D25
+13507=\u62A5\u8B66\u7C7B\u578B\u5165\u53C2\u5FC5\u4F20
+13506=\u8BBE\u5907\u4E0D\u5B58\u5728
+50001=\u672a\u67e5\u8be2\u5230\u5c5e\u6027
+15001=\u8ba2\u5355\u4e0d\u5b58\u5728
+15002=\u53ea\u6709\u5f85\u7b7e\u5230\u7684\u8ba2\u5355\u624d\u80fd\u7b7e\u5230
+16001=\u670d\u52a1\u8ba1\u5212\u4e0d\u5b58\u5728
+16002=\u5df2\u7ecf\u542f\u52a8\u7684\u670d\u52a1\u8ba1\u5212\u65e0\u6cd5\u5220\u9664
+16003=\u5f53\u524d\u662f\u505c\u6b62\u72b6\u6001\u65e0\u9700\u518d\u6b21\u505c\u6b62
+16004=\u9700\u8981\u8fdb\u884c\u4e2d\u7684\u6570\u636e\u624d\u80fd\u6539\u6210\u5df2\u5b8c\u6210
+16005=\u6539\u8ba1\u5212\u5df2\u7ecf\u542f\u52a8\u65e0\u9700\u518d\u6b21\u542f\u52a8
+16006=\u975e\u4fdd\u517b\u7c7b\u578b\u65e0\u4efb\u52a1\u65e5\u5386
+17001=\u7b7e\u5230\u4f4d\u7f6e\u8d85\u51fa\u4e86\u6253\u5361\u7684\u8303\u56f4\u8bf7\u91cd\u65b0\u7b7e\u5230
+18001=\u5f85\u529e\u5e93\u901a\u77e5\u4e0d\u5b58\u5728
+18002=\u5df2\u7ecf\u89e3\u51b3\u7684\u901a\u77e5\u4e0d\u80fd\u518d\u6b21\u5904\u7406\u8bf7\u5237\u65b0
+
+14001=\u4e0d\u5b58\u5728\u7684\u5386\u53f2\u5de5\u51b5\u8bbe\u5907\u4fe1\u606f
+13504=\u914d\u4ef6\u4e0d\u5b58\u5728
+13508=\u8bbe\u5907\u5b9e\u65f6\u5de5\u51b5\u6570\u636e\u4e0d\u5b58\u5728
+13502=\u552e\u540e\u914d\u4ef6\u51fa\u5e93\u6210\u529f
+13505=\u7528\u6237\u4e0d\u5b58\u5728
+13503=\u914d\u4ef6\u51fa\u5e93\u5931\u8d25
+13514=\u914d\u4ef6\u5e93\u5b58\u4e0d\u8db3
+13512=\u914d\u4ef6\u51fa\u5e93\u6210\u529f
+13501=\u914d\u4ef6\u5165\u5e93\u6210\u529f
+13500=\u5931\u8d25
+200=\u6210\u529f
+409= \u5bfc\u5165\u9519\u8bef
+
+60000= \u81ea\u52a8\u89e3\u9664
+60001= \u624b\u52a8\u89e3\u9664
+60002= \u6301\u7eed\u4e2d
+60003= \u6545\u969c\u62a5\u8b66
+60004= \u6682\u65e0\u6570\u636e
+60005= \u5907\u4ef6\u5bff\u547d\u9884\u8b66\u63d0\u9192
+60006= \u5bff\u547d\u63d0\u9192
+60007= \u5907\u4ef6\u7f16\u7801
+60008= \u5bff\u547d\u5269\u4f59\u65f6\u957f
+60009= \u5929
+60010= \u5c0f\u65f6
+60011= \u5b9e\u65f6\u5de5\u51b5
+60012= \u8bbe\u5907\u76d1\u63a7
+60013= \u7cfb\u7edf\u6d88\u606f
+60014= \u4fdd\u517b\u63d0\u9192
+60015= 55m75b2V5ZCN5oiW6ICF5a+G56CB6ZSZ6K+v
+60016= \u5bff\u547d\u5269\u4f59\u65f6\u957f
+60017= \u5b89\u88c5\u4f4d\u53f7
+
+60018= \u79bb\u7ebf
+60019= \u5f85\u673a
+60020= \u6253\u5370\u4e2d
+60021= \u7b7e\u5230\u5f02\u5e38
+60022= \u83b7\u53d6\u5f53\u524d\u4f4d\u7f6e\u5f02\u5e38
+60023= 6LSm5Y+35oiW6ICF5a+G56CB6ZSZ6K+v6LaF6L+HWzVd5qyhLOivtzMw5YiG6ZKf5ZCO5YaN6K+VIQ==
+
+60024= \u884c\uff0c
+60025= \u5bfc\u5165\u6570\u636e\u4e0d\u80fd\u4e3a\u7a7a
+60026= \u5bfc\u5165\u6570\u636e\u884c\u6570\u8d85\u8fc7\u4e00\u6b21\u53ef\u5bfc\u5165\u6700\u5927\u6570
+60027= \u5907\u4ef6\u7f16\u7801\u65e0\u6548
+60028= \u8bbe\u5907\u7f16\u7801\u4e0d\u80fd\u4e3a\u7a7a\u6216\u4e0d\u7b26\u5408\u6b63\u786e\u683c\u5f0f
+60029= \u5b89\u88c5\u4f4d\u53f7\u4e0d\u80fd\u4e3a\u7a7a\u6216\u4e0d\u7b26\u5408\u6b63\u786e\u683c\u5f0f
+60030= SN\u53f7\u4e0d\u80fd\u4e3a\u7a7a\u6216\u4e0d\u7b26\u5408\u6b63\u786e\u683c\u5f0f
+60031= \u5b89\u88c5\u65e5\u671f\u4e0d\u80fd\u4e3a\u7a7a\u6216\u4e0d\u7b26\u5408\u6b63\u786e\u683c\u5f0f
+60032= \u66f4\u6362\u65e5\u671f\u4e0d\u80fd\u4e3a\u7a7a\u6216\u4e0d\u7b26\u5408\u6b63\u786e\u683c\u5f0f
+60033= \u5bff\u547d\u9884\u8b66\u503c\u4e0d\u80fd\u4e3a\u7a7a\u6216\u4e0d\u7b26\u5408\u6b63\u786e\u683c\u5f0f
+60034= \u5907\u4ef6\u72b6\u6001\u4e0d\u80fd\u4e3a\u7a7a\u6216\u4e0d\u7b26\u5408\u6b63\u786e\u683c\u5f0f
+60035= \u5907\u4ef6\u7f16\u7801\u4e0d\u80fd\u4e3a\u7a7a\u6216\u4e0d\u7b26\u5408\u6b63\u786e\u683c\u5f0f
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/resources/i18n/messages_de.properties b/nxgx-ifsm-base/src/main/resources/i18n/messages_de.properties
new file mode 100644
index 0000000..6e499eb
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/i18n/messages_de.properties
@@ -0,0 +1,2 @@
+10000=Parameterfehler
+
diff --git a/nxgx-ifsm-base/src/main/resources/i18n/messages_en.properties b/nxgx-ifsm-base/src/main/resources/i18n/messages_en.properties
new file mode 100644
index 0000000..bdb7124
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/i18n/messages_en.properties
@@ -0,0 +1,6 @@
+# Error page
+601=Original password error.
+602=user does not exist.
+603=Setting the new password character length does not meet the requirements.
+200=Success
+
diff --git a/nxgx-ifsm-base/src/main/resources/i18n/messages_es.properties b/nxgx-ifsm-base/src/main/resources/i18n/messages_es.properties
new file mode 100644
index 0000000..b86d907
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/i18n/messages_es.properties
@@ -0,0 +1 @@
+10000=Error de parámetro
diff --git a/nxgx-ifsm-base/src/main/resources/i18n/messages_fr.properties b/nxgx-ifsm-base/src/main/resources/i18n/messages_fr.properties
new file mode 100644
index 0000000..449ed11
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/i18n/messages_fr.properties
@@ -0,0 +1 @@
+10000=Erreur de paramètre
diff --git a/nxgx-ifsm-base/src/main/resources/i18n/messages_zh_cn.properties b/nxgx-ifsm-base/src/main/resources/i18n/messages_zh_cn.properties
new file mode 100644
index 0000000..ef4cca5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/i18n/messages_zh_cn.properties
@@ -0,0 +1,5 @@
+# Error page
+error.title=Your request cannot be processed
+error.subtitle=Sorry, an error has occurred.
+error.status=Status:
+error.message=Message:
diff --git a/nxgx-ifsm-base/src/main/resources/i18n/messages_zhhk.properties b/nxgx-ifsm-base/src/main/resources/i18n/messages_zhhk.properties
new file mode 100644
index 0000000..a117d96
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/i18n/messages_zhhk.properties
@@ -0,0 +1,5 @@
+# Error page
+601=原始密碼錯誤!
+602=用戶不存在!
+603=設定新密碼字元長度不符合要求!
+200=成功
diff --git a/nxgx-ifsm-base/src/main/resources/logback-spring.xml b/nxgx-ifsm-base/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..34e8455
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/logback-spring.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration scan="true">
+    <include resource="logfile-config/base.xml"/>
+
+<!-- The FILE and ASYNC appenders are here as examples for a production configuration -->
+<!--
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>logFile.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>90</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <charset>utf-8</charset>
+            <Pattern>%d %-5level [%thread] %logger{0}: %msg%n</Pattern>
+        </encoder>
+    </appender>
+
+    <appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>512</queueSize>
+        <appender-ref ref="FILE"/>
+    </appender>
+-->
+
+    <logger name="javax.activation" level="WARN"/>
+    <logger name="javax.mail" level="WARN"/>
+    <logger name="javax.xml.bind" level="WARN"/>
+    <logger name="ch.qos.logback" level="WARN"/>
+    <logger name="com.codahale.metrics" level="WARN"/>
+    <logger name="com.netflix" level="WARN"/>
+    <logger name="com.netflix.discovery" level="INFO"/>
+    <logger name="com.ryantenney" level="WARN"/>
+    <logger name="com.sun" level="WARN"/>
+    <logger name="com.zaxxer" level="WARN"/>
+    <logger name="io.undertow" level="WARN"/>
+    <logger name="io.undertow.websockets.jsr" level="ERROR"/>
+    <logger name="org.apache" level="WARN"/>
+    <logger name="org.apache.catalina.startup.DigesterFactory" level="OFF"/>
+    <logger name="org.bson" level="WARN"/>
+    <logger name="org.hibernate.validator" level="WARN"/>
+    <logger name="org.hibernate" level="WARN"/>
+    <logger name="org.hibernate.ejb.HibernatePersistence" level="OFF"/>
+    <logger name="org.springframework" level="WARN"/>
+    <logger name="org.springframework.web" level="WARN"/>
+    <logger name="org.springframework.security" level="WARN"/>
+    <logger name="org.springframework.cache" level="WARN"/>
+    <logger name="org.thymeleaf" level="WARN"/>
+    <logger name="org.xnio" level="WARN"/>
+    <logger name="springfox" level="WARN"/>
+    <logger name="sun.rmi" level="WARN"/>
+    <logger name="liquibase" level="WARN"/>
+    <logger name="LiquibaseSchemaResolver" level="INFO"/>
+    <logger name="sun.net.www" level="INFO"/>
+    <logger name="sun.rmi.transport" level="WARN"/>
+
+    <!-- https://logback.qos.ch/manual/configuration.html#shutdownHook and https://jira.qos.ch/browse/LOGBACK-1090 -->
+    <shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
+
+    <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+        <resetJUL>true</resetJUL>
+    </contextListener>
+
+</configuration>
diff --git a/nxgx-ifsm-base/src/main/resources/logfile-config/base.xml b/nxgx-ifsm-base/src/main/resources/logfile-config/base.xml
new file mode 100644
index 0000000..0f4e050
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/logfile-config/base.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Base logback configuration provided for compatibility with Spring Boot 1.1
+-->
+
+<included>
+	<include resource="logfile-config/defaults.xml" />
+	<property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/spring.log}"/>
+	<include resource="logfile-config/console-appender.xml" />
+	<include resource="logfile-config/file-appender.xml" />
+	<root level="INFO">
+		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="FILE" />
+	</root>
+</included>
diff --git a/nxgx-ifsm-base/src/main/resources/logfile-config/console-appender.xml b/nxgx-ifsm-base/src/main/resources/logfile-config/console-appender.xml
new file mode 100644
index 0000000..58715a8
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/logfile-config/console-appender.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Console appender logback configuration provided for import, equivalent to the programmatic
+initialization performed by Boot
+-->
+
+<included>
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %X{requestId} %logger{50} - %msg %n</pattern>
+			<charset>utf8</charset>
+		</encoder>
+	</appender>
+
+<!--    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">-->
+<!--        <encoder charset="UTF-8">-->
+<!--            <pattern>{ "T": "%seconds", "B": "rootcloud-saas", "S": "saas-aba-base", "host": "0.0.0.0", "requestId": "%X{requestId}","tenantId": "%X{tenantId}","appCode": "%X{appCode}", "file": "%logger", "L": "%level", "line": "%L", "short_message": "%replace(%replace(%msg){'\n','\\n'}){'"','\''}", "_stack_trace": "%replace(%replace(%exception){'\n','\\n'}){'"','\''}", "_thread": "%thread" }%nopex%n</pattern>-->
+<!--        </encoder>-->
+<!--    </appender>-->
+</included>
diff --git a/nxgx-ifsm-base/src/main/resources/logfile-config/defaults.xml b/nxgx-ifsm-base/src/main/resources/logfile-config/defaults.xml
new file mode 100644
index 0000000..de56e56
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/logfile-config/defaults.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Default logback configuration provided for import, equivalent to the programmatic
+initialization performed by Boot
+-->
+
+<included>
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+	<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+	<property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }) {magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+	<property name="FILE_LOG_PATTERN" value="${FILE_LOG_PATTERN:-%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+
+	<logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
+	<logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
+	<logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
+	<logger name="org.apache.sshd.common.util.SecurityUtils" level="WARN"/>
+	<logger name="org.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
+	<logger name="org.crsh.plugin" level="WARN"/>
+	<logger name="org.crsh.ssh" level="WARN"/>
+	<logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
+	<logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
+	<logger name="org.springframework.boot.actuate.autoconfigure.CrshAutoConfiguration" level="WARN"/>
+
+</included>
diff --git a/nxgx-ifsm-base/src/main/resources/logfile-config/file-appender.xml b/nxgx-ifsm-base/src/main/resources/logfile-config/file-appender.xml
new file mode 100644
index 0000000..5f7a9c9
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/logfile-config/file-appender.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+File appender logback configuration provided for import, equivalent to the programmatic
+initialization performed by Boot
+-->
+
+<included>
+	<appender name="FILE"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %X{requestId} %logger{50} - %msg %n</pattern>
+		</encoder>
+		<file>${LOG_FILE}</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<fileNamePattern>${LOG_FILE}.%i</fileNamePattern>
+		</rollingPolicy>
+		<triggeringPolicy
+			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<MaxFileSize>10MB</MaxFileSize>
+		</triggeringPolicy>
+	</appender>
+</included>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/CommonMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/CommonMapper.xml
new file mode 100644
index 0000000..def79e8
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/CommonMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rootcloud.domain.mapper.CommonMapper">
+
+    <select id="getTableColumn" resultType="int">
+        select count(1) from information_schema.columns where table_name = #{tableName} and column_name = #{column}
+    </select>
+
+    <!-- 通过租户id,查询4.0 clientid -->
+    <select id="getRootClient" resultType="map">
+        select CLIENT_ID,CLIENT_SECRET from NX_ROOT_CLIENT where sy_zhid =#{syZhid}
+    </select>
+
+    <select id="getRootClientList" resultType="map">
+        select CLIENT_ID,CLIENT_SECRET from NX_ROOT_CLIENT
+    </select>
+
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/ConfigDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/ConfigDao.xml
new file mode 100644
index 0000000..23fde92
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/ConfigDao.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.dao.ConfigDao">
+	<insert id="add" parameterType="com.rootcloud.domain.vo.ConfigVO">
+		insert into config(code, name, `value`, `desc`) values(#{code}, #{name}, #{value}, #{desc})
+	</insert>
+
+	<delete id="delete" parameterType="string">
+		delete from config where code = #{code}
+	</delete>
+
+	<select id="find" parameterType="string" resultType="com.rootcloud.domain.vo.ConfigVO">
+		select code, name, `value`, `desc` from config where code=#{code}
+	</select>
+
+    <select id="list" parameterType="string" resultType="com.rootcloud.domain.vo.ConfigVO">
+        select code, name, `value`, `desc` from config
+    </select>
+
+	<update id="update" parameterType="com.rootcloud.domain.vo.ConfigVO">
+		update config
+		set `value` = #{value}
+		where code = #{code}
+	</update>
+
+	<select id="listTable_zhid" parameterType="string" resultType="com.rootcloud.domain.vo.ConfigVO">
+		select table_name name,"ZHID" value from information_schema.columns where table_schema='jepaas' and column_name="ZHID";
+	</select>
+
+	<select id="listTable_syzhid" parameterType="string" resultType="com.rootcloud.domain.vo.ConfigVO">
+		select table_name name,"SY_ZHID" value from information_schema.columns where table_schema='jepaas' and column_name="SY_ZHID";
+	</select>
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/CustomerDAO.xml b/nxgx-ifsm-base/src/main/resources/mapper/CustomerDAO.xml
new file mode 100644
index 0000000..632b59a
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/CustomerDAO.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.dao.CustomerDao">
+
+	<!-- 获取所有客户列表-->
+	<select id="getAllCustomer" resultType="com.rootcloud.domain.vo.CustomerVO">
+		select NX_KHGL_ID as customerCode,  KHGL_KHMC as customerName from nx_khgl
+	</select>
+
+<!--	用户表je_core_enduser 的字段BACKUSERCODE去匹配客户表nx_khgl 的KHGL_XSJLDH，查出所属的客户列表-->
+	<!-- 获取指定用户所属的客户列表接口-->
+	<select id="getCustomerListByUserId" resultType="com.rootcloud.domain.vo.CustomerVO">
+		select
+		NX_KHGL_ID as customerCode,  KHGL_KHMC as customerName
+		from nx_khgl where 1=1
+		<if test="userId !=null and userId !='' ">
+			and KHGL_XSJLDH = #{userId}
+		</if>
+	</select>
+
+
+	<!-- 返回用户已分配的注册设备编码 -->
+	<select id="getRegisterDeviceByUser" resultType="java.lang.String">
+		SELECT distinct d.sblb_sbbm as deviceCode FROM `nx_jcxx_sblb` d where d.sblb_khid in (
+		SELECT c.nx_khgl_id FROM `nx_khgl` c where c.nx_khgl_id in
+		<foreach collection="officeIds" index="index" item="item" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+		) and  d.sblb_sbbm is not null and d.sblb_sbbm != ''
+	</select>
+
+
+<!--	<select id="getCustomerListByUserId" resultType="com.rootcloud.domain.vo.CustomerVO">-->
+<!--		select-->
+<!--		t1.NX_KHGL_ID as customerCode,  t2.KHGL_KHMC as customerName-->
+<!--		from nx_khgl t1 inner join je_core_enduser t2 where 1=1-->
+<!--		and t2.BACKUSERCODE = t1.KHGL_XSJLDH-->
+<!--	    and t2.BACKUSERCODE =-->
+
+<!--		<if test="createCustomerCode !=null and createCustomerCode !='' ">-->
+<!--			and KHGL_XSJLDH = #{createCustomerCode}-->
+<!--		</if>-->
+<!--	</select>-->
+
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/DemoMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/DemoMapper.xml
new file mode 100644
index 0000000..a2c4ac3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/DemoMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rootcloud.domain.mapper.DemoMapper">
+
+
+    <select id="getDemo" resultType="com.rootcloud.domain.entity.DemoEntity">
+        SELECT * FROM table_demo
+    </select>
+
+    <insert id="insertData1">
+        INSERT INTO `s_dict`(`id`, `dict_code`, `dict_name`, `dict_sort`, `dict_type_id`, `tenant_id`, `delete_flag`, `create_datetime`, `update_datetime`) VALUES (25, 'APP_OPEN_REG', '云杉应用平台隐私保护指引\r\n发布日期：2021年12月13日\r\n生效日期：2021年12月13日\r\n为了给您提供更精准、更个性化的服务，同时保障您的相关权利，依照《中华人民共和国网络安全法》、《中华人民共和国个人信息保护法》等相关法律法规制定《云杉应用平台隐私保护指引》（下称“本隐私指引”），本隐私指引将向您说明云杉应用平台会如何收集、使用和存储您的个人信息及您享有何种权利，请您在使用云杉应用平台之前，仔细阅读、了解并同意本隐私指引和相关补充文件。\r\n本隐私指引适用于云杉应用平台产品自身的功能及服务，不适用于任何其他第三方提供的产品或服务（以下统称“第三方服务”），您在选择使用第三方服务前应充分了解第三方服务的产品功能及隐私保护政策。\r\n本隐私指引将帮助您了解以下内容：\r\n1. 我们收集哪些类型的信息\r\n2. 我们如何存储这些信息\r\n3. 我们如何保护这些信息\r\n4. 我们如何使用这些信息\r\n5. 信息的分享和对外提供\r\n6. 您如何访问和管理个人信息\r\n7. 未成年人保护\r\n8. 本隐私指引的变更\r\n9. 其它\r\n10. 联系我们\r\n \r\n相关定义：\r\n云杉应用平台：云杉应用平台是由树根互联公司提供的一款应用集成和搭建平台。云杉应用平台及服务，包括云杉应用平台官网（https://yunshan.irootech.com）及云杉在线APP（包括iOS、Android等多个应用版本）等。\r\n云杉应用平台运营主体：指提供云杉应用平台产品和相关服务的法律主体，为树根互联股份有限公司及关联公司，本指引中简称“树根互联”或“我们”。\r\n企业用户：指注册、登录、使用根云平台产品及服务并获得管理权限的个人或组织，包括但不限于法人、政府机构、其他组织、合伙或个体工商户等（下称“企业用户”）；企业用户可以通过根云平台控制台，邀请个人用户加入其组织成为其最终用户。\r\n个人用户/最终用户：指被企业用户邀请加入组织，使用根云平台产品和服务的个人用户，以下称“你”或“最终用户”。当企业用户邀请你作为最终用户加入其组织，你会收到邀请并可以选择是否加入该企业用户。\r\n个人信息：指以电子或者其他方式记录的与已识别或者可识别的自然人有关的各种信息，不包括匿名化处理后的信息。\r\n敏感个人信息：指一旦泄露或者非法使用,可能导致个人受到 歧视或者人身、财产安全受到严重危害的个人信息,包括种族、 民族、宗教信仰、个人生物特征、医疗健康、金融账户、个人行 踪等信息。\r\n匿名化处理：指通过对个人信息的技术处理，使得个人信息主体无法被识别，且处理后的信息不能被复原的过程。\r\n1. 我们收集哪些类型的信息\r\n1.1 为了向您和企业用户提供服务、保障服务的正常运行以及保障您的帐号安全，我们将需要向您索取相关的权限；其中的敏感权限例如摄像头、麦克风等均不会默认开启，只有在您明确同意后才会向我们授权。具体说明如下：\r\n1.1.1 当您使用语音通话或视频通话功能时，我们会在您同意授予麦克风或/和相机的系统权限后，为您提供语音通话或视频通话的服务。上述权限为使用相关功能的必要权限，拒绝授予权限仅会使您无法使用语音通话或视频通话功能，但不影响您正常使用云杉应用平台的其他功能。\r\n1.1.2 当您使用云杉应用平台的日程功能时，我们会在您同意授予日程的系统权限后，在您的企业微信中展示您的日程信息，向您提供日程信息的查阅、修改等服务。上述权限为使用相关功能的必要权限，拒绝授予权限仅会使您无法使用日程功能，但不影响您正常使用云杉应用平台的其他功能。\r\n需要特别说明的是，获得敏感权限是我们收集特定信息的必要而非充分条件。我们获得具体某一项敏感权限并不代表我们必然会收集您的相关信息；即使我们已经获得敏感权限，也仅在必要时、根据本指引来收集您的相关信息。\r\n1.2 为了向您和企业用户提供服务、保障服务的正常运行、改进和优化我们的服务以及保障帐号安全，云杉应用平台会按照如下方式收集您在注册、使用服务时主动提供、授权提供或因为使用服务而产生的信息：\r\n1.2.1 帐号注册信息：当您首次注册登录云杉应用平台，您需要提供您的手机号或提供您的电子邮箱账号，上述信息为您使用云杉应用平台所必需，若您不提供这类信息，您将无法正常使用我们的服务。\r\n1.2.2 当您使用云杉应用平台服务时，为向您及企业用户提供云杉应用平台产品及服务，维护我们服务的正常运行，改进及优化我们的服务体验以及保障您的帐号安全，我们会收集您下述信息：\r\n1.2.2.1 设备信息：根据您在安装及使用云杉应用平台服务过程中的设备型号及授予的权限，我们会收集使用企业微信服务的设备相关信息，包括设备型号、操作系统、唯一设备标识符（指由设备制造商编入到设备中的一串字符，可用于以独有方式标识相应设备，如手机的IMEI号、Mac地址、AndroidID等）、设备所在位置信息（如登录IP地址、GPS位置以及能够提供相关信息的Wi-Fi接入点等相关信息）、云杉应用平台软件版本号以及设备加速器（如重力感应设备）等。\r\n1.2.2.2 日志信息：当您使用云杉应用平台服务时，我们会收集您对服务使用的日志信息，包括接入网络的方式、类型和状态、网络质量数据、操作日志、服务日志信息等。 \r\n2. 我们如何存储这些信息\r\n2.1 信息存储的地点\r\n我们会按照法律法规规定，将在中国境内收集和产生的个人信息存储于中国境内。\r\n2.2 信息存储的期限\r\n一般而言，我们仅在为实现目的所必需的时间内保留您的个人信息，例如：\r\n手机号码及电子邮箱：无论您是通过手机号码注册还是电子邮箱注册，若您需要使用云杉应用平台服务，我们需要一直保存您的手机号码（包括初始注册手机号码、绑定的手机号码等），以保证您正常使用该服务。当您注销云杉应用平台帐号后，我们将删除相应的信息。\r\n当我们的产品或服务发生停止运营的情形时，我们将以推送通知、公告等形式通知您，在合理的期限内删除您的个人信息或进行匿名化处理，并立即停止收集个人信息的活动，以及关闭第三方应用服务接口，避免第三方服务收集及继续使用个人信息。\r\n3. 我们如何保护这些信息\r\n3.1 我们努力为用户的信息安全提供保障，以防止信息的丢失、不当使用、未经授权访问或披露。\r\n3.2 我们将在合理的安全水平内使用各种安全保护措施以保障信息的安全。例如，我们会使用加密技术（例如，SSL /TLS）、匿名化处理等手段来保护您的个人信息。\r\n3.3 我们建立专门的管理制度、流程和组织以保障信息的安全。例如，我们严格限制访问信息的人员范围，要求他们遵守保密义务，并进行审计。\r\n3.4 若发生个人信息泄露等安全事件，我们会依法启动应急预案，阻止安全事件扩大，并以推送通知、公告等形式告知您安全事件的情况、事件可能对您的影响以及我们将采取的补救措施。我们还将按照法律法规和监管部门要求，上报个人信息安全事件的处置情况。\r\n我们会尽力保护您的个人信息。我们也请您理解，任何安全措施都无法做到无懈可击。\r\n4. 我们如何使用这些信息\r\n我们严格遵守法律法规的规定及与用户的约定，将收集的信息按照本隐私保护指引的规定用于以下用途。\r\n4.1 我们在您使用云杉应用平台服务过程中收集相关的信息是为了向云杉应用平台用户（包括企业用户和最终用户）打造和提供更好的服务。我们会将收集的信息用于以下用途：\r\n4.1.1 提供、维护及开发云杉应用平台服务：我们会利用收集的信息来提供和优化改进云杉应用平台服务，例如，跟踪服务中断情况或排查云杉应用平台用户向我们报告的问题等。\r\n4.1.2 安全保障：为保障您以及所有云杉应用平台用户的安全，我们会利用相关信息协助提升云杉应用平台服务的安全性和可靠性，包括检测、防范和应对可能危害云杉应用平台、我们的用户或公众的欺诈行为、滥用行为、非法行为、安全风险和技术问题等。\r\n4.1.3 为了遵从相关法律法规、部门规章、政府指令的相关要求。\r\n目前，我们不会将您的个人信息用于个性化推荐或广告用途。如我们使用您的个人信息，超出了与收集时所声称的目的及具有直接或合理关联的范围，我们将在使用您的个人信息前，通过页面提示、交互流程、网站公告等方式另行向您告知并征得您的明示同意。\r\n4.2 根据相关法律法规以及国家标准，在以下情况下我们可能会收集、使用您的个人信息而无需征求您的授权同意：\r\n1）与个人信息控制者履行法律法规规定的义务相关的；\r\n2）与国家安全、国防安全直接相关的；\r\n3）与公共安全、公共卫生、重大公共利益直接相关的；\r\n4）与刑事侦查、起诉、审判和判决执行等直接相关的；\r\n5）出于维护个人信息主体或其他个人的生命、财产等重大合法权益但又很难得到本人授权同意的；\r\n6）所涉及的个人信息是个人信息主体自行向社会公众公开的；\r\n7）根据个人信息主体要求签订和履行合同所必需的；\r\n8）从合法公开披露的信息中收集个人信息的，如合法的新闻报道、政府信息公开等渠道；\r\n9）维护所提供产品或服务的安全稳定运行所必需的，如发现、处置产品或服务的故障；\r\n10）个人信息控制者为新闻单位，且其开展合法的新闻报道所必需的；\r\n11）个人信息控制者为学术研究机构，出于公共利益开展统计或学术研究所必要， 且其对外提供学术研究或描述的结果时，对结果中所包含的个人信息进行去标识化处理的。\r\n5. 信息的分享及对外提供\r\n我们不会共享或转让您的个人信息至第三方，但以下情况除外：\r\n5.1 获取您的明确同意：经您事先同意，我们可能与第三方分享您的个人信息；\r\n5.2 为实现外部处理的目的，我们可能会与关联公司或其他第三方合作伙伴（第三方服务供应商、承包商、代理、应用开发者等）分享您的个人信息，让他们按照我们的说明、隐私政策以及其他相关的保密和安全措施来为我们处理上述信息，并用于向您提供我们的服务，实现“我们如何使用信息”部分所述目的。如我们与上述关联公司或第三方分享您的信息，我们将会采用加密、匿名化处理等手段保障您的信息安全。\r\n5.3 我们不会对外公开披露所收集的个人信息。如必须公开披露时，我们会向您告知此次公开披露的目的、披露信息的类型及可能涉及的敏感信息，并遵从相关法律法规的要求进行披露。需要特别说明的是，对最终用户相关信息如何在其加入的企业用户工作平台中对外披露或共享，由企业用户决定并管理，如果您对此有任何疑问或意见，您理解并同意联系您所在企业用户或企业用户管理员处理。\r\n5.4 我们可能基于法律要求或相关部门的执法要求披露您的个人信息。\r\n6. 您如何访问及管理个人信息\r\n在您使用云杉应用平台期间，为了您可以更加便捷地访问、更正、删除您的个人信息，同时保障您撤回同意、退出企业（注销帐号）的权利，我们在产品设计中为您提供了相应的操作设置，您可以参考下面的指引进行操作。\r\n6.1 访问个人信息\r\n6.1.1 访问头像、姓名、性别、昵称、对外信息显示、所属企业、手机号码、电子邮箱地址、隶属部门等基本信息：\r\n1) 进入云杉应用平台后，点击“个人中心”（WEB）或者“我”（APP）；\r\n2) 访问个人信息。\r\n6.2 更正个人信息\r\n访问头像、姓名、性别、昵称、对外信息显示、所属企业、手机号码、电子邮箱地址、隶属部门等基本信息：\r\n1) 进入云杉应用平台后，点击“个人中心”（WEB）或者“我”（APP）；\r\n2) 更改信息。\r\n7. 未成年人保护\r\n我们非常重视对未成年人个人信息的保护，根据相关法律法规的规定，若您是14周岁以下的未成年人，需要取得您的家长或法定监护人对本隐私保护指引的书面同意。若您是未成年人的监护人，当您对您所监护的未成年人的个人信息有相关疑问时，请通过第10节中的联系方式与我们联系。\r\n8. 本隐私指引的变更\r\n我们可能会适时对本隐私指引进行修订。当指引的条款发生变更时，我们会通过官网公告（https://yunshan.irootech.com）、推送通知形式向您展示变更后的指引。\r\n当本隐私指引的条款发生重大变更时，我们将会通过官网公告（https://yunshan.irootech.com）、推送通知或者更为显著的弹窗方式向您告知。\r\n本条所指的重大变更包括但不限于：\r\n1）我们的服务模式发生重大变化，如处理个人信息的目的、处理的个人信息类型、个人信息的使用方式等；\r\n2）我们在所有权结构、组织架构等方面发生重大变化，如业务调整、破产并购等引起的所有者变更等；\r\n3）个人信息共享、转让或公开披露的主要对象发生变化；\r\n4）您参与个人信息处理方面的权利及其行使方式发生重大变化；\r\n5）我们负责处理个人信息安全的责任部门、联络方式及投诉渠道发生变化时；\r\n6）个人信息安全影响评估报告表明存在高风险时。\r\n9. 其他\r\n1、如您对本隐私权条款有任何疑问或您提供的上述个人信息受到了侵扰，您可以通过服务平台网站首页下方的联系方式与我们联系，我们将在接到投诉后尽快给予您答复。\r\n2、在本协议发布前若您已向服务平台或树根互联及其关联方提供了个人信息，同意本隐私政策时即视为您对本隐私政策下相关授权的追认。 \r\n10. 联系我们\r\n1、如您对本隐私政策或您个人信息的相关事宜有任何问题、意见或建议，请通过访问服务平台官方网站、客户端在线客服或拨打服务平台服务热线400-887-8318与我们联系。 2、一般情况下，我们将在十五个工作日内回复。如果您对我们的回复不满意，特别是我们的个人信息处理行为损害了您的合法权益，您还可以向网信、电信、公安及工商等监管部门进行投诉或举报。\r\n我们将尽快审核所涉问题，并在验证您的用户身份后的十五天内予以回复。\r\n', 1, 7, '-1', 1, '2019-01-21 14:32:45', '2021-12-28 10:42:06')
+    </insert>
+
+    <insert id="insertData2">
+        INSERT INTO `s_dict`(`id`, `dict_code`, `dict_name`, `dict_sort`, `dict_type_id`, `tenant_id`, `delete_flag`, `create_datetime`, `update_datetime`) VALUES (77, 'APP_YUNSHAN_ SECRET_PROTOCOL', '&lt;div id=\"APP_PRIVACY\">\r\n        &lt;div style=\"font-size: 18px; text-align: center;\">云杉应用平台隐私保护指引&lt;/div>\r\n        &lt;div style=\"font-size: 16px; margin-top: 8px;\">\r\n            &lt;div>\r\n                发布日期：2022年1月13日\r\n            &lt;/div>\r\n            &lt;div style=\"margin-top: 4px;\">\r\n                生效日期：2021年12月13日\r\n            &lt;/div>\r\n        &lt;/div>\r\n        &lt;div style=\"font-size: 14px;margin-top: 8px;\">\r\n            nbsp;nbsp;nbsp;nbsp;为了给您提供更精准、更个性化的服务，同时保障您的相关权利，依照《中华人民共和国网络安全法》、《中华人民共和国个人信息保护法》等相关法律法规制定《云杉应用平台隐私保护指引》（下称“本隐私指引”），本隐私指引将向您说明云杉应用平台会如何收集、使用和存储您的个人信息及您享有何种权利，请您在使用云杉应用平台之前，仔细阅读、了解并同意本隐私指引和相关补充文件\r\n        &lt;/div>\r\n        &lt;div style=\"font-size: 14px;margin-top: 8px;font-weight: 700;\">\r\n            本隐私指引适用于云杉应用平台产品自身的功能及服务，不适用于任何其他第三方提供的产品或服务（以下统称“第三方服务”），您在选择使用第三方服务前应充分了解第三方服务的产品功能及隐私保护政策。\r\n        &lt;/div>\r\n		&lt;div style=\"font-size: 14px;margin-top: 8px;\">\r\n            &lt;div style=\"font-size: 16px\">\r\n                本隐私指引将帮助您了解以下内容：\r\n            &lt;/div>\r\n            &lt;div>\r\n                1. 我们收集哪些类型的信息\r\n            &lt;/div>\r\n            &lt;div>\r\n                2. 我们如何存储这些信息\r\n            &lt;/div>\r\n            &lt;div>\r\n                3. 我们如何保护这些信息\r\n            &lt;/div>\r\n            &lt;div>\r\n                4. 我们如何使用这些信息\r\n            &lt;/div>\r\n            &lt;div>\r\n                5. 信息的分享和对外提供\r\n            &lt;/div>\r\n            &lt;div>\r\n                6. 您如何访问和管理个人信息\r\n            &lt;/div>\r\n            &lt;div>\r\n                7. 未成年人保护\r\n            &lt;/div>\r\n            &lt;div>\r\n                8. 本隐私指引的变更\r\n            &lt;/div>\r\n            &lt;div>\r\n                9. 其它\r\n            &lt;/div>\r\n            &lt;div>\r\n                10. 联系我们\r\n            &lt;/div>\r\n        &lt;/div>\r\n		\r\n		&lt;div style=\"font-size: 14px;margin-top: 8px;\">\r\n            &lt;div style=\"font-size: 16px;margin-bottom: 4px;\">\r\n                相关定义：\r\n            &lt;/div>\r\n            &lt;div>\r\n                云杉应用平台：云杉应用平台是由树根互联公司提供的一款应用集成和搭建平台。云杉应用平台及服务，包括云杉应用平台官网&lt;a href=\"https://yunshan.irootech.com\">（https://yunshan.irootech.com）&lt;/a>>及云杉在线APP（包括iOS、Android等多个应用版本）等。\r\n            &lt;/div>\r\n            &lt;div>\r\n                云杉应用平台：指提供云杉应用平台产品和相关服务的法律主体，为树根互联股份有限公司及关联公司，本指引中简称“树根互联”或“我们”。\r\n            &lt;/div>\r\n            &lt;div>\r\n                &lt;span style=\"font-weight: 700;\">企业用户&lt;/span>：指注册、登录、使用根云平台产品及服务并获得管理权限的个人或组织，包括但不限于法人、政府机构、其他组织、合伙或个体工商户等（下称“企业用户”）；企业用户可以通过根云平台控制台，邀请个人用户加入其组织成为其最终用户\r\n            &lt;/div>\r\n            &lt;div>\r\n                &lt;span style=\"font-weight: 700;\">个人用户/最终用户&lt;/span>：指被企业用户邀请加入组织，使用根云平台产品和服务的个人用户，以下称“你”或“最终用户”。当企业用户邀请你作为最终用户加入其组织，你会收到邀请并可以选择是否加入该企业用户。\r\n            &lt;/div>\r\n			&lt;div>\r\n                &lt;span style=\"font-weight: 700;\">个人信息&lt;/span>：指以电子或者其他方式记录的与已识别或者可识别的自然人有关的各种信息，不包括匿名化处理后的信息。\r\n            &lt;/div>\r\n            &lt;div>\r\n                &lt;span style=\"font-weight: 700;\">敏感个人信息&lt;/span>：指一旦泄露或者非法使用,可能导致个人受到 歧视或者人身、财产安全受到严重危害的个人信息,包括种族、 民族、宗教信仰、个人生物特征、医疗健康、金融账户、个人行 踪等信息。\r\n            &lt;/div>\r\n            &lt;div>\r\n                &lt;span style=\"font-weight: 700;\">匿名化处理&lt;/span>匿名化处理：指通过对个人信息的技术处理，使得个人信息主体无法被识别，且处理后的信息不能被复原的过程。\r\n            &lt;/div>\r\n            &lt;div>\r\n                声明与承诺\r\n            &lt;/div>\r\n            &lt;div>\r\n                1.您知悉并同意：为完善服务内容、改善服务体验，树根互联有权根据业务发展需要对平台系统进行升级、改造，以及对平台服务功能、内容及方式等进行调整。\r\n            &lt;/div>\r\n            &lt;div>\r\n                2.树根互联有权根据法律法规政策、系统升级、业务发展需要等合理原因修改本协议，您可以在云杉应用平台登录页查阅最新版本的协议条款。本协议条款变更后，如果您继续使用云杉应用平台，即视为您已充分阅读、理解、同意并接受修改后的协议。如果您不接受修改后的协议，应当停止使用云杉应用平台。\r\n            &lt;/div>\r\n			&lt;div>\r\n                3.您注册或使用本服务过程中，需要向云杉应用平台提供一些必要的信息，包括但不限于为向您提供账号的注册服务或进行用户身份识别，需要您填写您的手机号码；分行特色专区需要您所在地理位置信息；短信分享功能需要您授权使用手机短信；拨打网点或客服电话需要您授权使用手机电话；以及国家法律法规或政策有特殊规定的需要您提供真实的身份信息的业务。若您提供的信息不完整或者未按树根互联要求提供相关信息，则您无法使用相关服务或在使用过程中受限制。\r\n            &lt;/div>\r\n            &lt;div>\r\n                4.树根互联出于以下目的收集和使用您的个人信息：\r\n                &lt;div>   \r\n                    （1）帮助您成为云杉应用平台的用户。为向您提供服务，您需要提供手机号码、电子邮箱地址，并创建用户名和密码，如果您仅使用浏览、搜索等基本服务，您不需要注册成为用户及提供上述信息。在注册过程中，如果您提供以下额外信息，将有助于为您提供个性化的服务：真实姓名、性别、出生年月日、居住地、您本人的真实头像。如果您不提供这些信息，将会影响您使用个性化服务，但不影响使用基本的浏览、搜索、查看设备等功能。\r\n                &lt;/div>\r\n                &lt;div>\r\n                    （2）为您展示和推送商品或服务。为改善树根互联的产品或服务，为用户提供个性化的服务，我们会根据您的浏览、搜索记录、设备信息、位置信息、意向信息、订单信息等，提取您的浏览、搜索偏好、行为习惯、位置信息等特征，基于此推送信息或提供个性化服务。\r\n                &lt;/div>\r\n            &lt;/div>\r\n            &lt;div>\r\n                5.树根互联将对相关信息通过专业技术手段采取加密存储与传输，保障您个人信息的安全，承诺除法律法规规定以及本协议约定的情形外，未经您的许可树根互联不会向第三方公开、透露您的个人信息。\r\n            &lt;/div>\r\n			&lt;div>\r\n                6.您同意并授权树根互联在与您发生贷款或者担保等信用业务时，可以向依法设立的征信机构及其他相关合法机构查询、使用或提供您的信用、资产信息。树根互联依法对您的相关信息承担保密责任，并保证要求合作机构对您的相关信息承担保密责任。\r\n            &lt;/div>\r\n            &lt;div>\r\n                7.若您违反本协议或相关章程及业务规则，树根互联有权单方暂停或终止向您提供服务，并保留追究您责任的权利。本服务暂停、终止后，在暂停、终止前您已发送至树根互联的交易指令仍有效，您应承担其后果。\r\n            &lt;/div>\r\n        &lt;/div>\r\n		\r\n		&lt;div style=\"font-size: 14px; margin-top: 8px;\">\r\n            &lt;div style=\"font-size: 16px;margin-bottom: 4px; font-weight: 700;\">\r\n                1. 我们收集哪些类型的信息\r\n            &lt;/div>\r\n            &lt;div>\r\n                &lt;span style=\"font-weight: 700;\">1.1 为了向您和企业用户提供服务、保障服务的正常运行以及保障您的帐号安全，我们将需要向您索取相关的权限；其中的敏感权限例如摄像头、麦克风等均不会默认开启，只有在您明确同意后才会向我们授权。&lt;/span>具体说明如下\r\n                &lt;div>\r\n                    nbsp;nbsp;nbsp;nbsp;1.1.1 当您使用语音通话或视频通话功能时，我们会在您同意授予麦克风或/和相机的系统权限后，为您提供语音通话或视频通话的服务。云杉应用平台的其他功能。\r\n                &lt;/div>\r\n                &lt;div>\r\n                    nbsp;nbsp;nbsp;nbsp;1.1.2 当您使用云杉应用平台的日程功能时，我们会在您同意授予日程的系统权限后，在您的企业微信中展示您的日程信息，向您提供日程信息的查阅、修改等服务。&lt;span style=\"font-weight: 700;\">上述权限为使用相关功能的必要权限，拒绝授予权限仅会使您无法使用日程功能，但不影响您正常使用&lt;/span>云杉应用平台的其他功能。\r\n                &lt;/div>\r\n				&lt;div style=\"font-weight: 700;margin-top: 4px;\">\r\n                    需要特别说明的是，获得敏感权限是我们收集特定信息的必要而非充分条件。我们获得具体某一项敏感权限并不代表我们必然会收集您的相关信息；即使我们已经获得敏感权限，也仅在必要时、根据本指引来收集您的相关信息。\r\n                &lt;/div>\r\n            &lt;/div>\r\n            &lt;div style=\"margin: 4px 0px\">\r\n                &lt;div>\r\n                    1.2 为了向您和企业用户提供服务、保障服务的正常运行、改进和优化我们的服务以及保障帐号安全，云杉应用平台会按照如下方式收集您在注册、使用服务时主动提供、授权提供或因为使用服务而产生的信息\r\n                &lt;/div>\r\n                &lt;div>\r\n                    nbsp;nbsp;nbsp;nbsp;1.2.1 帐号注册信息：当您首次注册登录云杉应用平台，您需要提供&lt;span style=\"font-weight: 700;\">您的手机号&lt;/span>或提供您的&lt;span style=\"font-weight: 700;\">电子邮箱账号&lt;/span>，上述信息为您使用云杉应用平台所必需，若您不提供这类信息，您将无法正常使用我们的服务。\r\n                &lt;/div>\r\n				&lt;div>\r\n                    nbsp;nbsp;nbsp;nbsp;1.2.2 当您使用云杉应用平台服务时，为向您及企业用户提供云杉应用平台产品及服务，维护我们服务的正常运行，改进及优化我们的服务体验以及保障您的帐号安全，我们会收集您下述信息：\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;1.2.2.1 设备信息：根据您在安装及使用云杉应用平台服务过程中的设备型号及授予的权限，我们会收集使用企业微信服务的设备相关信息，包括设备型号、操作系统、唯一设备标识符（指由设备制造商编入到设备中的一串字符，可用于以独有方式标识相应设备，如手机的IMEI号、Mac地址、AndroidID等）、设备所在 &lt;span style=\"font-weight: 700;\">位置信息&lt;/span>（如登录IP地址、GPS位置以及能够提供相关信息的Wi-Fi接入点等相关信息）、云杉应用平台软件版本号以及设备加速器（如重力感应设备）等。\r\n                    &lt;/div>\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;1.2.2.2 日志信息：当您使用云杉应用平台服务时，我们会收集您对服务使用的日志信息，包括接入网络的方式、类型和状态、网络质量数据、操作日志、服务日志信息等。\r\n                    &lt;/div>\r\n                &lt;/div>\r\n            &lt;/div>\r\n        &lt;/div>\r\n		&lt;div style=\"font-size: 14px; margin-top: 8px;\">\r\n            &lt;div style=\"font-size: 16px;margin-bottom: 4px; font-weight: 700;\">\r\n                2. 我们如何存储这些信息\r\n            &lt;/div>\r\n            &lt;div>\r\n                &lt;div style=\"font-weight: 700;\">\r\n                    2.1 信息存储的地点\r\n                &lt;/div>\r\n                &lt;div>\r\n                    nbsp;nbsp;nbsp;nbsp;我们会按照法律法规规定，将在中国境内收集和产生的个人信息存储于中国境内。\r\n                &lt;/div>\r\n                &lt;div style=\"font-weight: 700;\">\r\n                    2.2 信息存储的期限\r\n                &lt;/div>\r\n				&lt;div>\r\n                    nbsp;nbsp;nbsp;nbsp;一般而言，我们仅在为实现目的所必需的时间内保留您的个人信息，例如：\r\n                &lt;/div>\r\n                &lt;div>\r\n                    &lt;span style=\"font-weight: 700;\">手机号码及电子邮箱：无论您是通过手机号码注册还是电子邮箱注册，若您需要使用云杉应用平台服务，我们需要一直保存您的手机号码&lt;/span>（包括初始注册手机号码、绑定的手机号码等），以保证您正常使用该服务。当您注销云杉应用平台帐号后，我们将删除相应的信息。\r\n                &lt;/div>\r\n            &lt;/div>\r\n            &lt;div style=\"margin-top: 4px;\">\r\n                当我们的产品或服务发生停止运营的情形时，我们将以推送通知、公告等形式通知您，在合理的期限内删除您的个人信息或进行匿名化处理，并立即停止收集个人信息的活动，以及关闭第三方应用服务接口，避免第三方服务收集及继续使用个人信息。\r\n            &lt;/div>\r\n        &lt;/div>\r\n        &lt;div style=\"font-size: 14px; margin-top: 8px;\">\r\n            &lt;div style=\"font-size: 16px;margin-bottom: 4px; font-weight: 700;\">\r\n                3. 我们如何保护这些信息\r\n            &lt;/div>\r\n			&lt;div>\r\n                &lt;div>\r\n                    nbsp;nbsp;nbsp;nbsp;3.1 我们努力为用户的信息安全提供保障，以防止信息的丢失、不当使用、未经授权访问或披露。\r\n                &lt;/div>\r\n                &lt;div>\r\n                    nbsp;nbsp;nbsp;nbsp;3.2 我们将在合理的安全水平内使用各种安全保护措施以保障信息的安全。例如，我们会使用加密技术（例如，SSL /TLS）、匿名化处理等手段来保护您的个人信息。\r\n                &lt;/div>\r\n                &lt;div>\r\n                    nbsp;nbsp;nbsp;nbsp;3.3 我们建立专门的管理制度、流程和组织以保障信息的安全。例如，我们严格限制访问信息的人员范围，要求他们遵守保密义务，并进行审计。\r\n                &lt;/div>\r\n                &lt;div>\r\n                    nbsp;nbsp;nbsp;nbsp;3.4 若发生个人信息泄露等安全事件，我们会依法启动应急预案，阻止安全事件扩大，并以推送通知、公告等形式告知您安全事件的情况、事件可能对您的影响以及我们将采取的补救措施。我们还将按照法律法规和监管部门要求，上报个人信息安全事件的处置情况。\r\n                &lt;/div>\r\n                &lt;div>\r\n                    我们会尽力保护您的个人信息。我们也请您理解，任何安全措施都无法做到无懈可击。\r\n                &lt;/div>\r\n            &lt;/div>\r\n            &lt;div style=\"margin-top: 4px;\">\r\n                当我们的产品或服务发生停止运营的情形时，我们将以推送通知、公告等形式通知您，在合理的期限内删除您的个人信息或进行匿名化处理，并立即停止收集个人信息的活动，以及关闭第三方应用服务接口，避免第三方服务收集及继续使用个人信息。\r\n            &lt;/div>\r\n		&lt;/div>\r\n        &lt;div style=\"font-size: 14px; margin-top: 8px;\">\r\n            &lt;div style=\"font-size: 16px;margin-bottom: 4px; font-weight: 700;\">\r\n                4. 我们如何使用这些信息\r\n            &lt;/div>\r\n            &lt;div>\r\n                &lt;div>\r\n                    我们严格遵守法律法规的规定及与用户的约定，将收集的信息按照本隐私保护指引的规定用于以下用途。\r\n                &lt;/div>\r\n				&lt;div>\r\n                    4.1 我们在您使用云杉应用平台服务过程中收集相关的信息是为了向云杉应用平台用户（包括企业用户和最终用户）打造和提供更好的服务。我们会将收集的信息用于以下用途：\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;4.1.1 提供、维护及开发云杉应用平台服务：我们会利用收集的信息来提供和优化改进云杉应用平台服务，例如，跟踪服务中断情况或排查云杉应用平台用户向我们报告的问题等\r\n                    &lt;/div>\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;4.1.2 安全保障：为保障您以及所有云杉应用平台用户的安全，我们会利用相关信息协助提升云杉应用平台服务的安全性和可靠性，包括检测、防范和应对可能危害云杉应用平台、我们的用户或公众的欺诈行为、滥用行为、非法行为、安全风险和技术问题等。\r\n                    &lt;/div>\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;4.1.3 为了遵从相关法律法规、部门规章、政府指令的相关要求。\r\n                    &lt;/div>\r\n                    &lt;div>\r\n                        目前，我们不会将您的个人信息用于个性化推荐或广告用途。如我们使用您的个人信息，超出了与收集时所声称的目的及具有直接或合理关联的范围，我们将在使用您的个人信息前，通过页面提示、交互流程、网站公告等方式另行向您告知并征得您的明示同意。\r\n                    &lt;/div>\r\n                &lt;/div>\r\n				&lt;div style=\"font-weight: 700;\">\r\n                    4.2 根据相关法律法规以及国家标准，在以下情况下我们可能会收集、使用您的个人信息而无需征求您的授权同意：\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;1）与个人信息控制者履行法律法规规定的义务相关的；\r\n                    &lt;/div>\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;2）与国家安全、国防安全直接相关的；\r\n                    &lt;/div>\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;3）与公共安全、公共卫生、重大公共利益直接相关的；\r\n                    &lt;/div>\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;4）与刑事侦查、起诉、审判和判决执行等直接相关的；；\r\n                    &lt;/div>\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;5）出于维护个人信息主体或其他个人的生命、财产等重大合法权益但又很难得到本人授权同意的;\r\n                    &lt;/div>\r\n					&lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;6）所涉及的个人信息是个人信息主体自行向社会公众公开的；\r\n                    &lt;/div>\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;7）根据个人信息主体要求签订和履行合同所必需的；\r\n                    &lt;/div>\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;8）从合法公开披露的信息中收集个人信息的，如合法的新闻报道、政府信息公开等渠道\r\n                    &lt;/div>\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;9）维护所提供产品或服务的安全稳定运行所必需的，如发现、处置产品或服务的故障；\r\n                    &lt;/div>\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;10）个人信息控制者为新闻单位，且其开展合法的新闻报道所必需的；\r\n                    &lt;/div>\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;11）个人信息控制者为学术研究机构，出于公共利益开展统计或学术研究所必要， 且其对外提供学术研究或描述的结果时，对结果中所包含的个人信息进行去标识化处理的。\r\n                    &lt;/div>\r\n                &lt;/div>\r\n				\r\n				&lt;div>\r\n                    我们会尽力保护您的个人信息。我们也请您理解，任何安全措施都无法做到无懈可击。\r\n                &lt;/div>\r\n            &lt;/div>\r\n            &lt;div style=\"margin-top: 4px;\">\r\n                当我们的产品或服务发生停止运营的情形时，我们将以推送通知、公告等形式通知您，在合理的期限内删除您的个人信息或进行匿名化处理，并立即停止收集个人信息的活动，以及关闭第三方应用服务接口，避免第三方服务收集及继续使用个人信息。\r\n            &lt;/div>\r\n        &lt;/div>\r\n        &lt;div style=\"font-size: 14px; margin-top: 8px;\">\r\n            &lt;div style=\"font-size: 16px;margin-bottom: 4px; font-weight: 700;\">\r\n                5. 信息的分享及对外提供\r\n            &lt;/div>\r\n            &lt;div>\r\n                我们不会共享或转让您的个人信息至第三方，但以下情况除外：\r\n            &lt;/div>\r\n            &lt;div>\r\n                &lt;div>\r\n                    nbsp;nbsp;nbsp;nbsp;5.1 获取您的明确同意：经您事先同意，我们可能与第三方分享您的个人信息；\r\n                &lt;/div>\r\n				&lt;div>\r\n                    nbsp;nbsp;nbsp;nbsp;5.2 为实现外部处理的目的，我们可能会与关联公司或其他第三方合作伙伴（第三方服务供应商、承包商、代理、应用开发者等）分享您的个人信息，让他们按照我们的说明、隐私政策以及其他相关的保密和安全措施来为我们处理上述信息，并用于向您提供我们的服务，实现“我们如何使用信息”部分所述目的。如我们与上述关联公司或第三方分享您的信息，我们将会采用加密、匿名化处理等手段保障您的信息安全。\r\n                &lt;/div>\r\n                &lt;div>\r\n                    nbsp;nbsp;nbsp;nbsp;5.3 我们不会对外公开披露所收集的个人信息。如必须公开披露时，我们会向您告知此次公开披露的目的、披露信息的类型及可能涉及的敏感信息，并遵从相关法律法规的要求进行披露。需要特别说明的是，对最终用户相关信息如何在其加入的企业用户工作平台中对外披露或共享，由企业用户决定并管理，如果您对此有任何疑问或意见，您理解并同意联系您所在企业用户或企业用户管理员处理。\r\n                &lt;/div>\r\n                &lt;div>\r\n                    nbsp;nbsp;nbsp;nbsp;5.4 我们可能基于法律要求或相关部门的执法要求披露您的个人信息。\r\n                &lt;/div>\r\n            &lt;/div>\r\n        &lt;/div>\r\n        &lt;div style=\"font-size: 14px; margin-top: 8px;\">\r\n            &lt;div style=\"font-size: 16px;margin-bottom: 4px; font-weight: 700;\">\r\n                6. 您如何访问及管理个人信息\r\n            &lt;/div>\r\n			&lt;div>\r\n                &lt;div>\r\n                    在您使用云杉应用平台期间，为了您可以更加便捷地访问、更正、删除您的个人信息，同时保障您撤回同意、退出企业（注销帐号）的权利，我们在产品设计中为您提供了相应的操作设置，您可以参考下面的指引进行操作。\r\n                &lt;/div>\r\n                &lt;div>\r\n                    6.1 访问个人信息\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;6.1.1 访问头像、姓名、性别、昵称、对外信息显示、所属企业、手机号码、电子邮箱地址、隶属部门等基本信息：\r\n                        &lt;div>\r\n                            nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;1) 进入云杉应用平台后，点击“个人中心”（WEB）或者“我”（APP）；\r\n                        &lt;/div>\r\n                        &lt;div>\r\n                            nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;2) 访问个人信息。\r\n                        &lt;/div>\r\n                    &lt;/div>\r\n                &lt;/div>\r\n                &lt;div >\r\n					6.2 更正个人信息\r\n                    &lt;div>\r\n                        nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;访问头像、姓名、性别、昵称、对外信息显示、所属企业、手机号码、电子邮箱地址、隶属部门等基本信息：\r\n                        &lt;div>\r\n                            nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;1) 进入云杉应用平台后，点击“个人中心”（WEB）或者“我”（APP）；\r\n                        &lt;/div>\r\n                        &lt;div>\r\n                            nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;2) 更改信息。\r\n                        &lt;/div>\r\n                    &lt;/div>\r\n                   \r\n                    \r\n                &lt;/div>\r\n            &lt;/div>\r\n        &lt;/div>\r\n        &lt;div style=\"font-size: 14px; margin-top: 8px;\">\r\n            &lt;div style=\"font-size: 16px;margin-bottom: 4px; font-weight: 700;\">\r\n                7. 未成年人保护\r\n            &lt;/div>\r\n			&lt;div>\r\n                我们非常重视对未成年人个人信息的保护，根据相关法律法规的规定，若您是14周岁以下的未成年人，需要取得您的家长或法定监护人对本隐私保护指引的书面同意。若您是未成年人的监护人，当您对您所监护的未成年人的个人信息有相关疑问时，请通过第10节中的联系方式与我们联系。\r\n            &lt;/div>\r\n        &lt;/div>\r\n        &lt;div style=\"font-size: 14px; margin-top: 8px;\">\r\n            &lt;div style=\"font-size: 16px;margin-bottom: 4px; font-weight: 700;\">\r\n                8. 本隐私指引的变更\r\n            &lt;/div>\r\n            &lt;div>\r\n                我们可能会适时对本隐私指引进行修订。当指引的条款发生变更时，我们会通过官网公告（&lt;a href=\"https://yunshan.irootech.com\">（https://yunshan.irootech.com）&lt;/a>、推送通知形式向您展示变更后的指引。\r\n            &lt;/div>\r\n            &lt;div>\r\n                当本隐私指引的条款发生重大变更时，我们将会通过官网公告&lt;a href=\"https://yunshan.irootech.com\">（https://yunshan.irootech.com）&lt;/a>、推送通知或者更为显著的弹窗方式向您告知。\r\n            &lt;/div>\r\n			&lt;div>\r\n                本条所指的重大变更包括但不限于：\r\n            &lt;/div>\r\n            &lt;div>\r\n                nbsp;nbsp;nbsp;nbsp;1）我们的服务模式发生重大变化，如处理个人信息的目的、处理的个人信息类型、个人信息的使用方式等；\r\n            &lt;/div>\r\n            &lt;div>\r\n                nbsp;nbsp;nbsp;nbsp;2）我们在所有权结构、组织架构等方面发生重大变化，如业务调整、破产并购等引起的所有者变更等；\r\n            &lt;/div>\r\n            &lt;div>\r\n                nbsp;nbsp;nbsp;nbsp;3）个人信息共享、转让或公开披露的主要对象发生变化；\r\n            &lt;/div>\r\n            &lt;div>\r\n                4）您参与个人信息处理方面的权利及其行使方式发生重大变化；\r\n            &lt;/div>\r\n			 &lt;div>\r\n                nbsp;nbsp;nbsp;nbsp;5）我们负责处理个人信息安全的责任部门、联络方式及投诉渠道发生变化时；\r\n            &lt;/div>\r\n            &lt;div>\r\n                nbsp;nbsp;nbsp;nbsp;6）个人信息安全影响评估报告表明存在高风险时。\r\n            &lt;/div>\r\n        &lt;/div>\r\n        &lt;div style=\"font-size: 14px; margin-top: 8px;\">\r\n            &lt;div style=\"font-size: 16px;margin-bottom: 4px; font-weight: 700;\">\r\n                9. 其他\r\n            &lt;/div>\r\n            &lt;div>\r\n                1、如您对本隐私权条款有任何疑问或您提供的上述个人信息受到了侵扰，您可以通过服务平台网站首页下方的联系方式与我们联系，我们将在接到投诉后尽快给予您答复。\r\n            &lt;/div>\r\n            &lt;div>\r\n                2、在本协议发布前若您已向服务平台或树根互联及其关联方提供了个人信息，同意本隐私政策时即视为您对本隐私政策下相关授权的追认。\r\n            &lt;/div>\r\n        &lt;/div>\r\n		&lt;div style=\"font-size: 14px; margin-top: 8px;\">\r\n            &lt;div style=\"font-size: 16px;margin-bottom: 4px; font-weight: 700;\">\r\n                10. 联系我们\r\n            &lt;/div>\r\n            &lt;div>\r\n                1、如您对本隐私政策或您个人信息的相关事宜有任何问题、意见或建议，请通过访问服务平台官方网站、客户端在线客服或拨打服务平台服务热线400-887-8318与我们联系。 \r\n            &lt;/div>\r\n            &lt;div>\r\n                2、一般情况下，我们将在十五个工作日内回复。如果您对我们的回复不满意，特别是我们的个人信息处理行为损害了您的合法权益，您还可以向网信、电信、公安及工商等监管部门进行投诉或举报。\r\n            &lt;/div>\r\n            &lt;div>\r\n                我们将尽快审核所涉问题，并在验证您的用户身份后的十五天内予以回复。\r\n            &lt;/div>\r\n        &lt;/div>\r\n        &lt;div style=\"text-align: right; margin-top: 10px; font-size: 16px;\">\r\n            树根互联股份有限公司\r\n        &lt;/div>\r\n    &lt;/div>', 1, 7, '-1', 1, '2022-01-24 17:36:10', '2022-01-24 17:36:10')
+    </insert>
+
+    <insert id="insertData3">
+        INSERT INTO `s_dict`(`id`, `dict_code`, `dict_name`, `dict_sort`, `dict_type_id`, `tenant_id`, `delete_flag`, `create_datetime`, `update_datetime`) VALUES (76, 'APP_YUNSHAN_PRIVACY_PROTOCOL', '&lt;div id=\"APP_PRIVACY\">\r\n        &lt;div style=\"font-size: 18px;\">云杉应用平台服务协议&lt;/div>\r\n        &lt;div style=\"font-size: 16px;\">\r\n            云杉应用平台服务（以下简称“本服务”）是指树根互联向您提供的平台服务，包括：云杉应用平台（https://yunshan.irootech.com/）及其上架向客户提供的应用。本协议是树根互联与您就本服务的使用等相关事项所订立的有效合约。您登录云杉应用平台，即表示您知悉、理解并同意接受本协议的全部内容，确认承担由此产生的一切法律后果。 在确认接受本协议之前，请您务必仔细阅读、充分理解本协议全部内容，特别是免除或者限制责任的条款，以及开通或使用某项服务的单独协议并选择接受或不接受（如有）。如果您不同意本协议的任何内容，或者无法准确理解相关条款的含义，请不要进行后续操作。\r\n        &lt;/div>\r\n        &lt;div style=\"font-size: 14px;margin-top: 8px;\">\r\n            &lt;div style=\"font-size: 16px\">\r\n                用户资格及账户\r\n            &lt;/div>\r\n            &lt;div>\r\n                1. 用户应当为具有完全民事行为能力的自然人，或者是具有独立承担法律责任能力的其他合法主体。若用户属于无民事行为能力、限制民事行为能力人的，或是不具有独立承担法律责任能力的其他主体的，应在监护人监护下进行交易或是得到有权主体授权。\r\n            &lt;/div>\r\n            &lt;div>\r\n                2. 用户在使用云杉应用平台前，应检查其软硬件设备，保证其处于安全使用状态。\r\n            &lt;/div>\r\n        &lt;/div>\r\n		\r\n		&lt;div style=\"font-size: 14px;margin-top: 8px;\">\r\n            &lt;div style=\"font-size: 16px;margin-bottom: 4px;\">\r\n                使用\r\n            &lt;/div>\r\n            &lt;div>\r\n                1.您自愿使用云杉应用平台，您通过云杉应用平台办理业务时须同时遵守与该业务相关的章程、协议及交易规则。\r\n            &lt;/div>\r\n            &lt;div>\r\n                2.您已了解树根互联提供的云杉应用平台服务是物联网方式提供的服务，可能因网络或通讯线路故障及断电、停电等其他树根互联不可预测、不可控制的因素，导致您在使用云杉应用平台服务的过程中出现登录失败、网页打开速度慢、信息传送延误与错误以及业务暂时无法办理或者被取消、暂停或终止的情况。如出现上述情况，您可在上述意外因素消失后重新在云杉应用平台上使用相关服务，或者到致电树根互联400-868-1122电话办理。您因上述不可预测不可控制的情况以及其他非因树根互联原因遭受的损失，树根互联不承担责任。\r\n            &lt;/div>\r\n            &lt;div>\r\n                3.您理解并同意：为了向您提供有效的服务，云杉应用平台会使用您终端设备的处理器和带宽等资源。云杉应用平台使用过程中可能产生数据流量的费用，您需自行向运营商了解相关资费信息，并自行承担相关费用。\r\n            &lt;/div>\r\n			&lt;div>\r\n                4.您保证向树根互联提供的资料真实、合法、有效、完整，因您未提供真实、合法、有效、完整的资料或资料发生任何变更而没有及时通知树根互联导致本服务无法提供或提供时发生任何错误，由此产生的后果由您自行承担。若树根互联有合理理由怀疑您提供的资料不实、非法、无效或不完整，树根互联有权拒绝、暂停或终止向您提供本服务，树根互联对此不承担任何责任，您将承担因此产生的责任和损失。\r\n            &lt;/div>\r\n            &lt;div>\r\n                5.您有责任妥善保管本人账户、密码、动态口令及证件号码、手机及手机号码等与本服务相关的信息，您使用上述信息进行的交易均为您本人办理的交易。您丧失对上述信息的掌控并导致因此发生任何风险或资金损失的，您将自行承担后果与责任。您的交易信息以树根互联系统记录的资料为准（有确凿证据证明树根互联系统记录错误的除外），您认可树根互联系统记录数据的真实性、准确性和合法性。\r\n            &lt;/div>\r\n            &lt;div>\r\n                6.您不得利用云杉应用平台服务从事包括但不限于欺诈等违法、违规行为；树根互联有理由合理怀疑您进行违法违规行为的，有权中止、停止向您提供服务或者采取其他合理的风险控制措施\r\n            &lt;/div>\r\n            &lt;div>\r\n                声明与承诺\r\n            &lt;/div>\r\n            &lt;div>\r\n                1.您知悉并同意：为完善服务内容、改善服务体验，树根互联有权根据业务发展需要对平台系统进行升级、改造，以及对平台服务功能、内容及方式等进行调整。\r\n            &lt;/div>\r\n            &lt;div>\r\n                2.树根互联有权根据法律法规政策、系统升级、业务发展需要等合理原因修改本协议，您可以在云杉应用平台登录页查阅最新版本的协议条款。本协议条款变更后，如果您继续使用云杉应用平台，即视为您已充分阅读、理解、同意并接受修改后的协议。如果您不接受修改后的协议，应当停止使用云杉应用平台。\r\n            &lt;/div>\r\n			&lt;div>\r\n                3.您注册或使用本服务过程中，需要向云杉应用平台提供一些必要的信息，包括但不限于为向您提供账号的注册服务或进行用户身份识别，需要您填写您的手机号码；分行特色专区需要您所在地理位置信息；短信分享功能需要您授权使用手机短信；拨打网点或客服电话需要您授权使用手机电话；以及国家法律法规或政策有特殊规定的需要您提供真实的身份信息的业务。若您提供的信息不完整或者未按树根互联要求提供相关信息，则您无法使用相关服务或在使用过程中受限制。\r\n            &lt;/div>\r\n            &lt;div>\r\n                4.树根互联出于以下目的收集和使用您的个人信息：\r\n                &lt;div>   \r\n                    （1）帮助您成为云杉应用平台的用户。为向您提供服务，您需要提供手机号码、电子邮箱地址，并创建用户名和密码，如果您仅使用浏览、搜索等基本服务，您不需要注册成为用户及提供上述信息。在注册过程中，如果您提供以下额外信息，将有助于为您提供个性化的服务：真实姓名、性别、出生年月日、居住地、您本人的真实头像。如果您不提供这些信息，将会影响您使用个性化服务，但不影响使用基本的浏览、搜索、查看设备等功能。\r\n                &lt;/div>\r\n                &lt;div>\r\n                    （2）为您展示和推送商品或服务。为改善树根互联的产品或服务，为用户提供个性化的服务，我们会根据您的浏览、搜索记录、设备信息、位置信息、意向信息、订单信息等，提取您的浏览、搜索偏好、行为习惯、位置信息等特征，基于此推送信息或提供个性化服务。\r\n                &lt;/div>\r\n            &lt;/div>\r\n            &lt;div>\r\n                5.树根互联将对相关信息通过专业技术手段采取加密存储与传输，保障您个人信息的安全，承诺除法律法规规定以及本协议约定的情形外，未经您的许可树根互联不会向第三方公开、透露您的个人信息。\r\n            &lt;/div>\r\n			&lt;div>\r\n                6.您同意并授权树根互联在与您发生贷款或者担保等信用业务时，可以向依法设立的征信机构及其他相关合法机构查询、使用或提供您的信用、资产信息。树根互联依法对您的相关信息承担保密责任，并保证要求合作机构对您的相关信息承担保密责任。\r\n            &lt;/div>\r\n            &lt;div>\r\n                7.若您违反本协议或相关章程及业务规则，树根互联有权单方暂停或终止向您提供服务，并保留追究您责任的权利。本服务暂停、终止后，在暂停、终止前您已发送至树根互联的交易指令仍有效，您应承担其后果。\r\n            &lt;/div>\r\n        &lt;/div>\r\n		\r\n		&lt;div style=\"font-size: 14px; margin-top: 8px;\">\r\n            &lt;div style=\"font-size: 16px;margin-bottom: 4px;\">\r\n                责任限制\r\n            &lt;/div>\r\n            &lt;div>\r\n                1.不论在任何情况下，树根互联均不对由于互联网正常的设备维护，互联网络连接故障，电脑、通讯或其他系统的故障，店里故障，罢工，暴乱，骚乱，灾难性天气（如火灾、洪水、风暴等），爆炸，战争，政府行为，司法行政机关的命令或第三方的不作为而造成的不能履行或延迟履行承担责任。\r\n            &lt;/div>\r\n            &lt;div>\r\n                2.如因上述不可抗力或其他树根互联无法控制的原因使云杉应用平台的系统崩溃或无法正常使用导致相关的信息、记录丢失等，树根互联不承担责任。但是树根互联会尽可能合理的协助处理善后事宜，并努力是客户面授经济损失。\r\n            &lt;/div>\r\n            &lt;div>\r\n                3.基于互联网的特殊性，云杉应用平台显示的信息可能有一定的滞后性或差错，对此情形您知悉并理解；您须自行辨别真伪，谨慎预防风险。\r\n            &lt;/div>\r\n        &lt;/div>\r\n		\r\n		&lt;div style=\"font-size: 14px; margin-top: 8px;\">\r\n            &lt;div style=\"font-size: 16px; margin-bottom: 4px;\">\r\n                其他\r\n            &lt;/div>\r\n            &lt;div>\r\n                1.若您与树根互联之间发生争议，由双方协商解决，协商不成提起诉讼的，由树根互联总部所在地法院管辖\r\n            &lt;/div>\r\n            &lt;div>\r\n                2.本协议的成立、生效、履行、解释及纠纷解决，适用中华人民共和国大陆地区法律，法律无明文规定的，可适用国内通行的惯例。\r\n            &lt;/div>\r\n            &lt;div>\r\n                3.本协议条款无论因何种原因部分无效或不可执行，都不影响本协议其他条款的效力。\r\n            &lt;/div>\r\n            &lt;div>\r\n                4.本协议中未尽事宜，按照法律法规和树根互联相关业务规则及国内通行的惯例办理。\r\n            &lt;/div>\r\n        &lt;/div>\r\n		        \r\n    &lt;/div>', 1, 7, '-1', 1, '2022-01-24 15:45:54', '2022-01-24 15:49:21')
+    </insert>
+
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/DeviceListMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/DeviceListMapper.xml
new file mode 100644
index 0000000..c0b26f2
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/DeviceListMapper.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rootcloud.domain.dao.ds.DeviceListMapper">
+
+    <select id="selectByUserId" resultType="com.rootcloud.domain.entity.ds.DeviceListEntity">
+        SELECT
+            SBLB_SBBM,
+            SBLB_SBMC,
+            SBLB_LWZT_CODE,
+            SBLB_SBXH_NAME,
+            SBLB_SBXH_CODE,
+            SBLB_SBLX_NAME,
+            SBLB_SBLX_CODE,
+            NX_JCXX_SBLB_ID as nxJcxxSblbId,
+            SBLB_SBLY,
+            SBLB_KHID
+        FROM
+            NX_JCXX_SBLB where 1=1
+        <if test="userId != null">
+            and SBLB_KHID = ( SELECT max(NX_KHGL_ID) FROM nx_khgl_khld WHERE nx_khgl_khld.KHLD_LDID = #{userId}  )
+        </if>
+        <if test="zhId != null and zhId != ''">
+            and SY_ZHID = #{zhId}
+        </if>
+    </select>
+
+    <select id="selectBykhmc" resultType="com.rootcloud.domain.entity.ds.DeviceListEntity">
+        SELECT
+            SBLB_SBBM,
+            SBLB_SBMC,
+            SBLB_LWZT_CODE,
+            SBLB_SBXH_NAME,
+            SBLB_SBXH_CODE,
+            SBLB_SBLX_NAME,
+            SBLB_SBLX_CODE,
+            NX_JCXX_SBLB_ID as nxJcxxSblbId,
+            SBLB_SBLY,
+            SBLB_KHID
+        FROM
+            NX_JCXX_SBLB  where 1=1
+        <if test="khmc != null and khmc != ''">
+            and SBLB_KHMC in (${khmc})
+        </if>
+        <if test="zhId != null and zhId != ''">
+            and SY_ZHID = #{zhId}
+        </if>
+    </select>
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/DeviceMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..c27f801
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rootcloud.domain.mapper.DeviceMapper">
+    <select id="findAll" resultType="com.rootcloud.domain.dto.DeviceDTO">
+        select jd.DEVICE_SBLX_NAME as typeName, jd.DEVICE_SBXH_NAME as modelName ,
+               sb.SBLB_WBJSRQ as warrantyTime,
+               sb.SBLB_KHMC as customerName,
+               sb.SBLB_SBZT_NAME as deviceStatus,
+               jd.NX_JE_DEVICE_ID as id,
+               jd.DEVICE_SBBM as code ,
+               jd.DEVICE_JWD as location,
+               jd.DEVICE_SBMC as name ,
+               jd.DEVICE_SBXXDZ as address,
+               sb.SBLB_SBXXDZ as address2,
+               jd.DEVICE_STATUS_CODE as status,
+               jd.DEVICE_NETWORK_STATUS_CODE as networkStatus,
+               jd.DEVICE_SSKHMC as clientUserName,
+               jd.MODEL_ID ,
+               jd.CREATE_TIME as cloudTime from nx_je_device jd left join
+                                                nx_jcxx_sblb sb
+                                                on jd.DEVICE_SBBM = sb.SBLB_SBBM
+        where jd.device_source = 1
+    </select>
+
+
+
+    <select id="findAllByUserId" resultType="com.rootcloud.domain.dto.DeviceDTO">
+        select jd.DEVICE_SBLX_NAME as typeName, jd.DEVICE_SBXH_NAME as modelName ,
+        sb.SBLB_WBJSRQ as warrantyTime,
+        sb.SBLB_KHMC as customerName,
+        sb.SBLB_SBZT_NAME as deviceStatus,
+        jd.NX_JE_DEVICE_ID as id,
+        jd.DEVICE_SBBM as code ,
+        jd.DEVICE_JWD as location,
+        jd.DEVICE_SBMC as name ,
+        jd.DEVICE_SBXXDZ as address,
+        sb.SBLB_SBXXDZ as address2,
+        jd.DEVICE_STATUS_CODE as status,
+        jd.DEVICE_NETWORK_STATUS_CODE as networkStatus,
+        jd.DEVICE_SSKHMC as clientUserName,
+        jd.MODEL_ID ,
+        jd.CREATE_TIME as cloudTime
+        from nx_je_device jd
+        join nx_jcxx_sblb sb on jd.NX_JE_DEVICE_ID = sb.NX_JCXX_SBLB_ID
+        where jd.device_source = 1
+        <if test="userIds != '' and userIds != null">
+            and jd.DEVICE_SSKH  in
+            <foreach item="item" index="index" collection="userIds.split(',')"  open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+
+    <select id="findSpecialAll" resultType="com.rootcloud.domain.dto.DeviceSpecialDTO">
+        select NX_JCXX_SBLB_ID as id,
+               SBLB_SBBM as deviceNo ,
+               SBLB_SBLX_CODE as deviceType,
+               SBLB_SBXH_CODE as deviceSbxh,
+               SBLB_SBLX_NAME as deviceTypeName,
+               SBLB_SBXH_NAME as dviceModelName,
+               SBLB_JWD as location,
+               SBLB_SBMC as name ,
+               SBLB_SBXXDZ as address,
+               SBLB_SBZT_CODE as status,
+               SBLB_LWZT_CODE as networkStatus,
+               SY_CREATETIME as cloudTime from nx_jcxx_sblb where SBLB_SBZT_CODE in ('1', '2', '5', '7', '8', '9')
+    </select>
+
+    <select id="findAllWithMonthWorkTime" resultType="com.rootcloud.domain.dto.DeviceWorkTimeDTO">
+        select * from NX_DEVICE_WORKING_TIMES_MONTH
+        <where>
+            1 = 1
+            <if test="deviceId != '' and deviceId != null">
+                and device_id = #{deviceId}
+            </if>
+            <if test="searchDate != null">
+                and TIME = #{searchDate}
+            </if>
+        </where>
+    </select>
+
+    <select id="findAllWithMonthWorkBetweenTime" resultType="com.rootcloud.domain.dto.DeviceWorkTimeDTO">
+        select * from NX_DEVICE_WORKING_TIMES_MONTH
+        <where>
+            1 = 1
+            <if test="deviceId != '' and deviceId != null">
+                and device_id = #{deviceId}
+            </if>
+            <if test="startDate != null">
+                and TIME  &gt;= #{startDate}
+            </if>
+
+            <if test="endDate != null">
+                and TIME &lt;= #{endDate}
+            </if>
+        </where>
+    </select>
+
+    <select id="findAllWithDayWorkTime" resultType="com.rootcloud.domain.dto.DeviceWorkTimeDTO">
+        select * from NX_DEVICE_WORKING_TIMES_DAY
+        <where>
+            1 = 1
+            <if test="deviceId != '' and deviceId != null">
+                and device_id = #{deviceId}
+            </if>
+            <if test="startDate != null">
+                and TIME  &gt;= #{startDate}
+            </if>
+
+            <if test="endDate != null">
+                and TIME &lt;= #{endDate}
+            </if>
+        </where>
+    </select>
+
+
+    <delete id="clearDeviceTimesDay">
+        delete from NX_DEVICE_WORKING_TIMES_DAY where time=#{time}
+        <if test="clearAll!=null and clearAll == false">
+            and DEVICE_ID
+            <foreach collection="resultList" open="in(" item="item" separator="," close=")">
+                #{item.deviceId}
+            </foreach>
+        </if>
+    </delete>
+
+    <insert id="batchAddDeviceTimesDay">
+        insert into NX_DEVICE_WORKING_TIMES_DAY(TIME, DEVICE_ID, ONLINED_TIMES,SY_CREATETIME)
+        values
+        <foreach collection="resultList" item="item" separator=",">
+            (#{time}, #{item.deviceId}, #{item.dyhs},#{syCreatetime})
+        </foreach>
+    </insert>
+
+
+    <select id="statisticsDeviceTimesMonth" parameterType="map" resultType="map">
+        SELECT
+            sum( ONLINED_TIMES ) as onlinedTimes,
+            DEVICE_ID as deviceId,
+            date_format( time, '%Y-%m' ) as yearMonth
+        FROM
+            NX_DEVICE_WORKING_TIMES_DAY
+        WHERE
+            date_format( time, '%Y-%m' ) = #{month}
+        GROUP BY
+            DEVICE_ID,
+            date_format(
+                    time,
+                    '%Y-%m')
+    </select>
+
+
+    <select id="getDeviceTimesMonth" parameterType="map" resultType="map">
+        select * from NX_DEVICE_WORKING_TIMES_MONTH
+        WHERE DEVICE_ID = #{deviceId} and date_format( time, '%Y-%m' ) = #{month}
+    </select>
+
+
+    <update id="updateDeviceTimesMonth" parameterType="map">
+        update NX_DEVICE_WORKING_TIMES_MONTH set ONLINED_TIMES=#{onlinedTimes}
+        where  TIME = #{time} and DEVICE_ID = #{deviceId}
+    </update>
+
+    <insert id="insertDeviceTimesMonth" parameterType="map">
+        insert into NX_DEVICE_WORKING_TIMES_MONTH(TIME, DEVICE_ID, ONLINED_TIMES)
+        values  (#{time}, #{deviceId}, #{onlinedTimes})
+    </insert>
+
+    <select id="getPrinterEfficiencyData" resultType="map">
+        select
+            device_id as device_id,
+            sum(gk_sc_dy_dyhs) / (count(distinct case
+                                                     when gk_sc_dy_dyhs = 0 then null
+                                                     else data_day
+                end) * 24) as dyhs,
+            sum(gk_sc_dy_dytime) / count(distinct case
+                                                      when gk_sc_dy_dytime = 0 then null
+                                                      else data_day
+                end) as dyxl,
+            sum(gk_sc_dy_ghjhl) /  count(distinct case
+                                                      when gk_sc_dy_ghjhl = 0 then null
+                                                      else data_day
+                end) as btl
+        from rep_printer_efficiency
+        where data_year = #{year}
+          and data_month = #{month}
+          and data_day = #{day}
+          and gk_sc_dy_dyhs + gk_sc_dy_dytime + gk_sc_dy_ghjhl <![CDATA[ <> ]]> 0
+        group by device_id
+    </select>
+
+
+    <!--    <select id="findCameraList" resultMap="deviceCameraMap">-->
+    <!--        select a.SBLB_SBBM,-->
+    <!--               a.SBLB_SBMC,-->
+    <!--               a.SBLB_SBLX_NAME,-->
+    <!--               a.NX_JCXX_SBLB_ID,-->
+    <!--               B.NAME,-->
+    <!--               B.SNO,-->
+    <!--               B.CNO,-->
+    <!--               B.FACTORY_NAME,-->
+    <!--               B.MODEL,-->
+    <!--               b.NX_JCXX_SBLB_CAMERA_ID as ID,-->
+    <!--               b.DEVICE_ID,-->
+    <!--               b.ORDER_INDEX-->
+    <!--        from NX_JCXX_SBLB_CAMERA b-->
+    <!--                 right join (select SBLB_SBBM, SBLB_SBMC, SBLB_SBLX_NAME, NX_JCXX_SBLB_ID from NX_JCXX_SBLB    order by SY_CREATETIME desc) a on a.NX_JCXX_SBLB_ID = b.DEVICE_ID-->
+    <!--        <where>-->
+    <!--             1 = 1-->
+    <!--            <if test="name != null and name  != ''">-->
+    <!--                AND a.SBLB_SBMC like  concat('%',#{name},'%')-->
+    <!--            </if>-->
+    <!--            <if test="no != null and no  != ''">-->
+    <!--                AND a.SBLB_SBBM like  concat('%',#{no},'%')-->
+    <!--            </if>-->
+    <!--            <if test="type != null and type  != ''">-->
+    <!--                AND a.SBLB_SBLX_NAME like  concat('%',#{type},'%')-->
+    <!--            </if>-->
+    <!--        </where>-->
+    <!--        limit ${startNo},${endNo}-->
+    <!--    </select>-->
+
+    <select id="findCameraCount" resultType="java.lang.Integer">
+        select  count(1) from NX_JCXX_SBLB
+        <where>
+            1 = 1
+            <if test="name != null and name  != ''">
+                AND NX_JCXX_SBLB.SBLB_SBMC like  concat('%',#{name},'%')
+            </if>
+            <if test="no != null and no  != ''">
+                AND NX_JCXX_SBLB.SBLB_SBBM like  concat('%',#{no},'%')
+            </if>
+            <if test="type != null and type  != ''">
+                AND NX_JCXX_SBLB.SBLB_SBLX_NAME like  concat('%',#{type},'%')
+            </if>
+        </where>
+    </select>
+
+    <!--    <resultMap id="deviceCameraMap" type="com.rootcloud.domain.dto.NxDeviceDTO">-->
+    <!--        <id property="deviceId" column="NX_JCXX_SBLB_ID"></id>-->
+    <!--        <result property="no" column="SBLB_SBBM"></result>-->
+    <!--        <result property="name" column="SBLB_SBMC"></result>-->
+    <!--        <result property="type" column="SBLB_SBLX_NAME"></result>-->
+    <!--        <collection property="cameras" ofType="com.rootcloud.domain.dto.CameraDTO">-->
+    <!--            <id property="id" column="ID"></id>-->
+    <!--            <result property="name" column="NAME"></result>-->
+    <!--            <result property="sno" column="SNO"></result>-->
+    <!--            <result property="cno" column="CNO"></result>-->
+    <!--            <result property="model" column="MODEL"></result>-->
+    <!--            <result property="factoryName" column="FACTORY_NAME"></result>-->
+    <!--            <result property="deviceId" column="DEVICE_ID"></result>-->
+    <!--            <result property="orderIndex" column="ORDER_INDEX"></result>-->
+    <!--        </collection>-->
+    <!--    </resultMap>-->
+
+    <resultMap id="deviceCameraMap" type="com.rootcloud.domain.dto.NxDeviceDTO">
+        <id property="deviceId" column="NX_JCXX_SBLB_ID"></id>
+        <result property="no" column="SBLB_SBBM"></result>
+        <result property="name" column="SBLB_SBMC"></result>
+        <result property="type" column="SBLB_SBLX_NAME"></result>
+        <!--        <collection property="cameras" column="deviceId" select="selectCameras">-->
+        <!--            <id property="id" column="ID"></id>-->
+        <!--            <result property="name" column="NAME"></result>-->
+        <!--            <result property="sno" column="SNO"></result>-->
+        <!--            <result property="cno" column="CNO"></result>-->
+        <!--            <result property="model" column="MODEL"></result>-->
+        <!--            <result property="factoryName" column="FACTORY_NAME"></result>-->
+        <!--            <result property="deviceId" column="DEVICE_ID"></result>-->
+        <!--            <result property="orderIndex" column="ORDER_INDEX"></result>-->
+        <!--        </collection>-->
+    </resultMap>
+
+    <select id="findCameraList" resultMap="deviceCameraMap">
+        select a.SBLB_SBBM,
+        a.SBLB_SBMC,
+        a.SBLB_SBLX_NAME,
+        a.NX_JCXX_SBLB_ID from NX_JCXX_SBLB a
+        <where>
+            1 = 1
+            <if test="name != null and name  != ''">
+                AND a.SBLB_SBMC like  concat('%',#{name},'%')
+            </if>
+            <if test="no != null and no  != ''">
+                AND a.SBLB_SBBM like  concat('%',#{no},'%')
+            </if>
+            <if test="type != null and type  != ''">
+                AND a.SBLB_SBLX_NAME like  concat('%',#{type},'%')
+            </if>
+        </where>
+        order by SY_CREATETIME desc
+        limit ${startNo},${endNo}
+    </select>
+
+    <select id="selectCameras" resultType="com.rootcloud.domain.dto.CameraDTO" parameterType="java.lang.String">
+        select
+            B.NAME,
+            B.SNO,
+            B.CNO,
+            B.FACTORY_NAME,
+            B.MODEL,
+            b.NX_JCXX_SBLB_CAMERA_ID as ID,
+            b.DEVICE_ID,
+            b.ORDER_INDEX
+        from NX_JCXX_SBLB_CAMERA b where b.DEVICE_ID = #{deviceId}
+    </select>
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/GbsjbDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/GbsjbDao.xml
new file mode 100644
index 0000000..db14ee8
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/GbsjbDao.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rootcloud.domain.dao.GbsjbDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.rootcloud.domain.entity.GbsjbEntity" id="gbsjbMap">
+        <result property="gbsjbSbbm" column="GBSJB_SBBM"/>
+        <result property="gbsjbHtdqrq" column="GBSJB_HTDQRQ"/>
+        <result property="gbsjbGzr" column="GBSJB_GZR"/>
+        <result property="gbsjbCjrq" column="GBSJB_CJRQ"/>
+        <result property="gbsjbId" column="GBSJB_ID"/>
+        <result property="syAudflag" column="SY_AUDFLAG"/>
+        <result property="syCreateorgid" column="SY_CREATEORGID"/>
+        <result property="syCreateorg" column="SY_CREATEORG"/>
+        <result property="syCreateorgname" column="SY_CREATEORGNAME"/>
+        <result property="syCreatetime" column="SY_CREATETIME"/>
+        <result property="syCreateuserid" column="SY_CREATEUSERID"/>
+        <result property="syCreateuser" column="SY_CREATEUSER"/>
+        <result property="syCreateusername" column="SY_CREATEUSERNAME"/>
+        <result property="syStatus" column="SY_STATUS"/>
+        <result property="syOrderindex" column="SY_ORDERINDEX"/>
+        <result property="syPiid" column="SY_PIID"/>
+        <result property="syPdid" column="SY_PDID"/>
+        <result property="syJtgsmc" column="SY_JTGSMC"/>
+        <result property="syJtgsid" column="SY_JTGSID"/>
+        <result property="syFuncedit" column="SY_FUNCEDIT"/>
+        <result property="gbsjbKhmc" column="GBSJB_KHMC"/>
+        <result property="gbsjbSbmc" column="GBSJB_SBMC"/>
+        <result property="gbsjbSbxh" column="GBSJB_SBXH"/>
+        <result property="gbsjbHtmc" column="GBSJB_HTMC"/>
+        <result property="gbsjbSysj" column="GBSJB_SYSJ"/>
+        <result property="gbsjbTzdx" column="GBSJB_TZDX"/>
+        <result property="gbsjbLxdh" column="GBSJB_LXDH"/>
+        <result property="gbsjbJg" column="GBSJB_JG"/>
+        <result property="gbsjbBz" column="GBSJB_BZ"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/JeCoreEnduserDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/JeCoreEnduserDao.xml
new file mode 100644
index 0000000..32f3f69
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/JeCoreEnduserDao.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rootcloud.domain.dao.JeCoreEnduserDao">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.rootcloud.domain.entity.JeCoreEnduserEntity" id="jeCoreEnduserMap">
+        <result property="userid" column="USERID"/>
+        <result property="audflag" column="AUDFLAG"/>
+        <result property="createorg" column="CREATEORG"/>
+        <result property="createorgname" column="CREATEORGNAME"/>
+        <result property="createtime" column="CREATETIME"/>
+        <result property="createuser" column="CREATEUSER"/>
+        <result property="createusername" column="CREATEUSERNAME"/>
+        <result property="flag" column="FLAG"/>
+        <result property="modifyorg" column="MODIFYORG"/>
+        <result property="modifyorgname" column="MODIFYORGNAME"/>
+        <result property="modifytime" column="MODIFYTIME"/>
+        <result property="modifyuser" column="MODIFYUSER"/>
+        <result property="modifyusername" column="MODIFYUSERNAME"/>
+        <result property="status" column="STATUS"/>
+        <result property="idcard" column="IDCARD"/>
+        <result property="orderindex" column="ORDERINDEX"/>
+        <result property="password" column="PASSWORD"/>
+        <result property="usercard" column="USERCARD"/>
+        <result property="usercode" column="USERCODE"/>
+        <result property="username" column="USERNAME"/>
+        <result property="deptid" column="DEPTID"/>
+        <result property="pdid" column="PDID"/>
+        <result property="piid" column="PIID"/>
+        <result property="ismanager" column="ISMANAGER"/>
+        <result property="monitordeptcode" column="MONITORDEPTCODE"/>
+        <result property="monitordept" column="MONITORDEPT"/>
+        <result property="rtxid" column="RTXID"/>
+        <result property="gender" column="GENDER"/>
+        <result property="issysuser" column="ISSYSUSER"/>
+        <result property="jobnum" column="JOBNUM"/>
+        <result property="easyname" column="EASYNAME"/>
+        <result property="fullname" column="FULLNAME"/>
+        <result property="deptname" column="deptname"/>
+        <result property="deptcode" column="DEPTCODE"/>
+        <result property="rolenames" column="ROLENAMES"/>
+        <result property="rolecodes" column="ROLECODES"/>
+        <result property="sentrynames" column="SENTRYNAMES"/>
+        <result property="sentrycodes" column="SENTRYCODES"/>
+        <result property="sentryids" column="SENTRYIDS"/>
+        <result property="shadow" column="SHADOW"/>
+        <result property="backusercode" column="BACKUSERCODE"/>
+        <result property="iconcls" column="ICONCLS"/>
+        <result property="othercard" column="OTHERCARD"/>
+        <result property="companyemail" column="COMPANYEMAIL"/>
+        <result property="otheremail" column="OTHEREMAIL"/>
+        <result property="birthday" column="BIRTHDAY"/>
+        <result property="nation" column="NATION"/>
+        <result property="nativeplace" column="NATIVEPLACE"/>
+        <result property="degree" column="DEGREE"/>
+        <result property="married" column="MARRIED"/>
+        <result property="photo" column="PHOTO"/>
+        <result property="workexperience" column="WORKEXPERIENCE"/>
+        <result property="contacts" column="CONTACTS"/>
+        <result property="craftname" column="CRAFTNAME"/>
+        <result property="craftcode" column="CRAFTCODE"/>
+        <result property="executivename" column="EXECUTIVENAME"/>
+        <result property="executivecode" column="EXECUTIVECODE"/>
+        <result property="phone" column="PHONE"/>
+        <result property="expirydate" column="EXPIRYDATE"/>
+        <result property="failuretime" column="FAILURETIME"/>
+        <result property="roleids" column="ROLEIDS"/>
+        <result property="zuoji" column="ZUOJI"/>
+        <result property="deptorderindex" column="DEPTORDERINDEX"/>
+        <result property="userorder" column="USERORDER"/>
+        <result property="jtgsid" column="JTGSID"/>
+        <result property="jtgsmc" column="JTGSMC"/>
+        <result property="jtgsdm" column="JTGSDM"/>
+        <result property="theme" column="THEME"/>
+        <result property="gsbmid" column="GSBMID"/>
+        <result property="zsldname" column="ZSLDNAME"/>
+        <result property="zsldid" column="ZSLDID"/>
+        <result property="plususercode" column="PLUSUSERCODE"/>
+        <result property="plususerpass" column="PLUSUSERPASS"/>
+        <result property="plusrememberpass" column="PLUSREMEMBERPASS"/>
+        <result property="plusautologin" column="PLUSAUTOLOGIN"/>
+        <result property="sound" column="SOUND"/>
+        <result property="menutype" column="MENUTYPE"/>
+        <result property="loginlocked" column="LOGINLOCKED"/>
+        <result property="zhid" column="ZHID"/>
+        <result property="zhmc" column="ZHMC"/>
+        <result property="logintime" column="LOGINTIME"/>
+        <result property="identphone" column="IDENTPHONE"/>
+        <result property="loginnumber" column="LOGINNUMBER"/>
+        <result property="rzrq" column="RZRQ"/>
+        <result property="lzrq" column="LZRQ"/>
+        <result property="valid" column="VALID"/>
+        <result property="onlinesys" column="ONLINESYS"/>
+        <result property="initpassword" column="INITPASSWORD"/>
+        <result property="enduserAge" column="ENDUSER_AGE"/>
+        <result property="enduserHyzkName" column="ENDUSER_HYZK_NAME"/>
+        <result property="enduserHyzkCode" column="ENDUSER_HYZK_CODE"/>
+        <result property="enduserHjxzName" column="ENDUSER_HJXZ_NAME"/>
+        <result property="enduserHjxzCode" column="ENDUSER_HJXZ_CODE"/>
+        <result property="enduserSccjgzrq" column="ENDUSER_SCCJGZRQ"/>
+        <result property="enduserZgl" column="ENDUSER_ZGL"/>
+        <result property="enduserZzmmName" column="ENDUSER_ZZMM_NAME"/>
+        <result property="enduserZzmmCode" column="ENDUSER_ZZMM_CODE"/>
+        <result property="enduserSfzfzz" column="ENDUSER_SFZFZZ"/>
+        <result property="enduserLxrgxName" column="ENDUSER_LXRGX_NAME"/>
+        <result property="enduserLxrgxCode" column="ENDUSER_LXRGX_CODE"/>
+        <result property="enduserJjlxrdz" column="ENDUSER_JJLXRDZ"/>
+        <result property="enduserJjlxrdh" column="ENDUSER_JJLXRDH"/>
+        <result property="enduserYglxName" column="ENDUSER_YGLX_NAME"/>
+        <result property="enduserYglxCode" column="ENDUSER_YGLX_CODE"/>
+        <result property="enduserSyqName" column="ENDUSER_SYQ_NAME"/>
+        <result property="enduserSyqCode" column="ENDUSER_SYQ_CODE"/>
+        <result property="enduserZzrq" column="ENDUSER_ZZRQ"/>
+        <result property="enduserSln" column="ENDUSER_SLN"/>
+        <result property="enduserSly" column="ENDUSER_SLY"/>
+        <result property="enduserGzkhyx" column="ENDUSER_GZKHYX"/>
+        <result property="enduserGzkzh" column="ENDUSER_GZKZH"/>
+        <result property="enduserSbzh" column="ENDUSER_SBZH"/>
+        <result property="enduserGjjzh" column="ENDUSER_GJJZH"/>
+        <result property="enduserSxqm" column="ENDUSER_SXQM"/>
+        <result property="enduserFrztName" column="ENDUSER_FRZT_NAME"/>
+        <result property="enduserFrztCode" column="ENDUSER_FRZT_CODE"/>
+        <result property="enduserHtkssj" column="ENDUSER_HTKSSJ"/>
+        <result property="enduserHtjssj" column="ENDUSER_HTJSSJ"/>
+        <result property="enduserQycs" column="ENDUSER_QYCS"/>
+        <result property="enduserHtfj" column="ENDUSER_HTFJ"/>
+        <result property="enduserQysj" column="ENDUSER_QYSJ"/>
+        <result property="enduserLdhtlxName" column="ENDUSER_LDHTLX_NAME"/>
+        <result property="enduserLdhtlxCode" column="ENDUSER_LDHTLX_CODE"/>
+        <result property="enduserHtqxName" column="ENDUSER_HTQX_NAME"/>
+        <result property="enduserHtqxCode" column="ENDUSER_HTQX_CODE"/>
+        <result property="enduserShy" column="ENDUSER_SHY"/>
+        <result property="enduserSyqxz" column="ENDUSER_SYQXZ"/>
+        <result property="enduserZzhxz" column="ENDUSER_ZZHXZ"/>
+        <result property="isSuperManager" column="IS_SUPER_MANAGER"/>
+    </resultMap>
+
+
+    <select id="getUserInfo" resultType="com.rootcloud.config.auth.LoginUserInfo" parameterType="java.lang.String">
+        SELECT
+        userId as userId,
+        username as userName,
+        zhid as tenantId,
+        (SELECT GROUP_CONCAT(ROLEID) FROM je_core_role_user where je_core_role_user.userid = je_core_enduser.USERID) as roleIds
+        from je_core_enduser where USERID = #{userId}
+    </select>
+
+
+    <select id="getUser" resultType="com.rootcloud.config.auth.UserInfo" parameterType="java.lang.String">
+        SELECT
+            userId as userId,
+            username as userName,
+            zhid as tenantId,
+            ROLEIDS as roleIds
+        from je_core_enduser where USERID = #{userId}
+    </select>
+
+    <select id="getSiteByUserId" resultType="com.rootcloud.domain.entity.SiteDTO" parameterType="java.lang.String">
+        SELECT
+            max(FWRY_WDID) AS siteId,
+            (
+                SELECT
+                    FWWD_SSQY
+                FROM
+                    NXGX_JCDA_FWWD
+                WHERE
+                    NXGX_JCDA_FWWD_ID = NXGX_JCDA_FWRY.FWRY_WDID
+            ) AS serviceArea
+        FROM
+            NXGX_JCDA_FWRY
+        WHERE
+            NXGX_JCDA_FWRY.userid = #{userId}
+    </select>
+
+    <select id="getCustomsBySiteAreaName" resultType="java.lang.String" parameterType="java.lang.String">
+        SELECT GROUP_CONCAT(NX_KHGL_ID) from nx_khgl where KHGL_KHDZ like concat('%',#{areaName},'%')
+    </select>
+
+    <select id="getCustomByUserId" resultType="java.lang.String" parameterType="java.lang.String">
+        SELECT NX_KHGL_ID from nx_khgl_khld where KHLD_LDID = #{userId}
+    </select>
+    <select id="getRolesByUserId" resultType="java.lang.String">
+        SELECT GROUP_CONCAT(ROLEID) FROM je_core_role_user where je_core_role_user.userid = #{userId}
+    </select>
+
+    <select id="getTenantInfo" resultType="com.rootcloud.domain.dto.EnterpriseInfoDTO" parameterType="java.lang.String">
+        SELECT ZHMC as enterpriseAbbreviation,ZHMC as enterpriseDesc,ZHMC as enterpriseName,BACKUSERCODE as enterprisePhone,ZHID as tenantId,userId as userId,username as userName from je_core_enduser where userid = #{userId}
+    </select>
+
+    <select id="getTenantInfoNOSQL" resultType="String" parameterType="java.lang.String">
+        SELECT ZHID as tenantId from je_core_enduser where userid = #{userId}
+    </select>
+
+    <select id="getUserLoginInfo" resultType="com.rootcloud.domain.dto.UserRoleDeptDTO" parameterType="java.lang.String">
+         SELECT deptname as deptNames, DEPTID as deptIds, username as loginName, username as nickName, roleids as roleIds, rolenames as roleNames,zhid as tenantId,userid as userId,BACKUSERCODE as userMobile,username as userName from je_core_enduser where userid = #{userId}
+    </select>
+    <select id="getUserListByRole" parameterType="String" resultMap="jeCoreEnduserMap">
+        select  * from je_core_enduser where ROLECODES like concat('%',#{role},'%') and zhid=#{zhid}
+    </select>
+
+    <select id="getDataByKey" resultType="string">
+        select CONFIG_VALUE from je_user_config where CONFIG_CODE=#{key}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/JeCoreRoleDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/JeCoreRoleDao.xml
new file mode 100644
index 0000000..813f6af
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/JeCoreRoleDao.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rootcloud.domain.dao.JeCoreRoleDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.rootcloud.domain.entity.JeCoreRoleEntity" id="jeCoreRoleMap">
+        <result property="roleid" column="ROLEID"/>
+        <result property="audflag" column="AUDFLAG"/>
+        <result property="createorg" column="CREATEORG"/>
+        <result property="createorgname" column="CREATEORGNAME"/>
+        <result property="createtime" column="CREATETIME"/>
+        <result property="createuser" column="CREATEUSER"/>
+        <result property="createusername" column="CREATEUSERNAME"/>
+        <result property="flag" column="FLAG"/>
+        <result property="modifyorg" column="MODIFYORG"/>
+        <result property="modifyorgname" column="MODIFYORGNAME"/>
+        <result property="modifytime" column="MODIFYTIME"/>
+        <result property="modifyuser" column="MODIFYUSER"/>
+        <result property="modifyusername" column="MODIFYUSERNAME"/>
+        <result property="status" column="STATUS"/>
+        <result property="layer" column="LAYER"/>
+        <result property="nodetype" column="NODETYPE"/>
+        <result property="orderindex" column="ORDERINDEX"/>
+        <result property="rolecode" column="ROLECODE"/>
+        <result property="rolename" column="ROLENAME"/>
+        <result property="parent" column="PARENT"/>
+        <result property="nodeinfo" column="NODEINFO"/>
+        <result property="nodeinfotype" column="NODEINFOTYPE"/>
+        <result property="icon" column="ICON"/>
+        <result property="pdid" column="PDID"/>
+        <result property="piid" column="PIID"/>
+        <result property="issuperadmin" column="ISSUPERADMIN"/>
+        <result property="path" column="PATH"/>
+        <result property="iconcls" column="ICONCLS"/>
+        <result property="parentname" column="PARENTNAME"/>
+        <result property="parentcode" column="PARENTCODE"/>
+        <result property="groupcode" column="GROUPCODE"/>
+        <result property="groupname" column="GROUPNAME"/>
+        <result property="rejectgroupcode" column="REJECTGROUPCODE"/>
+        <result property="rejectgroupname" column="REJECTGROUPNAME"/>
+        <result property="extendgroupcode" column="EXTENDGROUPCODE"/>
+        <result property="extendgroupname" column="EXTENDGROUPNAME"/>
+        <result property="deptid" column="DEPTID"/>
+        <result property="sentryid" column="SENTRYID"/>
+        <result property="roletype" column="ROLETYPE"/>
+        <result property="manager" column="MANAGER"/>
+        <result property="develop" column="DEVELOP"/>
+        <result property="parentpath" column="PARENTPATH"/>
+        <result property="treeorderindex" column="TREEORDERINDEX"/>
+        <result property="jtgsid" column="JTGSID"/>
+        <result property="jtgsmc" column="JTGSMC"/>
+        <result property="rolerank" column="ROLERANK"/>
+        <result property="cpname" column="CPNAME"/>
+        <result property="cpid" column="CPID"/>
+        <result property="baserolename" column="BASEROLENAME"/>
+        <result property="baseroleid" column="BASEROLEID"/>
+        <result property="saas" column="SAAS"/>
+        <result property="zhid" column="ZHID"/>
+        <result property="zhmc" column="ZHMC"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/JeCoreRoleUserDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/JeCoreRoleUserDao.xml
new file mode 100644
index 0000000..66900a5
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/JeCoreRoleUserDao.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rootcloud.domain.dao.JeCoreRoleUserDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.rootcloud.domain.entity.JeCoreRoleUserEntity" id="jeCoreRoleUserMap">
+        <result property="roleid" column="ROLEID"/>
+        <result property="userid" column="USERID"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/JeSysUsermsgDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/JeSysUsermsgDao.xml
new file mode 100644
index 0000000..84676c2
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/JeSysUsermsgDao.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rootcloud.domain.mapper.JeSysUsermsgMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.rootcloud.domain.entity.JeSysUsermsgEntity" id="jeSysUsermsgMap">
+        <result property="usermsgJsrId" column="USERMSG_JSR_ID"/>
+        <result property="usermsgYd" column="USERMSG_YD"/>
+        <result property="usermsgNr" column="USERMSG_NR"/>
+        <result property="usermsgBt" column="USERMSG_BT"/>
+        <result property="usermsgJssj" column="USERMSG_JSSJ"/>
+        <result property="usermsgJsrName" column="USERMSG_JSR_NAME"/>
+        <result property="usermsgMsgtypeName" column="USERMSG_MSGTYPE_NAME"/>
+        <result property="usermsgMsgtypeCode" column="USERMSG_MSGTYPE_CODE"/>
+        <result property="jeSysUsermsgId" column="JE_SYS_USERMSG_ID"/>
+        <result property="syCreateorgid" column="SY_CREATEORGID"/>
+        <result property="syCreateorg" column="SY_CREATEORG"/>
+        <result property="syCreateorgname" column="SY_CREATEORGNAME"/>
+        <result property="syCreatetime" column="SY_CREATETIME"/>
+        <result property="syCreateuserid" column="SY_CREATEUSERID"/>
+        <result property="syCreateuser" column="SY_CREATEUSER"/>
+        <result property="syCreateusername" column="SY_CREATEUSERNAME"/>
+        <result property="syStatus" column="SY_STATUS"/>
+        <result property="syOrderindex" column="SY_ORDERINDEX"/>
+        <result property="syJtgsmc" column="SY_JTGSMC"/>
+        <result property="syJtgsid" column="SY_JTGSID"/>
+        <result property="usermsgXxyCode" column="USERMSG_XXY_CODE"/>
+        <result property="usermsgXxyName" column="USERMSG_XXY_NAME"/>
+        <result property="usermsgYwId" column="USERMSG_YW_ID"/>
+        <result property="usermsgAppinfo" column="USERMSG_APPINFO"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/KhDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/KhDao.xml
new file mode 100644
index 0000000..5e41e04
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/KhDao.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.dao.KhDao">
+
+	<select id="getKuList" parameterType="com.rootcloud.domain.vo.KhVO" resultType="com.rootcloud.domain.vo.KhVO">
+		select  KHLD_LDID as userId,KHLD_LDMC as userName
+		from NX_KHGL_KHLD where nx_khgl_id =(SELECT NX_KHGL_ID FROM NX_KHGL_KHLD WHERE KHLD_LDID = #{userId})
+	</select>
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/MessageModelMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/MessageModelMapper.xml
new file mode 100644
index 0000000..219eede
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/MessageModelMapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rootcloud.domain.mapper.MessageModelMapper">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+   <!-- <resultMap type="com.rootcloud.domain.entity.NxOrderEntity" id="nxOrderMap">
+
+    </resultMap>-->
+
+    <select id="getFwjhCount" parameterType="java.util.List" resultType="int">
+        SELECT count(1) from nx_user_info WHERE INFO_XXMBID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
+
+    <delete id="delMessageModel" parameterType="java.util.List">
+        DELETE    from NX_MODEL_CONFIG where NX_MODEL_CONFIG_ID in
+        <foreach item = "item"  index = "index"  collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/ModelMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/ModelMapper.xml
new file mode 100644
index 0000000..21640ef
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/ModelMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rootcloud.domain.dao.ds.ModelSyncMapper">
+
+
+    <select id="getDemo" resultType="com.rootcloud.domain.entity.ds.ModelEntity">
+    </select>
+
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/ModelPropertyMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/ModelPropertyMapper.xml
new file mode 100644
index 0000000..4f13675
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/ModelPropertyMapper.xml
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rootcloud.domain.mapper.ModelPropertyMapper">
+
+    <resultMap id="BaseResultMap" type="com.rootcloud.domain.entity.base.ModelPropertyEntity">
+        <id column="NX_MODEL_DATA_ID" jdbcType="VARCHAR" property="id" />
+        <result column="PROPERTY_ID" jdbcType="VARCHAR" property="propertyId" />
+        <result column="PROPERTY_NAME" jdbcType="VARCHAR" property="propertyName" />
+        <result column="PROPERTY_DATA_TYPE" jdbcType="VARCHAR" property="propertyDataType" />
+        <result column="PROPERTY_DATA_UNIT" jdbcType="VARCHAR" property="propertyDataUnit" />
+        <result column="MODEL_ID" jdbcType="VARCHAR" property="modelId" />
+        <result column="CREATE_TIME" jdbcType="VARCHAR" property="createTime" />
+        <result column="UPDATE_TIME" jdbcType="VARCHAR" property="updateTime" />
+        <result column="PROPERTY_TAG" jdbcType="VARCHAR" property="propertyTag" />
+        <result column="PROPERTY_COLOR_FALSE" jdbcType="VARCHAR" property="propertyColorFalse" />
+        <result column="PROPERTY_COLOR_TRUE" jdbcType="VARCHAR" property="propertyColorTrue" />
+        <result column="PROPERTY_TAG_CODE" jdbcType="VARCHAR" property="propertyTagCode" />
+        <result column="WORKING_CONDITION_TYPE" jdbcType="VARCHAR" property="workingConditionType" />
+        <result column="PROPERTY_UUID" jdbcType="VARCHAR" property="propertyUuid" />
+        <result column="DEVICE_SBLX" jdbcType="VARCHAR" property="deviceSblx" />
+        <result column="DEVICE_SBXH" jdbcType="VARCHAR" property="deviceSbxh" />
+        <result column="DATA_SJY" jdbcType="VARCHAR" property="dataSource" />
+    </resultMap>
+
+    <resultMap id="BaseResultMap1" type="com.rootcloud.domain.entity.base.ModelColor">
+        <id column="COLOR_ID" jdbcType="VARCHAR" property="colorId" />
+        <result column="COLOR_YS" jdbcType="VARCHAR" property="colorYs" />
+        <result column="COLOR_YS_CODE" jdbcType="VARCHAR" property="colorYsCode" />
+    </resultMap>
+
+    <select id="getWorkingCondition" resultMap="BaseResultMap" parameterType="map">
+        SELECT
+        *
+        FROM
+        nx_model_data
+        WHERE
+        WORKING_CONDITION_TYPE = #{workingConditionType}
+        and   DEVICE_SBLX = #{deviceSblx}
+        and property_id is not null and property_id != ''
+        <if test="deviceSbxh != null and deviceSbxh!= ''">
+            AND device_sbxh = #{deviceSbxh}
+        </if>
+        <if test="dataSource == 0 ">
+            AND DATA_SJY = '0'
+        </if>
+    </select>
+
+    <select id="getWorkingTitle" resultType="java.lang.String" parameterType="map">
+        SELECT
+        property_tag
+        FROM
+        nx_model_data
+        WHERE
+        WORKING_CONDITION_TYPE = #{workingConditionType}
+        and (property_id is null or property_id = '')
+        and   DEVICE_SBLX = #{deviceSblx}
+        <if test="deviceSbxh != null and deviceSbxh!= ''">
+            AND device_sbxh = #{deviceSbxh}
+        </if>
+        <if test="dataSource == 0 ">
+            AND DATA_SJY = '0'
+        </if>
+        order by create_time desc
+    </select>
+
+    <select id="getGroupAtt" parameterType="map" resultMap="BaseResultMap">
+        SELECT
+        *
+        FROM
+        NX_MODEL_PROPERTY
+        where 1=1
+        <if test="workingConditionType == 2">
+            and PROPERTY_DATA_TYPE = 'boolean'
+        </if>
+        <if test="workingConditionType == 1">
+            and PROPERTY_DATA_TYPE != 'boolean'
+        </if>
+        and MODEL_ID IN (
+        SELECT
+        MODEL_ID
+        FROM
+        NX_JE_DEVICE
+        WHERE
+        DEVICE_SBLX = #{deviceSblx}
+        <if test="deviceSbxh != null and deviceSbxh!= ''">
+            AND device_sbxh = #{deviceSbxh}
+        </if>
+        )
+    </select>
+
+
+
+    <select id="getGroupAttData" parameterType="map" resultMap="BaseResultMap">
+        SELECT
+        *
+        FROM
+        nx_model_data
+        where  1=1
+        and property_id is not null and property_id != ''
+        <if test="propertyDataType != null and propertyDataType!= ''">
+            and PROPERTY_DATA_TYPE  = #{propertyDataType}
+        </if>
+        <if test="propertyTagCode != null and propertyTagCode != ''">
+            and PROPERTY_TAG_CODE = #{propertyTagCode}
+        </if>
+        <if test="propertyTag != null and propertyTag != ''">
+            and PROPERTY_TAG = #{propertyTag}
+        </if>
+        <if test="workingConditionType != null and workingConditionType != ''">
+            and WORKING_CONDITION_TYPE = #{workingConditionType}
+        </if>
+        and   DEVICE_SBLX = #{deviceSblx}
+        <if test="deviceSbxh != null and deviceSbxh!= ''">
+            AND device_sbxh = #{deviceSbxh}
+        </if>
+    </select>
+
+    <delete id="delWorkingCondition" parameterType="map">
+        DELETE  from nx_model_data where PROPERTY_TAG_CODE = #{propertyTagCode} and WORKING_CONDITION_TYPE = #{workingConditionType};
+    </delete>
+
+    <select id="getColor" resultMap="BaseResultMap1">
+        select *
+        from NX_COLOR;
+    </select>
+
+    <insert id="batchinsert" parameterType="java.util.List">
+        INSERT INTO nx_model_data (
+        `PROPERTY_ID`,
+        `PROPERTY_NAME`,
+        `PROPERTY_DATA_TYPE`,
+        `PROPERTY_DATA_UNIT`,
+        `MODEL_ID`,
+        `CREATE_TIME`,
+        `UPDATE_TIME`,
+        `PROPERTY_TAG`,
+        `PROPERTY_COLOR_FALSE`,
+        `PROPERTY_COLOR_TRUE`,
+        `PROPERTY_TAG_CODE`,
+        `WORKING_CONDITION_TYPE`,
+        `PROPERTY_UUID`,
+        `DEVICE_SBLX`,
+        `DEVICE_SBXH`,
+        `NX_MODEL_DATA_ID`,
+        `DATA_SJY`
+        ) values
+        <foreach collection="list" item="po" separator=",">
+            (
+            #{po.propertyId},
+            #{po.propertyName},
+            #{po.propertyDataType},
+            #{po.propertyDataUnit},
+            #{po.modelId},
+            #{po.createTime},
+            #{po.updateTime},
+            #{po.propertyTag},
+            #{po.propertyColorFalse},
+            #{po.propertyColorTrue},
+            #{po.propertyTagCode},
+            #{po.workingConditionType},
+            #{po.propertyUuid},
+            #{po.deviceSblx},
+            #{po.deviceSbxh},
+            #{po.id},
+            #{po.dataSource}
+            )
+        </foreach>
+    </insert>
+
+
+    <select id="queryWorkingCondition" resultMap="BaseResultMap" parameterType="map">
+        SELECT
+            *
+        FROM
+            nx_model_data
+        WHERE
+            WORKING_CONDITION_TYPE = #{workingConditionType}
+          and PROPERTY_TAG = #{propertyTag}    ;
+    </select>
+
+    <delete id="deleteByIds" parameterType="java.util.List">
+        DELETE   from nx_model_data where NX_MODEL_DATA_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteByCode" parameterType="String">
+        DELETE  from nx_model_data where PROPERTY_TAG_CODE = #{propertyTagCode}
+        <if test="notDeleteTitle != null and notDeleteTitle!= ''">
+            AND (property_id is not null or property_id != '')
+        </if>
+    </delete>
+
+
+
+    <select id="selectUnitByModelId" resultType="String">
+        select PROPERTY_DATA_UNIT  from  nx_model_property
+        where PROPERTY_ID = #{propertyId}
+          and MODEL_ID = #{modelId}
+            limit 1
+    </select>
+
+    <select id="selectUuidByModelId" resultType="String">
+        select PROPERTY_UUID  as propertyUuid from  nx_model_property
+        where PROPERTY_ID = #{propertyId}
+          and MODEL_ID = #{modelId}
+            limit 1
+    </select>
+
+    <select id="getmodelPropertyBySbxh" parameterType="java.util.List" resultMap="BaseResultMap">
+        select *  from nx_model_data where property_id is not null and property_id != '' and DEVICE_SBXH in
+        <foreach collection="list" item="sbxh" open="(" close=")" separator=",">
+            #{sbxh}
+        </foreach>
+    </select>
+
+    <delete id="del" parameterType="com.rootcloud.domain.entity.base.ModelPropertyEntity">
+        DELETE  from nx_model_data where PROPERTY_TAG = #{propertyTag} AND   DEVICE_SBLX = #{deviceSblx} AND device_sbxh = #{deviceSbxh}
+    </delete>
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/ModelPropertySyncMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/ModelPropertySyncMapper.xml
new file mode 100644
index 0000000..f07d2c4
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/ModelPropertySyncMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rootcloud.domain.dao.ds.ModelPropertySyncMapper">
+
+
+    <select id="getDemo" resultType="com.rootcloud.domain.entity.ds.ModelPropertySyncEntity">
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/NxDeviceDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/NxDeviceDao.xml
new file mode 100644
index 0000000..91117c6
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/NxDeviceDao.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.dao.NxDeviceDao">
+
+	<select id="getDeviceList" parameterType="com.rootcloud.domain.vo.NxDeviceVO" resultType="com.rootcloud.domain.vo.NxDeviceVO">
+		select NX_JE_DEVICE_ID as thingID, MODEL_ID as modeID,DEVICE_SBBM as deviceCode, DEVICE_SBMC as deviceName,
+		DEVICE_SBLX as deviceTypeId,DEVICE_SBXH as devicexhID,DEVICE_SBLX_NAME as deviceTypeName,DEVICE_SBXH_NAME as devicexhName
+		from nx_je_device
+		where 1=1 and MODEL_ID ='197ZUeGcXkY' or MODEL_ID='1bZAac2IEHS' and DEVICE_SBLX_NAME like '3DP打印机%';
+
+<!--		<if test="modeID != null and modeID != ''">-->
+<!--			and MODEL_ID =#{modeID}-->
+<!--		</if>-->
+<!--		<if test="deviceTypeId != null and deviceTypeId != ''">-->
+<!--			and DEVICE_SBLX =#{deviceTypeId}-->
+<!--		</if>-->
+<!--		<if test="deviceTypeName != null and deviceTypeName != ''">-->
+<!--			and DEVICE_SBLX_NAME =#{deviceTypeName}-->
+<!--		</if>-->
+
+<!--		<if test="DEVICE_SBLX != null and DEVICE_SBLX != ''">-->
+<!--			and DEVICE_SBLX =#{DEVICE_SBLX}-->
+<!--		</if>-->
+<!--		<if test="DEVICE_SBLX_NAME != null and DEVICE_SBLX_NAME != ''">-->
+<!--			and DEVICE_SBLX_NAME =#{DEVICE_SBLX_NAME}-->
+<!--		</if>-->
+	</select>
+
+	<select id="getDeviceListEurope" parameterType="com.rootcloud.domain.vo.NxDeviceVO" resultType="com.rootcloud.domain.vo.NxDeviceVO">
+		select NX_JE_DEVICE_ID as thingID, MODEL_ID as modeID,DEVICE_SBBM as deviceCode, DEVICE_SBMC as deviceName,
+			   DEVICE_SBLX as deviceTypeId,DEVICE_SBXH as devicexhID,DEVICE_SBLX_NAME as deviceTypeName,DEVICE_SBXH_NAME as devicexhName
+		from nx_je_device
+		where 1=1 and  MODEL_ID='1bZAac2IEHS' and DEVICE_SBLX_NAME like '3DP打印机%';
+	</select>
+
+
+	<select id="getDeviceById" parameterType="com.rootcloud.domain.vo.NxDeviceVO" resultType="com.rootcloud.domain.vo.NxDeviceVO">
+		select NX_JE_DEVICE_ID as thingID, MODEL_ID as modeID,DEVICE_SBBM as deviceCode, DEVICE_SBMC as deviceName,
+		DEVICE_SBLX as deviceTypeId,DEVICE_SBXH as devicexhID,DEVICE_SBLX_NAME as deviceTypeName,DEVICE_SBXH_NAME as devicexhName
+		from nx_je_device
+		where 1=1
+		<if test="deviceCode != null and deviceCode != ''">
+			and DEVICE_SBBM =#{deviceCode}
+		</if>
+
+
+		<!--		<if test="DEVICE_SBLX != null and DEVICE_SBLX != ''">-->
+		<!--			and DEVICE_SBLX =#{DEVICE_SBLX}-->
+		<!--		</if>-->
+		<!--		<if test="DEVICE_SBLX_NAME != null and DEVICE_SBLX_NAME != ''">-->
+		<!--			and DEVICE_SBLX_NAME =#{DEVICE_SBLX_NAME}-->
+		<!--		</if>-->
+	</select>
+
+
+	<select id="getDeviceList2" parameterType="com.rootcloud.domain.vo.NxDeviceVO" resultType="com.rootcloud.domain.vo.NxDeviceVO">
+		select NX_JE_DEVICE_ID, MODEL_ID,DEVICE_SBBM, DEVICE_SBMC, DEVICE_SBLX,DEVICE_SBXH,DEVICE_SBLX_NAME,DEVICE_SBXH_NAME,
+			   DEVICE_SBEWM,
+			   DEVICE_SBCCRQ,
+			   DEVICE_SBXXDZ,
+			   DEVICE_SSGJ,
+			   DEVICE_SSSFMC,
+			   DEVICE_SSSFBM,
+			   DEVICE_SSCSMC,
+			   DEVICE_SSQXMC,
+			   DEVICE_JD,
+			   DEVICE_WD,
+			   DEVICE_SSKH,
+			   DEVICE_STATUS_CODE,
+			   DEVICE_NETWORK_STATUS_CODE,
+			   DEVICE_SSKHMC,
+			   DEVICE_SSQXBM,
+			   DEVICE_SSCSBM,
+			   DEVICE_SBFJ,
+			   DEVICE_JWD,
+			   SY_FUNCEDIT,
+			   SY_AUDFLAG,
+			   SY_CREATEORGID,
+			   SY_CREATEORG,
+			   SY_CREATEORGNAME,
+			   SY_CREATETIME,
+			   SY_CREATEUSERID,
+			   SY_CREATEUSER,
+			   SY_CREATEUSERNAME,
+			   SY_STATUS,
+			   SY_ORDERINDEX,
+			   SY_PIID,
+			   SY_PDID,
+			   SY_JTGSMC,
+			   SY_JTGSID,
+			   DEVICE_TAG,
+			   DEVICE_SOURCE,
+			   CREATE_TIME,
+			   UPDATE_TIME
+		from nx_je_device
+		where 1=1
+	</select>
+
+
+
+
+	<select id="getDeviceListByCustomerCode" parameterType="com.rootcloud.domain.vo.NxDeviceVO" resultType="com.rootcloud.domain.vo.NxDeviceVO">
+		select NX_JE_DEVICE_ID as thingID, MODEL_ID as modeID,DEVICE_SBBM as deviceCode, DEVICE_SBMC as deviceName,
+		DEVICE_SBLX as deviceTypeId,DEVICE_SBXH as devicexhID,DEVICE_SBLX_NAME as deviceTypeName,DEVICE_SBXH_NAME as devicexhName
+		from nx_je_device
+		where 1=1
+		<if test="deviceTypeId != null and deviceTypeId != ''">
+			and DEVICE_SBLX =#{deviceTypeId}
+		</if>
+		<if test="deviceTypeName != null and deviceTypeName != ''">
+			and DEVICE_SBLX_NAME =#{deviceTypeName}
+		</if>
+	</select>
+
+	<!-- 查询用户分配的设备列表 -->
+
+	<!-- 查询客户分配的设备编号列表 -->
+	<select id="getDeviceCodeListByCustomerCode" resultType="java.lang.String">
+		SELECT t.SBLB_SBBM as deviceCode,t.SBLB_SBMC as deviceName from nx_jcxx_sblb t where
+		t.sblb_khid in
+		<foreach collection="officeIds" index="index" item="item" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+
+	</select>
+
+	<!-- 查询客户下分配的设备列表 -->
+	<select id="getDeviceListByCustomerId" parameterType="map" resultType="com.rootcloud.domain.vo.DeviceListVO">
+		SELECT t.SBLB_SBBM as deviceCode,t.SBLB_SBMC as deviceName from nx_jcxx_sblb t
+		where t.sblb_khid =#{officeId}
+	</select>
+
+
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/NxDeviceMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/NxDeviceMapper.xml
new file mode 100644
index 0000000..29e5b8f
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/NxDeviceMapper.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.mapper.NxDeviceMapper">
+
+    <select id="getJcxxByIds" resultType="com.rootcloud.vo.order.DeviceDataVo">
+        select
+        GROUP_CONCAT(SBLB_SBBM) as SBLB_SBBM,
+        GROUP_CONCAT(SBLB_SBMC) as SBLB_SBMC,
+        GROUP_CONCAT(SBLB_SBLX_NAME) as SBLB_SBLX_NAME,
+        GROUP_CONCAT(SBLB_SBXH_NAME) as SBLB_SBXH_NAME,
+        GROUP_CONCAT(SBLB_BXZT_CODE) as SBLB_BXZT_CODE,
+        GROUP_CONCAT(SBLB_SBXXDZ) as SBLB_SBXXDZ,
+        GROUP_CONCAT(SBLB_WBJSRQ) as SBLB_WBJSRQ,
+        GROUP_CONCAT(SBLB_JD) as SBLB_JD,
+        GROUP_CONCAT(SBLB_WD) as SBLB_WD,
+        GROUP_CONCAT(SBLB_KHMC) as SBLB_KHMC,
+        GROUP_CONCAT(SBLB_KHLXR) as SBLB_KHLXR,
+        GROUP_CONCAT(SBLB_LXFS) as SBLB_LXFS,
+        GROUP_CONCAT(SBLB_KHID) as SBLB_KHID,
+        GROUP_CONCAT(NX_JCXX_SBLB_ID) as NX_JCXX_SBLB_ID
+        from nx_jcxx_sblb
+        where NX_JCXX_SBLB_ID in
+        <foreach item="item" index="index" collection="ids.split(',')" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="selectFwwdId" resultType="string">
+        select NXGX_JCDA_FWWD_ID
+        from nxgx_jcda_fwwd
+        where find_in_set((select KHGL_KHDZS from nx_khgl where NX_KHGL_ID = #{khid}), FWWD_SSQY) and sy_zhid=#{zhId} limit 1
+    </select>
+
+    <select id="getKuDeviceList" resultType="com.rootcloud.vo.order.DeviceDataVo">
+        select SBLB_SBBM as SBLB_SBBM,SBLB_SBMC  as SBLB_SBMC
+        from NX_JCXX_SBLB
+        where SBLB_KHID=(SELECT NX_KHGL_ID FROM NX_KHGL_KHLD WHERE KHLD_LDID = #{userId})
+    </select>
+
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/NxJeDeviceDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/NxJeDeviceDao.xml
new file mode 100644
index 0000000..5329fce
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/NxJeDeviceDao.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rootcloud.domain.dao.gkjk.NxJeDeviceDao">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.rootcloud.domain.dao.gkjk.NxJeDeviceDao" id="nxJeDeviceMap">
+        <result property="deviceSbbm" column="DEVICE_SBBM"/>
+        <result property="deviceSbmc" column="DEVICE_SBMC"/>
+        <result property="deviceSblx" column="DEVICE_SBLX"/>
+        <result property="deviceSbxh" column="DEVICE_SBXH"/>
+        <result property="deviceSbewm" column="DEVICE_SBEWM"/>
+        <result property="deviceSbccrq" column="DEVICE_SBCCRQ"/>
+        <result property="deviceSbxxdz" column="DEVICE_SBXXDZ"/>
+        <result property="deviceSsgj" column="DEVICE_SSGJ"/>
+        <result property="deviceSssfmc" column="DEVICE_SSSFMC"/>
+        <result property="deviceSssfbm" column="DEVICE_SSSFBM"/>
+        <result property="deviceSscsmc" column="DEVICE_SSCSMC"/>
+        <result property="deviceSsqxmc" column="DEVICE_SSQXMC"/>
+        <result property="deviceJd" column="DEVICE_JD"/>
+        <result property="deviceWd" column="DEVICE_WD"/>
+        <result property="deviceSskh" column="DEVICE_SSKH"/>
+        <result property="deviceStatusCode" column="DEVICE_STATUS_CODE"/>
+        <result property="deviceNetworkStatusCode" column="DEVICE_NETWORK_STATUS_CODE"/>
+        <result property="deviceSskhmc" column="DEVICE_SSKHMC"/>
+        <result property="deviceSsqxbm" column="DEVICE_SSQXBM"/>
+        <result property="deviceSscsbm" column="DEVICE_SSCSBM"/>
+        <result property="deviceSbfj" column="DEVICE_SBFJ"/>
+        <result property="deviceSblxName" column="DEVICE_SBLX_NAME"/>
+        <result property="deviceSbxhName" column="DEVICE_SBXH_NAME"/>
+        <result property="deviceJwd" column="DEVICE_JWD"/>
+        <result property="syFuncedit" column="SY_FUNCEDIT"/>
+        <result property="nxJeDeviceId" column="NX_JE_DEVICE_ID"/>
+        <result property="syAudflag" column="SY_AUDFLAG"/>
+        <result property="syCreateorgid" column="SY_CREATEORGID"/>
+        <result property="syCreateorg" column="SY_CREATEORG"/>
+        <result property="syCreateorgname" column="SY_CREATEORGNAME"/>
+        <result property="syCreatetime" column="SY_CREATETIME"/>
+        <result property="syCreateuserid" column="SY_CREATEUSERID"/>
+        <result property="syCreateuser" column="SY_CREATEUSER"/>
+        <result property="syCreateusername" column="SY_CREATEUSERNAME"/>
+        <result property="syStatus" column="SY_STATUS"/>
+        <result property="syOrderindex" column="SY_ORDERINDEX"/>
+        <result property="syPiid" column="SY_PIID"/>
+        <result property="syPdid" column="SY_PDID"/>
+        <result property="syJtgsmc" column="SY_JTGSMC"/>
+        <result property="syJtgsid" column="SY_JTGSID"/>
+        <result property="modelId" column="MODEL_ID"/>
+        <result property="deviceTag" column="DEVICE_TAG"/>
+        <result property="deviceSource" column="DEVICE_SOURCE"/>
+        <result property="createTime" column="CREATE_TIME"/>
+        <result property="updateTime" column="UPDATE_TIME"/>
+    </resultMap>
+
+    <select id="devicePage" resultType="com.rootcloud.domain.dto.DeviceVO">
+        select * from
+        (
+        SELECT
+        NX_JCXX_SBLB_ID as deviceId,
+        SBLB_SBBM as deviceNo,
+        SBLB_SBMC as deviceName,
+        SBLB_SBLX_NAME as deviceTypeName,
+        SBLB_SBLX_CODE as deviceTypeCode,
+        SBLB_SBXH_CODE as deviceModelCode,
+        SBLB_SBXH_NAME as deviceModelName,
+        SBLB_SBXXDZ as deviceAddress,
+        SBLB_LWZT_CODE as onlineStatus,
+        SBLB_SBLY as sblbSbly,
+        s.ALARM as alarmStatus,
+        IF(SBLB_WBJSRQ >= NOW(), 1, 0) as maintenanceStatus,
+        (CASE
+        WHEN s.RUNNING = 1 THEN 4
+        WHEN s.ONLINE = 1 THEN 3
+        WHEN s.READY = 1 THEN 2
+        ELSE 1
+        END) as statusCode
+        FROM
+        nx_jcxx_sblb t
+        LEFT JOIN
+        (SELECT * FROM NX_DEVICE_WORKING_STATUS WHERE (DEVICE_ID,time) IN (SELECT DEVICE_ID,max(time) FROM
+        NX_DEVICE_WORKING_STATUS GROUP BY DEVICE_ID)) s
+        on t.NX_JCXX_SBLB_ID = s.device_id COLLATE utf8mb4_unicode_ci
+        <where>
+            <if test="isCare != null and isCare != ''">
+                AND SBLB_SFZY = #{isCare}
+            </if>
+            <if test="khmc != null and khmc != ''">
+                and SBLB_KHMC in (${khmc})
+            </if>
+            <if test="kh != null and kh != ''">
+                and SBLB_KHMC = #{kh}
+            </if>
+            <if test="syZhid != null and syZhid != ''">
+                and SY_ZHID = #{syZhid}
+            </if>
+        </where>
+        ) tt
+        <where>
+            <if test="queryData != null and queryData != ''">
+                AND (tt.deviceAddress LIKE CONCAT('%', #{queryData}, '%')
+                OR tt.deviceName LIKE CONCAT('%', #{queryData}, '%')
+                OR tt.deviceTypeName LIKE CONCAT('%', #{queryData}, '%')
+                OR tt.deviceNo LIKE CONCAT('%', #{queryData}, '%')
+                <if test="queryData eq '打印中'">
+                    OR tt.statusCode = 4
+                </if>
+                <if test="queryData eq '待机'">
+                    OR tt.statusCode = 2
+                </if>
+                <if test="queryData eq '离线'">
+                    OR tt.statusCode = 1
+                </if>
+                )
+            </if>
+        </where>
+        order by tt.statusCode desc
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/NxOrderMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/NxOrderMapper.xml
new file mode 100644
index 0000000..cf81b37
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/NxOrderMapper.xml
@@ -0,0 +1,1453 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rootcloud.domain.mapper.NxOrderMapper">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.rootcloud.domain.entity.NxOrderEntity" id="nxOrderMap">
+        <result property="orderApplydate" column="ORDER_APPLYDATE"/>
+        <result property="orderServicetypeName" column="ORDER_SERVICETYPE_NAME"/>
+        <result property="orderServicetypeCode" column="ORDER_SERVICETYPE_CODE"/>
+        <result property="orderCustomerName" column="ORDER_CUSTOMER_NAME"/>
+        <result property="orderCustomerId" column="ORDER_CUSTOMER_ID"/>
+        <result property="orderServiceaddress" column="ORDER_SERVICEADDRESS"/>
+        <result property="orderInformant" column="ORDER_INFORMANT"/>
+        <result property="orderContactway" column="ORDER_CONTACTWAY"/>
+        <result property="orderDemanddescription" column="ORDER_DEMANDDESCRIPTION"/>
+        <result property="orderFwwdid" column="ORDER_FWWDID"/>
+        <result property="orderWbjsrq" column="ORDER_WBJSRQ"/>
+        <result property="orderLcinfo" column="ORDER_LCINFO"/>
+        <result property="orderFiles" column="ORDER_FILES"/>
+        <result property="orderDevicename" column="ORDER_DEVICENAME"/>
+        <result property="orderDevicecode" column="ORDER_DEVICECODE"/>
+        <result property="orderDevicetype" column="ORDER_DEVICETYPE"/>
+        <result property="orderDevicemodel" column="ORDER_DEVICEMODEL"/>
+        <result property="orderWarrantiesName" column="ORDER_WARRANTIES_NAME"/>
+        <result property="orderWarrantiesCode" column="ORDER_WARRANTIES_CODE"/>
+        <result property="orderServicemethodName" column="ORDER_SERVICEMETHOD_NAME"/>
+        <result property="orderServicemethodCode" column="ORDER_SERVICEMETHOD_CODE"/>
+        <result property="orderAssignengineer" column="ORDER_ASSIGNENGINEER"/>
+        <result property="orderDispatchtime" column="ORDER_DISPATCHTIME"/>
+        <result property="orderPlanstarttime" column="ORDER_PLANSTARTTIME"/>
+        <result property="orderPlanendtime" column="ORDER_PLANENDTIME"/>
+        <result property="orderRepairduration" column="ORDER_REPAIRDURATION"/>
+        <result property="orderOrdertime" column="ORDER_ORDERTIME"/>
+        <result property="orderSigntime" column="ORDER_SIGNTIME"/>
+        <result property="orderSignaddress" column="ORDER_SIGNADDRESS"/>
+        <result property="orderCauseofissue" column="ORDER_CAUSEOFISSUE"/>
+        <result property="orderSolution" column="ORDER_SOLUTION"/>
+        <result property="orderRemark" column="ORDER_REMARK"/>
+        <result property="orderOrderstatusName" column="ORDER_ORDERSTATUS_NAME"/>
+        <result property="orderOrderstatusCode" column="ORDER_ORDERSTATUS_CODE"/>
+        <result property="orderOrdernumber" column="ORDER_ORDERNUMBER"/>
+        <result property="orderSource" column="ORDER_SOURCE"/>
+        <result property="orderRevisitstatusName" column="ORDER_REVISITSTATUS_NAME"/>
+        <result property="orderRevisitstatusCode" column="ORDER_REVISITSTATUS_CODE"/>
+        <result property="orderServiceaddressLongitude" column="ORDER_SERVICEADDRESS_LONGITUDE"/>
+        <result property="orderServiceaddressDimension" column="ORDER_SERVICEADDRESS_DIMENSION"/>
+        <result property="orderSignaddressLongitude" column="ORDER_SIGNADDRESS_LONGITUDE"/>
+        <result property="orderSignaddressDimension" column="ORDER_SIGNADDRESS_DIMENSION"/>
+        <result property="orderFaulttyprName" column="ORDER_FAULTTYPR_NAME"/>
+        <result property="orderFaulttyprCode" column="ORDER_FAULTTYPR_CODE"/>
+        <result property="orderCauseofissuefile" column="ORDER_CAUSEOFISSUEFILE"/>
+        <result property="orderRemarkfile" column="ORDER_REMARKFILE"/>
+        <result property="orderSolutionfile" column="ORDER_SOLUTIONFILE"/>
+        <result property="orderRefusefile" column="ORDER_REFUSEFILE"/>
+        <result property="orderRefuse" column="ORDER_REFUSE"/>
+        <result property="orderSignfile" column="ORDER_SIGNFILE"/>
+        <result property="orderAssignengineerid" column="ORDER_ASSIGNENGINEERID"/>
+        <result property="orderRemainingproblem" column="ORDER_REMAININGPROBLEM"/>
+        <result property="orderSuggestions" column="ORDER_SUGGESTIONS"/>
+        <result property="orderProcessproblem" column="ORDER_PROCESSPROBLEM"/>
+        <result property="orderWorksummary" column="ORDER_WORKSUMMARY"/>
+        <result property="orderTurndown" column="ORDER_TURNDOWN"/>
+        <result property="orderTurndownfile" column="ORDER_TURNDOWNFILE"/>
+        <result property="orderAssistengineer" column="ORDER_ASSISTENGINEER"/>
+        <result property="orderAssistengineerid" column="ORDER_ASSISTENGINEERID"/>
+        <result property="orderInstallremark" column="ORDER_INSTALLREMARK"/>
+        <result property="orderInstallremarkfile" column="ORDER_INSTALLREMARKFILE"/>
+        <result property="orderRemainingproblemfile" column="ORDER_REMAININGPROBLEMFILE"/>
+        <result property="orderSuggestionsfile" column="ORDER_SUGGESTIONSFILE"/>
+        <result property="orderProcessproblemfile" column="ORDER_PROCESSPROBLEMFILE"/>
+        <result property="orderWorksummaryfile" column="ORDER_WORKSUMMARYFILE"/>
+        <result property="nxOrderId" column="NX_ORDER_ID"/>
+        <result property="syAudflag" column="SY_AUDFLAG"/>
+        <result property="syCreateorgid" column="SY_CREATEORGID"/>
+        <result property="syCreateorg" column="SY_CREATEORG"/>
+        <result property="syCreateorgname" column="SY_CREATEORGNAME"/>
+        <result property="syCreatetime" column="SY_CREATETIME"/>
+        <result property="syCreateuserid" column="SY_CREATEUSERID"/>
+        <result property="syCreateuser" column="SY_CREATEUSER"/>
+        <result property="syCreateusername" column="SY_CREATEUSERNAME"/>
+        <result property="syStatus" column="SY_STATUS"/>
+        <result property="syOrderindex" column="SY_ORDERINDEX"/>
+        <result property="syPiid" column="SY_PIID"/>
+        <result property="syPdid" column="SY_PDID"/>
+        <result property="syJtgsmc" column="SY_JTGSMC"/>
+        <result property="syJtgsid" column="SY_JTGSID"/>
+        <result property="syStarteduser" column="SY_STARTEDUSER"/>
+        <result property="syStartedusername" column="SY_STARTEDUSERNAME"/>
+        <result property="syApprovedusers" column="SY_APPROVEDUSERS"/>
+        <result property="syApprovedusernames" column="SY_APPROVEDUSERNAMES"/>
+        <result property="syPreapprovusers" column="SY_PREAPPROVUSERS"/>
+        <result property="syLastflowinfo" column="SY_LASTFLOWINFO"/>
+        <result property="syPreapprovusernames" column="SY_PREAPPROVUSERNAMES"/>
+        <result property="syLastflowuserid" column="SY_LASTFLOWUSERID"/>
+        <result property="syLastflowuser" column="SY_LASTFLOWUSER"/>
+        <result property="syWfwarn" column="SY_WFWARN"/>
+        <result property="syCurrenttask" column="SY_CURRENTTASK"/>
+        <result property="syWarnflag" column="SY_WARNFLAG"/>
+        <result property="orderWdjd" column="ORDER_WDJD"/>
+        <result property="orderWdwd" column="ORDER_WDWD"/>
+        <result property="orderSfjj" column="ORDER_SFJJ"/>
+        <result property="orderShtgsj" column="ORDER_SHTGSJ"/>
+        <result property="orderDdms" column="ORDER_DDMS"/>
+    </resultMap>
+
+    <select id="getOrderByEngineer" parameterType="String" resultMap="nxOrderMap">
+        SELECT
+            *
+        FROM
+            nx_order
+        WHERE
+            ORDER_ASSIGNENGINEER = #{orderAssignengineer}
+        ORDER BY
+            SY_CREATETIME DESC;
+    </select>
+
+    <select id="getEngineer" resultType="com.rootcloud.domain.dto.EngineerModel">
+        SELECT
+            fw.USERID as userId,
+            fw.FWRY_YHXM AS fwryYhxm,
+            fw.FWRY_SJH AS fwrySjh,
+            jc.FWWD_WDJWD AS fwwdWdjwd
+        FROM
+            nxgx_jcda_fwry AS fw
+                LEFT JOIN nxgx_jcda_fwwd AS jc ON fw.FWRY_WDID = jc.NXGX_JCDA_FWWD_ID
+        WHERE
+            fw.FWRY_JS LIKE '%工程师%';
+    </select>
+    <select id="pendingOrder" resultType="com.rootcloud.domain.dto.PendingOrderModel">
+        SELECT
+            o.ORDER_DEVICECODE AS orderdevicecode,
+            o.ORDER_DEVICETYPE AS orderDevicetype,
+            o.ORDER_ASSIGNENGINEER AS sblbZrgcs,
+            o.ORDER_CONTACTWAY AS orderContactway,
+            b.SBLB_WBJSRQ AS sblbWbjsrq,
+            b.SBLB_SBXXDZ AS sblbSbxxdz,
+            b.SBLB_SFMC AS sblbSfmc,
+            b.SBLB_SMC AS sblbSmc,
+            b.SBLB_QXMC AS sblbQxmc
+        FROM
+            nx_order o
+                LEFT JOIN nx_jcxx_sblb b ON o.ORDER_DEVICECODE = b.SBLB_SBBM
+        WHERE
+            o.ORDER_ORDERSTATUS_NAME IN ('待签到', '待派工');
+    </select>
+
+    <select id="orderPage" resultType="com.rootcloud.domain.dto.OrderVO">
+        SELECT ORDER_ORDERNUMBER      AS orderNo,
+               NX_ORDER_ID            AS orderId,
+               ORDER_SERVICETYPE_CODE AS serviceType,
+               ORDER_SERVICETYPE_NAME AS serviceTypeName,
+               ORDER_ASSIGNENGINEER   AS engineer,
+               ORDER_ASSIGNENGINEERID AS engineerId,
+               ORDER_ORDERSTATUS_CODE AS orderStatus,
+               ORDER_ORDERSTATUS_NAME AS orderStatusName,
+               ORDER_PLANSTARTTIME    AS planArriveDate
+        FROM NX_ORDER
+        <where>
+            <if test="serviceType != null and serviceType != ''">
+                ORDER_SERVICETYPE_CODE =#{serviceType}
+            </if>
+            <if test="orderStatus != null and orderStatus != ''">
+                ORDER_ORDERSTATUS_CODE =#{orderStatus}
+            </if>
+        </where>
+        ORDER BY SY_CREATETIME DESC
+    </select>
+
+    <select id="orderInfo" resultType="com.rootcloud.domain.dto.OrderInfoVO">
+        SELECT ORDER_CUSTOMER_NAME     AS customerName,
+               ORDER_APPLYDATE         AS applyTime,
+               ORDER_ORDERNUMBER       AS orderNo,
+               ORDER_DEMANDDESCRIPTION AS demandDesc,
+               ORDER_FILES             AS files,
+               ORDER_INFORMANT         AS contactPerson,
+               ORDER_CONTACTWAY        AS contactTel,
+               ORDER_SERVICEADDRESS    AS serviceAddress,
+               ORDER_DEVICENAME        AS deviceName,
+               ORDER_DEVICETYPE        AS deviceType,
+               ORDER_DEVICEMODEL       AS deviceModel,
+               ORDER_WARRANTIES_CODE   AS shelfLife,
+               ORDER_SERVICETYPE_NAME  AS serviceTypeName
+        FROM NX_ORDER
+        WHERE NX_ORDER_ID = #{orderId}
+    </select>
+
+    <select id="equipmentOrderNum" parameterType="String" resultType="int">
+        SELECT count(1) from nx_order where ORDER_DEVICECODE = #{orderDeviceCode} and ORDER_ORDERSTATUS_CODE in (1,3)
+    </select>
+
+
+
+    <select id="selectByEngineer" resultMap="nxOrderMap">
+        SELECT
+        NX_ORDER_ID,
+        ORDER_APPLYDATE,
+        ORDER_PLANENDTIME,
+        (CASE WHEN (ORDER_SHTGSJ IS NOT NULL AND ORDER_SHTGSJ!='') THEN FROM_UNIXTIME( ORDER_SHTGSJ / 1000, '%Y-%m-%d' ) ELSE ORDER_SHTGSJ
+        END) AS ORDER_SHTGSJ
+        FROM
+            nx_order
+        WHERE
+            ORDER_ASSIGNENGINEERID = #{engineerId}
+            AND SY_STATUS != 0
+    </select>
+
+
+    <select id="selectByEngineerBusyness" resultType="integer">
+        select count(1) from nx_order WHERE ORDER_ASSIGNENGINEERID = #{engineerId} and SY_STATUS != 0 and ORDER_ORDERSTATUS_CODE in(1,3,4)
+    </select>
+
+
+    <select id="getNxgxJcdaFwryList" parameterType="com.rootcloud.domain.entity.FwryDTO" resultType="com.rootcloud.domain.entity.FwryDTO">
+        SELECT
+            COUNT(o.NX_ORDER_ID) AS fwryZtCode,
+            r.NXGX_JCDA_FWRY_ID AS nxgxJcdaFwryId,
+            r.FWRY_YHXM AS fwryYhxm,
+            r.FWRY_YX AS fwryYx,
+            r.FWRY_SJH AS fwrySjh,
+            r.FWRY_SJH AS fwrySjh,
+            r.FWRY_JS AS fwryJs
+        FROM
+        NXGX_JCDA_FWRY r
+        LEFT JOIN nx_order o ON r.FWRY_YHXM = o.ORDER_ASSIGNENGINEER
+        AND o.ORDER_ORDERSTATUS_CODE IN (4, 5)
+        WHERE
+        1=1
+        <if test="fwryWdid != null and fwryWdid != ''">
+            and r.FWRY_WDID = #{fwryWdid}
+        </if>
+        <if test="fwryYhxm != null and fwryYhxm != ''">
+            and r.FWRY_YHXM like  concat('%',#{fwryYhxm},'%')
+        </if>
+        <if test="fwrySjh != null and fwrySjh != ''">
+            and r.FWRY_SJH = #{fwrySjh}
+        </if>
+        GROUP BY
+        r.FWRY_SJH
+        <if test="fwryZtCode == 0">
+            HAVING fwryZtCode > 0
+        </if>
+        <if test="fwryZtCode == 1">
+            HAVING fwryZtCode = 0
+        </if>
+    </select>
+
+    <delete id="delFwry" parameterType="String">
+        delete  from NXGX_JCDA_FWRY where NXGX_JCDA_FWRY_ID = #{nxgxJcdaFwryId}
+    </delete>
+
+
+
+
+    <select id="selectByServicePlanId" resultMap="nxOrderMap">
+        SELECT
+            o.*
+        FROM
+            service_plan sp
+        LEFT JOIN nx_todo_library tl ON sp.SERVICE_PLAN_ID = tl.SERVICE_PLAN_ID
+        AND tl.TIME = #{time}
+        LEFT JOIN nx_order o ON tl.NX_ORDER_ID = o.NX_ORDER_ID
+        where
+        sp.SERVICE_PLAN_ID = #{servicePlanId}
+            limit 1
+    </select>
+
+    <update id="updateNxgxJcdaFwryByUserId" parameterType="java.util.HashMap">
+        update nxgx_jcda_fwry set FWRY_ZTCODE = #{fwryZtCode} ,FWRY_ZT = #{fwryZt} where USERID = #{userId};
+    </update>
+
+    <select id="getOrderByEngineerId" parameterType="String" resultMap="nxOrderMap">
+        SELECT
+            *
+        FROM
+            nx_order
+        WHERE
+            ORDER_ASSIGNENGINEERID = #{userId}
+    </select>
+
+    <select id="getNxgxJcdaFwryByUserId" parameterType="String" resultType="com.rootcloud.domain.entity.FwryDTO">
+        SELECT * from nxgx_jcda_fwry where  USERID = #{userId}
+    </select>
+
+
+    <select id="getOrderNum" parameterType="java.util.HashMap" resultType="java.lang.Integer">
+        SELECT count(1) from nx_order where SY_CREATETIME &gt; #{startDate} and SY_CREATETIME &lt; #{endDate}
+    </select>
+
+    <select id="getCoreEnduserByUsrId" parameterType="String" resultType="com.rootcloud.domain.entity.JeCoreEnduserEntity">
+        SELECT * from je_core_enduser where USERID = #{userId};
+    </select>
+
+    <select id="getKhBykhdzs" resultType="com.rootcloud.domain.entity.KhglDTO">
+        select   KHGL_KHMC as khglKhmc , NX_KHGL_ID AS nxKhglId from  NX_KHGL where KHGL_KHDZS in
+        <foreach item = "item"  index = "index"  collection="array" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="getNxDeviceEntity" parameterType="java.util.HashMap" resultType="com.rootcloud.domain.entity.device.NxDeviceEntity">
+        select  * from NX_JCXX_SBLB
+        <where>
+            and SBLB_SBZT_CODE in ('1', '2', '5', '7', '8', '9')
+            <if test="khmc != null and khmc != ''">
+                and SBLB_KHMC in (${khmc})
+            </if>
+            <if test="kh != null and kh != ''">
+                and SBLB_KHMC = #{kh}
+            </if>
+            <if test="sblbSbbm!=null and sblbSbbm!=''">
+                and (SBLB_SBBM like concat('%',#{sblbSbbm},'%') or SBLB_SBMC like concat('%',#{sblbSbbm},'%')
+                  or SBLB_SBLX_NAME like concat('%',#{sblbSbbm},'%') or SBLB_SBXH_NAME like concat('%',#{sblbSbbm},'%'))
+            </if>
+            <if test="id!=null and id!=''">
+                and NX_JCXX_SBLB_ID=#{id}
+            </if>
+        </where>
+        order by SY_CREATETIME desc
+        limit #{page},#{size}
+    </select>
+
+    <select id="getNxDeviceEntityCount" resultType="integer">
+        select  count(1) from NX_JCXX_SBLB
+        <where>
+            and SBLB_SBZT_CODE in ('1', '2', '5', '7', '8', '9')
+            <if test="khmc != null and khmc != ''">
+                and SBLB_KHMC in (${khmc})
+            </if>
+            <if test="kh != null and kh != ''">
+                and SBLB_KHMC = #{kh}
+            </if>
+            <if test="sblbSbbm!=null and sblbSbbm!=''">
+                and (SBLB_SBBM like concat('%',#{sblbSbbm},'%') or SBLB_SBMC like concat('%',#{sblbSbbm},'%')
+                or SBLB_SBLX_NAME like concat('%',#{sblbSbbm},'%') or SBLB_SBXH_NAME like concat('%',#{sblbSbbm},'%'))
+            </if>
+            <if test="id!=null and id!=''">
+                and NX_JCXX_SBLB_ID=#{id}
+            </if>
+        </where>
+    </select>
+
+    <select id="getfwwd" parameterType="com.rootcloud.domain.entity.FwryDTO" resultType="com.rootcloud.domain.entity.NetworkEntity">
+        SELECT * from NXGX_JCDA_FWWD where nxgx_jcda_fwwd_id = #{fwryWdid};
+    </select>
+
+    <select id="getNxDeviceEntityList" parameterType="java.util.HashMap" resultType="com.rootcloud.domain.entity.device.NxDeviceEntity">
+        SELECT  *  FROM NX_JCXX_SBLB
+        <where>
+            and SBLB_SBZT_CODE in ('1', '2', '5', '7', '8', '9')
+            <if test="userId!=null and userId!=''">
+              and SBLB_KHID IN (SELECT NX_KHGL_ID FROM NX_KHGL WHERE NX_KHGL_ID IN (SELECT NX_KHGL_ID FROM NX_KHGL_KHLD WHERE KHLD_LDID = #{userId}))
+            </if>
+            <if test="sblbSbbm!=null and sblbSbbm!=''">
+                and (SBLB_SBBM like concat('%',#{sblbSbbm},'%') or SBLB_SBMC like concat('%',#{sblbSbbm},'%')
+                or SBLB_SBLX_NAME like concat('%',#{sblbSbbm},'%') or SBLB_SBXH_NAME like concat('%',#{sblbSbbm},'%'))
+            </if>
+        </where>
+        order by SY_CREATETIME desc
+        limit #{page},#{size}
+    </select>
+    <select id="getNxDeviceEntityListCount" resultType="integer">
+        SELECT  count(1)  FROM NX_JCXX_SBLB
+        <where>
+            and SBLB_SBZT_CODE in ('1', '2', '5', '7', '8', '9')
+            <if test="userId!=null and userId!=''">
+               and SBLB_KHID IN (SELECT NX_KHGL_ID FROM NX_KHGL WHERE NX_KHGL_ID IN (SELECT NX_KHGL_ID FROM NX_KHGL_KHLD WHERE KHLD_LDID = #{userId}))
+            </if>
+            <if test="sblbSbbm!=null and sblbSbbm!=''">
+                and (SBLB_SBBM like concat('%',#{sblbSbbm},'%') or SBLB_SBMC like concat('%',#{sblbSbbm},'%')
+                or SBLB_SBLX_NAME like concat('%',#{sblbSbbm},'%') or SBLB_SBXH_NAME like concat('%',#{sblbSbbm},'%'))
+            </if>
+        </where>
+    </select>
+
+    <select id="getPhotoByUserId" parameterType="String" resultType="com.rootcloud.domain.dto.ServiceViewResultModel">
+        SELECT PHOTO AS photo  from je_core_enduser where USERID =#{userId}
+    </select>
+
+
+    <select id="getServiceView" parameterType="java.util.HashMap" resultType="com.rootcloud.domain.dto.PendingOrderModel">
+        SELECT
+        o.ORDER_DEVICECODE AS orderdevicecode,
+        o.ORDER_ASSIGNENGINEER AS sblbZrgcs,
+        o.ORDER_CONTACTWAY AS orderContactway,
+        b.SBLB_WBJSRQ AS sblbWbjsrq,
+        b.SBLB_SBXXDZ AS sblbSbxxdz,
+        o.ORDER_SERVICEADDRESS_LONGITUDE AS orderServiceaddressLongitude,
+        o.ORDER_SERVICEADDRESS_DIMENSION AS orderServiceaddressDimension,
+        b.SBLB_SFMC AS sblbSfmc,
+        b.SBLB_SMC AS sblbSmc,
+        b.SBLB_QXMC AS sblbQxmc,
+        b.SBLB_SBMC AS sblbSbmc,
+        b.NX_JCXX_SBLB_ID AS nxJcxxSblbId,
+        b.SBLB_KHLXR AS sblbKhlxr,
+        b.SBLB_LWZT_CODE AS sblbLwztCode,
+        b.SBLB_LXFS as sblb_lxfs,
+        b.SBLB_SBXH_NAME as sblbSbxhName,
+        b.SBLB_SBLX_NAME as sblbSblxName
+        FROM
+        nx_order o
+        LEFT JOIN nx_jcxx_sblb b ON o.ORDER_DEVICECODE = b.SBLB_SBBM
+        WHERE  1 = 1 and  o.SY_STATUS != '0'
+        <if test="isService == 0 ">
+            and  o.ORDER_ORDERSTATUS_CODE IN ('1', '3')
+        </if>
+        <if test="isService == 1 ">
+            and o.ORDER_ORDERSTATUS_CODE IN ('4', '5')
+        </if>
+        <if test="isService == 2 ">
+            and  o.ORDER_ORDERSTATUS_CODE IN ('1', '3','4', '5')
+        </if>
+        <if test="khids != null and khids != '' ">
+            and o.ORDER_CUSTOMER_ID in
+            <foreach item = "item"  index = "index"  collection="khids" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="userId != null and userId != '' ">
+            and  o.ORDER_ASSIGNENGINEER = #{userId}
+        </if>
+        GROUP BY
+        o.ORDER_DEVICECODE
+        ORDER BY
+        o.SY_CREATETIME
+    </select>
+
+    <select id="getServiceViewBySbbm" parameterType="java.util.HashMap" resultMap="nxOrderMap">
+        SELECT
+            *
+        FROM
+            nx_order
+        WHERE
+            SY_STATUS != '0'
+        <if test="sbbm != null and sbbm != '' ">
+            AND ORDER_DEVICECODE = #{sbbm}
+        </if>
+        <if test="isService == 0 ">
+            and  ORDER_ORDERSTATUS_CODE IN ('1', '3')
+        </if>
+        <if test="isService == 1 ">
+            and ORDER_ORDERSTATUS_CODE IN ('4', '5')
+        </if>
+        <if test="isService == 2 ">
+            and  ORDER_ORDERSTATUS_CODE IN ('1', '3','4', '5')
+        </if>
+        <if test="khids != null and khids != '' ">
+            and ORDER_CUSTOMER_ID in
+            <foreach item = "item"  index = "index"  collection="khids" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="userId != null and userId != '' ">
+            and  ORDER_ASSIGNENGINEER = #{userId}
+        </if>
+        ORDER BY
+        SY_CREATETIME
+    </select>
+
+    <select id="getUserInfo" parameterType="String" resultType="String">
+        SELECT GROUP_CONCAT(ROLEID) FROM je_core_role_user where je_core_role_user.userid = #{userId}
+    </select>
+
+
+    <select id="orderCount" resultType="com.rootcloud.domain.vo.OrderStatusStatistic">
+        select
+        count(*) as orderTotal,
+        ifnull(sum(case when ORDER_ORDERSTATUS_CODE = "1" then 1 else 0 end ),0) as dipatched,
+        ifnull(sum(case when ORDER_ORDERSTATUS_CODE = "3" then 1 else 0 end ),0) as checkIn,
+        ifnull(sum(case when ORDER_ORDERSTATUS_CODE = "4" then 1 else 0 end ),0) as reporting,
+        ifnull(sum(case when ORDER_ORDERSTATUS_CODE = "5" then 1 else 0 end ),0) as review,
+        ifnull(sum(case when ORDER_ORDERSTATUS_CODE = "6" then 1 else 0 end ),0) as appraise,
+        ifnull(sum(case when ORDER_ORDERSTATUS_CODE = "7" then 1 else 0 end ),0) as finish
+        from nx_order
+        WHERE
+        SY_STATUS != '0' and ORDER_ORDERSTATUS_CODE !='10' and ORDER_ORDERSTATUS_CODE!='11'
+        <if test="startTime != null and startTime !=''">
+            <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') >= #{startTime}]]>
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') <= #{endTime}]]>
+        </if>
+        <if test="wdUserId != null and wdUserId !=''">
+            and  ORDER_ASSIGNENGINEERID IN ( SELECT USERID FROM nxgx_jcda_fwry WHERE FWRY_WDID = (select FWRY_WDID from NXGX_JCDA_FWRY where userid = #{wdUserId} ))
+        </if>
+        <if test="userIds != '' and userIds != null">
+            and ORDER_CUSTOMER_ID  in
+            <foreach item="item" index="index" collection="userIds.split(',')"  open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+
+
+
+    <select id="orderStatusStatistic" resultMap="nxOrderMap">
+        select
+               *
+        from nx_order
+        WHERE
+            SY_STATUS != '0'
+        <if test="startTime != null and startTime !=''">
+            <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') >= #{startTime}]]>
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') <= #{endTime}]]>
+        </if>
+        <if test="userIds != '' and userIds != null">
+            and ORDER_CUSTOMER_ID  in
+            <foreach item="item" index="index" collection="userIds.split(',')"  open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="orderStatus != null and orderStatus !=''">
+           and  ORDER_ORDERSTATUS_CODE = #{orderStatus}
+        </if>
+        <if test="wdUserId != null and wdUserId !=''">
+            and  ORDER_ASSIGNENGINEERID IN ( SELECT USERID FROM nxgx_jcda_fwry WHERE FWRY_WDID = (select FWRY_WDID from NXGX_JCDA_FWRY where userid = #{wdUserId} ))
+        </if>
+    </select>
+
+
+    <select id="deviceStatusStatistic" resultType="com.rootcloud.domain.vo.DeviceStatusStatistic">
+        select
+            count(*) as deviceTotal,
+            ifnull(sum(case when SBLB_SBZT_CODE = "1" then 1 else 0 end ),0) as lease,
+            ifnull(sum(case when SBLB_SBZT_CODE = "2" then 1 else 0 end ),0) as sellOff,
+            ifnull(sum(case when SBLB_SBZT_CODE = "3" then 1 else 0 end ),0) as free,
+            ifnull(sum(case when SBLB_SBZT_CODE = "4" then 1 else 0 end ),0) as sealed,
+            ifnull(sum(case when SBLB_SBZT_CODE = "5" then 1 else 0 end ),0) as enable,
+            ifnull(sum(case when SBLB_SBZT_CODE = "6" then 1 else 0 end ),0) as discard,
+            ifnull(sum(case when SBLB_SBZT_CODE = "7" then 1 else 0 end ),0) as inUse,
+            ifnull(sum(case when SBLB_SBZT_CODE = "8" then 1 else 0 end ),0) as inProcess,
+            ifnull(sum(case when SBLB_SBZT_CODE = "9" then 1 else 0 end ),0) as toBeDelivered
+        from
+            NX_JCXX_SBLB
+        where SBLB_SBZT_CODE in('1','2','3','4','5','6','7','8','9')
+        <if test="userIds != '' and userIds != null">
+            and SBLB_KHID  in
+            <foreach item="item" index="index" collection="userIds.split(',')"  open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+
+    <select id="outletsStatistic"  resultType="com.rootcloud.domain.vo.Outlets">
+        SELECT
+            FWWD_WDJWD as outletsJwd,
+            FWWD_WDMC as  outletsName,
+            FWWD_XXDZ as  outletsAddress,
+            FWWD_SSQY as  outletsKzqy,
+            (
+            SELECT
+            count(*)
+            FROM
+            nx_khgl
+            WHERE
+            khgl_khdzs IN (
+            SELECT
+            substring_index( substring_index( njf.FWWD_SSQY, ',', b.help_topic_id + 1 ), ',', - 1 ) AS areas
+            FROM
+            nxgx_jcda_fwwd njf
+            JOIN mysql.help_topic b ON b.help_topic_id &lt; length( njf.FWWD_SSQY ) - length(
+            REPLACE ( njf.FWWD_SSQY, ',', '' )) + 1
+            WHERE
+            njf.NXGX_JCDA_FWWD_ID = NXGX_JCDA_FWWD.NXGX_JCDA_FWWD_ID
+            )
+            ) AS customerTotal,
+            (
+                SELECT
+                    count(*)
+                FROM
+                    nx_order
+                WHERE
+                SY_STATUS != '0'
+                and
+                ORDER_CUSTOMER_ID IN (
+                SELECT
+                NX_KHGL_ID
+                FROM
+                nx_khgl
+                WHERE
+                khgl_khdzs IN (
+                SELECT
+                substring_index( substring_index( njf.FWWD_SSQY, ',', b.help_topic_id + 1 ), ',', - 1 ) AS areas
+                FROM
+                nxgx_jcda_fwwd njf
+                JOIN mysql.help_topic b ON b.help_topic_id &lt; length( njf.FWWD_SSQY ) - length(
+                REPLACE ( njf.FWWD_SSQY, ',', '' )) + 1
+                WHERE
+                njf.NXGX_JCDA_FWWD_ID = NXGX_JCDA_FWWD.NXGX_JCDA_FWWD_ID
+                )
+                )
+                <if test="startTime != null and startTime !=''">
+                    <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') >= #{startTime}]]>
+                </if>
+                <if test="endTime!=null and endTime!=''">
+                    <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') <= #{endTime}]]>
+                </if>
+                ) AS orderTotal
+        FROM
+            NXGX_JCDA_FWWD
+        <where>
+            <if test="wdUserId != null and wdUserId !=''">
+                and NXGX_JCDA_FWWD_ID = (select FWRY_WDID from NXGX_JCDA_FWRY where userid = #{wdUserId})
+            </if>
+        </where>
+    </select>
+
+
+    <select id="orderStatisticByDay" resultType="com.rootcloud.domain.vo.OrderStatistic">
+        SELECT
+        tt.DAY AS date,
+        ifnull( od.num, 0 ) AS value
+        FROM
+        (
+        SELECT
+        date_add( date_sub( #{startTime}, INTERVAL 1 DAY ), INTERVAL ( cast( help_topic_id AS signed INTEGER ) + 1 ) DAY ) DAY
+        FROM
+        mysql.help_topic
+        WHERE
+        help_topic_id &lt; DATEDIFF(
+        #{endTime},
+        date_sub( #{startTime}, INTERVAL 1 DAY ))
+        ORDER BY
+        help_topic_id
+        ) tt
+        LEFT JOIN (
+        SELECT
+        count(*) AS num,
+        DATE_FORMAT( SY_CREATETIME, '%Y-%m-%d' ) AS orderTime
+        FROM
+        nx_order
+        where  SY_STATUS != '0'
+        and SY_ZHID = #{syzhid}
+        <if test="startTime != null and startTime !=''">
+            <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') >= #{startTime}]]>
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') <= #{endTime}]]>
+        </if>
+        <if test="wdUserId != null and wdUserId !=''">
+            and  ORDER_ASSIGNENGINEERID IN ( SELECT USERID FROM nxgx_jcda_fwry WHERE FWRY_WDID = (select FWRY_WDID from NXGX_JCDA_FWRY where userid = #{wdUserId} ))
+        </if>
+        <if test="userIds != '' and userIds != null">
+            and ORDER_CUSTOMER_ID  in
+            <foreach item="item" index="index" collection="userIds.split(',')"  open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY
+        DATE_FORMAT( SY_CREATETIME, '%Y-%m-%d' )) od ON tt.DAY = od.orderTime
+
+    </select>
+
+
+
+    <select id="orderStatisticByDayMonth" resultType="com.rootcloud.domain.vo.OrderStatistic">
+        SELECT
+        tt.DAY AS date,
+        ifnull( od.num, 0 ) AS value
+        FROM
+        (
+        select DATE_FORMAT(date_add(#{startTime}, interval row MONTH),'%Y-%m') DAY from
+        (
+        SELECT @row := @row + 1 as row FROM
+        (select 0 union all select 1 union all select 2 union all select 3 union all select 4 union all select 5 union all select 6 union all select 7 union all select 8 union all select 9) t,
+        (select 0 union all select 1 union all select 2 union all select 3 union all select 4 union all select 5 union all select 6 union all select 7 union all select 8 union all select 9) t2,
+        (SELECT @row:=-1) r
+        ) se
+        where DATE_FORMAT(date_add( #{startTime}, interval row MONTH),'%Y-%m') &lt;=  DATE_FORMAT( #{endTime},'%Y-%m')
+        ) tt
+        LEFT JOIN (
+        SELECT
+        count(*) AS num,
+        DATE_FORMAT( SY_CREATETIME, '%Y-%m' ) AS orderTime
+        FROM
+        nx_order
+        where  SY_STATUS != '0'
+        and SY_ZHID = #{syzhid}
+        <if test="startTime != null and startTime !=''">
+            <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m') >= DATE_FORMAT(#{startTime} , '%Y-%m')]]>
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m') <= DATE_FORMAT(#{endTime}, '%Y-%m')]]>
+        </if>
+        <if test="wdUserId != null and wdUserId !=''">
+            and  ORDER_ASSIGNENGINEERID IN ( SELECT USERID FROM nxgx_jcda_fwry WHERE FWRY_WDID = (select FWRY_WDID from NXGX_JCDA_FWRY where userid = #{wdUserId} ))
+        </if>
+        <if test="userIds != '' and userIds != null">
+            and ORDER_CUSTOMER_ID  in
+            <foreach item="item" index="index" collection="userIds.split(',')"  open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY
+        DATE_FORMAT( SY_CREATETIME, '%Y-%m' )) od ON tt.DAY = od.orderTime
+
+    </select>
+
+
+    <select id="checkPersonStatistic" resultType="com.rootcloud.domain.vo.PersonnelStatistic">
+    select
+    max(ORDER_ASSIGNENGINEER) as personName,
+    count(*) as orderNum,
+    sum(FWPJ) as serviceNum,
+    sum(TIME) as  workTimeNum
+    from
+    (
+    SELECT
+            ORDER_ASSIGNENGINEER,
+            ORDER_ASSIGNENGINEERID,
+            ORDER_SERVICETYPE_NAME,
+            ORDER_SERVICETYPE_CODE,
+            ( ORDER_FIELD1 + ORDER_FIELD2 + ORDER_FIELD3 + ORDER_FIELD4 + ORDER_FIELD5 + ORDER_FIELD6 + ORDER_FIELD7 + ORDER_FIELD8 + ORDER_FIELD9 + ORDER_FIELD10
+             +ORDER_FIELD11 + ORDER_FIELD12 + ORDER_FIELD13 + ORDER_FIELD14 + ORDER_FIELD15 + ORDER_FIELD16 + ORDER_FIELD17 + ORDER_FIELD18 + ORDER_FIELD19 + ORDER_FIELD20) AS FWPJ,
+            (
+                CASE
+
+                    WHEN ORDER_SERVICETYPE_CODE = '002' THEN
+                        (
+        select XMBYNR_BZGS from XMBYNR where od.ORDER_BYNR= XMBYNR_CODE or od.ORDER_BYNR=XMBYNR_ID
+                            ) ELSE (
+        select sum(FWXMB_XMFY) from NX_BGB_FWXMB where NX_ORDER_ID = od.nx_order_id
+                    )
+                    END
+                ) AS TIME
+        FROM
+            (
+            SELECT
+            NX_ORDER_ID,
+            ORDER_BYGS,
+            ORDER_BYNR,
+            ORDER_ASSIGNENGINEER,
+            ORDER_ASSIGNENGINEERID,
+            ORDER_SERVICETYPE_NAME,
+            ORDER_SERVICETYPE_CODE,
+            ORDER_SERVICEMETHOD_CODE,
+            ORDER_SERVICEMETHOD_NAME,
+            ORDER_CUSTOMER_NAME,
+            ORDER_CUSTOMER_ID,
+            ( CASE WHEN ( ORDER_FIELD1 IS NULL OR ORDER_FIELD1 = '' ) THEN 0 ELSE ORDER_FIELD1 END ) AS ORDER_FIELD1,
+            ( CASE WHEN ( ORDER_FIELD2 IS NULL OR ORDER_FIELD2 = '' ) THEN 0 ELSE ORDER_FIELD2 END ) AS ORDER_FIELD2,
+            ( CASE WHEN ( ORDER_FIELD3 IS NULL OR ORDER_FIELD3 = '' ) THEN 0 ELSE ORDER_FIELD3 END ) AS ORDER_FIELD3,
+            ( CASE WHEN ( ORDER_FIELD4 IS NULL OR ORDER_FIELD4 = '' ) THEN 0 ELSE ORDER_FIELD4 END ) AS ORDER_FIELD4,
+            ( CASE WHEN ( ORDER_FIELD5 IS NULL OR ORDER_FIELD5 = '' ) THEN 0 ELSE ORDER_FIELD5 END ) AS ORDER_FIELD5,
+            ( CASE WHEN ( ORDER_FIELD6 IS NULL OR ORDER_FIELD6 = '' ) THEN 0 ELSE ORDER_FIELD6 END ) AS ORDER_FIELD6,
+            ( CASE WHEN ( ORDER_FIELD7 IS NULL OR ORDER_FIELD7 = '' ) THEN 0 ELSE ORDER_FIELD7 END ) AS ORDER_FIELD7,
+            ( CASE WHEN ( ORDER_FIELD8 IS NULL OR ORDER_FIELD8 = '' ) THEN 0 ELSE ORDER_FIELD8 END ) AS ORDER_FIELD8,
+            ( CASE WHEN ( ORDER_FIELD9 IS NULL OR ORDER_FIELD9 = '' ) THEN 0 ELSE ORDER_FIELD9 END ) AS ORDER_FIELD9,
+            ( CASE WHEN ( ORDER_FIELD10 IS NULL OR ORDER_FIELD10 = '' ) THEN 0 ELSE ORDER_FIELD10 END ) AS ORDER_FIELD10,
+            ( CASE WHEN ( ORDER_FIELD11 IS NULL OR ORDER_FIELD11 = '' ) THEN 0 ELSE ORDER_FIELD11 END ) AS ORDER_FIELD11,
+            ( CASE WHEN ( ORDER_FIELD12 IS NULL OR ORDER_FIELD12 = '' ) THEN 0 ELSE ORDER_FIELD12 END ) AS ORDER_FIELD12,
+            ( CASE WHEN ( ORDER_FIELD13 IS NULL OR ORDER_FIELD13 = '' ) THEN 0 ELSE ORDER_FIELD13 END ) AS ORDER_FIELD13,
+            ( CASE WHEN ( ORDER_FIELD14 IS NULL OR ORDER_FIELD14 = '' ) THEN 0 ELSE ORDER_FIELD14 END ) AS ORDER_FIELD14,
+            ( CASE WHEN ( ORDER_FIELD15 IS NULL OR ORDER_FIELD15 = '' ) THEN 0 ELSE ORDER_FIELD15 END ) AS ORDER_FIELD15,
+            ( CASE WHEN ( ORDER_FIELD16 IS NULL OR ORDER_FIELD16 = '' ) THEN 0 ELSE ORDER_FIELD16 END ) AS ORDER_FIELD16,
+            ( CASE WHEN ( ORDER_FIELD17 IS NULL OR ORDER_FIELD17 = '' ) THEN 0 ELSE ORDER_FIELD17 END ) AS ORDER_FIELD17,
+            ( CASE WHEN ( ORDER_FIELD18 IS NULL OR ORDER_FIELD18 = '' ) THEN 0 ELSE ORDER_FIELD18 END ) AS ORDER_FIELD18,
+            ( CASE WHEN ( ORDER_FIELD19 IS NULL OR ORDER_FIELD19 = '' ) THEN 0 ELSE ORDER_FIELD19 END ) AS ORDER_FIELD19,
+            ( CASE WHEN ( ORDER_FIELD20 IS NULL OR ORDER_FIELD20 = '' ) THEN 0 ELSE ORDER_FIELD20 END ) AS ORDER_FIELD20,
+            ( CASE WHEN ( ORDER_DISPATCHTIME IS NULL OR ORDER_DISPATCHTIME = '' ) THEN NULL ELSE ORDER_DISPATCHTIME END ) AS ORDER_DISPATCHTIME,
+            ( CASE WHEN ( ORDER_ORDERTIME IS NULL OR ORDER_ORDERTIME = '' ) THEN NULL ELSE ORDER_ORDERTIME END ) AS ORDER_ORDERTIME,
+            ( CASE WHEN ( ORDER_PGSJ IS NULL OR ORDER_PGSJ = '' ) THEN NULL ELSE ORDER_PGSJ END ) AS ORDER_PGSJ,
+            ( CASE WHEN ( ORDER_SIGNTIME IS NULL OR ORDER_SIGNTIME = '' ) THEN NULL ELSE ORDER_SIGNTIME END ) AS ORDER_SIGNTIME,
+            ( CASE WHEN ( ORDER_SHTGSJ IS NULL OR ORDER_SHTGSJ = '' ) THEN NULL ELSE ORDER_SHTGSJ END ) AS ORDER_SHTGSJ,
+             ( CASE WHEN ( ORDER_BGSJ IS NULL OR ORDER_BGSJ = '' ) THEN NULL ELSE ORDER_BGSJ END ) AS ORDER_BGSJ
+            FROM
+            nx_order
+            <where>
+                SY_STATUS != '0'
+                and ORDER_ASSIGNENGINEERID is not null and ORDER_ASSIGNENGINEERID!=''
+                and ORDER_ORDERSTATUS_CODE not in ('10','11')
+                <if test="syZhid!=null and syZhid !=''">
+                    and SY_ZHID = #{syZhid}
+                </if>
+                <if test="orderStatus!=null and orderStatus !=''">
+                    and ORDER_ORDERSTATUS_CODE = #{orderStatus}
+                </if>
+                <if test="startTime != null and startTime !=''">
+                    <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') >= #{startTime}]]>
+                </if>
+                <if test="endTime!=null and endTime!=''">
+                    <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') <= #{endTime}]]>
+                </if>
+                <if test="wdUserId != null and wdUserId !=''">
+                    and  ORDER_ASSIGNENGINEERID IN ( SELECT USERID FROM nxgx_jcda_fwry WHERE FWRY_WDID = (select FWRY_WDID from NXGX_JCDA_FWRY where userid = #{wdUserId} ))
+                </if>
+                <if test="serviceType != null and serviceType !=''">
+                    and  ORDER_SERVICETYPE_CODE = #{serviceType}
+                </if>
+            </where>
+            ) od
+    )dd
+    group by ORDER_ASSIGNENGINEERID
+    <choose>
+        <when test="sortReverseOrder != null and sortReverseOrder !=''">
+            <if test="sortType != null and sortType !=''">
+                order by ${sortType} asc
+            </if>
+        </when>
+        <otherwise>
+            <if test="sortType != null and sortType !=''">
+                order by ${sortType} desc
+            </if>
+        </otherwise>
+    </choose>
+    </select>
+
+    <select id="getGzsc" resultType="com.rootcloud.domain.vo.PersonnelStatistic">
+        select
+        SUBSTRING_INDEX(SUBSTRING_INDEX(gcsIds,',',b.help_topic_id+1),',',-1) AS gcsId,SUM(temp.sc) as workTimeNum,
+        (select USERNAME from je_core_enduser where gcsId=userid COLLATE utf8mb4_general_ci) as personName
+        from (
+        select a.gcsIds,CONVERT(TIMESTAMPDIFF(SECOND,IFNULL(a.ORDER_SIGNTIME,a.ORDER_PGSJ),a.ORDER_BGSJ)/3600, DECIMAL (10, 1)) sc from (
+        select concat_ws(',',if(length(ORDER_ASSISTENGINEERID)>0,ORDER_ASSISTENGINEERID,null),if(length(ORDER_ASSIGNENGINEERID)>0,ORDER_ASSIGNENGINEERID,null)) as gcsIds,
+        ORDER_SIGNTIME,FROM_UNIXTIME( ORDER_BGSJ / 1000, '%Y-%m-%d %H:%i:%s' ) as ORDER_BGSJ,FROM_UNIXTIME( ORDER_PGSJ / 1000, '%Y-%m-%d %H:%i:%s' ) as ORDER_PGSJ
+        from nx_order
+        <where>
+            SY_STATUS != '0' and ORDER_ORDERSTATUS_CODE in(6,7)
+            and (LENGTH(ORDER_ASSISTENGINEERID)>0 or LENGTH(ORDER_JDGCS)>0)
+            and ORDER_ASSIGNENGINEERID is not null and ORDER_ASSIGNENGINEERID!=''
+            and ORDER_ORDERSTATUS_CODE not in ('10','11')
+            <if test="syZhid!=null and syZhid !=''">
+                and SY_ZHID = #{syZhid}
+            </if>
+            <if test="startTime != null and startTime !=''">
+                <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') >= #{startTime}]]>
+            </if>
+            <if test="endTime!=null and endTime!=''">
+                <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') <= #{endTime}]]>
+            </if>
+            <if test="wdUserId != null and wdUserId !=''">
+                and  ORDER_ASSIGNENGINEERID IN ( SELECT USERID FROM nxgx_jcda_fwry WHERE FWRY_WDID = (select FWRY_WDID from NXGX_JCDA_FWRY where userid = #{wdUserId} ))
+            </if>
+            <if test="serviceType != null and serviceType !=''">
+                and  ORDER_SERVICETYPE_CODE = #{serviceType}
+            </if>
+        </where>
+        ) as a
+        ) as temp
+        join
+        mysql.help_topic b on b.help_topic_id  <![CDATA[ <  ]]>  FLOOR((LENGTH(temp.gcsIds)-LENGTH(REPLACE(temp.gcsIds,',','')))+1)
+        GROUP BY gcsId
+        order by workTimeNum desc
+    </select>
+
+    <select id="getGcsIds" resultType="com.rootcloud.domain.vo.PersonnelStatistic">
+        select ORDER_ASSISTENGINEERID as orderAssistengineerid,ORDER_ASSIGNENGINEERID as orderAssignengineerid
+        from nx_order
+        <where>
+            and SY_STATUS != '0' and ORDER_ORDERSTATUS_CODE in(6,7)
+            and (LENGTH(ORDER_ASSISTENGINEERID)>0 or LENGTH(ORDER_JDGCS)>0)
+            and ORDER_ASSIGNENGINEERID is not null and ORDER_ASSIGNENGINEERID!=''
+            and ORDER_ORDERSTATUS_CODE not in ('10','11')
+            <if test="syZhid!=null and syZhid !=''">
+                and SY_ZHID = #{syZhid}
+            </if>
+            <if test="startTime != null and startTime !=''">
+                <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') >= #{startTime}]]>
+            </if>
+            <if test="endTime!=null and endTime!=''">
+                <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') <= #{endTime}]]>
+            </if>
+            <if test="wdUserId != null and wdUserId !=''">
+                and  ORDER_ASSIGNENGINEERID IN ( SELECT USERID FROM nxgx_jcda_fwry WHERE FWRY_WDID = (select FWRY_WDID from NXGX_JCDA_FWRY where userid = #{wdUserId} ))
+            </if>
+            <if test="serviceType != null and serviceType !=''">
+                and  ORDER_SERVICETYPE_CODE = #{serviceType}
+            </if>
+        </where>
+    </select>
+
+    <select id="getGcsGzsc" resultType="decimal">
+        select sum(CONVERT(GREATEST(TIMESTAMPDIFF(SECOND,IFNULL(a.ORDER_SIGNTIME,a.ORDER_PGSJ),a.ORDER_BGSJ),0)/3600, DECIMAL (10, 1))) sc from (
+        select ORDER_SIGNTIME,FROM_UNIXTIME( ORDER_BGSJ / 1000, '%Y-%m-%d %H:%i:%s' ) as ORDER_BGSJ,FROM_UNIXTIME( ORDER_PGSJ / 1000, '%Y-%m-%d %H:%i:%s' ) as ORDER_PGSJ
+        from nx_order
+        <where>
+            and SY_STATUS != '0' and ORDER_ORDERSTATUS_CODE in(6,7)
+            and ORDER_ORDERSTATUS_CODE not in ('10','11')
+            <if test="gcsId!=null and gcsId!=''">
+                and (FIND_IN_SET(#{gcsId},ORDER_ASSISTENGINEERID) or FIND_IN_SET(#{gcsId},ORDER_ASSIGNENGINEERID))
+            </if>
+            <if test="syZhid!=null and syZhid !=''">
+                and SY_ZHID = #{syZhid}
+            </if>
+            <if test="startTime != null and startTime !=''">
+                <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') >= #{startTime}]]>
+            </if>
+            <if test="endTime!=null and endTime!=''">
+                <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') <= #{endTime}]]>
+            </if>
+            <if test="serviceType != null and serviceType !=''">
+                and  ORDER_SERVICETYPE_CODE = #{serviceType}
+            </if>
+        </where>
+        )as a
+    </select>
+
+    <select id="faultStatistic" resultType="com.rootcloud.domain.vo.FaultNumber">
+        SELECT
+        count(*) as appearNumber,
+        max(ORDER_FAULTTYPR_NAME) as faultName,
+        ORDER_FAULTTYPR_CODE as faultCode
+        FROM
+        nx_order
+        WHERE
+        SY_STATUS != '0'
+        AND ORDER_FAULTTYPR_NAME IS NOT NULL
+        AND ORDER_FAULTTYPR_NAME != ''
+        <if test="startTime != null and startTime !=''">
+            <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') >= #{startTime}]]>
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            <![CDATA[ AND DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') <= #{endTime}]]>
+        </if>
+        <if test="wdUserId != null and wdUserId !=''">
+            and  ORDER_ASSIGNENGINEERID IN ( SELECT USERID FROM nxgx_jcda_fwry WHERE FWRY_WDID = (select FWRY_WDID from NXGX_JCDA_FWRY where userid = #{wdUserId} ))
+        </if>
+        <if test="userIds != '' and userIds != null">
+            and ORDER_CUSTOMER_ID  in
+            <foreach item="item" index="index" collection="userIds.split(',')"  open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        group by ORDER_FAULTTYPR_CODE
+        order by appearNumber desc
+        limit 10
+    </select>
+
+
+
+    <select id="partsFaultStatistic" resultType="com.rootcloud.domain.vo.PartsFaultNumber">
+        select
+            nbw.WXHJ_PJBM as partsCode,
+            max(nbw.WXHJ_PJMC) as partsName,
+            count(*) as appearNumber
+
+        from nx_bgb_wxhj nbw
+        left join nx_order  nod
+        on
+        nbw.NX_ORDER_ID = nod.NX_ORDER_ID
+        where
+            nod.SY_STATUS != '0'
+        <if test="startTime != null and startTime !=''">
+            <![CDATA[ AND DATE_FORMAT(nod.SY_CREATETIME, '%Y-%m-%d') >= #{startTime}]]>
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            <![CDATA[ AND DATE_FORMAT(nod.SY_CREATETIME, '%Y-%m-%d') <= #{endTime}]]>
+        </if>
+        <if test="wdUserId != null and wdUserId !=''">
+            and  nod.ORDER_ASSIGNENGINEERID IN ( SELECT USERID FROM nxgx_jcda_fwry WHERE FWRY_WDID = (select FWRY_WDID from NXGX_JCDA_FWRY where userid = #{wdUserId} ))
+        </if>
+        <if test="serviceType != null and serviceType !=''">
+            and  nod.ORDER_SERVICETYPE_CODE = #{serviceType}
+        </if>
+        group by WXHJ_PJBM
+        order by appearNumber desc
+        limit 10
+    </select>
+
+
+
+    <select id="saleFittingsStatistic" resultType="com.rootcloud.domain.vo.FittingsSales">
+        select
+            cast(sum(ifnull(nxp.PJXSPJLBGL_CJXJ,0)) as DECIMAL(19, 2)) as countSales,
+            np.PJXS_YWY as personName
+        from  nx_pjxspjlbgl nxp
+        left join
+        nx_pjxs np
+        on nxp.PJXSPJLBGL_PJGLWYBS = np.NX_PJXS_ID
+        <where>
+            <if test="startTime != null and startTime !=''">
+                <![CDATA[ AND DATE_FORMAT(np.PJXS_BJSJ, '%Y-%m-%d') >= #{startTime}]]>
+            </if>
+            <if test="endTime!=null and endTime!=''">
+                <![CDATA[ AND DATE_FORMAT(np.PJXS_BJSJ, '%Y-%m-%d') <= #{endTime}]]>
+            </if>
+            <if test="businessType!=null and businessType!=''">
+                and np.PJXS_YWLX = #{businessType}
+            </if>
+            <if test="wdUserId != null and wdUserId !=''">
+                and  np.PJXS_YWYID IN ( SELECT USERID FROM nxgx_jcda_fwry WHERE FWRY_WDID = (select FWRY_WDID from NXGX_JCDA_FWRY where userid = #{wdUserId} ))
+            </if>
+        </where>
+        group by np.PJXS_YWYID
+        order by countSales desc
+        limit 10
+    </select>
+
+
+    <select id="saleCustomerStatistic" resultType="com.rootcloud.domain.vo.CustomerSales">
+        select
+        cast(sum(ifnull(nxp.PJXSPJLBGL_CJXJ,0)) as DECIMAL(19, 2)) as countSales,
+        np.PJXS_KHMC as personName
+        from  nx_pjxspjlbgl nxp
+        left join
+        nx_pjxs np
+        on nxp.PJXSPJLBGL_PJGLWYBS = np.NX_PJXS_ID
+        <where>
+            <if test="startTime != null and startTime !=''">
+                <![CDATA[ AND DATE_FORMAT(np.PJXS_BJSJ, '%Y-%m-%d') >= #{startTime}]]>
+            </if>
+            <if test="endTime!=null and endTime!=''">
+                <![CDATA[ AND DATE_FORMAT(np.PJXS_BJSJ, '%Y-%m-%d') <= #{endTime}]]>
+            </if>
+            <if test="businessType!=null and businessType!=''">
+                and np.PJXS_YWLX = #{businessType}
+            </if>
+            <if test="userIds != '' and userIds != null">
+                and np.PJXS_KHID  in
+                <foreach item="item" index="index" collection="userIds.split(',')"  open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        group by np.PJXS_KHID
+        order by countSales desc
+        limit 10
+    </select>
+
+
+
+    <select id="selectByUserId" resultMap="nxOrderMap">
+        select *  from nx_order
+        where
+        <![CDATA[ DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 3 DAY), '%Y-%m-%d')]]>
+        <if test="type != null and type !=''">
+            AND ORDER_SERVICETYPE_CODE = #{type}
+        </if>
+        <if test="zhId != null and zhId != ''">
+            and SY_ZHID = #{zhId}
+        </if>
+        AND (ORDER_SFJJ != 1 or ORDER_SFJJ is null)
+        AND (
+        ORDER_CUSTOMER_ID = ( SELECT max(NX_KHGL_ID) FROM nx_khgl_khld WHERE nx_khgl_khld.KHLD_LDID = #{userId} )
+        OR ORDER_CUSTOMER_ID IN (
+        SELECT
+        NX_KHGL_ID
+        FROM
+        nx_khgl
+        WHERE
+        khgl_khdzs IN (
+        SELECT
+        substring_index( substring_index( nxgx_jcda_fwwd.FWWD_SSQY, ',', b.help_topic_id + 1 ), ',', - 1 ) AS areas
+        FROM
+        nxgx_jcda_fwwd
+        JOIN mysql.help_topic b ON b.help_topic_id    &lt;  length( nxgx_jcda_fwwd.FWWD_SSQY ) - length(
+        REPLACE ( nxgx_jcda_fwwd.FWWD_SSQY, ',', '' )) + 1
+        WHERE
+        NXGX_JCDA_FWWD_ID = (
+        SELECT
+        FWRY_WDID
+        FROM
+        NXGX_JCDA_FWRY
+        WHERE
+        NXGX_JCDA_FWRY.userid = #{userId}
+        AND EXISTS ( SELECT 1 FROM je_core_role_user WHERE je_core_role_user.userid = #{userId} AND ROLEID = 'wq3AoijXFmkUWUrKgUl' )
+        )
+        )
+        )
+        OR ORDER_ASSIGNENGINEERID = #{userId}
+        OR ORDER_ASSISTENGINEERID = #{userId}
+        OR ORDER_JDGCS = #{userId}
+        OR EXISTS ( SELECT 1 FROM je_core_role_user WHERE je_core_role_user.userid = #{userId} AND ROLEID IN ( '10125632', 'lEsw0MgJDhyW0S8iC3q' ) ))
+        order by SY_CREATETIME desc
+        limit ${startNo},${endNo}
+    </select>
+
+    <!--订单用户订单统计-->
+    <select id="countByUserId" resultType="java.lang.Integer">
+        select count(NX_ORDER_ID)  from nx_order
+        where
+        <![CDATA[ DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 3 DAY), '%Y-%m-%d')]]>
+        <if test="type != null and type !=''">
+            AND ORDER_SERVICETYPE_CODE = #{type}
+        </if>
+        <if test="zhId != null and zhId != ''">
+            and SY_ZHID = #{zhId}
+        </if>
+        AND (ORDER_SFJJ != 1 or ORDER_SFJJ is null)
+        AND (
+        ORDER_CUSTOMER_ID = ( SELECT max(NX_KHGL_ID) FROM nx_khgl_khld WHERE nx_khgl_khld.KHLD_LDID = #{userId} )
+        OR ORDER_CUSTOMER_ID IN (
+        SELECT
+        NX_KHGL_ID
+        FROM
+        nx_khgl
+        WHERE
+        khgl_khdzs IN (
+        SELECT
+        substring_index( substring_index( nxgx_jcda_fwwd.FWWD_SSQY, ',', b.help_topic_id + 1 ), ',', - 1 ) AS areas
+        FROM
+        nxgx_jcda_fwwd
+        JOIN mysql.help_topic b ON b.help_topic_id    &lt;  length( nxgx_jcda_fwwd.FWWD_SSQY ) - length(
+        REPLACE ( nxgx_jcda_fwwd.FWWD_SSQY, ',', '' )) + 1
+        WHERE
+        NXGX_JCDA_FWWD_ID = (
+        SELECT
+        FWRY_WDID
+        FROM
+        NXGX_JCDA_FWRY
+        WHERE
+        NXGX_JCDA_FWRY.userid = #{userId}
+        AND EXISTS ( SELECT 1 FROM je_core_role_user WHERE je_core_role_user.userid = #{userId} AND ROLEID = 'wq3AoijXFmkUWUrKgUl' )
+        )
+        )
+        )
+        OR ORDER_ASSIGNENGINEERID = #{userId}
+        OR ORDER_ASSISTENGINEERID = #{userId}
+        OR ORDER_JDGCS = #{userId}
+        OR EXISTS ( SELECT 1 FROM je_core_role_user WHERE je_core_role_user.userid = #{userId} AND ROLEID IN ( '10125632', 'lEsw0MgJDhyW0S8iC3q' ) ))
+    </select>
+
+
+
+    <select id="getContentByMbId" resultType="java.lang.String">
+        select CONFIG_MBNR from
+            nx_model_config
+        where CONFIG_MBID = #{mbId}
+    </select>
+
+
+    <select id="jsGetByUserId" resultType="com.rootcloud.domain.entity.ContractEntity">
+        select
+            JSXX_HTBH as numberCode, '合同' as numberName, NX_JSXX_ID as nxJsxxId , nk.khgl_xsjl as xsjl , JSXX_FWQJZJE as fwqkzje
+        from nx_jsxx
+        LEFT JOIN NX_KHGL as nk on nk.NX_KHGL_ID = nx_jsxx.NX_KHGL_ID
+        where DATEDIFF(JSXX_HTDQRQ, DATE_FORMAT(NOW(), '%Y-%m-%d')) 	&gt;=   0
+        and DATEDIFF(JSXX_HTDQRQ, DATE_FORMAT(NOW(), '%Y-%m-%d')) 	&lt;=   30
+        AND (JSXX_SFJJ != 1 or JSXX_SFJJ is null)
+        <if test="userIds != '' and userIds != null">
+            and nk.NX_KHGL_ID  in
+            <foreach item="item" index="index" collection="userIds.split(',')"  open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+    <select id="fwGetByUserId" resultType="com.rootcloud.domain.entity.ContractEntity">
+        select
+            FWHT_HTBM as numberCode, FWHT_HTMC as numberName, NX_FWHT_ID as nxJsxxId, nk.KHGL_XSJL as xsjl
+        from nx_fwht
+        LEFT JOIN nx_khgl nk on nk.NX_KHGL_ID = nx_fwht.NX_KHGL_KHLD_ID
+         where DATEDIFF(FWHT_DQRQ, DATE_FORMAT(NOW(), '%Y-%m-%d')) 	&gt;=   0
+        and DATEDIFF(FWHT_DQRQ, DATE_FORMAT(NOW(), '%Y-%m-%d')) 	&lt;=   30
+        and (FWHT_SFJJ != 1 or FWHT_SFJJ is null)
+        <if test="userIds != '' and userIds != null">
+            and  NX_KHGL_KHLD_ID in
+            <foreach item="item" index="index" collection="userIds.split(',')"  open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+    <update id="mesSfjj" parameterType="String">
+        update nx_order set ORDER_SFJJ = '1' where ORDER_ORDERNUMBER = #{orderId}
+    </update>
+
+    <update id="eqMesSfjj" parameterType="String">
+        update NX_SPARE_PART set PART_SFJJ = '1' where NX_SPARE_PART_ID = #{id}
+    </update>
+
+    <update id="htSerMesSfjj" parameterType="String">
+        update NX_FWHT set FWHT_SFJJ = '1' where NX_FWHT_ID = #{id}
+    </update>
+
+    <update id="jsSerMesSfjj" parameterType="String">
+        update NX_JSXX set JSXX_SFJJ = '1' where NX_JSXX_ID = #{id}
+    </update>
+
+
+    <select id="getKmcList" parameterType="java.util.HashMap" resultType="String">
+
+                SELECT
+                    KHGL_KHMC
+                FROM
+                    NX_KHGL
+                WHERE
+                        NX_KHGL_ID IN (
+                        SELECT
+                            NX_KHGL_ID
+                        FROM
+                            NX_KHGL_KHLD
+                        WHERE
+                            KHLD_LDID = #{userId}
+                    )
+
+    </select>
+
+    <select id="getSpartPartList" parameterType="java.util.HashMap" resultType="com.rootcloud.domain.entity.NxSparePartEntity">
+                SELECT
+            PART_SBID AS partSbid,
+            (
+                SELECT
+                    sblb_sbbm
+                FROM
+                    nx_jcxx_sblb
+                WHERE
+                    nx_jcxx_sblb.nx_jcxx_sblb_id = nx_spare_part.part_sbid and sy_zhid=#{zhid}
+            ) AS partSbbm,
+            NX_SPARE_PART_ID AS nxSparePartId,
+            PART_GZSC AS partGzsc,
+            PART_SM AS partSm,
+            PART_SMYJZ AS partSmyjz,
+            PART_YJZT AS partYjzt,
+            PART_YJSJ AS partYjsj,
+            PART_BJMC AS partBjmc,
+            PART_SFJJ AS partSfjj,
+            PART_AZWH AS partAzwh,
+            PART_SN AS partSn,
+            PART_XTMK AS partXtmk
+        FROM
+            NX_SPARE_PART
+        WHERE
+            PART_SBID IN
+        <foreach collection='deviceCodes' item='id' open='(' separator=',' close=')'>
+            #{id}
+        </foreach>
+        AND PART_YJZT = '0000'
+        AND PART_YJSJ BETWEEN #{startTime}
+        AND #{endTime}
+        AND (PART_SFJJ != 1 OR PART_SFJJ is NULL) and PART_BJZT = '1'
+        limit ${startNo},${endNo};
+    </select>
+
+    <select id="countSpartPartList" parameterType="java.util.HashMap" resultType="java.lang.Integer">
+        SELECT
+        count(NX_SPARE_PART_ID)
+        FROM
+        NX_SPARE_PART
+        WHERE
+        PART_SBID IN
+        <foreach collection='deviceCodes' item='id' open='(' separator=',' close=')'>
+            #{id}
+        </foreach>
+        AND PART_YJZT = '0000'
+        AND PART_YJSJ BETWEEN #{startTime}
+        AND #{endTime}
+        AND (PART_SFJJ != 1 OR PART_SFJJ is NULL) and PART_BJZT = '1';
+    </select>
+
+    <select id="getOrderTypeNum" parameterType="String" resultMap="nxOrderMap">
+        SELECT
+        *
+        FROM
+        nx_order
+        WHERE
+        1 = 1 and SY_STATUS != 0
+        AND (
+        ORDER_CUSTOMER_ID = (
+        SELECT
+        NX_KHGL_ID
+        FROM
+        nx_khgl
+        WHERE
+        nx_khgl.NX_KHGL_ID = (
+        SELECT
+        NX_KHGL_ID
+        FROM
+        nx_khgl_khld
+        WHERE
+        nx_khgl_khld.KHLD_LDID = #{userId}
+        )
+        )
+        OR ORDER_CUSTOMER_ID IN (
+        SELECT
+        NX_KHGL_ID
+        FROM
+        nx_khgl
+        WHERE
+        khgl_khdzs IN (
+        SELECT
+        substring_index(
+        substring_index(
+        nxgx_jcda_fwwd.FWWD_SSQY,
+        ',',
+        b.help_topic_id + 1
+        ),
+        ',',
+        - 1
+        ) AS areas
+        FROM
+        nxgx_jcda_fwwd
+        JOIN mysql.help_topic b ON b.help_topic_id &lt; length(nxgx_jcda_fwwd.FWWD_SSQY) - length(
+        REPLACE (
+        nxgx_jcda_fwwd.FWWD_SSQY,
+        ',',
+        ''
+        )
+        ) + 1
+        WHERE
+        NXGX_JCDA_FWWD_ID = (
+        SELECT
+        FWRY_WDID
+        FROM
+        NXGX_JCDA_FWRY
+        WHERE
+        NXGX_JCDA_FWRY.userid = #{userId}
+        AND EXISTS (
+        SELECT
+        1
+        FROM
+        je_core_role_user
+        WHERE
+        je_core_role_user.userid = #{userId}
+        AND ROLEID = 'wq3AoijXFmkUWUrKgUl'
+        )
+        )
+        )
+        )
+        OR ORDER_ASSIGNENGINEERID = #{userId}
+        OR ORDER_ASSISTENGINEERID = #{userId}
+        OR ORDER_JDGCS = #{userId}
+        OR EXISTS (
+        SELECT
+        1
+        FROM
+        je_core_role_user
+        WHERE
+        je_core_role_user.userid = #{userId}
+        AND ROLEID IN (
+        '10125632',
+        'lEsw0MgJDhyW0S8iC3q'
+        )
+        )
+        )
+    </select>
+
+    <select id="getOrderTypeNum2" parameterType="String" resultMap="nxOrderMap">
+        SELECT
+            ORDER_ORDERSTATUS_CODE as orderOrderstatusCode
+        FROM
+            nx_order
+        WHERE SY_STATUS != 0
+        AND (
+        ORDER_CUSTOMER_ID = (
+        SELECT
+        NX_KHGL_ID
+        FROM
+        nx_khgl
+        WHERE
+        nx_khgl.NX_KHGL_ID = (
+        SELECT
+        NX_KHGL_ID
+        FROM
+        nx_khgl_khld
+        WHERE
+        nx_khgl_khld.KHLD_LDID = #{userId}
+            )
+            )
+           OR ORDER_CUSTOMER_ID IN (
+            SELECT
+            NX_KHGL_ID
+            FROM
+            nx_khgl
+            WHERE
+            khgl_khdzs IN (
+            SELECT
+            substring_index(
+            substring_index(
+            nxgx_jcda_fwwd.FWWD_SSQY,
+            ',',
+            b.help_topic_id + 1
+            ),
+            ',',
+            - 1
+            ) AS areas
+            FROM
+            nxgx_jcda_fwwd
+            JOIN mysql.help_topic b ON b.help_topic_id &lt; length(nxgx_jcda_fwwd.FWWD_SSQY) - length(
+            REPLACE (
+            nxgx_jcda_fwwd.FWWD_SSQY,
+            ',',
+            ''
+            )
+            ) + 1
+            WHERE
+            NXGX_JCDA_FWWD_ID = (
+            SELECT
+            FWRY_WDID
+            FROM
+            NXGX_JCDA_FWRY
+            WHERE
+            NXGX_JCDA_FWRY.userid = #{userId}
+          AND EXISTS (
+            SELECT
+            1
+            FROM
+            je_core_role_user
+            WHERE
+            je_core_role_user.userid = #{userId}
+          AND ROLEID = 'wq3AoijXFmkUWUrKgUl'
+            )
+            )
+            )
+            )
+           OR ORDER_ASSIGNENGINEERID = #{userId}
+           OR ORDER_ASSISTENGINEERID = #{userId}
+           OR ORDER_JDGCS = #{userId}
+           OR EXISTS (
+            SELECT
+            1
+            FROM
+            je_core_role_user
+            WHERE
+            je_core_role_user.userid = #{userId}
+          AND ROLEID IN (
+            '10125632',
+            'lEsw0MgJDhyW0S8iC3q'
+            )
+            )
+            )
+    </select>
+
+    <select id="getOrderTypeNumByCustomer"  parameterType="map"  resultMap="nxOrderMap">
+        SELECT
+            *
+        FROM
+            nx_order
+        WHERE SY_ZHID=#{zhid} and SY_STATUS != 0
+        <if test="informantList != '' and informantList != null">
+            and ORDER_INFORMANT  in
+            <foreach collection="informantList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        and ORDER_CUSTOMER_ID in(SELECT NX_KHGL_ID FROM NX_KHGL_KHLD WHERE KHLD_LDID = #{userId})
+        <if test="deviceCodeList != '' and deviceCodeList != null">
+            and ORDER_DEVICECODE  in
+            <foreach collection="deviceCodeList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+    <update id="updateOrderShsj">
+        update nx_order set ORDER_SHSJ=FROM_UNIXTIME(ORDER_SHTGSJ/1000,'%Y-%m-%d %H:%i:%s') where ORDER_SHSJ is null and ORDER_SHTGSJ is not null
+    </update>
+
+    <update id="updateOrderWgsj">
+        update nx_order set ORDER_WGSJ=FROM_UNIXTIME(ORDER_BGSJ/1000,'%Y-%m-%d %H:%i:%s') where ORDER_WGSJ is null and ORDER_BGSJ is not null
+    </update>
+
+    <update id="updateOrderZpgcssj">
+        update nx_order set ORDER_ZPGCSSJ=FROM_UNIXTIME(ORDER_PGSJ/1000,'%Y-%m-%d %H:%i:%s')  where ORDER_ZPGCSSJ is null and ORDER_PGSJ is not null
+    </update>
+
+    <select id="getOrderCount" resultType="integer">
+        SELECT count(1) from nx_order where DATE_FORMAT(SY_CREATETIME, '%Y-%m-%d' )=#{date}
+    </select>
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/NxPartFileConfigDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/NxPartFileConfigDao.xml
new file mode 100644
index 0000000..f16b1ed
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/NxPartFileConfigDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rootcloud.domain.dao.part.NxPartFileConfigDao">
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/NxPartFileDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/NxPartFileDao.xml
new file mode 100644
index 0000000..d419ee0
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/NxPartFileDao.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rootcloud.domain.dao.part.NxPartFileDao">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.rootcloud.domain.entity.NxPartFileEntity" id="nxPartFileMap">
+        <result property="filePjbm" column="FILE_PJBM"/>
+        <result property="filePjmc" column="FILE_PJMC"/>
+        <result property="fileSfsgjpj" column="FILE_SFSGJPJ"/>
+        <result property="fileXtmk" column="FILE_XTMK"/>
+        <result property="fileXtmkbm" column="FILE_XTMKBM"/>
+        <result property="fileGgxh" column="FILE_GGXH"/>
+        <result property="fileLlsm" column="FILE_LLSM"/>
+        <result property="fileDj" column="FILE_DJ"/>
+        <result property="fileKcsx" column="FILE_KCSX"/>
+        <result property="fileKcxx" column="FILE_KCXX"/>
+        <result property="fileKcsl" column="FILE_KCSL"/>
+        <result property="fileCkmc" column="FILE_CKMC"/>
+        <result property="fileCkbm" column="FILE_CKBM"/>
+        <result property="fileDw" column="FILE_DW"/>
+        <result property="nxPartFileId" column="NX_PART_FILE_ID"/>
+        <result property="syAudflag" column="SY_AUDFLAG"/>
+        <result property="syCreateorgid" column="SY_CREATEORGID"/>
+        <result property="syCreateorg" column="SY_CREATEORG"/>
+        <result property="syCreateorgname" column="SY_CREATEORGNAME"/>
+        <result property="syCreatetime" column="SY_CREATETIME"/>
+        <result property="syCreateuserid" column="SY_CREATEUSERID"/>
+        <result property="syCreateuser" column="SY_CREATEUSER"/>
+        <result property="syCreateusername" column="SY_CREATEUSERNAME"/>
+        <result property="syStatus" column="SY_STATUS"/>
+        <result property="syOrderindex" column="SY_ORDERINDEX"/>
+        <result property="syPiid" column="SY_PIID"/>
+        <result property="syPdid" column="SY_PDID"/>
+        <result property="syJtgsmc" column="SY_JTGSMC"/>
+        <result property="syJtgsid" column="SY_JTGSID"/>
+    </resultMap>
+
+    <select id="getByPartCode" resultType="com.rootcloud.domain.entity.NxPartFileEntity"
+            parameterType="java.lang.String">
+        select * from nx_part_file where FILE_PJBM = #{filePjbm} and FILE_CKBM = #{fileCkbm} and FILE_KWBM = #{fileKwbm} and SY_ZHID=#{syZhid} limit 1
+    </select>
+
+
+    <update id="updateByPartCode" parameterType="com.rootcloud.domain.entity.NxPartFileEntity">
+        update nx_part_file
+        set
+        FILE_PJMC = #{filePjmc},
+        FILE_GGXH = #{fileGgxh},
+        FILE_DJ = #{fileDj},
+        FILE_KCSL = #{fileKcsl},
+        FILE_DW = #{fileDw},
+        FILE_CKBM = #{fileCkbm},
+        FILE_CKMC = #{fileCkmc},
+        SY_CREATETIME = #{syCreatetime},
+        SY_ZHID = #{syZhid}
+        where NX_PART_FILE_ID=#{nxPartFileId}
+    </update>
+
+
+    <update id="updateCkmc" parameterType="com.rootcloud.domain.entity.NxPartFileEntity">
+        update nx_part_file a,nx_part_resp b set a.FILE_CKMC=b.RESP_CKMC  where a.FILE_CKBM=b.RESP_CKBM and a.FILE_KWBM=b.RESP_KWBM and a.FILE_CKBM = #{fileCkbm} and a.FILE_KWBM = #{fileKwbm} and a.SY_ZHID=#{syZhid} and b.SY_ZHID=#{syZhid};
+    </update>
+
+
+    <select id="queryLgortCode" resultType="java.lang.String">
+    select CONCAT(df.FILE_CKBM,'~',(case when df.FILE_KWBM is null then '' else df.FILE_KWBM end)) from (select FILE_CKBM,FILE_KWBM from nx_part_file where FILE_CKBM is not null and FILE_CKBM != '' and not exists (select 1 from nx_part_resp where nx_part_resp.resp_ckbm = nx_part_file.file_ckbm) group by FILE_KWBM) df group by df.FILE_CKBM;
+    </select>
+
+    <select id="queryLgorts" resultType="java.lang.String">
+        SELECT CONFIG_VALUE from je_user_config where config_code ='SAP_PARAMS' and CONFIG_ENABLED = '1' ORDER BY SY_CREATETIME desc limit 1;
+    </select>
+
+    <delete id="removePartFile2" parameterType="java.lang.String">
+        delete from nx_part_file2
+    </delete>
+
+    <insert id="insertPartFile2" parameterType="com.rootcloud.domain.entity.NxPartFileEntity">
+        INSERT INTO nx_part_file2 (
+            FILE_PJBM,
+            FILE_PJMC,
+            FILE_SFSGJPJ,
+            FILE_XTMK,
+            FILE_XTMKBM,
+            FILE_GGXH,
+            FILE_LLSM,
+            FILE_DJ,
+            FILE_KCSX,
+            FILE_KCXX,
+            FILE_KCSL,
+            FILE_CKMC,
+            FILE_CKBM,
+            FILE_DW,
+            NX_PART_FILE2_ID,
+            SY_AUDFLAG,
+            SY_CREATEORGID,
+            SY_CREATEORG,
+            SY_CREATEORGNAME,
+            SY_CREATETIME,
+            SY_CREATEUSERID,
+            SY_CREATEUSER,
+            SY_CREATEUSERNAME,
+            SY_STATUS,
+            SY_ORDERINDEX,
+            SY_PIID,
+            SY_PDID,
+            SY_JTGSMC,
+            SY_JTGSID,
+            FILE_KWBM
+        )
+        VALUES
+            (#{filePjbm}, #{filePjmc}, '0', NULL, NULL, #{fileGgxh}, NULL, #{fileDj}, 0, 0,
+            #{fileKcsl}, #{fileCkbm}, #{fileCkbm}, #{fileDw}, UUID(), NULL, NULL, NULL, NULL,
+            now(), NULL, 'system', NULL, NULL, NULL, NULL, NULL, NULL, NULL, #{fileKwbm})
+    </insert>
+
+</mapper>
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/NxPartRespDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/NxPartRespDao.xml
new file mode 100644
index 0000000..5454fc2
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/NxPartRespDao.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rootcloud.domain.dao.part.NxPartRespDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.rootcloud.domain.entity.NxPartRespEntity" id="nxPartRespMap">
+        <result property="respCkbm" column="RESP_CKBM"/>
+        <result property="respCkmc" column="RESP_CKMC"/>
+        <result property="nxPartRespId" column="NX_PART_RESP_ID"/>
+        <result property="syAudflag" column="SY_AUDFLAG"/>
+        <result property="syCreateorgid" column="SY_CREATEORGID"/>
+        <result property="syCreateorg" column="SY_CREATEORG"/>
+        <result property="syCreateorgname" column="SY_CREATEORGNAME"/>
+        <result property="syCreatetime" column="SY_CREATETIME"/>
+        <result property="syCreateuserid" column="SY_CREATEUSERID"/>
+        <result property="syCreateuser" column="SY_CREATEUSER"/>
+        <result property="syCreateusername" column="SY_CREATEUSERNAME"/>
+        <result property="syStatus" column="SY_STATUS"/>
+        <result property="syOrderindex" column="SY_ORDERINDEX"/>
+        <result property="syPiid" column="SY_PIID"/>
+        <result property="syPdid" column="SY_PDID"/>
+        <result property="syJtgsmc" column="SY_JTGSMC"/>
+        <result property="syJtgsid" column="SY_JTGSID"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/NxPlpzMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/NxPlpzMapper.xml
new file mode 100644
index 0000000..41475c1
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/NxPlpzMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.mapper.NxPlpzMapper">
+
+
+    <select id="getCountServiceItem" resultType="int">
+        select count(1) from nx_Plpz where SY_STATUS!=2
+    </select>
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/NxSparePartDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/NxSparePartDao.xml
new file mode 100644
index 0000000..bab671d
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/NxSparePartDao.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.mapper.SparePartMapper">
+
+	<update id="updateZhid">
+		update nx_spare_part a,nx_jcxx_sblb b set a.PART_ZHID=b.SY_ZHID where a.PART_SBID=b.NX_JCXX_SBLB_ID and a.PART_ZHID is null
+	</update>
+
+	<update id="updateWorkTime">
+		update nx_spare_part
+		SET part_ghrq = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+		where NX_SPARE_PART_ID = #{id}
+	</update>
+
+	<update id="updateWorkTime2">
+		update nx_spare_part
+		SET SY_MODIFYTIME = DATE_FORMAT( NOW( ), '%Y-%m-%d' ),
+			<!-- part_ghrq = DATE_FORMAT( NOW( ), '%Y-%m-%d' ),  -->
+			PART_GZSC = #{gzsc}
+		where NX_SPARE_PART_ID = #{id}
+	</update>
+	<select id="selectNoSyncPart" resultType="com.rootcloud.domain.dto.NxSparePartVo">
+		select * from nx_spare_part where part_bjzt = '1' AND ( SY_MODIFYTIME IS NULL OR SY_MODIFYTIME != DATE_FORMAT( NOW( ), '%Y-%m-%d' ) );
+	</select>
+
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/NxTodoLibraryMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/NxTodoLibraryMapper.xml
new file mode 100644
index 0000000..6363087
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/NxTodoLibraryMapper.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.mapper.NxTodoLibraryMapper">
+
+
+    <select id="getPage" resultType="com.rootcloud.vo.todo.TodoVo">
+        SELECT
+        ntl.DEVICE_CODE AS deviceCode,
+        ntl.DEVICE_TYPE AS deviceType,
+        ntl.DEVICE_SBXH AS deviceSbxh,
+        ntl.DEVICE_NAME AS deviceName,
+        ntl.ADVICE_CODE AS adviceCode,
+        ntl.TYPE_CODE AS typeCode,
+        ntl.TITLE AS title,
+        ntl.OPERATION AS operation,
+        ntl.TIME AS time,
+        ntl.CONTENT AS content,
+        ntl.NX_TODO_LIBRARY_ID AS nxTodoLibraryId,
+        ntl.SERVE_TYPE AS serveType,
+        ntl.STATUS AS STATUS,
+        ntl.SERVICE_PLAN_ID AS servicePlanId,
+        ntl.USERID AS userid,
+        ntl.SERVICE_TIME AS serviceTime,
+        ntl.NX_ORDER_ID AS nxOrderId,
+        ord.ORDER_ORDERNUMBER as orderNo,
+        ord.ORDER_ASSIGNENGINEERID as engineerId,
+        ord.ORDER_JDGCS as engineerName,
+        ntl.SY_CREATETIME AS creatTime,
+        ntl.LIBRARY_SN as sn,
+        ntl.LIBRARY_AZWH as partAzwh,
+        ntl.LIBRARY_JHMC as planName,
+        ntl.LIBRARY_JHWCSJ as planEndTime,
+        ntl.LIBRARY_XTMK as partXtmk,
+        ntl.LIBRARY_GZSC as partGzsc,
+        ntl.LIBRARY_BJMC as partBjmc,
+        ntl.LIBRARY_BJBM as bjbm,
+        ntl.LIBRARY_GZDJ as gzdj,
+        ntl.LIBRARY_BJSJ as bjsj,
+        ntl.LIBRARY_DDBH as ddbh,
+        ntl.LIBRARY_GCS as gcs,
+        ntl.LIBRARY_XQMS as xqms
+        FROM
+        nx_todo_library ntl
+        left join
+        nx_order ord
+        on
+        (ntl.NX_ORDER_ID = ord.NX_ORDER_ID and ord.sy_zhid = #{syZhid}) COLLATE utf8mb4_unicode_ci
+        where
+        case when ord.ORDER_ORDERSTATUS_CODE is null = "1"   then ntl.STATUS !='1' else ord.ORDER_ORDERSTATUS_CODE not in ('1','3','4','5','10','11') end
+        and ntl.type_code != 3
+       <if test="queryData != null and queryData != ''">
+            AND (ntl.DEVICE_SBXH LIKE CONCAT('%', #{queryData}, '%')
+            OR ntl.DEVICE_NAME LIKE CONCAT('%', #{queryData}, '%'))
+        </if>
+        <if test="userId != null and userId != ''">
+            AND (ntl.USERID = #{userId}
+            OR (
+            ord.ORDER_CUSTOMER_ID = ( SELECT max(NX_KHGL_ID) FROM nx_khgl_khld WHERE nx_khgl_khld.KHLD_LDID = #{userId} )
+            OR ord.ORDER_CUSTOMER_ID IN (
+            SELECT
+            NX_KHGL_ID
+            FROM
+            nx_khgl
+            WHERE
+            khgl_khdzs IN (
+            SELECT
+            substring_index( substring_index( nxgx_jcda_fwwd.FWWD_SSQY, ',', b.help_topic_id + 1 ), ',', - 1 ) AS areas
+            FROM
+            nxgx_jcda_fwwd
+            JOIN mysql.help_topic b ON b.help_topic_id    &lt;  length( nxgx_jcda_fwwd.FWWD_SSQY ) - length(
+            REPLACE ( nxgx_jcda_fwwd.FWWD_SSQY, ',', '' )) + 1
+            WHERE
+            NXGX_JCDA_FWWD_ID = (
+            SELECT
+            FWRY_WDID
+            FROM
+            NXGX_JCDA_FWRY
+            WHERE
+            NXGX_JCDA_FWRY.userid = #{userId}
+            AND EXISTS ( SELECT 1 FROM je_core_role_user WHERE je_core_role_user.userid = #{userId} AND ROLEID = 'wq3AoijXFmkUWUrKgUl' )
+            )
+            )
+            )
+            OR ord.ORDER_ASSIGNENGINEERID = #{userId}
+            OR ord.ORDER_ASSISTENGINEERID = #{userId}
+            OR ord.ORDER_JDGCS = #{userId}
+            OR EXISTS ( SELECT 1 FROM je_core_role_user WHERE je_core_role_user.userid = #{userId} AND ROLEID IN ( '10125632', 'lEsw0MgJDhyW0S8iC3q' ) ))
+            )
+        </if>
+        order by ntl.SY_CREATETIME desc
+    </select>
+
+    <select id="getPageNew" resultType="com.rootcloud.vo.todo.TodoVo">
+        select * from (
+        SELECT
+        ntl.DEVICE_CODE AS deviceCode,
+        ntl.DEVICE_TYPE AS deviceType,
+        ntl.DEVICE_SBXH AS deviceSbxh,
+        ntl.DEVICE_NAME AS deviceName,
+        ntl.ADVICE_CODE AS adviceCode,
+        ntl.TYPE_CODE AS typeCode,
+        ntl.TITLE AS title,
+        ntl.OPERATION AS operation,
+        ntl.TIME AS time,
+        ntl.CONTENT AS content,
+        ntl.NX_TODO_LIBRARY_ID AS nxTodoLibraryId,
+        ntl.SERVE_TYPE AS serveType,
+        ntl.STATUS AS STATUS,
+        ntl.SERVICE_PLAN_ID AS servicePlanId,
+        ntl.USERID AS userid,
+        ntl.SERVICE_TIME AS serviceTime,
+        ntl.NX_ORDER_ID AS nxOrderId,
+        ord.ORDER_ORDERNUMBER as orderNo,
+        ord.ORDER_ASSIGNENGINEERID as engineerId,
+        ord.ORDER_JDGCS as engineerName,
+        ntl.SY_CREATETIME AS creatTime,
+        ntl.LIBRARY_SN as sn,
+        ntl.LIBRARY_AZWH as partAzwh,
+        ntl.LIBRARY_JHMC as planName,
+        ntl.LIBRARY_JHWCSJ as planEndTime,
+        ntl.LIBRARY_XTMK as partXtmk,
+        ntl.LIBRARY_GZSC as partGzsc,
+        ntl.LIBRARY_BJMC as partBjmc,
+        ntl.LIBRARY_BJBM as bjbm,
+        ntl.LIBRARY_GZDJ as gzdj,
+        ntl.LIBRARY_BJSJ as bjsj,
+        ntl.LIBRARY_DDBH as ddbh,
+        ntl.LIBRARY_GCS as gcs,
+        ntl.LIBRARY_XQMS as xqms
+        FROM
+        nx_todo_library ntl
+        join nx_order ord ON (ntl.NX_ORDER_ID = ord.NX_ORDER_ID)
+        <where>
+            and ntl.type_code != 3 and ntl.ADVICE_CODE in('6')  and ntl.`STATUS`='0'
+            <if test="syZhid!=null and syZhid!=''">
+                AND ord.sy_zhid = #{syZhid}
+            </if>
+            and ord.ORDER_ORDERSTATUS_CODE not in ('1','3','4','5','10','11')
+            AND (
+            ord.ORDER_CUSTOMER_ID = ( SELECT max(NX_KHGL_ID) FROM nx_khgl_khld WHERE nx_khgl_khld.KHLD_LDID = #{userId} )
+            OR ord.ORDER_CUSTOMER_ID IN (
+            SELECT
+            NX_KHGL_ID
+            FROM
+            nx_khgl
+            WHERE
+            khgl_khdzs IN (
+            SELECT
+            substring_index( substring_index( nxgx_jcda_fwwd.FWWD_SSQY, ',', b.help_topic_id + 1 ), ',', - 1 ) AS areas
+            FROM
+            nxgx_jcda_fwwd
+            JOIN mysql.help_topic b ON b.help_topic_id  &lt;  length( nxgx_jcda_fwwd.FWWD_SSQY ) - length(
+            REPLACE ( nxgx_jcda_fwwd.FWWD_SSQY, ',', '' )) + 1
+            WHERE
+            NXGX_JCDA_FWWD_ID = (
+            SELECT
+            FWRY_WDID
+            FROM
+            NXGX_JCDA_FWRY
+            WHERE
+            NXGX_JCDA_FWRY.userid = #{userId}
+            AND EXISTS ( SELECT 1 FROM je_core_role_user WHERE je_core_role_user.userid = #{userId} AND ROLEID = 'wq3AoijXFmkUWUrKgUl' )
+            )
+            )
+            )
+            OR ord.ORDER_ASSIGNENGINEERID = #{userId}
+            OR ord.ORDER_ASSISTENGINEERID = #{userId}
+            OR ord.ORDER_JDGCS = #{userId}
+            OR EXISTS ( SELECT 1 FROM je_core_role_user WHERE je_core_role_user.userid = #{userId} AND ROLEID IN ( '10125632', 'lEsw0MgJDhyW0S8iC3q' ) ))
+        </where>
+        union all
+        SELECT
+        ntl.DEVICE_CODE AS deviceCode,
+        ntl.DEVICE_TYPE AS deviceType,
+        ntl.DEVICE_SBXH AS deviceSbxh,
+        ntl.DEVICE_NAME AS deviceName,
+        ntl.ADVICE_CODE AS adviceCode,
+        ntl.TYPE_CODE AS typeCode,
+        ntl.TITLE AS title,
+        ntl.OPERATION AS operation,
+        ntl.TIME AS time,
+        ntl.CONTENT AS content,
+        ntl.NX_TODO_LIBRARY_ID AS nxTodoLibraryId,
+        ntl.SERVE_TYPE AS serveType,
+        ntl.STATUS AS STATUS,
+        ntl.SERVICE_PLAN_ID AS servicePlanId,
+        ntl.USERID AS userid,
+        ntl.SERVICE_TIME AS serviceTime,
+        ntl.NX_ORDER_ID AS nxOrderId,
+        '' as orderNo,
+        '' as engineerId,
+        '' as engineerName,
+        ntl.SY_CREATETIME AS creatTime,
+        ntl.LIBRARY_SN as sn,
+        ntl.LIBRARY_AZWH as partAzwh,
+        ntl.LIBRARY_JHMC as planName,
+        ntl.LIBRARY_JHWCSJ as planEndTime,
+        ntl.LIBRARY_XTMK as partXtmk,
+        ntl.LIBRARY_GZSC as partGzsc,
+        ntl.LIBRARY_BJMC as partBjmc,
+        ntl.LIBRARY_BJBM as bjbm,
+        ntl.LIBRARY_GZDJ as gzdj,
+        ntl.LIBRARY_BJSJ as bjsj,
+        ntl.LIBRARY_DDBH as ddbh,
+        ntl.LIBRARY_GCS as gcs,
+        ntl.LIBRARY_XQMS as xqms
+        FROM
+        nx_todo_library ntl
+        where ntl.type_code != 3 and ntl.ADVICE_CODE in('3','5') and ntl.`STATUS`='0'
+        and ntl.USERID=#{userId}
+        ) as a
+        <where>
+            <if test="queryData != null and queryData != ''">
+                AND ( a.deviceSbxh LIKE CONCAT('%', #{queryData}, '%')
+                OR a.deviceName LIKE CONCAT('%', #{queryData}, '%'))
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/NxTriggerConditionMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/NxTriggerConditionMapper.xml
new file mode 100644
index 0000000..8de9e39
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/NxTriggerConditionMapper.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rootcloud.domain.mapper.NxTriggerConditionMapper">
+
+    <resultMap id="BaseResultMap" type="com.rootcloud.domain.entity.sp.NxTriggerConditionEntity" >
+        <result column="NX_TIGGER_CONDITION_ID" property="nxTriggerConditionId"/>
+        <result column="SERVICE_PLAN_ID" property="servicePlanId"/>
+        <result column="TIGGER_CONDITION" property="triggerCondition"/>
+        <result column="CONDITION_TJ" property="conditionTj"/>
+        <result column="CONDITION_VALUE" property="conditionValue"/>
+        <result column="SET_VALUE" property="setValue"/>
+        <result column="CREATE_TIME" property="createTime"/>
+    </resultMap>
+
+    <!--批量 插入记录 -->
+    <insert id="batchInsert" parameterType="java.util.ArrayList">
+        insert into nx_tigger_condition(
+        `NX_TRIGGER_CONDITION_ID`,
+        `SERVICE_PLAN_ID`,
+        `TRIGGER_CONDITION`,
+        `CONDITION_TJ`,
+        `CONDITION_VALUE`,
+        `SET_VALUE` ,
+        `CREATE_TIME`
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.nxTiggerConditionId},
+            #{item.servicePlanId},
+            #{item.tiggerCondition},
+            #{item.conditionTj},
+            #{item.conditionValue},
+            #{item.setValue},
+            #{item.createTime})
+        </foreach>
+    </insert>
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/NxUserInfoMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/NxUserInfoMapper.xml
new file mode 100644
index 0000000..ba99ba8
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/NxUserInfoMapper.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rootcloud.domain.mapper.NxUserInfoMapper">
+
+    <resultMap id="BaseResultMap" type="com.rootcloud.domain.entity.sp.NxUserInfoEntity" >
+        <result column="NX_USER_INFO_ID" property="nxUserInfoId"/>
+        <result column="SERVICE_PLAN_ID" property="servicePlanId"/>
+        <result column="DEPARTMENT_ID" property="departmentId"/>
+        <result column="USER_ID" property="userId"/>
+        <result column="ROLE_ID" property="roleId"/>
+        <result column="EXTERNAL_REMINDERS" property="externalReminders"/>
+        <result column="STATION_REMINDERS" property="stationReminders"/>
+        <result column="EMAIL_REMINDERS" property="emailReminders"/>
+        <result column="SMS_REMINDERS" property="smsReminders"/>
+        <result column="INFO_TYPE" property="infoType"/>
+        <result column="INFO_CONTENT" property="infoContent"/>
+        <result column="CREATE_TIME" property="createTime"/>
+    </resultMap>
+
+
+    <select id="queryUserIdsByDeptId" resultType="java.lang.String">
+        select group_concat(userid) from (
+            select userid from je_core_enduser where DEPTID in
+            (
+            SELECT DEPTID FROM je_core_department WHERE DEPTID in
+            <foreach collection='deptList' item='id' open='(' separator=',' close=')'>
+                  #{id}
+            </foreach>
+            ) group by userid
+       )t
+    </select>
+
+
+    <select id="getRoleName" resultType="java.lang.String">
+        select group_concat(ROLENAME) from je_core_role where ROLEID in
+        <foreach collection='roleList' item='id' open='(' separator=',' close=')'>
+            #{id}
+        </foreach>
+    </select>
+
+
+    <select id="getDeptName" resultType="java.lang.String">
+        select group_concat(DEPTNAME) from je_core_department where DEPTID in
+        <foreach collection='deptList' item='id' open='(' separator=',' close=')'>
+            #{id}
+        </foreach>
+    </select>
+
+
+    <select id="getUserName" resultType="java.lang.String">
+        select group_concat(USERNAME) from je_core_enduser where USERID in
+        <foreach collection='userList' item='id' open='(' separator=',' close=')'>
+            #{id}
+        </foreach>
+    </select>
+
+
+
+
+    <select id="selectBySeviceCode" resultType="com.rootcloud.vo.service.NxUserInfoVo">
+        SELECT
+            gl.KHGL_ZYLXR as mainContact,gl.KHGL_ZYLXRDH as mainPhone
+        FROM
+            nx_jcxx_sblb lb
+            LEFT JOIN nx_khgl gl
+            on lb.SBLB_KHID = gl.NX_KHGL_ID
+        where lb.SBLB_SBBM = #{deviceCode} and lb.sy_zhid=#{syZhid}
+        limit 1
+    </select>
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/NxZskFaultCodeMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/NxZskFaultCodeMapper.xml
new file mode 100644
index 0000000..a7eaf77
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/NxZskFaultCodeMapper.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rootcloud.domain.mapper.NxZskFaultCodeMapper">
+
+
+    <select id="getPage" resultType="com.rootcloud.vo.faultcode.FaultCodeVo">
+        SELECT
+            FAULTCODE_GZM as faultcodeGzm,
+            FAULTCODE_GZMC as faultcodeGzmc,
+            FAULTCODE_SBLX as faultcodeSblx,
+            FAULTCODE_SBLXCODE as  faultcodeSblxcode,
+            FAULTCODE_SBXH as faultcodeSbxh,
+            FAULTCODE_GZMS as faultcodeGzms,
+            FAULTCODE_GZDJ as faultcodeGzdj,
+            NX_ZSK_FAULTCODE_ID as NxZskFaultcodeId
+        FROM
+            nx_zsk_faultcode
+        <where>
+            <if test="queryData != null and queryData != ''">
+                AND (FAULTCODE_GZM LIKE CONCAT('%', #{queryData}, '%')
+                OR FAULTCODE_GZMS LIKE CONCAT('%', #{queryData}, '%'))
+            </if>
+            <if test="faultcodeSblxcode != null and faultcodeSblxcode != ''">
+                AND FAULTCODE_SBLXCODE = #{faultcodeSblxcode}
+            </if>
+        </where>
+        order by SY_CREATETIME desc
+    </select>
+
+
+    <select id="getCodes" resultType="String">
+        SELECT
+            FAULTCODE_GZM as faultcodeGzm
+        FROM
+            nx_zsk_faultcode
+        <where>
+            <if test="level!=null and level!=''"> and FAULTCODE_GZDJCODE = #{level}</if>
+            <if test="sbxh!=null and sbxh!=''"> and FAULTCODE_SBXHCODE = #{sbxh}</if>
+        </where>
+        limit 1000
+    </select>
+
+    <select id="getSbxh" resultType="string">
+        select MODEL_XHBM from NX_JCDA_DEVICE_MODEL where NX_JCDA_DEVICE_MODEL_ID=#{id}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/PrinterEfficiencyWorkDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/PrinterEfficiencyWorkDao.xml
new file mode 100644
index 0000000..959a60b
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/PrinterEfficiencyWorkDao.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rootcloud.domain.dao.PrinterEfficiencyWorkDao">
+
+    <insert id="batchAdd">
+        insert into rep_printer_efficiency(device_id, device_type_id, data_year, data_month, data_day, gk_sc_dy_dyhs, gk_sc_dy_dytime, gk_sc_dy_ghjhl)
+        values
+        <foreach collection="dataList" item="item" separator=",">
+            (#{item.deviceId}, #{item.deviceTypeId}, #{year}, #{month}, #{day}, #{item.dyhs}, #{item.dyTime}, #{item.ghjhl})
+        </foreach>
+    </insert>
+
+    <delete id="clear">
+        delete from rep_printer_efficiency where data_year=#{year} and data_month = #{month} and data_day = #{day}
+    </delete>
+
+    <select id="getPrinterEfficiencyData" resultType="map">
+        select
+            device_id as device_id,
+            sum(gk_sc_dy_dyhs) / (count(distinct case
+                                                     when gk_sc_dy_dyhs = 0 then null
+                                                     else data_day
+                end) * 24) as dyhs,
+            sum(gk_sc_dy_dytime) / count(distinct case
+                                                      when gk_sc_dy_dytime = 0 then null
+                                                      else data_day
+                end) as dyxl,
+            sum(gk_sc_dy_ghjhl) /  count(distinct case
+                                                      when gk_sc_dy_ghjhl = 0 then null
+                                                      else data_day
+                end) as btl
+        from rep_printer_efficiency
+        where data_year = #{year}
+          and data_month = #{month}
+          and data_day = #{day}
+          and gk_sc_dy_dyhs + gk_sc_dy_dytime + gk_sc_dy_ghjhl <![CDATA[ <> ]]> 0
+        group by device_id
+    </select>
+
+
+
+
+    <select id="getReportDYHSByDevice" parameterType="com.rootcloud.web.dto.PrinterEfficiencyDTO" resultType="map">
+        select
+        t.device_id, sum(t.gk_sc_dy_dyhs) as dyhs
+        from rep_printer_efficiency t
+        where 1=1
+        <if test="null != deviceIdList">
+            and device_id in
+            <foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="null != startDate and '' != startDate">
+            AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+        </if>
+        <if test="null != endDate and '' != endDate">
+            AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+        </if>
+        group by t.device_id
+        order by dyhs desc
+    </select>
+
+    <select id="getReportDYXLByDevice" parameterType="com.rootcloud.web.dto.PrinterEfficiencyDTO" resultType="map">
+        select
+        t.device_id, avg(gk_sc_dy_dytime) as dyxl
+        from rep_printer_efficiency t
+        where 1=1
+        and gk_sc_dy_dytime <![CDATA[ > ]]> 0
+        <if test="null != deviceIdList">
+            and device_id in
+            <foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="null != startDate and '' != startDate">
+            AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+        </if>
+        <if test="null != endDate and '' != endDate">
+            AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+        </if>
+        group by t.device_id
+        order by dyxl desc
+    </select>
+
+    <select id="getReportBTLByDevice" parameterType="com.rootcloud.web.dto.PrinterEfficiencyDTO" resultType="map">
+        select
+        t.device_id,avg(gk_sc_dy_ghjhl) as btl
+        from rep_printer_efficiency t
+        where 1=1
+        and gk_sc_dy_ghjhl <![CDATA[ > ]]> 0
+        <if test="null != deviceIdList">
+            and device_id in
+            <foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="null != startDate and '' != startDate">
+            AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+        </if>
+        <if test="null != endDate and '' != endDate">
+            AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+        </if>
+        group by t.device_id
+        order by btl desc
+    </select>
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/PrinterHeadRecordDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/PrinterHeadRecordDao.xml
new file mode 100644
index 0000000..b0faff4
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/PrinterHeadRecordDao.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.dao.PrinterHeadRecordDao">
+
+	<insert id="addSN" parameterType="com.rootcloud.domain.vo.PrinterHeadRecordVO">
+		replace into nx_printerHead_record(tenantId,deviceCode,thingId,updatetime,kuCode,kuName,SN1,SN2,SN3,SN4,SN5,SN6,SN7,SN8,SN9,SN10,
+                           SN11,SN12,SN13,SN14,SN15,SN16,SN17,SN18,SN19,SN20,SN21,SN22,SN23,SN24,SN25)
+		<foreach collection="VOList" item="item" open="VALUES" close=";"  separator=",">
+			(#{item.tenantId},#{item.deviceCode},#{item.thingId},
+			#{item.updatetime},#{item.kuCode}, #{item.kuName},
+            #{item.SN1}, #{item.SN2},#{item.SN3},#{item.SN4},#{item.SN5},
+			#{item.SN6}, #{item.SN7},#{item.SN8},#{item.SN9},#{item.SN10},
+			#{item.SN11}, #{item.SN12},#{item.SN13},#{item.SN14},#{item.SN15},
+			#{item.SN16}, #{item.SN17},#{item.SN18},#{item.SN19},#{item.SN20},
+			#{item.SN21}, #{item.SN22},#{item.SN23},#{item.SN24},#{item.SN25}
+			)
+		</foreach>
+	</insert>
+
+	<insert id="newSN" parameterType="com.rootcloud.domain.vo.PrinterHeadRecordVO">
+		insert into nx_printerHead_record2(tenantId,deviceCode,thingId,updatetime,kuCode,kuName,SN1,SN2,SN3,SN4,SN5,SN6,SN7,SN8,SN9,SN10,
+		SN11,SN12,SN13,SN14,SN15,SN16,SN17,SN18,SN19,SN20,SN21,SN22,SN23,SN24,SN25)
+		<foreach collection="VOList" item="item" open="VALUES" close=";"  separator=",">
+			(#{item.tenantId},#{item.deviceCode},#{item.thingId},
+			#{item.updatetime},#{item.kuCode}, #{item.kuName},
+			#{item.SN1}, #{item.SN2},#{item.SN3},#{item.SN4},#{item.SN5},
+			#{item.SN6}, #{item.SN7},#{item.SN8},#{item.SN9},#{item.SN10},
+			#{item.SN11}, #{item.SN12},#{item.SN13},#{item.SN14},#{item.SN15},
+			#{item.SN16}, #{item.SN17},#{item.SN18},#{item.SN19},#{item.SN20},
+			#{item.SN21}, #{item.SN22},#{item.SN23},#{item.SN24},#{item.SN25}
+			)
+		</foreach>
+	</insert>
+
+	<select id="printerHeadList" parameterType="com.rootcloud.domain.vo.PrinterHeadRecordVO" resultType="com.rootcloud.domain.vo.PrinterHeadRecordVO">
+		select tenantId,deviceCode,thingId,updatetime,SN1,SN2,SN3,SN4,SN5,SN6,SN7,SN8,SN9,SN10,
+		SN11,SN12,SN13,SN14,SN15,SN16,SN17,SN18,SN19,SN20,SN21,SN22,SN23,SN24,SN25
+		from nx_printerHead_record
+		<where>
+			<if test="null != tenantId  and '' != tenantId">
+				and tenantId = #{tenantId}
+			</if>
+			<if test="null != deviceCode  and '' != deviceCode">
+				and deviceCode = #{deviceCode}
+			</if>
+			<if test="null != thingId  and '' != thingId">
+				and thingId = #{thingId}
+			</if>
+		</where>
+	</select>
+
+
+
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterOutputDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterOutputDao.xml
new file mode 100644
index 0000000..d9151f1
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterOutputDao.xml
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.dao.RepPrinterOutputDao">
+
+	<insert id="add" parameterType="com.rootcloud.domain.vo.RepPrinterOutputVO">
+		replace into rep_printer_output(device_id, start_date, end_date,gk_sc_dy_cl,
+		gk_sc_dy_hgl,gk_sc_dy_fpnum,gk_sc_dy_devfpnum,gk_sc_dy_fpl,gk_sc_dy_devfpl,create_date)
+		<foreach collection="repPrinterOutputVOs" item="repPrinterOutputVO" open="VALUES" close=";"  separator=",">
+			(#{repPrinterOutputVO.deviceId},
+			#{repPrinterOutputVO.startDate},
+			#{repPrinterOutputVO.endDate},
+			#{repPrinterOutputVO.gkScDyCl},
+			#{repPrinterOutputVO.gkScDyHgl},
+			#{repPrinterOutputVO.gkScDyFpnum},
+			#{repPrinterOutputVO.gkScDyDevfpnum},
+			#{repPrinterOutputVO.gkScDyFpl},
+			#{repPrinterOutputVO.gkScDyDevfpl},
+			now())
+		</foreach>
+	</insert>
+
+	<select id="list" parameterType="com.rootcloud.domain.vo.RepPrinterOutputVO" resultType="com.rootcloud.domain.vo.RepPrinterOutputVO">
+		select id, device_id deviceId, data_year dataYear, data_month dataMonth,start_date startDate,end_date endDate,
+		data_day dataDay,gk_sc_dy_cl gkScDyCl,gk_sc_dy_hgl gkScDyHgl,
+		gk_sc_dy_fpnum gkScDyFpnum, gk_sc_dy_devfpnum gkScDyDevfpnum,
+		gk_sc_dy_fpl as gkScDyFpl, gk_sc_dy_devfpl as gkScDyDevfpl,
+		create_date createDate
+		from rep_printer_output
+		where 1=1
+		<if test="deviceId != '' and deviceId != null">
+			and device_id=#{deviceId}
+		</if>
+		<if test="null != createDate  and '' != createDate">
+		    and SUBSTR(create_date, 1, 10)=#{createDate}
+        </if>
+        <if test="null != startDate and '' != startDate">
+        	AND start_date = #{startDate}
+        </if>
+        <if test="null != endDate and '' != endDate">
+      		AND end_date = #{endDate}
+        </if>
+		<if test="dataYear != '' and dataYear != null">
+			and data_year=#{dataYear}
+		</if>
+		<if test="dataMonth != '' and dataMonth != null">
+			and data_month=#{dataMonth}
+		</if>
+		<if test="dataDay != '' and dataDay != null">
+			and data_day=#{dataDay}
+		</if>
+		<if test="gkScDyCl != '' and gkScDyCl != null">
+			and gk_sc_dy_cl=#{gkScDyCl}
+		</if>
+		<if test="gkScDyHgl != '' and gkScDyHgl != null">
+			and gk_sc_dy_hgl=#{gkScDyHgl}
+		</if>
+		<if test="gkScDyFpl != '' and gkScDyFpl != null">
+			and gk_sc_dy_fpl=#{gkScDyFpl}
+		</if>
+		<if test="gkScDyDevfpl != '' and gkScDyDevfpl != null">
+			and gk_sc_dy_devfpl=#{gkScDyDevfpl}
+		</if>
+		order by id desc
+	</select>
+	<select id="listPage" parameterType="com.rootcloud.domain.vo.RepPrinterOutputVO" resultType="com.rootcloud.domain.vo.RepPrinterOutputVO">
+		select id, device_id deviceId, data_year dataYear, data_month dataMonth,start_date startDate,end_date endDate,
+		data_day dataDay,gk_sc_dy_cl gkScDyCl,gk_sc_dy_hgl gkScDyHgl,
+		gk_sc_dy_fpnum gkScDyFpnum, gk_sc_dy_devfpnum gkScDyDevfpnum,
+		gk_sc_dy_fpl as gkScDyFpl, gk_sc_dy_devfpl as gkScDyDevfpl,
+		create_date createDate
+		from rep_printer_output
+		where 1=1
+		<if test="deviceId != '' and deviceId != null">
+			and device_id=#{deviceId}
+		</if>
+		<if test="null != createDate  and '' != createDate">
+			and SUBSTR(create_date, 1, 10)=#{createDate}
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND start_date = #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND end_date = #{endDate}
+		</if>
+		<if test="dataYear != '' and dataYear != null">
+			and data_year=#{dataYear}
+		</if>
+		<if test="dataMonth != '' and dataMonth != null">
+			and data_month=#{dataMonth}
+		</if>
+		<if test="dataDay != '' and dataDay != null">
+			and data_day=#{dataDay}
+		</if>
+		<if test="gkScDyCl != '' and gkScDyCl != null">
+			and gk_sc_dy_cl=#{gkScDyCl}
+		</if>
+		<if test="gkScDyHgl != '' and gkScDyHgl != null">
+			and gk_sc_dy_hgl=#{gkScDyHgl}
+		</if>
+		<if test="gkScDyFpl != '' and gkScDyFpl != null">
+			and gk_sc_dy_fpl=#{gkScDyFpl}
+		</if>
+		<if test="gkScDyDevfpl != '' and gkScDyDevfpl != null">
+			and gk_sc_dy_devfpl=#{gkScDyDevfpl}
+		</if>
+		order by id desc
+		limit #{startNo},#{endNo}
+	</select>
+
+
+	<select id="list1" parameterType="com.rootcloud.domain.vo.RepPrinterOutputVO" resultType="com.rootcloud.domain.vo.RepPrinterOutputVO">
+		select id, device_id deviceId, data_year dataYear, data_month dataMonth,start_date startDate,end_date endDate,
+		data_day dataDay,gk_sc_dy_cl gkScDyCl,gk_sc_dy_hgl gkScDyHgl,
+		gk_sc_dy_fpnum gkScDyFpnum, gk_sc_dy_devfpnum gkScDyDevfpnum,
+		gk_sc_dy_fpl as gkScDyFpl, gk_sc_dy_devfpl as gkScDyDevfpl,
+		create_date createDate
+		from rep_printer_output
+		where 1=1
+		<if test="deviceId != '' and deviceId != null">
+			and device_id=#{deviceId}
+		</if>
+		<if test="null != createDate  and '' != createDate">
+			and SUBSTR(create_date, 1, 10)=#{createDate}
+		</if>
+		<if test="null != startDate and '' != startDate">
+			<![CDATA[ and start_date  >=  #{startDate} ]]>
+		</if>
+		<if test="null != endDate and '' != endDate">
+			<![CDATA[ and end_date  <=  #{endDate} ]]>
+		</if>
+		<if test="dataYear != '' and dataYear != null">
+			and data_year=#{dataYear}
+		</if>
+		<if test="dataMonth != '' and dataMonth != null">
+			and data_month=#{dataMonth}
+		</if>
+		<if test="dataDay != '' and dataDay != null">
+			and data_day=#{dataDay}
+		</if>
+		<if test="gkScDyCl != '' and gkScDyCl != null">
+			and gk_sc_dy_cl=#{gkScDyCl}
+		</if>
+		<if test="gkScDyHgl != '' and gkScDyHgl != null">
+			and gk_sc_dy_hgl=#{gkScDyHgl}
+		</if>
+		<if test="gkScDyFpl != '' and gkScDyFpl != null">
+			and gk_sc_dy_fpl=#{gkScDyFpl}
+		</if>
+		<if test="gkScDyDevfpl != '' and gkScDyDevfpl != null">
+			and gk_sc_dy_devfpl=#{gkScDyDevfpl}
+		</if>
+		order by id desc
+	</select>
+
+	<select id="listnew" parameterType="com.rootcloud.domain.vo.RepPrinterOutputVO" resultType="com.rootcloud.domain.vo.RepPrinterOutputVO">
+		select id, device_id deviceId, data_year dataYear, data_month dataMonth,start_date startDate,end_date endDate,
+		data_day dataDay,gk_sc_dy_cl gkScDyCl,gk_sc_dy_hgl gkScDyHgl,
+		gk_sc_dy_fpnum gkScDyFpnum, gk_sc_dy_devfpnum gkScDyDevfpnum,
+		gk_sc_dy_fpl as gkScDyFpl, gk_sc_dy_devfpl as gkScDyDevfpl,
+		create_date createDate
+		from rep_printer_output
+		where 1=1 ORDER BY start_date desc LIMIT 1;
+	</select>
+
+	<select id="sumDeviceProductWasteData" parameterType="com.rootcloud.web.dto.PrinterReportDTO" resultType="map">
+		select device_id,
+		SUM(gk_sc_dy_cl) cl,
+		SUM(gk_sc_dy_hgl) hgl,
+		round(SUM(gk_sc_dy_fpnum)/SUM(gk_sc_dy_cl),3) as fpl,
+		round(SUM(gk_sc_dy_devfpnum)/SUM(gk_sc_dy_cl),3) as devfpl,
+		SUM(gk_sc_dy_devfpnum) as devfpnum,
+		SUM(gk_sc_dy_fpnum) as fpnum,
+		count(device_id) count
+		from rep_printer_output
+		where 1=1
+		<if test="null != deviceIdList">
+            and device_id in
+            <foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="null != startDate and '' != startDate">
+        	AND start_date <![CDATA[>=#{startDate}]]>
+        </if>
+        <if test="null != endDate and '' != endDate">
+      		AND end_date <![CDATA[<=#{endDate}]]>
+        </if>
+		GROUP BY device_id having cl > 0
+		order by hgl desc
+	</select>
+
+	<delete id="deleteOutput" parameterType="com.rootcloud.domain.vo.RepPrinterOutputVO">
+		delete from rep_printer_output where 1=1
+		<if test="createDate != '' and createDate != null">
+			and SUBSTR(create_date, 1, 10) = #{createDate}
+		</if>
+		<if test="id != null">
+			and id=#{id}
+		</if>
+	</delete>
+
+	<delete id="deleteOutputUpload" parameterType="com.rootcloud.domain.vo.RepPrinterOutputVO">
+		delete from rep_printer_output where 1=1
+		<if test="null != startDate and '' != startDate">
+			AND start_date = #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND end_date = #{endDate}
+		</if>
+		<if test="null != deviceId and '' != deviceId">
+			AND device_id = #{deviceId}
+		</if>
+		<if test="id != null">
+			and id=#{id}
+		</if>
+
+	</delete>
+
+	<select id="chanNengLiYongLv" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+            resultType="com.rootcloud.web.dto.ChanNengLiYongLvDto">
+		select device_id deviceId,
+		SUM(gk_sc_dy_cl) chanLiang
+		from rep_printer_output
+		where 1=1
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND start_date <![CDATA[>=#{startDate}]]>
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND end_date <![CDATA[<=#{endDate}]]>
+		</if>
+		GROUP BY device_id
+		order by chanLiang desc
+	</select>
+
+	<select id="chanNengLiYongLvV2" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+			resultType="com.rootcloud.web.dto.ChanNengLiYongLvDto">
+		select device_id deviceId,
+		gk_sc_dy_cl as  chanLiang,data_year,data_month,data_day,start_date,end_date
+		from rep_printer_output
+		where 1=1
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND start_date <![CDATA[>=#{startDate}]]>
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND end_date <![CDATA[<=#{endDate}]]>
+		</if>
+		GROUP BY  start_date, end_date;
+	</select>
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterReportDAO.xml b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterReportDAO.xml
new file mode 100644
index 0000000..4b3c446
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterReportDAO.xml
@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.dao.RepPrinterReportDAO">
+
+	<insert id="insert" parameterType="com.rootcloud.domain.vo.RepPrinterReportVO"  useGeneratedKeys="true" keyProperty="id">
+		insert into rep_printer_report (tenant_id, title, emails, office_id, office_name, customer_id, customer_name,
+		      rate1, rate2, rate3, rate4, rate5, rate6, rate7,
+		      rate8, rate9, rate10,rate11,rate12,rate13,rate14,rate15,
+		      value0, value1, value2, value3, value4, value5, value5_1, value6, value6_1, value7,
+		       value8,value9,value11, value12,value13,value14,value15,value16,value17,value18,value19,value20,value21,value22,value23,value24,target_values,
+		      remindlist, ratelist, data_year, data_quarter, data_month, data_week, start_date, end_date,
+		      remark1, remark2, remark3, remark4, remark5, remark6,
+		      remark7, remark8, remark9,remark10,
+		      remark11,remark12,remark13,remark14,remark15,remark16
+		      )
+	    values (#{tenantId},  #{title}, #{emails}, #{officeId}, #{officeName}, #{customerId}, #{customerName},
+	    	  #{rate1}, #{rate2}, #{rate3}, #{rate4}, #{rate5}, #{rate6}, #{rate7},
+	    	   #{rate8}, #{rate9},#{rate10},#{rate11},#{rate12},#{rate13},#{rate14},#{rate15},
+		      #{value0}, #{value1}, #{value2}, #{value3}, #{value4}, #{value5},#{value5_1}, #{value6},#{value6_1}, #{value7},
+		      #{value8}, #{value9},#{value11},#{value12},#{value13},#{value14},#{value15},
+		      #{value16},#{value17},#{value18},#{value19},#{value20},#{value21},#{value22},#{value23},#{value24},#{targetValues},
+		      #{remindlist},#{ratelist},#{dataYear},#{dataQuarter},#{dataMonth},#{dataWeek},#{startDate},#{endDate},
+	    	  #{remark1}, #{remark2}, #{remark3}, #{remark4}, #{remark5}, #{remark6},
+	    	  #{remark7}, #{remark8}, #{remark9},#{remark10},
+	    	  #{remark11},#{remark12},#{remark13},#{remark14},#{remark15},#{remark16}
+	    )
+	</insert>
+
+	<update id="updateUserReport" parameterType="com.rootcloud.web.dto.UpdateUserReportDTO">
+		update rep_printer_report
+		<set >
+			remark1 = #{remark1},
+			remark2 = #{remark2},
+			remark3 = #{remark3},
+			remark4 = #{remark4},
+			remark5 = #{remark5},
+			remark6 = #{remark6},
+			remark7 = #{remark7},
+			remark8 = #{remark8},
+			remark9 = #{remark9},
+			remark10 = #{remark10},
+			remark11 = #{remark11},
+			remark12 = #{remark12},
+			remark13 = #{remark13},
+			remark14 = #{remark14},
+			remark15 = #{remark15},
+			remark16 = #{remark16}
+		</set>
+		 where id=#{id}
+	</update>
+
+	<update id="updateEmailsById" parameterType="map">
+		update rep_printer_report set emails = #{emails} where id=#{id}
+	</update>
+
+	<delete id="deleteReportById" parameterType="map">
+		delete from rep_printer_report where id=#{reportId}
+	</delete>
+
+
+	<!-- 获取客户报告内容-不分页-->
+	<select id="getPrinterUserReports" parameterType="map" resultType="com.rootcloud.domain.vo.RepPrinterReportVO">
+		select id, tenant_id tenantId, title, emails, office_id officeId, office_name officeName, customer_id customerId, customer_name customerName,
+		      rate1, rate2, rate3, rate4, rate5, rate6, rate7, rate8, rate9,rate10,rate11,rate12,rate13,rate14,rate15,
+		value0, value1, value2, value3, value4, value5,value5_1, value6,value6_1, value7, value8,value9,value11,value12,value13,value14,value15,
+		value16,value17,value18,value19,value20,value21,value22,value23,value24,
+		      target_values targetValues, remindlist, ratelist, create_date createDate,
+		      data_year dataYear, data_quarter dataQuarter, data_month dataMonth,
+        data_week dataWeek, start_date startDate, end_date endDate,
+		      remark1, remark2, remark3, remark4, remark5, remark6, remark7, remark8, remark9,remark10,
+        remark11,remark12,remark13,remark14,remark15,remark16
+		 from rep_printer_report where 1=1
+		<if test="null != today and '' != today">
+		    and SUBSTR(create_date, 1, 10) = #{today}
+        </if>
+        <if test="null != reportId">
+		    and id = #{reportId}
+        </if>
+        <if test="null != tenantId  and '' != tenantId">
+		    and tenant_id=#{tenantId}
+        </if>
+        <if test="null != officeId  and '' != officeId">
+		    and office_id=#{officeId}
+        </if>
+        <if test="officeIds != null and officeIds.size>0">
+		    AND office_id IN
+	        <foreach collection="officeIds" open="(" close=")" separator="," item="id">
+	            #{id}
+	        </foreach>
+        </if>
+        <if test="officeName !=null and officeName !=''">
+			and office_name LIKE CONCAT('%', #{officeName}, '%')
+		</if>
+        <if test="null != customerId  and '' != customerId">
+		    and customer_id=#{customerId}
+        </if>
+        <if test="customerName !=null and customerName !=''">
+			and customer_name LIKE CONCAT('%', #{customerName}, '%')
+		</if>
+        <if test="emails !=null and emails !=''">
+			and emails LIKE CONCAT('%', #{emails}, '%')
+		</if>
+        <if test="null != dataYear and dataYear >0">
+		    and data_year=#{dataYear}
+        </if>
+        <if test="null != dataQuarter and dataQuarter>0 ">
+		    and data_quarter=#{dataQuarter}
+        </if>
+        <if test="null != dataMonth and dataMonth>0 ">
+		    and data_month=#{dataMonth}
+        </if>
+        <if test="null != dataWeek and dataWeek>0 ">
+		    and data_week=#{dataWeek}
+        </if>
+         <if test="startDate !=null and startDate !=''">
+		    and start_date=#{startDate}
+        </if>
+         <if test="endDate !=null and endDate !=''">
+		    and end_date=#{endDate}
+        </if>
+        order by id desc
+	</select>
+
+
+	<!-- 获取客户报告 分页-->
+	<select id="getPrinterUserReportsList" parameterType="map" resultType="com.rootcloud.domain.vo.RepPrinterReportVO">
+		select id, tenant_id tenantId, title, emails, office_id officeId, office_name officeName, customer_id customerId, customer_name customerName,
+		rate1, rate2, rate3, rate4, rate5, rate6, rate7, rate8, rate9,rate10,rate11,rate12,rate13,rate14,rate15,
+		value0, value1, value2, value3, value4, value5,value5_1, value6,value6_1, value7, value8,value9,value11,value12,value13,value14,value15,
+		value16,value17,value18,value19,value20,value21,value22,value23,value24,
+		target_values targetValues, remindlist, ratelist, create_date createDate,
+		data_year dataYear, data_quarter dataQuarter, data_month dataMonth,
+		data_week dataWeek, start_date startDate, end_date endDate,
+		remark1, remark2, remark3, remark4, remark5, remark6, remark7, remark8, remark9,remark10,
+		remark11,remark12,remark13,remark14,remark15,remark16
+		from rep_printer_report where 1=1
+		<if test="null != today and '' != today">
+			and SUBSTR(create_date, 1, 10) = #{today}
+		</if>
+		<if test="null != reportId">
+			and id = #{reportId}
+		</if>
+		<if test="null != tenantId  and '' != tenantId">
+			and tenant_id=#{tenantId}
+		</if>
+		<if test="null != officeId  and '' != officeId">
+			and office_id=#{officeId}
+		</if>
+		<if test="officeIds != null and officeIds.size>0">
+			AND office_id IN
+			<foreach collection="officeIds" open="(" close=")" separator="," item="id">
+				#{id}
+			</foreach>
+		</if>
+		<if test="officeName !=null and officeName !=''">
+			and office_name LIKE CONCAT('%', #{officeName}, '%')
+		</if>
+		<if test="null != customerId  and '' != customerId">
+			and customer_id=#{customerId}
+		</if>
+		<if test="customerName !=null and customerName !=''">
+			and customer_name LIKE CONCAT('%', #{customerName}, '%')
+		</if>
+		<if test="emails !=null and emails !=''">
+			and emails LIKE CONCAT('%', #{emails}, '%')
+		</if>
+		<if test="null != dataYear and dataYear >0">
+			and data_year=#{dataYear}
+		</if>
+		<if test="null != dataQuarter and dataQuarter>0 ">
+			and data_quarter=#{dataQuarter}
+		</if>
+		<if test="null != dataMonth and dataMonth>0 ">
+			and data_month=#{dataMonth}
+		</if>
+		<if test="null != dataWeek and dataWeek>0 ">
+			and data_week=#{dataWeek}
+		</if>
+		<if test="startDate !=null and startDate !=''">
+			and start_date=#{startDate}
+		</if>
+		<if test="endDate !=null and endDate !=''">
+			and end_date=#{endDate}
+		</if>
+		order by id desc
+		limit #{startNo},#{endNo}
+	</select>
+
+
+
+	<select id="getPrinterUserReportsCount" parameterType="map" resultType="com.rootcloud.domain.vo.RepPrinterReportVO">
+		select id, tenant_id tenantId, title, emails, office_id officeId, office_name officeName, customer_id customerId, customer_name customerName,
+		rate1, rate2, rate3, rate4, rate5, rate6, rate7, rate8, rate9,rate10,rate11,rate12,rate13,rate14,rate15,
+		value0, value1, value2, value3, value4, value5,value5_1, value6,value6_1, value7, value8,value9,value11,value12,value13,value14,value15,
+		value16,value17,value18,value19,value20,value21,value22,value23,value24,
+		target_values targetValues, remindlist, ratelist, create_date createDate,
+		data_year dataYear, data_quarter dataQuarter, data_month dataMonth,
+		data_week dataWeek, start_date startDate, end_date endDate,
+		remark1, remark2, remark3, remark4, remark5, remark6, remark7, remark8, remark9,remark10,
+		remark11,remark12,remark13,remark14,remark15,remark16
+		from rep_printer_report where 1=1
+		<if test="null != today and '' != today">
+			and SUBSTR(create_date, 1, 10) = #{today}
+		</if>
+		<if test="null != reportId">
+			and id = #{reportId}
+		</if>
+		<if test="null != tenantId  and '' != tenantId">
+			and tenant_id=#{tenantId}
+		</if>
+		<if test="null != officeId  and '' != officeId">
+			and office_id=#{officeId}
+		</if>
+		<if test="officeIds != null and officeIds.size>0">
+			AND office_id IN
+			<foreach collection="officeIds" open="(" close=")" separator="," item="id">
+				#{id}
+			</foreach>
+		</if>
+		<if test="officeName !=null and officeName !=''">
+			and office_name LIKE CONCAT('%', #{officeName}, '%')
+		</if>
+		<if test="null != customerId  and '' != customerId">
+			and customer_id=#{customerId}
+		</if>
+		<if test="customerName !=null and customerName !=''">
+			and customer_name LIKE CONCAT('%', #{customerName}, '%')
+		</if>
+		<if test="emails !=null and emails !=''">
+			and emails LIKE CONCAT('%', #{emails}, '%')
+		</if>
+		<if test="null != dataYear and dataYear >0">
+			and data_year=#{dataYear}
+		</if>
+		<if test="null != dataQuarter and dataQuarter>0 ">
+			and data_quarter=#{dataQuarter}
+		</if>
+		<if test="null != dataMonth and dataMonth>0 ">
+			and data_month=#{dataMonth}
+		</if>
+		<if test="null != dataWeek and dataWeek>0 ">
+			and data_week=#{dataWeek}
+		</if>
+		<if test="startDate !=null and startDate !=''">
+			and start_date=#{startDate}
+		</if>
+		<if test="endDate !=null and endDate !=''">
+			and end_date=#{endDate}
+		</if>
+		order by id desc
+	</select>
+
+
+	<!-- 获取客户邮箱配置-->
+	<select id="getPrinterEmailConfigs" parameterType="map" resultType="com.rootcloud.domain.vo.RepPrinterEmailConfigVO">
+		select  * from rep_printer_email_config where 1=1
+		<if test="null != customerId and '' != customerId">
+		    and customer_id = #{customerId}
+        </if>
+	</select>
+
+	<!-- 获取废品原因分类-->
+	<select id="getRepPrinterWasteTypes" parameterType="map" resultType="com.rootcloud.domain.vo.RepPrinterWasteTypeVO">
+		select  * from rep_printer_waste_type where 1=1
+	</select>
+
+	<update id="updateUserReportValue" parameterType="com.rootcloud.domain.vo.RepPrinterReportVO">
+		update rep_printer_report
+		<set >
+            title = #{title},
+            rate1 = #{rate1},
+            rate2 = #{rate2},
+            rate3 = #{rate3},
+            rate4 = #{rate4},
+            rate5 = #{rate5},
+            rate6 = #{rate6},
+            rate7 = #{rate7},
+            rate8 = #{rate8},
+            rate9 = #{rate9},
+            rate10 = #{rate10},
+            rate11 = #{rate11},
+            value0 = #{value0},
+            value1 = #{value1},
+            value2 = #{value2},
+            value3 = #{value3},
+            value4 = #{value4},
+            value5 = #{value5},
+			value5_1 = #{value5_1},
+            value6 = #{value6},
+			value6_1 = #{value6_1},
+            value7 = #{value7},
+            value8 = #{value8},
+            value9 = #{value9},
+            value11 = #{value11},
+            value12 = #{value12},
+            value13 = #{value13},
+            value14 = #{value14},
+            value15 = #{value15},
+            value16 = #{value16},
+            value17 = #{value17},
+            value18 = #{value18},
+            value19 = #{value19},
+            value20 = #{value20},
+            value21 = #{value21},
+			value22 = #{value22},
+			value23 = #{value23},
+			value24 = #{value24},
+            remindlist = #{remindlist},
+            ratelist = #{ratelist},
+            target_values = #{targetValues}
+		</set>
+		where id=#{id}
+	</update>
+
+	<select id="weiXuFeiYongTongJi" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+			resultType="com.rootcloud.web.dto.WeiXuFeiYongTongJiDto">
+        /*!mycat:schema = ICSM*/
+        select d.register_device_code as deviceId,ROUND(sum(b.total_cost),1) as fee
+        from csm_repair_sheet a
+        inner join csm_part_change_list b on a.form_id=b.form_id
+        inner join csm_device d on a.device_code=d.device_code and a.tenant_id=d.tenant_id
+		where 1=1
+        and a.tenant_id = #{tenantId} and d.register_device_type='5719'
+		<if test="null != deviceIdList">
+            and d.register_device_code in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+            and a.create_date &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+            and a.create_date &lt;= #{endDate}
+		</if>
+        and a.check_date is not null
+		group by d.register_device_code
+		order by fee desc
+	</select>
+
+	<select id="weiXuFeiYongTongJiV2" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+			resultType="com.rootcloud.web.dto.WeiXuFeiYongTongJiDto">
+		/*!mycat:schema = ICSM*/
+		select d.register_device_code as deviceId,year(b.create_date) as year,month(b.create_date) as month,sum(ROUND((b.total_cost),1)) as fee
+		from csm_repair_sheet a
+		inner join csm_part_change_list b on a.form_id=b.form_id
+		inner join csm_device d on a.device_code=d.device_code and a.tenant_id=d.tenant_id
+		where 1=1
+		and a.tenant_id = #{tenantId} and d.register_device_type='5719'
+		<if test="null != deviceIdList">
+			and d.register_device_code in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			and a.create_date &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			and a.create_date &lt;= #{endDate}
+		</if>
+		and a.check_date is not null
+		group by MONTH(b.create_date) order by year(b.create_date),month(b.create_date)
+	</select>
+
+	<select id="weiXuFeiYongTongJiWeiBo" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+			resultType="com.rootcloud.web.dto.WeiXuFeiYongTongJiDto">
+		/*!mycat:schema = ICSM*/
+		select d.register_device_code as deviceId,year(b.create_date) as year,month(b.create_date) as month,sum(ROUND((b.total_cost),1)) as fee
+		from csm_repair_sheet a
+		inner join csm_part_change_list b on a.form_id=b.form_id
+		inner join csm_device d on a.device_code=d.device_code and a.tenant_id=d.tenant_id
+		where 1=1
+		and a.tenant_id = #{tenantId} and d.register_device_type='5691'
+		<if test="null != deviceIdList">
+			and d.register_device_code in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			and a.create_date &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			and a.create_date &lt;= #{endDate}
+		</if>
+		and a.check_date is not null
+		group by MONTH(b.create_date) order by year(b.create_date),month(b.create_date)
+	</select>
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterReportItemDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterReportItemDao.xml
new file mode 100644
index 0000000..905ee23
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterReportItemDao.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.dao.RepPrinterReportItemDao">
+
+	<insert id="add" parameterType="com.rootcloud.domain.vo.RepPrinterReportItemVO">
+		insert into rep_printer_report_item(report_id, report_type, report_data)
+
+		<foreach collection="repPrinterReportItemVOs" item="vo" open="VALUES" close=";"  separator=",">
+			(#{vo.reportId}, #{vo.reportType}, #{vo.reportData})
+		</foreach>
+	</insert>
+
+	<update id="update" parameterType="com.rootcloud.domain.vo.RepPrinterReportItemVO">
+		<foreach collection="repPrinterReportItemVOs" item="vo" open="" close=""  separator=";">
+            update rep_printer_report_item  set report_data = #{vo.reportData}
+            where report_id=#{vo.reportId} and report_type = #{vo.reportType}
+		</foreach>
+	</update>
+
+	<select id="list" parameterType="com.rootcloud.domain.vo.RepPrinterReportItemVO" resultType="com.rootcloud.domain.vo.RepPrinterReportItemVO">
+		select id, report_id reportId, report_type reportType, report_data reportData  from rep_printer_report_item where 1=1
+		<if test="reportId != null">
+			and report_id=#{reportId}
+		</if>
+	</select>
+
+	<delete id="deleteByReportId" parameterType="map">
+		delete from rep_printer_report_item where report_id=#{reportId}
+	</delete>
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterSandPassrateDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterSandPassrateDao.xml
new file mode 100644
index 0000000..6005bca
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterSandPassrateDao.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.dao.RepPrinterSandPassrateDao">
+
+	<insert id="add" parameterType="com.rootcloud.domain.vo.RepPrinterSandPassrateVO">
+		replace into rep_printer_sand_passrate(sx_type,device_id, start_date, end_date,gk_sc_dy_sxmd,
+		sxmd_total,sxmd_hgnum,sxmd_ave,create_date)
+
+		<foreach collection="repPrinterSandPassrateVOs" item="item" open="VALUES" close=";"  separator=",">
+			(#{item.sxType}, #{item.deviceId},  #{item.startDate},
+			#{item.endDate},#{item.gkScDySxmd},
+			#{item.sxmdTotal}, #{item.sxmdHgnum},#{item.sxmdAve},now())
+		</foreach>
+	</insert>
+
+	<select id="list" parameterType="com.rootcloud.domain.vo.RepPrinterSandPassrateVO" resultType="com.rootcloud.domain.vo.RepPrinterSandPassrateVO">
+		select id,device_id deviceId,  data_year dataYear, data_month dataMonth,start_date startDate,end_date endDate,
+		data_day dataDay,gk_sc_dy_sxmd gkScDySxmd,sx_type,
+		sxmd_total sxmdTotal,sxmd_hgnum sxmdHgnum,sxmd_ave sxmdAve,
+		create_date createDate from rep_printer_sand_passrate
+		where 1=1
+        and sx_type = #{sxType}
+		<if test="deviceId != '' and deviceId != null">
+			and device_id=#{deviceId}
+		</if>
+		<if test="dataYear != '' and dataYear != null">
+			and data_year=#{dataYear}
+		</if>
+		<if test="dataMonth != '' and dataMonth != null">
+			and data_month=#{dataMonth}
+		</if>
+		<if test="dataDay != '' and dataDay != null">
+			and data_day=#{dataDay}
+		</if>
+		<if test="gkScDySxmd != '' and gkScDySxmd != null">
+			and gk_sc_dy_sxmd=#{gkScDySxmd}
+		</if>
+		<if test="null != createDate  and '' != createDate">
+		    and SUBSTR(create_date, 1, 10)=#{createDate}
+        </if>
+        <if test="null != startDate and '' != startDate">
+        	AND start_date = #{startDate}
+        </if>
+        <if test="null != endDate and '' != endDate">
+      		AND end_date = #{endDate}
+        </if>
+		order by id desc
+	</select>
+
+	<select id="listPage" parameterType="com.rootcloud.domain.vo.RepPrinterSandPassrateVO" resultType="com.rootcloud.domain.vo.RepPrinterSandPassrateVO">
+		select id,device_id deviceId,  data_year dataYear, data_month dataMonth,start_date startDate,end_date endDate,
+		data_day dataDay,gk_sc_dy_sxmd gkScDySxmd,sx_type,
+		sxmd_total sxmdTotal,sxmd_hgnum sxmdHgnum,sxmd_ave sxmdAve,
+		create_date createDate from rep_printer_sand_passrate
+		where 1=1
+		and sx_type = #{sxType}
+		<if test="deviceId != '' and deviceId != null">
+			and device_id=#{deviceId}
+		</if>
+		<if test="dataYear != '' and dataYear != null">
+			and data_year=#{dataYear}
+		</if>
+		<if test="dataMonth != '' and dataMonth != null">
+			and data_month=#{dataMonth}
+		</if>
+		<if test="dataDay != '' and dataDay != null">
+			and data_day=#{dataDay}
+		</if>
+		<if test="gkScDySxmd != '' and gkScDySxmd != null">
+			and gk_sc_dy_sxmd=#{gkScDySxmd}
+		</if>
+		<if test="null != createDate  and '' != createDate">
+			and SUBSTR(create_date, 1, 10)=#{createDate}
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND start_date = #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND end_date = #{endDate}
+		</if>
+		order by id desc
+		limit #{startNo},#{endNo}
+	</select>
+
+
+
+	<select id="listnew" parameterType="com.rootcloud.domain.vo.RepPrinterSandPassrateVO" resultType="com.rootcloud.domain.vo.RepPrinterSandPassrateVO">
+		select id,device_id deviceId,  data_year dataYear, data_month dataMonth,start_date startDate,end_date endDate,
+		data_day dataDay,gk_sc_dy_sxmd gkScDySxmd,sx_type,
+		sxmd_total sxmdTotal,sxmd_hgnum sxmdHgnum,sxmd_ave sxmdAve,
+		create_date createDate from rep_printer_sand_passrate
+
+
+		where 1=1 ORDER BY start_date   desc LIMIT 1;
+	</select>
+
+
+	<select id="sumPrinterSandPassrateData" parameterType="com.rootcloud.web.dto.PrinterReportDTO" resultType="map">
+		select device_id, SUM(gk_sc_dy_sxmd) sxmd, SUM(sxmd_ave) sxmdAve,COUNT(gk_sc_dy_sxmd) count
+		,SUM(gk_sc_dy_sxmd)/COUNT(gk_sc_dy_sxmd) as odr
+		from rep_printer_sand_passrate
+		where sx_type = 0
+		 <if test="null != deviceIdList">
+            and device_id in
+            <foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="null != startDate and '' != startDate">
+        	AND start_date <![CDATA[>=#{startDate}]]>
+        </if>
+        <if test="null != endDate and '' != endDate">
+      		AND end_date <![CDATA[<=#{endDate}]]>
+        </if>
+		GROUP BY device_id
+		order by odr desc
+	</select>
+
+	<select id="sumPrinterSandPassrateQiangDuData" parameterType="com.rootcloud.web.dto.PrinterReportDTO" resultType="map">
+		select device_id, SUM(gk_sc_dy_sxmd) sxmd, SUM(sxmd_ave) sxmdAve,COUNT(gk_sc_dy_sxmd) count
+		,SUM(gk_sc_dy_sxmd)/COUNT(gk_sc_dy_sxmd) as odr
+		from rep_printer_sand_passrate
+		where sx_type = 1
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND start_date <![CDATA[>=#{startDate}]]>
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND end_date <![CDATA[<=#{endDate}]]>
+		</if>
+		GROUP BY device_id
+		order by odr desc
+	</select>
+
+	<select id="sumPrinterSandPassrateQiangDuDataStarEvaluate" parameterType="map" resultType="map">
+		select device_id, SUM(gk_sc_dy_sxmd) sxmd, SUM(sxmd_ave) sxmdAve,COUNT(gk_sc_dy_sxmd) count
+		,SUM(gk_sc_dy_sxmd)/COUNT(gk_sc_dy_sxmd) as odr
+		from rep_printer_sand_passrate
+		where sx_type = 1
+		<if test="null != deviceId and '' != deviceId">
+			AND device_id =  #{deviceId}
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND start_date <![CDATA[>=#{startDate}]]>
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND end_date <![CDATA[<=#{endDate}]]>
+		</if>
+		GROUP BY device_id
+		order by odr desc
+	</select>
+
+	<delete id="deleteSandPassrate" parameterType="com.rootcloud.domain.vo.RepPrinterSandPassrateVO">
+		delete from rep_printer_sand_passrate where 1=1
+		<if test="createDate != '' and createDate != null">
+			and SUBSTR(create_date, 1, 10) = #{createDate}
+		</if>
+		<if test="id != null">
+			and id=#{id}
+		</if>
+	</delete>
+
+	<!--删除已上传过的重新上传 -->
+	<delete id="deleteSandPassrateUpload" parameterType="com.rootcloud.domain.vo.RepPrinterSandPassrateVO">
+		delete from rep_printer_sand_passrate where 1=1
+
+		<if test="null != sxType and '' != sxType">
+			AND sx_type = #{sxType}
+		</if>
+		<if test="null != deviceId and '' != deviceId">
+			AND device_id = #{deviceId}
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND start_date = #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND end_date = #{endDate}
+		</if>
+		<if test="id != null">
+			and id=#{id}
+		</if>
+	</delete>
+
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterSandPercentDAO2.xml b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterSandPercentDAO2.xml
new file mode 100644
index 0000000..b0dd5e3
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterSandPercentDAO2.xml
@@ -0,0 +1,447 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.dao.RepPrinterSandPercentDAO2">
+
+	<insert id="batchAdd">
+		insert into rep_printer_sand_percent2(device_id, device_type_id, data_year, data_month, data_day, gk_sc_dy_sxmd, gk_sc_dy_xjszb, gk_sc_dy_lsl,
+		sb_bindercost,hmi_volume,sb_mx_asandlv,sb_mx_bsandlv,sb_mx_mixingtimes,gk_sc_dy_wsysl,
+		hmi_jobid,hmi_begintime,hmi_endtime,hmi_totaltimecost,hmi_curprintlayer,hmi_thickness,gk_sc_dy_dyxl,gk_sc_dy_btl,sb_activatorcost,gk_layer_costtime)
+		values
+		<foreach collection="dataList" item="item" separator=",">
+			(#{item.deviceId}, #{item.deviceTypeId}, #{item.dataYear}, #{item.dataMonth}, #{item.dataDay}, #{item.gkScDySxmd}, #{item.gkScDyXjszb}, #{item.gkScDyLsl},
+			 #{item.sbBindercost}, #{item.hmiVolume}, #{item.sbMxAsandlv}, #{item.sbMxBsandlv}, #{item.sbMxMixingtimes},#{item.gkScDyWsysl},
+			 #{item.hmiJobid}, #{item.hmiBegintime}, #{item.hmiEndtime}, #{item.hmiTotaltimecost}, #{item.hmiCurprintlayer},
+			#{item.hmiThickness},#{item.gkScDyDyxl},#{item.gkScDyBtl},#{item.sbActivatorcost},#{item.hmiLayercosttime})
+		</foreach>
+	</insert>
+
+	<delete id="clear">
+		delete from rep_printer_sand_percent2 where data_year=#{year} and data_month = #{month} and data_day = #{day}
+	</delete>
+
+	<insert id="insert">
+		insert into rep_printer_sand_percent2(device_id, device_type_id, data_year, data_month, data_day, gk_sc_dy_sxmd, gk_sc_dy_xjszb, gk_sc_dy_lsl)
+		values
+		<foreach collection="dataList" item="item" separator=",">
+			(#{item.deviceId}, #{item.deviceTypeId}, #{year}, #{month}, #{day}, #{item.sxmd}, #{item.xjszb}, #{item.lsl})
+		</foreach>
+	</insert>
+
+	<update id="update" parameterType="com.rootcloud.domain.vo.RepPrinterSandPercentVO" >
+		update rep_printer_sand_percent2
+		set `device_id` = #{`deviceId`}
+		where id = #{id}
+	</update>
+
+	<delete id="deleteById">
+		delete from rep_printer_sand_percent2 where id = #{id}
+	</delete>
+
+	<select id="getRepPrinterSandPercentList" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+        resultType="map">
+        select
+            DISTINCT( t.device_id ),
+            sum(gk_sc_dy_sxmd) / count(gk_sc_dy_sxmd) as sxmd,
+            ROUND(sum(sb_mx_asandlv) / sum(sb_mx_asandlv+sb_mx_bsandlv),2 ) as xjszb,
+            sum(gk_sc_dy_lsl) / count(gk_sc_dy_lsl) as lsl
+		FROM rep_printer_sand_percent2 t
+            where 1=1
+            and sb_mx_asandlv+sb_mx_bsandlv<![CDATA[ <> ]]> 0
+            <if test="null != deviceIdList">
+                and device_id in
+                <foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+			<if test="null != startDate and '' != startDate">
+	        	AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+	        </if>
+	        <if test="null != endDate and '' != endDate">
+	      		AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+	        </if>
+        group by t.device_id
+	</select>
+
+	<select id="getRepPrinterSandSXMDList" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+        resultType="map">
+        select
+            DISTINCT( t.device_id ),
+		   100*sum(gk_sc_dy_sxmd * hmi_volume * 1.5 * 10)/sum(hmi_volume * 1.5 * 1000) sxmd
+		FROM rep_printer_sand_percent2 t
+            where 1=1
+			and hmi_volume <![CDATA[ <> ]]> 0
+			and gk_sc_dy_sxmd <![CDATA[ > ]]> 0
+			and gk_sc_dy_sxmd <![CDATA[ < ]]> 10
+			and hmi_curprintlayer > 10
+            <if test="null != deviceIdList">
+                and device_id in
+                <foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+			<if test="null != startDate and '' != startDate">
+	        	AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+	        </if>
+	        <if test="null != endDate and '' != endDate">
+	      		AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+	        </if>
+        group by t.device_id
+        order by sxmd desc
+	</select>
+
+	<select id="getRepPrinterSandSXMDListV2" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+			resultType="map">
+		select
+		DISTINCT( t.device_id ),
+		AVG(100*(gk_sc_dy_sxmd * hmi_volume * 1.5 * 10) /(hmi_volume * 1.5 * 1000)) as sxmd,t.data_year,t.data_month,t.data_day
+		FROM rep_printer_sand_percent2 t
+		where 1=1
+		and hmi_volume <![CDATA[ <> ]]> 0
+		and gk_sc_dy_sxmd <![CDATA[ > ]]> 0
+		and gk_sc_dy_sxmd <![CDATA[ < ]]> 10
+		and hmi_curprintlayer > 10
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+		</if>
+		GROUP BY t.data_year,t.data_month,t.data_day
+	</select>
+
+	<select id="getRepPrinterSandSXMDListV3" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+			resultType="map">
+		select
+		t.device_id,t.hmi_jobid,gk_sc_dy_sxmd,hmi_volume,t.data_year,t.data_month,t.data_day
+		FROM rep_printer_sand_percent2 t
+		where 1=1
+		and hmi_volume <![CDATA[ <> ]]> 0
+		and gk_sc_dy_sxmd <![CDATA[ > ]]> 0
+		and gk_sc_dy_sxmd <![CDATA[ < ]]> 10
+		and hmi_curprintlayer > 10
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+		</if>
+
+	</select>
+
+
+	<select id="getRepPrinterProcessData"  parameterType="map"  resultType="map">
+		select t.device_id,t.hmi_jobid,gk_sc_dy_sxmd,hmi_volume,t.data_year,t.data_month,t.data_day,
+		gk_sc_dy_sxmd,gk_sc_dy_xjszb,gk_sc_dy_lsl,office_id,sb_bindercost,hmi_volume,sb_mx_asandlv,sb_mx_bsandlv,
+		sb_mx_mixingtimes,hmi_begintime,hmi_endtime,hmi_totaltimecost,hmi_curprintlayer,hmi_thickness,gk_sc_dy_wsysl,
+		gk_sc_dy_dyxl,gk_sc_dy_btl,sb_activatorcost,sb_cleanercost,gk_layer_costtime
+		FROM rep_printer_sand_percent2 t
+		where 1=1
+		<if test="device_id != null" >
+			and device_id = #{device_id}
+		</if>
+
+		<if test="null != startDate and '' != startDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+		</if>
+		ORDER BY STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') asc;
+	</select>
+
+	<select id="getRepPrinterSandXJSZBList" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+        resultType="map">
+        select
+            DISTINCT( t.device_id ),
+            ROUND(sum(sb_mx_asandlv) / sum(sb_mx_asandlv+sb_mx_bsandlv),4) as xjszb
+		FROM rep_printer_sand_percent2 t
+            where 1=1
+            and sb_mx_asandlv + sb_mx_bsandlv <![CDATA[ <> ]]> 0
+            <if test="null != deviceIdList">
+                and device_id in
+                <foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+			<if test="null != startDate and '' != startDate">
+	        	AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+	        </if>
+	        <if test="null != endDate and '' != endDate">
+	      		AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+	        </if>
+        group by t.device_id
+        order by xjszb desc
+	</select>
+
+	<select id="getRepPrinterSandLSLList" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+        resultType="map">
+		select
+		 t.device_id ,
+		avg( sb_mx_asandlv + sb_mx_bsandlv )/1000 as hszl,
+		avg(gk_sc_dy_wsysl)/1000 as wsysl,
+		(avg(sb_mx_asandlv + sb_mx_bsandlv)-avg(gk_sc_dy_wsysl))*100/avg(sb_mx_asandlv + sb_mx_bsandlv) as slyl
+		FROM rep_printer_sand_percent2 t
+		where 1=1
+		and gk_sc_dy_lsl <![CDATA[ < ]]> 1
+		and gk_sc_dy_wsysl <![CDATA[ > ]]> 0
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+		</if>
+		group by t.device_id
+		order by slyl desc
+	</select>
+	<select id="getRepPrinterSandLSLListV2" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+			resultType="map">
+		select
+		t.device_id ,
+		avg(sb_mx_asandlv + sb_mx_bsandlv )/1000 as hszl,
+		avg(gk_sc_dy_wsysl)/1000 as wsysl,
+		(avg(sb_mx_asandlv + sb_mx_bsandlv)-avg(gk_sc_dy_wsysl))*100/avg(sb_mx_asandlv + sb_mx_bsandlv) as slyl,
+		t.data_year,t.data_month,t.data_day
+		FROM rep_printer_sand_percent2 t
+		where 1=1
+		and gk_sc_dy_lsl <![CDATA[ < ]]> 1
+		and gk_sc_dy_wsysl <![CDATA[ > ]]> 0
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+		</if>
+		group by t.data_year,t.data_month,t.data_day
+	</select>
+
+	<select id="getRepPrinterVolumeList" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+        resultType="map">
+		select  tt.deviceId,sum(tt.hmiVolume) hmiVolume from (
+			select  device_id as deviceId, max(hmi_volume) as hmiVolume,hmi_jobid
+				from rep_printer_sand_percent2
+				where 1=1
+				<if test="null != deviceIdList">
+					and device_id in
+					<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+						#{item}
+					</foreach>
+				</if>
+				<if test="null != startDate and '' != startDate">
+					AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+				</if>
+				<if test="null != endDate and '' != endDate">
+					AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+				</if>
+			 group by device_id,hmi_jobid
+		) tt group by tt.deviceId
+	</select>
+
+	<select id="getVosByJobIds" resultType="com.rootcloud.domain.vo.RepPrinterSandPercentVO">
+		select id,hmi_jobid hmiJobid,hmi_volume hmiVolume,sb_mx_asandlv sbMxAsandlv
+		from rep_printer_sand_percent2 t
+		where t.device_id=#{deviceId}
+		and t.hmi_jobid in
+		<foreach collection="jobIds" item="item" open="(" close=")" separator=",">
+			#{item}
+		</foreach>
+		and STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') <![CDATA[ < ]]> #{startDate}
+	</select>
+
+    <select id="pinJunDaYinGaoDu" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+            resultType="com.rootcloud.web.dto.PinJunDaYinGaoDuDto">
+        select
+        t.device_id deviceId,
+		ROUND(avg( hmi_thickness * hmi_curprintlayer * 0.1 ),2) as height
+        FROM rep_printer_sand_percent2 t
+        where 1=1
+        and hmi_curprintlayer > 200
+        <if test="null != deviceIdList">
+            and device_id in
+            <foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="null != startDate and '' != startDate">
+            AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+        </if>
+        <if test="null != endDate and '' != endDate">
+            AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+        </if>
+        group by t.device_id
+        order by height desc
+    </select>
+	<select id="pinJunDaYinGaoDuV2" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+			resultType="com.rootcloud.web.dto.PinJunDaYinGaoDuDto">
+		select
+		t.device_id deviceId,
+		ROUND(avg( hmi_thickness * hmi_curprintlayer * 0.1 ),2) as height,data_year,data_month,data_day as day
+		FROM rep_printer_sand_percent2 t
+		where 1=1
+		and hmi_curprintlayer > 200
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+		</if>
+		group by data_year,data_month,data_day
+	</select>
+
+	<select id="guHuaJiDanHao" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+			resultType="com.rootcloud.web.dto.GuHuaJiDanHaoDto">
+		select
+		t.device_id deviceId,
+		ROUND(avg( sb_activatorcost / (hmi_volume * 1.5) ),2) as activatorCost
+		FROM rep_printer_sand_percent2 t
+		where 1=1
+		and hmi_volume > 0
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+		</if>
+		group by t.device_id
+		order by activatorCost desc
+	</select>
+
+	<select id="guHuaJiDanHaoV2" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+			resultType="com.rootcloud.web.dto.GuHuaJiDanHaoDto">
+		select
+		t.device_id deviceId,
+		ROUND(avg( sb_activatorcost / (hmi_volume * 1.5) ),2) as activatorCost,
+		t.data_year,t.data_month,t.data_day as day
+		FROM rep_printer_sand_percent2 t
+		where 1=1
+		and hmi_volume > 0
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+		</if>
+		group by t.data_year,t.data_month,t.data_day
+	</select>
+	<select id="getHimTimesByDeviceCode"  resultType="com.rootcloud.domain.vo.RepPrinterSandPercentVO">
+		select id,device_id as deviceId,data_year as dataYear,data_month as dataMonth,data_day as dataDay,hmi_begintime as hmiBegintime,
+		hmi_endtime as hmiEndtime,hmi_jobid as hmiJobid,hmi_totaltimecost as hmiTotaltimecost from rep_printer_sand_percent2
+		where 1=1
+		<if test="device_id !=null and device_id != '' ">
+			and device_id = #{device_id}
+		</if>
+		<if test="data_year !=null and data_year != ''">
+			and data_year = #{data_year}
+		</if>
+		<if test="data_month !=null and data_month != ''">
+			and data_month = #{data_month}
+		</if>
+		<if test="data_day !=null and data_day != ''">
+			and data_day = #{data_day}
+		</if>
+	</select>
+
+	<select id="getHimTimesByDeviceCode2"  resultType="com.rootcloud.domain.vo.RepPrinterSandPercentVO">
+		select id,device_id as deviceId,data_year as dataYear,data_month as dataMonth,data_day as dataDay,hmi_begintime as hmiBegintime,
+		hmi_endtime as hmiEndtime,hmi_jobid as hmiJobid,hmi_totaltimecost as hmiTotaltimecost from rep_printer_sand_percent2
+		where 1=1
+		<if test="deviceId !=null and deviceId != '' ">
+			and device_id = #{deviceId}
+		</if>
+		<if test="dataYear !=null and dataYear != ''">
+			and data_year = #{dataYear}
+		</if>
+		<if test="dataMonth !=null and dataMonth != ''">
+			and data_month = #{dataMonth}
+		</if>
+		<if test="dataDay !=null and dataDay != ''">
+			and data_day = #{dataDay}
+		</if>
+	</select>
+	<select id="getPrintJobTaskinfo"  resultType="com.rootcloud.domain.vo.RepPrinterSandPercentVO">
+		select id,device_id as deviceId,data_year as dataYear,data_month as dataMonth,data_day as dataDay,hmi_begintime as hmiBegintime,
+		hmi_endtime as hmiEndtime,hmi_jobid as hmiJobid,hmi_totaltimecost as hmiTotaltimecost from rep_printer_sand_percent2
+		where 1=1
+		<if test="device_id !=null and device_id != '' ">
+			and device_id = #{device_id}
+		</if>
+		<if test="hmi_begintime !=null and hmi_begintime != ''">
+			<![CDATA[ and hmi_begintime >= #{hmi_begintime} ]]>
+		</if>
+		<if test="hmi_endtime !=null and hmi_endtime != ''">
+			<![CDATA[ and hmi_begintime <= #{hmi_endtime} ]]>
+		</if>
+		ORDER BY hmi_begintime desc
+	</select>
+
+
+	<select id="getTaskIndex3ByJobId" resultType="map">
+		select
+		t.device_id,
+		avg(sb_mx_asandlv + sb_mx_bsandlv )/1000 as hszl,
+		avg(gk_sc_dy_wsysl)/1000 as wsysl,
+		(avg(sb_mx_asandlv + sb_mx_bsandlv)-avg(gk_sc_dy_wsysl))*100/avg(sb_mx_asandlv + sb_mx_bsandlv) as slyl,
+		t.data_year,t.data_month,t.data_day
+		FROM rep_printer_sand_percent2 t
+		where 1=1
+		and gk_sc_dy_lsl <![CDATA[ < ]]> 1
+		and gk_sc_dy_wsysl <![CDATA[ > ]]> 0
+		and hmi_jobid = #{hmi_jobid}
+		group by STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d')
+	</select>
+
+	<select id="queryTaskLayerCostTimeByDevice" resultType="map">
+		select
+		t.hmi_jobid,
+		t.device_id,
+		t.data_year,t.data_month,t.data_day,
+		t.gk_layer_costtime
+		FROM rep_printer_sand_percent2 t
+		where 1=1
+		and hmi_jobid = #{hmi_jobid}
+		and device_id = #{device_id}
+	</select>
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterSandPercentDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterSandPercentDao.xml
new file mode 100644
index 0000000..1873997
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterSandPercentDao.xml
@@ -0,0 +1,384 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.dao.RepPrinterSandPercentDAO">
+
+	<insert id="batchAdd">
+		insert into rep_printer_sand_percent(device_id, device_type_id, data_year, data_month, data_day, gk_sc_dy_sxmd, gk_sc_dy_xjszb, gk_sc_dy_lsl,
+		sb_bindercost,hmi_volume,sb_mx_asandlv,sb_mx_bsandlv,sb_mx_mixingtimes,gk_sc_dy_wsysl,
+		hmi_jobid,hmi_begintime,hmi_endtime,hmi_totaltimecost,hmi_curprintlayer,hmi_thickness,gk_sc_dy_dyxl,gk_sc_dy_btl,sb_activatorcost)
+		values
+		<foreach collection="dataList" item="item" separator=",">
+			(#{item.deviceId}, #{item.deviceTypeId}, #{item.dataYear}, #{item.dataMonth}, #{item.dataDay}, #{item.gkScDySxmd}, #{item.gkScDyXjszb}, #{item.gkScDyLsl},
+			 #{item.sbBindercost}, #{item.hmiVolume}, #{item.sbMxAsandlv}, #{item.sbMxBsandlv}, #{item.sbMxMixingtimes},#{item.gkScDyWsysl},
+			 #{item.hmiJobid}, #{item.hmiBegintime}, #{item.hmiEndtime}, #{item.hmiTotaltimecost}, #{item.hmiCurprintlayer},
+			#{item.hmiThickness},#{item.gkScDyDyxl},#{item.gkScDyBtl},#{item.sbActivatorcost})
+		</foreach>
+	</insert>
+
+	<delete id="clear">
+		delete from rep_printer_sand_percent where data_year=#{year} and data_month = #{month} and data_day = #{day}
+	</delete>
+
+	<insert id="insert">
+		insert into rep_printer_sand_percent(device_id, device_type_id, data_year, data_month, data_day, gk_sc_dy_sxmd, gk_sc_dy_xjszb, gk_sc_dy_lsl)
+		values
+		<foreach collection="dataList" item="item" separator=",">
+			(#{item.deviceId}, #{item.deviceTypeId}, #{year}, #{month}, #{day}, #{item.sxmd}, #{item.xjszb}, #{item.lsl})
+		</foreach>
+	</insert>
+
+	<update id="update" parameterType="com.rootcloud.domain.vo.RepPrinterSandPercentVO" >
+		update rep_printer_sand_percent
+		set `device_id` = #{`deviceId`}
+		where id = #{id}
+	</update>
+
+	<delete id="deleteById">
+		delete from rep_printer_sand_percent where id = #{id}
+	</delete>
+
+	<select id="getRepPrinterSandPercentList" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+        resultType="map">
+        select
+            DISTINCT( t.device_id ),
+            sum(gk_sc_dy_sxmd) / count(gk_sc_dy_sxmd) as sxmd,
+            ROUND(sum(sb_mx_asandlv) / sum(sb_mx_asandlv+sb_mx_bsandlv),2 ) as xjszb,
+            sum(gk_sc_dy_lsl) / count(gk_sc_dy_lsl) as lsl
+		FROM rep_printer_sand_percent t
+            where 1=1
+            and sb_mx_asandlv+sb_mx_bsandlv<![CDATA[ <> ]]> 0
+            <if test="null != deviceIdList">
+                and device_id in
+                <foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+			<if test="null != startDate and '' != startDate">
+	        	AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+	        </if>
+	        <if test="null != endDate and '' != endDate">
+	      		AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+	        </if>
+        group by t.device_id
+	</select>
+
+	<select id="getRepPrinterSandSXMDList" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+        resultType="map">
+        select
+            DISTINCT( t.device_id ),
+		   100*sum(gk_sc_dy_sxmd * hmi_volume * 1.5 * 10)/sum(hmi_volume * 1.5 * 1000) sxmd
+		FROM rep_printer_sand_percent t
+            where 1=1
+			and hmi_volume <![CDATA[ <> ]]> 0
+			and gk_sc_dy_sxmd <![CDATA[ > ]]> 0
+			and gk_sc_dy_sxmd <![CDATA[ < ]]> 10
+			and hmi_curprintlayer > 10
+            <if test="null != deviceIdList">
+                and device_id in
+                <foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+			<if test="null != startDate and '' != startDate">
+	        	AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+	        </if>
+	        <if test="null != endDate and '' != endDate">
+	      		AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+	        </if>
+        group by t.device_id
+        order by sxmd desc
+	</select>
+
+	<select id="getRepPrinterSandSXMDListV2" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+			resultType="map">
+		select
+		DISTINCT( t.device_id ),
+		AVG(100*(gk_sc_dy_sxmd * hmi_volume * 1.5 * 10) /(hmi_volume * 1.5 * 1000)) as sxmd,t.data_year,t.data_month,t.data_day
+		FROM rep_printer_sand_percent t
+		where 1=1
+		and hmi_volume <![CDATA[ <> ]]> 0
+		and gk_sc_dy_sxmd <![CDATA[ > ]]> 0
+		and gk_sc_dy_sxmd <![CDATA[ < ]]> 10
+		and hmi_curprintlayer > 10
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+		</if>
+		GROUP BY t.data_year,t.data_month,t.data_day
+	</select>
+
+	<select id="getRepPrinterSandSXMDListV3" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+			resultType="map">
+		select
+		t.device_id,t.hmi_jobid,gk_sc_dy_sxmd,hmi_volume,t.data_year,t.data_month,t.data_day
+		FROM rep_printer_sand_percent t
+		where 1=1
+		and hmi_volume <![CDATA[ <> ]]> 0
+		and gk_sc_dy_sxmd <![CDATA[ > ]]> 0
+		and gk_sc_dy_sxmd <![CDATA[ < ]]> 10
+		and hmi_curprintlayer > 10
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+		</if>
+
+	</select>
+
+
+	<select id="getRepPrinterSandXJSZBList" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+        resultType="map">
+        select
+            DISTINCT( t.device_id ),
+            ROUND(sum(sb_mx_asandlv) / sum(sb_mx_asandlv+sb_mx_bsandlv),4) as xjszb
+		FROM rep_printer_sand_percent t
+            where 1=1
+            and sb_mx_asandlv + sb_mx_bsandlv <![CDATA[ <> ]]> 0
+            <if test="null != deviceIdList">
+                and device_id in
+                <foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+			<if test="null != startDate and '' != startDate">
+	        	AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+	        </if>
+	        <if test="null != endDate and '' != endDate">
+	      		AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+	        </if>
+        group by t.device_id
+        order by xjszb desc
+	</select>
+
+	<select id="getRepPrinterSandLSLList" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+        resultType="map">
+		select
+		 t.device_id ,
+		avg( sb_mx_asandlv + sb_mx_bsandlv )/1000 as hszl,
+		avg(gk_sc_dy_wsysl)/1000 as wsysl,
+		(avg(sb_mx_asandlv + sb_mx_bsandlv)-avg(gk_sc_dy_wsysl))*100/avg(sb_mx_asandlv + sb_mx_bsandlv) as slyl
+		FROM rep_printer_sand_percent t
+		where 1=1
+		and gk_sc_dy_lsl <![CDATA[ < ]]> 1
+		and gk_sc_dy_wsysl <![CDATA[ > ]]> 0
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+		</if>
+		group by t.device_id
+		order by slyl desc
+	</select>
+	<select id="getRepPrinterSandLSLListV2" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+			resultType="map">
+		select
+		t.device_id ,
+		avg(sb_mx_asandlv + sb_mx_bsandlv )/1000 as hszl,
+		avg(gk_sc_dy_wsysl)/1000 as wsysl,
+		(avg(sb_mx_asandlv + sb_mx_bsandlv)-avg(gk_sc_dy_wsysl))*100/avg(sb_mx_asandlv + sb_mx_bsandlv) as slyl,
+		t.data_year,t.data_month,t.data_day
+		FROM rep_printer_sand_percent t
+		where 1=1
+		and gk_sc_dy_lsl <![CDATA[ < ]]> 1
+		and gk_sc_dy_wsysl <![CDATA[ > ]]> 0
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+		</if>
+		group by t.data_year,t.data_month,t.data_day
+	</select>
+
+	<select id="getRepPrinterVolumeList" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+        resultType="map">
+		select  tt.deviceId,sum(tt.hmiVolume) hmiVolume from (
+			select  device_id as deviceId, max(hmi_volume) as hmiVolume,hmi_jobid
+				from rep_printer_sand_percent
+				where 1=1
+				<if test="null != deviceIdList">
+					and device_id in
+					<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+						#{item}
+					</foreach>
+				</if>
+				<if test="null != startDate and '' != startDate">
+					AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+				</if>
+				<if test="null != endDate and '' != endDate">
+					AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+				</if>
+			 group by device_id,hmi_jobid
+		) tt group by tt.deviceId
+	</select>
+
+	<select id="getVosByJobIds" resultType="com.rootcloud.domain.vo.RepPrinterSandPercentVO">
+		select id,hmi_jobid hmiJobid,hmi_volume hmiVolume,sb_mx_asandlv sbMxAsandlv
+		from rep_printer_sand_percent t
+		where t.device_id=#{deviceId}
+		and t.hmi_jobid in
+		<foreach collection="jobIds" item="item" open="(" close=")" separator=",">
+			#{item}
+		</foreach>
+		and STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') <![CDATA[ < ]]> #{startDate}
+	</select>
+
+    <select id="pinJunDaYinGaoDu" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+            resultType="com.rootcloud.web.dto.PinJunDaYinGaoDuDto">
+        select
+        t.device_id deviceId,
+		ROUND(avg( hmi_thickness * hmi_curprintlayer * 0.1 ),2) as height
+        FROM rep_printer_sand_percent t
+        where 1=1
+        and hmi_curprintlayer > 200
+        <if test="null != deviceIdList">
+            and device_id in
+            <foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="null != startDate and '' != startDate">
+            AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+        </if>
+        <if test="null != endDate and '' != endDate">
+            AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+        </if>
+        group by t.device_id
+        order by height desc
+    </select>
+	<select id="pinJunDaYinGaoDuV2" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+			resultType="com.rootcloud.web.dto.PinJunDaYinGaoDuDto">
+		select
+		t.device_id deviceId,
+		ROUND(avg( hmi_thickness * hmi_curprintlayer * 0.1 ),2) as height,data_year,data_month,data_day as day
+		FROM rep_printer_sand_percent t
+		where 1=1
+		and hmi_curprintlayer > 200
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+		</if>
+		group by data_year,data_month,data_day
+	</select>
+
+	<select id="guHuaJiDanHao" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+			resultType="com.rootcloud.web.dto.GuHuaJiDanHaoDto">
+		select
+		t.device_id deviceId,
+		ROUND(avg( sb_activatorcost / (hmi_volume * 1.5) ),2) as activatorCost
+		FROM rep_printer_sand_percent t
+		where 1=1
+		and hmi_volume > 0
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+		</if>
+		group by t.device_id
+		order by activatorCost desc
+	</select>
+
+	<select id="guHuaJiDanHaoV2" parameterType="com.rootcloud.web.dto.PrinterReportDTO"
+			resultType="com.rootcloud.web.dto.GuHuaJiDanHaoDto">
+		select
+		t.device_id deviceId,
+		ROUND(avg( sb_activatorcost / (hmi_volume * 1.5) ),2) as activatorCost,
+		t.data_year,t.data_month,t.data_day as day
+		FROM rep_printer_sand_percent t
+		where 1=1
+		and hmi_volume > 0
+		<if test="null != deviceIdList">
+			and device_id in
+			<foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+				#{item}
+			</foreach>
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &gt;= #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND STR_TO_DATE(CONCAT(data_year,'-',data_month,'-',data_day),'%Y-%m-%d') &lt;= #{endDate}
+		</if>
+		group by t.data_year,t.data_month,t.data_day
+	</select>
+	<select id="getHimTimesByDeviceCode"  resultType="com.rootcloud.domain.vo.RepPrinterSandPercentVO">
+		select id,device_id as deviceId,data_year as dataYear,data_month as dataMonth,data_day as dataDay,hmi_begintime as hmiBegintime,
+		hmi_endtime as hmiEndtime,hmi_jobid as hmiJobid,hmi_totaltimecost as hmiTotaltimecost from rep_printer_sand_percent
+		where 1=1
+		<if test="device_id !=null and device_id != '' ">
+			and device_id = #{device_id}
+		</if>
+		<if test="data_year !=null and data_year != ''">
+			and data_year = #{data_year}
+		</if>
+		<if test="data_month !=null and data_month != ''">
+			and data_month = #{data_month}
+		</if>
+		<if test="data_day !=null and data_day != ''">
+			and data_day = #{data_day}
+		</if>
+	</select>
+
+	<select id="getHimTimesByDeviceCode2"  resultType="com.rootcloud.domain.vo.RepPrinterSandPercentVO">
+		select id,device_id as deviceId,data_year as dataYear,data_month as dataMonth,data_day as dataDay,hmi_begintime as hmiBegintime,
+		hmi_endtime as hmiEndtime,hmi_jobid as hmiJobid,hmi_totaltimecost as hmiTotaltimecost from rep_printer_sand_percent
+		where 1=1
+		<if test="deviceId !=null and deviceId != '' ">
+			and device_id = #{deviceId}
+		</if>
+		<if test="dataYear !=null and dataYear != ''">
+			and data_year = #{dataYear}
+		</if>
+		<if test="dataMonth !=null and dataMonth != ''">
+			and data_month = #{dataMonth}
+		</if>
+		<if test="dataDay !=null and dataDay != ''">
+			and data_day = #{dataDay}
+		</if>
+	</select>
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterStarPassrateDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterStarPassrateDao.xml
new file mode 100644
index 0000000..c6a7948
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterStarPassrateDao.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.dao.RepPrinterStarPassrateDao">
+
+	<insert id="add" parameterType="com.rootcloud.domain.vo.RepPrinterStarPassrateVO">
+		replace into rep_printer_star_passrate(sx_type,device_id, start_date, end_date,item_inspect,
+		item_hgnum,item_hglv,create_date,customer_name)
+
+		<foreach collection="repPrinterStarPassrateVOs" item="item" open="VALUES" close=";"  separator=",">
+			(#{item.sxType}, #{item.deviceId},  #{item.startDate},
+			#{item.endDate},#{item.itemInspect},#{item.itemHgnum}, #{item.itemHglv},now(), #{item.customerName})
+		</foreach>
+	</insert>
+
+	<select id="list" parameterType="com.rootcloud.domain.vo.RepPrinterStarPassrateVO" resultType="com.rootcloud.domain.vo.RepPrinterStarPassrateVO">
+		select id,device_id deviceId,data_year dataYear, data_month dataMonth,start_date startDate,end_date endDate,
+		data_day dataDay,sx_type sxType,
+		item_inspect itemInspect,item_hgnum itemHgnum,item_hglv itemHglv,
+		create_date createDate,customer_name customerName from rep_printer_star_passrate
+		where 1=1
+        and sx_type = #{sxType}
+		<if test="deviceId != '' and deviceId != null">
+			and device_id=#{deviceId}
+		</if>
+		<if test="dataYear != '' and dataYear != null">
+			and data_year=#{dataYear}
+		</if>
+		<if test="dataMonth != '' and dataMonth != null">
+			and data_month=#{dataMonth}
+		</if>
+		<if test="dataDay != '' and dataDay != null">
+			and data_day=#{dataDay}
+		</if>
+
+		<if test="null != createDate  and '' != createDate">
+		    and SUBSTR(create_date, 1, 10)=#{createDate}
+        </if>
+        <if test="null != startDate and '' != startDate">
+        	AND start_date = #{startDate}
+        </if>
+        <if test="null != endDate and '' != endDate">
+      		AND end_date = #{endDate}
+        </if>
+		order by id desc
+	</select>
+
+	<select id="listPage" parameterType="com.rootcloud.domain.vo.RepPrinterStarPassrateVO" resultType="com.rootcloud.domain.vo.RepPrinterStarPassrateVO">
+		select id,device_id deviceId,data_year dataYear, data_month dataMonth,start_date startDate,end_date endDate,
+		data_day dataDay,sx_type sxType,
+		item_inspect itemInspect,item_hgnum itemHgnum,item_hglv itemHglv,
+		create_date createDate,customer_name customerName from rep_printer_star_passrate
+		where 1=1
+		and sx_type = #{sxType}
+		<if test="deviceId != '' and deviceId != null">
+			and device_id=#{deviceId}
+		</if>
+		<if test="dataYear != '' and dataYear != null">
+			and data_year=#{dataYear}
+		</if>
+		<if test="dataMonth != '' and dataMonth != null">
+			and data_month=#{dataMonth}
+		</if>
+		<if test="dataDay != '' and dataDay != null">
+			and data_day=#{dataDay}
+		</if>
+
+		<if test="null != createDate  and '' != createDate">
+			and SUBSTR(create_date, 1, 10)=#{createDate}
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND start_date = #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND end_date = #{endDate}
+		</if>
+		order by id desc
+		limit #{startNo},#{endNo}
+	</select>
+
+
+	<select id="listnew" parameterType="com.rootcloud.domain.vo.RepPrinterStarPassrateVO" resultType="com.rootcloud.domain.vo.RepPrinterStarPassrateVO">
+		select id,device_id deviceId,  data_year dataYear, data_month dataMonth,start_date startDate,end_date endDate,
+		data_day dataDay,sx_type sxType,item_inspect itemInspect,
+		item_hgnum itemHgnum,item_hglv itemHglv,
+		create_date createDate,customer_name customerName from rep_printer_star_passrate
+		where 1=1 ORDER BY start_date   desc LIMIT 1;
+	</select>
+
+
+	<select id="sumPrinterStarPassrateData" parameterType="com.rootcloud.web.dto.PrinterReportDTO" resultType="map">
+		select device_id, SUM(gk_sc_dy_sxmd) sxmd, SUM(sxmd_ave) sxmdAve,COUNT(gk_sc_dy_sxmd) count
+		,SUM(gk_sc_dy_sxmd)/COUNT(gk_sc_dy_sxmd) as odr
+		from rep_printer_star_passrate
+		where sx_type = 0
+		 <if test="null != deviceIdList">
+            and device_id in
+            <foreach collection="deviceIdList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="null != startDate and '' != startDate">
+        	AND start_date <![CDATA[>=#{startDate}]]>
+        </if>
+        <if test="null != endDate and '' != endDate">
+      		AND end_date <![CDATA[<=#{endDate}]]>
+        </if>
+		GROUP BY device_id
+		order by odr desc
+	</select>
+
+	<select id="sumPrinterStarPassrateDataEvaluate" parameterType="com.rootcloud.web.dto.PrinterReportDTO" resultType="map">
+		select device_id, SUM(item_hglv) itemHglv,COUNT(item_hglv) count
+		,SUM(item_hglv)/COUNT(item_hglv) as odr
+		from rep_printer_star_passrate
+		where 1 = 1
+        <if test="null != sxType and '' != sxType">
+            and sx_type = #{sxType}
+        </if>
+        <if test="null != deviceId and '' != deviceId">
+            AND device_id =  #{deviceId}
+        </if>
+
+		<if test="null != startDate and '' != startDate">
+			AND start_date <![CDATA[>=#{startDate}]]>
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND end_date <![CDATA[<=#{endDate}]]>
+		</if>
+		GROUP BY device_id
+		order by odr desc
+	</select>
+
+	<select id="sumPrinterStarPassrateStarEvaluate" parameterType="map" resultType="map">
+		select device_id, SUM(item_hglv) itemHglv, COUNT(item_hglv) count
+		,SUM(item_hglv)/COUNT(item_hglv) as odr
+		from rep_printer_star_passrate
+		where 1 = 1
+		<if test="null != sxType and '' != sxType">
+			and sx_type = #{sxType}
+		</if>
+		<if test="null != deviceId and '' != deviceId">
+			AND device_id =  #{deviceId}
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND start_date <![CDATA[>=#{startDate}]]>
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND end_date <![CDATA[<=#{endDate}]]>
+		</if>
+		GROUP BY device_id
+		order by odr desc
+	</select>
+
+	<delete id="deleteStarPassrate" parameterType="com.rootcloud.domain.vo.RepPrinterStarPassrateVO">
+		delete from rep_printer_star_passrate where 1=1
+		<if test="createDate != '' and createDate != null">
+			and SUBSTR(create_date, 1, 10) = #{createDate}
+		</if>
+		<if test="id != null">
+			and id=#{id}
+		</if>
+	</delete>
+
+	<!--删除已上传过的重新上传 -->
+	<delete id="deleteStarPassrateUpload" parameterType="com.rootcloud.domain.vo.RepPrinterSandPassrateVO">
+		delete from rep_printer_star_passrate where 1=1
+
+		<if test="null != sxType and '' != sxType">
+			AND sx_type = #{sxType}
+		</if>
+		<if test="null != deviceId and '' != deviceId">
+			AND device_id = #{deviceId}
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND start_date = #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND end_date = #{endDate}
+		</if>
+		<if test="id != null">
+			and id=#{id}
+		</if>
+	</delete>
+
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterTargetDicDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterTargetDicDao.xml
new file mode 100644
index 0000000..7cd44b0
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterTargetDicDao.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.dao.RepPrinterTargetDicDAO">
+	<insert id="insert" parameterType="com.rootcloud.domain.vo.RepPrinterTargetDicVO">
+		insert into rep_printer_target_dic(customer_id,customer_name,statistics_type, target_value, target_show, start_date, end_date)
+		values(#{customerId},#{customerName},#{statisticsType}, #{targetValue}, #{targetShow}, #{startDate}, #{endDate})
+	</insert>
+
+	<update id="update" parameterType="com.rootcloud.domain.vo.RepPrinterTargetDicVO">
+		update rep_printer_target_dic
+		set
+		customer_id = #{customerId},
+		customer_name = #{customerName},
+		statistics_type = #{statisticsType},
+		target_value = #{targetValue},
+		target_show = #{targetShow},
+		start_date = #{startDate},
+		end_date = #{endDate}
+		where id = #{id}
+	</update>
+
+	<delete id="deleteById">
+		delete from rep_printer_target_dic where id = #{id}
+	</delete>
+
+	<select id="getRepPrinterTargetDicById" resultType="com.rootcloud.domain.vo.RepPrinterTargetDicVO">
+        select id, statistics_type as statisticsType, target_value as targetValue, target_show as targetShow,
+        start_date as startDate, end_date as endDate,
+        create_date as createDate,update_date as updateDate,
+        customer_id as customerId,customer_name as customerName
+        from rep_printer_target_dic
+        where id = #{id}
+    </select>
+	<select id="getRepPrinterTargetDicByKey" resultType="com.rootcloud.domain.vo.RepPrinterTargetDicVO">
+        select id, statistics_type as statisticsType, target_value as targetValue, target_show as targetShow,
+        start_date as startDate, end_date as endDate,
+        create_date as createDate,update_date as updateDate,
+        customer_id as customerId,customer_name as customerName
+        from rep_printer_target_dic
+        where statistics_type = #{statisticsType}
+        and customer_id = #{customerId}
+    </select>
+
+<!--	<select id="getRepPrinterTargetDicList"  resultType="com.rootcloud.domain.vo.RepPrinterTargetDicVO">-->
+<!--        select id, statistics_type as statisticsType, target_value as targetValue, target_show as targetShow,-->
+<!--        start_date as startDate, end_date as endDate, create_date as createDate, update_date as updateDate,-->
+<!--		customer_id as customerId,customer_name as customerName-->
+<!--        from rep_printer_target_dic-->
+<!--        where 1=1-->
+<!--         <if test="null != statisticsType  and '' != statisticsType">-->
+<!--		    and statistics_type=#{statisticsType}-->
+<!--        </if>-->
+<!--		<if test="null != customerId  and '' != customerId">-->
+<!--			and customer_id=#{customerId}-->
+<!--		</if>-->
+<!--        order by id desc-->
+<!--    </select>-->
+
+	<select id="getRepPrinterTargetDicListCount"  resultType="com.rootcloud.domain.vo.RepPrinterTargetDicVO">
+		select id, statistics_type as statisticsType, target_value as targetValue, target_show as targetShow,
+		start_date as startDate, end_date as endDate, create_date as createDate, update_date as updateDate,
+		customer_id as customerId,customer_name as customerName
+		from rep_printer_target_dic
+		where 1=1
+		<if test="null != statisticsType  and '' != statisticsType">
+			and statistics_type=#{statisticsType}
+		</if>
+		<if test="null != customerId  and '' != customerId">
+			and customer_id=#{customerId}
+		</if>
+		order by id desc
+	</select>
+
+	<select id="getRepPrinterTargetDicList"  resultType="com.rootcloud.domain.vo.RepPrinterTargetDicVO">
+		select id, statistics_type as statisticsType, target_value as targetValue, target_show as targetShow,
+		start_date as startDate, end_date as endDate, create_date as createDate, update_date as updateDate,
+		customer_id as customerId,customer_name as customerName
+		from rep_printer_target_dic
+		where 1=1
+		<if test="null != statisticsType  and '' != statisticsType">
+			and statistics_type=#{statisticsType}
+		</if>
+		<if test="null != customerId  and '' != customerId">
+			and customer_id=#{customerId}
+		</if>
+		order by id desc
+		limit #{startNo},#{endNo}
+	</select>
+
+
+	<select id="groupByPrinterTargetDic" resultType="com.rootcloud.domain.vo.RepPrinterTargetDicVO" >
+		select id, statistics_type as statisticsType, target_value as targetValue, target_show as targetShow,
+        start_date as startDate, end_date as endDate, create_date as createDate, update_date as updateDate,
+        customer_id as customerId,customer_name as customerName
+         from (
+			select * from rep_printer_target_dic where SYSDATE() BETWEEN start_date and end_date
+			ORDER BY create_date desc
+		) t GROUP BY t.customer_id,t.statistics_type
+	 </select>
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterWastereasonDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterWastereasonDao.xml
new file mode 100644
index 0000000..b115d91
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/RepPrinterWastereasonDao.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.dao.RepPrinterWastereasonDao">
+
+	<insert id="add" parameterType="com.rootcloud.domain.vo.RepPrinterWastereasonVO">
+		replace into rep_printer_wastereason(waste_type,start_date, end_date,
+		gk_sc_dy_count,create_date,office_id,customer_name,customer_code)
+		<foreach collection="repPrinterWastereasonVOs" item="item" open="VALUES" close=";"  separator=",">
+			(#{item.wasteType},
+			#{item.startDate}, #{item.endDate},
+			#{item.gkScDyCount},now(),
+			#{item.officeId}, #{item.customerName}, #{item.customerCode}
+			)
+		</foreach>
+	</insert>
+
+	<select id="list" parameterType="com.rootcloud.domain.vo.RepPrinterWastereasonVO" resultType="com.rootcloud.domain.vo.RepPrinterWastereasonVO">
+		select id, waste_type wasteType, data_year dataYear, data_month dataMonth,start_date startDate,end_date endDate,
+		data_day dataDay, gk_sc_dy_count gkScDyCount,office_id officeId,customer_name customerName,customer_code customerCode,
+		create_date createDate from rep_printer_wastereason
+		where 1=1
+		<if test="wasteType != null and wasteType != ''">
+			and waste_type  LIKE CONCAT('%', #{wasteType}, '%')
+		</if>
+		<if test="dataYear != '' and dataYear != null">
+			and data_year=#{dataYear}
+		</if>
+		<if test="dataMonth != '' and dataMonth != null">
+			and data_month=#{dataMonth}
+		</if>
+		<if test="dataDay != '' and dataDay != null">
+			and data_day=#{dataDay}
+		</if>
+		<if test="gkScDyCount != null and gkScDyCount != ''">
+			and gk_sc_dy_count=#{gkScDyCount}
+		</if>
+        <if test="null != officeId  and '' != officeId">
+		    and office_id=#{officeId}
+        </if>
+        <if test="null != createDate  and '' != createDate">
+		    and SUBSTR(create_date, 1, 10)=#{createDate}
+        </if>
+        <if test="null != startDate and '' != startDate">
+        	AND start_date = #{startDate}
+        </if>
+        <if test="null != endDate and '' != endDate">
+      		AND end_date = #{endDate}
+        </if>
+        <if test="null != customerCode  and '' != customerCode">
+		    and customer_code=#{customerCode}
+        </if>
+        <if test="customerName !=null and customerName !=''">
+			and customer_name LIKE CONCAT('%', #{customerName}, '%')
+		</if>
+
+		order by id desc
+	</select>
+
+
+	<select id="listPage" parameterType="com.rootcloud.domain.vo.RepPrinterWastereasonVO" resultType="com.rootcloud.domain.vo.RepPrinterWastereasonVO">
+		select id, waste_type wasteType, data_year dataYear, data_month dataMonth,start_date startDate,end_date endDate,
+		data_day dataDay, gk_sc_dy_count gkScDyCount,office_id officeId,customer_name customerName,customer_code customerCode,
+		create_date createDate from rep_printer_wastereason
+		where 1=1
+		<if test="wasteType != null and wasteType != ''">
+			and waste_type  LIKE CONCAT('%', #{wasteType}, '%')
+		</if>
+		<if test="dataYear != '' and dataYear != null">
+			and data_year=#{dataYear}
+		</if>
+		<if test="dataMonth != '' and dataMonth != null">
+			and data_month=#{dataMonth}
+		</if>
+		<if test="dataDay != '' and dataDay != null">
+			and data_day=#{dataDay}
+		</if>
+		<if test="gkScDyCount != null and gkScDyCount != ''">
+			and gk_sc_dy_count=#{gkScDyCount}
+		</if>
+		<if test="null != officeId  and '' != officeId">
+			and office_id=#{officeId}
+		</if>
+		<if test="null != createDate  and '' != createDate">
+			and SUBSTR(create_date, 1, 10)=#{createDate}
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND start_date = #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND end_date = #{endDate}
+		</if>
+		<if test="null != customerCode  and '' != customerCode">
+			and customer_code=#{customerCode}
+		</if>
+		<if test="customerName !=null and customerName !=''">
+			and customer_name LIKE CONCAT('%', #{customerName}, '%')
+		</if>
+		order by id desc
+		limit #{startNo},#{endNo}
+	</select>
+
+
+	<select id="sumWastereasonData" parameterType="com.rootcloud.web.dto.PrinterReportDTO" resultType="map">
+		select waste_type, SUM(gk_sc_dy_count) count
+		from rep_printer_wastereason
+		where 1=1
+		<if test="officeId != '' and officeId != null">
+			and office_id=#{officeId}
+		</if>
+		<if test="null != startDate and '' != startDate">
+        	AND start_date <![CDATA[>=#{startDate}]]>
+        </if>
+        <if test="null != endDate and '' != endDate">
+      		AND end_date <![CDATA[<=#{endDate}]]>
+        </if>
+		GROUP BY waste_type
+		order by count desc
+	</select>
+
+	<delete id="deleteDeviceWaste" parameterType="com.rootcloud.domain.vo.RepPrinterWastereasonVO">
+		delete from rep_printer_wastereason where 1=1
+		<if test="createDate != '' and createDate != null">
+			and SUBSTR(create_date, 1, 10) = #{createDate}
+		</if>
+		<if test="id != null">
+			and id=#{id}
+		</if>
+	</delete>
+	<delete id="deleteDeviceWasteUpload" parameterType="com.rootcloud.domain.vo.RepPrinterWastereasonVO">
+		delete from rep_printer_wastereason where 1=1
+		<if test="null != wasteType and '' != wasteType">
+			AND waste_type = #{wasteType}
+		</if>
+		<if test="null != customerName and '' != customerName">
+			AND customer_name = #{customerName}
+		</if>
+		<if test="null != customerCode and '' != customerCode">
+			AND customer_code = #{customerCode}
+		</if>
+		<if test="null != officeId and '' != officeId">
+			AND office_id = #{officeId}
+		</if>
+		<if test="null != startDate and '' != startDate">
+			AND start_date = #{startDate}
+		</if>
+		<if test="null != endDate and '' != endDate">
+			AND end_date = #{endDate}
+		</if>
+		<if test="id != null">
+			and id=#{id}
+		</if>
+
+	</delete>
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/ServicePlanMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/ServicePlanMapper.xml
new file mode 100644
index 0000000..6026d07
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/ServicePlanMapper.xml
@@ -0,0 +1,461 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rootcloud.domain.mapper.ServicePlanMapper">
+
+    <resultMap id="BaseResultMap" type="com.rootcloud.domain.entity.sp.ServicePlanEntity" >
+        <result column="SERVICE_PLAN_ID" property="servicePlanId"/>
+        <result column="DEVICE_CODE" property="deviceCode"/>
+        <result column="PLAN_NAME" property="planName"/>
+        <result column="PLAN_TYPE" property="planType"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="DEVICE_SBXH" property="deviceSbxh"/>
+        <result column="PLAN_CYCLE" property="planCycle"/>
+        <result column="PLAN_INTERVAL" property="planInterval"/>
+        <result column="PLAN_STATUS" property="planStatus"/>
+        <result column="CREATE_TIME" property="createTime"/>
+        <result column="PLAN_START_TIME" property="planStartTime"/>
+        <result column="PLAN_END_TIME" property="planEndTime"/>
+        <result column="IS_TIMEOUT" property="isTimeout"/>
+        <result column="PLAN_REMIND_WAY" property="planRemindWay"/>
+        <result column="FINISH_TIME_NODE" property="finishTimeNode"/>
+        <result column="MAINTAIN_CONTENT_NAME" property="maintainContent"/>
+        <result column="PLAN_SFJJ" property="planSfjj"/>
+        <result column="PLAN_LSCFSJ" property="planLscfsj"/>
+    </resultMap>
+
+    <select id="selectAlarmLevel" resultType="com.rootcloud.domain.entity.NxZskFaultCodeEntity">
+        SELECT FAULTCODE_GZDJCODE,FAULTCODE_SBLXCODE FROM NX_ZSK_FAULTCODE WHERE FAULTCODE_GZM IN
+        <foreach collection="codes" separator="," item="code" open="(" close=")">
+            #{code}
+        </foreach>
+    </select>
+
+    <select id="findConditionList" resultType="com.rootcloud.domain.dto.ConditionModel">
+        SELECT ntc.*,sp.DEVICE_TYPE AS deviceType,(select type_lxbm from nx_jcda_device_type where nx_jcda_device_type_id =sp.DEVICE_TYPE limit 1) AS deviceTypeCode FROM nx_trigger_condition ntc
+            LEFT JOIN service_plan sp ON sp.SERVICE_PLAN_ID = ntc.SERVICE_PLAN_ID
+        <where>
+            <if test="date != null and date != ''">
+                AND sp.PLAN_START_TIME <![CDATA[<=#{date}]]>  and sp.PLAN_END_TIME <![CDATA[>= #{date}]]>
+            </if>
+            <if test="planStatus != null">
+                AND sp.PLAN_STATUS = #{planStatus}
+            </if>
+            <if test="triggerType != null and triggerType != ''">
+                AND ntc.TRIGGER_CONDITION = #{triggerType}
+            </if>
+            <if test="detailStatus != null">
+                AND sp.DETAIL_STATUS = #{detailStatus}
+            </if>
+            <if test="alarmTypeId != null and alarmTypeId != ''">
+                AND ntc.ALARM_TYPE_ID = #{alarmTypeId}
+            </if>
+        </where>
+    </select>
+    <resultMap id="ListResultMap" type="com.rootcloud.vo.service.ServicePlanVo" >
+        <result column="SERVICE_PLAN_ID" property="servicePlanId"/>
+        <result column="DEVICE_CODE" property="deviceCode"/>
+        <result column="PLAN_NAME" property="planName"/>
+        <result column="PLAN_TYPE" property="planType"/>
+        <result column="DEVICE_TYPE" property="deviceType"/>
+        <result column="DEVICE_SBXH" property="deviceSbxh"/>
+        <result column="PLAN_CYCLE" property="planCycle"/>
+        <result column="PLAN_INTERVAL" property="planInterval"/>
+        <result column="PLAN_STATUS" property="planStatus"/>
+        <result column="CREATE_TIME" property="createTime"/>
+        <result column="PLAN_START_TIME" property="planStartTime"/>
+        <result column="PLAN_END_TIME" property="planEndTime"/>
+        <result column="IS_TIMEOUT" property="isTimeout"/>
+        <result column="PLAN_REMIND_WAY" property="planRemindWay"/>
+        <result column="FINISH_TIME_NODE" property="finishTimeNode"/>
+        <result column="MAINTAIN_CONTENT_NAME" property="maintainContent"/>
+        <result column="SET_VALUE" property="setValue"/>
+    </resultMap>
+
+
+    <select id="selectSysTimeList" resultMap="ListResultMap">
+        SELECT
+        sp.*,
+        nx.SET_VALUE
+        FROM
+        service_plan sp
+        join
+        nx_trigger_condition nx
+        on
+        sp.SERVICE_PLAN_ID = nx.SERVICE_PLAN_ID
+        and nx.TRIGGER_CONDITION = '1'
+        WHERE
+        sp.PLAN_STATUS = '1'
+        and (sp.sy_status !=0 or sp.sy_status is null or sp.sy_status = '')
+        and DATE_FORMAT(now(), '%Y-%m-%d' ) >= DATE_FORMAT( DATE_ADD(sp.PLAN_START_TIME, INTERVAL -1 day), '%Y-%m-%d' )
+        AND (
+            (DATE_FORMAT(now(), '%Y-%m-%d' ) <![CDATA[<=]]>  DATE_FORMAT( sp.PLAN_END_TIME, '%Y-%m-%d') or sp.PLAN_END_TIME is null or sp.PLAN_END_TIME='')
+            OR (sp.PLAN_LSCFSJ IS NOT NULL or sp.PLAN_LSCFSJ!='')
+        )
+    </select>
+
+
+
+    <select id="selectListByParams" resultMap="BaseResultMap">
+        SELECT
+        *
+        FROM
+        service_plan
+        <where>
+            and (sy_status !=0 or sy_status is null or sy_status = '')
+            <if test="planParamsAO.planStatus != null">
+                AND PLAN_STATUS = #{planParamsAO.planStatus}
+            </if>
+            <if test="planParamsAO.sysTime != '' and planParamsAO.sysTime != null">
+                AND ((DATE_FORMAT(#{planParamsAO.sysTime}, '%Y-%m-%d' ) >= DATE_FORMAT(PLAN_START_TIME, '%Y-%m-%d' )
+                AND DATE_FORMAT(#{planParamsAO.sysTime}, '%Y-%m-%d' ) <![CDATA[<=]]>  DATE_FORMAT(PLAN_END_TIME, '%Y-%m-%d')) or
+                (DATE_FORMAT(#{planParamsAO.sysTime}, '%Y-%m-%d' ) >= DATE_FORMAT(PLAN_START_TIME, '%Y-%m-%d') and (PLAN_END_TIME is NULL or PLAN_END_TIME='')))
+            </if>
+            <if test="planParamsAO.planCycle != null and planParamsAO.planCycle != '' ">
+                AND PLAN_CYCLE is not null  and PLAN_CYCLE !=''
+            </if>
+        </where>
+    </select>
+
+
+
+    <select id="selectByParams" resultType="com.rootcloud.vo.service.ServicePlanInfoVO">
+        SELECT sp.*,
+        sb.SBLB_SBMC as deviceName,
+        sb.SBLB_KHMC as customerName
+        FROM service_plan sp
+        LEFT JOIN
+        nx_jcxx_sblb sb
+        on sp.DEVICE_CODE = sb.SBLB_SBBM
+       <where>
+          and (sp.sy_status !=0 or sp.sy_status is null or sp.sy_status = '')
+           <if test="servicePlanCalendarNewAO.syZhid != '' and servicePlanCalendarNewAO.syZhid != null">
+               AND sp.SY_ZHID = #{servicePlanCalendarNewAO.syZhid}
+               AND sb.SY_ZHID =  #{servicePlanCalendarNewAO.syZhid}
+           </if>
+            <if test="servicePlanCalendarNewAO.queryTime != '' and servicePlanCalendarNewAO.queryTime != null">
+                AND ((#{servicePlanCalendarNewAO.queryTime} >= DATE_FORMAT(sp.PLAN_START_TIME, '%Y-%m' )
+                AND #{servicePlanCalendarNewAO.queryTime} <![CDATA[<=]]>  DATE_FORMAT(sp.PLAN_END_TIME, '%Y-%m')) or
+                (#{servicePlanCalendarNewAO.queryTime} >= DATE_FORMAT(sp.PLAN_START_TIME, '%Y-%m') and (sp.PLAN_END_TIME is NULL or sp.PLAN_END_TIME='')))
+            </if>
+            <if test="servicePlanCalendarNewAO.maintenanceType != null and servicePlanCalendarNewAO.maintenanceType != '' ">
+                AND sp.MAINTENANCE_TYPE = #{servicePlanCalendarNewAO.maintenanceType}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectScheduledTasksList" resultMap="BaseResultMap">
+        select
+        *
+        from service_plan
+        where DETAIL_STATUS = '1' and (sy_status !=0 or sy_status is null or sy_status = '')
+        AND PLAN_STATUS = '1'
+        AND ((DATE_FORMAT(now(), '%Y-%m-%d' ) >= DATE_FORMAT(PLAN_START_TIME, '%Y-%m-%d' )
+            AND DATE_FORMAT(now(), '%Y-%m-%d' ) <![CDATA[<=]]>  DATE_FORMAT(PLAN_END_TIME, '%Y-%m-%d')) or
+        (DATE_FORMAT(now(), '%Y-%m-%d' ) >= DATE_FORMAT(PLAN_START_TIME, '%Y-%m-%d') and (PLAN_END_TIME is NULL or PLAN_END_TIME='')))
+        union all
+        select
+        sp.*
+        from service_plan sp where sp.PLAN_STATUS = '1' and (sp.sy_status !=0 or sp.sy_status is null or sp.sy_status = '')
+        AND NOT EXISTS (select 1 from nx_trigger_condition where SERVICE_PLAN_ID = sp.SERVICE_PLAN_ID and TRIGGER_CONDITION!='')
+        AND ((DATE_FORMAT(now(), '%Y-%m-%d' ) >= DATE_FORMAT(sp.PLAN_START_TIME, '%Y-%m-%d' )
+                AND DATE_FORMAT(now(), '%Y-%m-%d' ) <![CDATA[<=]]>  DATE_FORMAT(sp.PLAN_END_TIME, '%Y-%m-%d')) or
+        (DATE_FORMAT(now(), '%Y-%m-%d' ) >= DATE_FORMAT(sp.PLAN_START_TIME, '%Y-%m-%d') and (sp.PLAN_END_TIME is NULL or sp.PLAN_END_TIME='')))
+    </select>
+
+
+    <select id="selectByUserId" resultMap="BaseResultMap">
+        SELECT sp.*
+        FROM service_plan sp
+                 LEFT JOIN
+             nx_je_device jd
+             on sp.DEVICE_CODE = jd.DEVICE_SBBM
+        where (sp.PLAN_SFJJ != 1 or sp.PLAN_SFJJ is null) AND
+        <![CDATA[ DATE_FORMAT(sp.LATEST_TRIGGER_TIME, '%Y-%m-%d') >=
+              DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 3 DAY), '%Y-%m-%d')]]>
+          AND (
+                    jd.DEVICE_SSKH = (SELECT max(NX_KHGL_ID)
+                                                             FROM nx_khgl_khld
+                                                             WHERE nx_khgl_khld.KHLD_LDID = #{userId})
+        OR jd.DEVICE_SSKH IN (
+        SELECT NX_KHGL_ID
+        FROM nx_khgl
+        WHERE khgl_khdzs IN (
+            SELECT substring_index(substring_index(nxgx_jcda_fwwd.FWWD_SSQY, ',', b.help_topic_id + 1), ',',
+                                   - 1) AS areas
+            FROM nxgx_jcda_fwwd
+                     JOIN mysql.help_topic b ON b.help_topic_id &lt; length(nxgx_jcda_fwwd.FWWD_SSQY) - length(
+                    REPLACE(nxgx_jcda_fwwd.FWWD_SSQY, ',', '')) + 1
+            WHERE NXGX_JCDA_FWWD_ID = (
+                SELECT FWRY_WDID
+                FROM NXGX_JCDA_FWRY
+                WHERE NXGX_JCDA_FWRY.userid = #{userId}
+                  AND EXISTS(SELECT 1
+                             FROM je_core_role_user
+                             WHERE je_core_role_user.userid = #{userId}
+                               AND ROLEID = 'wq3AoijXFmkUWUrKgUl')
+                    )
+                )
+            )
+            )
+            limit ${startNo},${endNo}
+    </select>
+
+    <select id="countByUserId" resultType="java.lang.Integer">
+        SELECT count(1)
+        FROM service_plan sp
+                 LEFT JOIN
+             nx_je_device jd
+             on sp.DEVICE_CODE = jd.DEVICE_SBBM
+        where (sp.PLAN_SFJJ != 1 or sp.PLAN_SFJJ is null) AND
+        <![CDATA[ DATE_FORMAT(sp.LATEST_TRIGGER_TIME, '%Y-%m-%d') >=
+                DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 3 DAY), '%Y-%m-%d')]]>
+          AND (
+                    jd.DEVICE_SSKH = (SELECT max(NX_KHGL_ID)
+                                      FROM nx_khgl_khld
+                                      WHERE nx_khgl_khld.KHLD_LDID = #{userId})
+                OR jd.DEVICE_SSKH IN (
+                SELECT NX_KHGL_ID
+                FROM nx_khgl
+                WHERE khgl_khdzs IN (
+                    SELECT substring_index(substring_index(nxgx_jcda_fwwd.FWWD_SSQY, ',', b.help_topic_id + 1), ',',
+                                           - 1) AS areas
+                    FROM nxgx_jcda_fwwd
+                             JOIN mysql.help_topic b ON b.help_topic_id &lt; length(nxgx_jcda_fwwd.FWWD_SSQY) - length(
+                            REPLACE(nxgx_jcda_fwwd.FWWD_SSQY, ',', '')) + 1
+                    WHERE NXGX_JCDA_FWWD_ID = (
+                        SELECT FWRY_WDID
+                        FROM NXGX_JCDA_FWRY
+                        WHERE NXGX_JCDA_FWRY.userid = #{userId}
+                          AND EXISTS(SELECT 1
+                                     FROM je_core_role_user
+                                     WHERE je_core_role_user.userid = #{userId}
+                                       AND ROLEID = 'wq3AoijXFmkUWUrKgUl')
+                    )
+                )
+            )
+            )
+    </select>
+
+
+    <update id="updateDetailStatusByPlanIds">
+        UPDATE service_plan SET DETAIL_STATUS = #{status} WHERE SERVICE_PLAN_ID IN
+            <foreach collection="planIds" separator="," item="planId" open="(" close=")">
+                #{planId}
+            </foreach>
+    </update>
+
+    <update id="updateStatus">
+        UPDATE service_plan SET DETAIL_STATUS = #{detailStatus},PLAN_STATUS = #{planStatus.code},PLAN_STATUS_NAME = #{planStatus.desc} WHERE SERVICE_PLAN_ID IN
+        <foreach collection="planIds" separator="," item="planId" open="(" close=")">
+            #{planId}
+        </foreach>
+    </update>
+
+
+    <select id="selectListByName" resultType="com.rootcloud.vo.service.MaintenanceListVo">
+        select XMBY_XMML as projectName,XMBY_BYFF as projectContent from  XMBY where XMBY_BYNR = #{maintainContentName} and (sy_status !=0 or sy_status is null or sy_status ='')
+    </select>
+
+    <select id="selectListByName2" resultType="com.rootcloud.vo.service.MaintenanceListVo">
+        select XMBY_XMML as projectName,XMBY_BYFF as projectContent from  XMBY where XMBY_BYNR = #{maintainContentName}
+                                                                                 and NX_XMBYNR_ID = #{maintainContent}
+                                                                                 and (sy_status !=0 or sy_status is null or sy_status ='')
+    </select>
+
+
+    <select id="selectListXMBY" resultType="map">
+        select * from  XMBY where NX_XMBYNR_ID = #{code} and sy_zhid =#{syZhid} and (sy_status!=0 or sy_status is null or sy_status='')
+    </select>
+
+    <insert id="insertXmbynr">
+        insert into NX_BYNR (NX_BYNR_ID,BYNR_BYXM,BYNR_BYFF,BYNR_ZYSX,BYNR_BYXMID,BYNR_BYNRID,BYNR_ZT,NX_ORDER_ID)
+        <foreach collection="list" item="item" open="VALUES" close=";"  separator=",">
+           (#{item.NX_BYNR_ID},#{item.XMBY_XMML},#{item.XMBY_BYFF},#{item.XMBY_ZYSX},#{item.XMBY_ID},#{item.XMBY_BYNR},2,#{nxOrderId})
+        </foreach>
+    </insert>
+
+
+    <select id="getCustomerAndRoles" resultType="java.lang.String">
+        select KHLD_LDID as userId from nx_khgl_khld where NX_KHGL_ID=#{customerId}
+        union all
+        select
+            njf.USERID as userId
+        from NXGX_JCDA_FWRY njf
+                 left join
+             je_core_enduser jce
+             on njf.USERID = jce.USERID COLLATE utf8mb4_unicode_ci
+        where jce.ROLEIDS like '%wq3AoijXFmkUWUrKgUl%'
+        <if test="syZhid != null and syZhid != ''">
+            AND jce.zhid = #{syZhid}
+        </if>
+        and  FWRY_WDID  in
+       (SELECT
+            NXGX_JCDA_FWWD_ID
+        FROM
+            NXGX_JCDA_FWWD
+        where
+            FWWD_SSQY = (
+            select KHGL_KHDZS from nx_khgl where NX_KHGL_ID=#{customerId}
+        )
+        <if test="syZhid != null and syZhid != ''">
+            AND sy_zhid = #{syZhid}
+        </if>
+
+        )
+
+    </select>
+
+    <update id="eqMesSfjj" parameterType="String">
+        update service_plan set PLAN_SFJJ = '1' where SERVICE_PLAN_ID =#{id}
+    </update>
+
+
+    <select id="queryLgortsByCode" resultType="java.lang.Integer">
+        SELECT CONFIG_VALUE from je_user_config where config_code = #{configCode} and CONFIG_ENABLED = '1' ORDER BY SY_CREATETIME desc limit 1;
+    </select>
+
+
+
+    <select id="queryStringByCode" resultType="java.lang.String">
+        SELECT CONFIG_VALUE from je_user_config where config_code = #{configCode} and CONFIG_ENABLED = '1' ORDER BY SY_CREATETIME desc limit 1;
+    </select>
+
+
+
+    <select id="selectOutletsIdByCustomerId" resultType="java.lang.String">
+        SELECT NXGX_JCDA_FWWD_ID AS orderFwwdid FROM NXGX_JCDA_FWWD WHERE sy_zhid=#{syZhid} and FWWD_SSQY LIKE
+            CONCAT( '%',( SELECT KHGL_KHDZS FROM NX_KHGL WHERE NX_KHGL_ID = #{customerId}),'%')
+            LIMIT 1
+    </select>
+
+
+    <select id="returnUserNames" resultType="com.rootcloud.vo.service.OutletsVO">
+        select GROUP_CONCAT(userName) as userNames, GROUP_CONCAT(userId) as userIds from
+            (
+                select FWRY_YHXM  as userName,USERID as userId  from NXGX_JCDA_FWRY  where FWRY_JS = '服务经理' and  FWRY_WDID = #{wdId}
+                union
+                select FWWD_LXR as userName,FWWD_LXRCODE as userId from  NXGX_JCDA_FWWD  where NXGX_JCDA_FWWD_ID = #{wdId}
+            )aa
+    </select>
+
+    <select id="getTodoLibrary" resultType="map" parameterType="map">
+        select
+            ntl.*,
+            ord.SY_STATUS  as ORDER_STATUS
+        FROM
+        nx_todo_library ntl
+        left join
+        nx_order ord
+        on
+        (ntl.NX_ORDER_ID = ord.NX_ORDER_ID and ord.SY_STATUS=1)
+        left join
+        service_plan sp
+        on sp.SERVICE_PLAN_ID =  ntl.SERVICE_PLAN_ID
+        where ntl.SERVICE_PLAN_ID = #{planId}
+        <if test="firstDay!=null">
+            and ntl.time <![CDATA[>=#{firstDay}]]>
+        </if>
+        <if test="lastDay!=null">
+            and ntl.time <![CDATA[<=#{lastDay}]]>
+        </if>
+        order by ntl.time asc
+    </select>
+
+
+    <select id="getPlanExsitOrder" resultType="map" parameterType="map">
+        select
+           ord.*
+        FROM
+            nx_todo_library ntl
+                left join
+            nx_order ord
+            on
+                ntl.NX_ORDER_ID = ord.NX_ORDER_ID
+                left join
+            service_plan sp
+            on sp.SERVICE_PLAN_ID =  ntl.SERVICE_PLAN_ID
+        where ntl.SERVICE_PLAN_ID = #{planId}
+          and ord.NX_ORDER_ID is not null
+          and ord.SY_STATUS = '1'
+        and ord.ORDER_ORDERSTATUS_CODE not in(7,10)
+          <if test="nextCycleTime!=null and previousTime!=null">
+              and ntl.time <![CDATA[>=#{previousTime}]]>  and ntl.time <![CDATA[<=#{nextCycleTime}]]>
+          </if>
+        <if test="syZhid != null and syZhid != ''">
+            AND ord.sy_zhid = #{syZhid}
+        </if>
+    </select>
+
+
+    <select id="getIslcpzb" resultType="map">
+        select LCPZB_SFXYPG from NX_LCPZB where LCPZB_ZHID = #{syZhid}
+    </select>
+    <!--提高临时触发时间优先级 2024-10-22 commit-->
+    <select id="selectExecutedServicePlan" resultType="com.rootcloud.vo.service.ServicePlanVo">
+        SELECT
+            sp.*
+        FROM service_plan sp
+        WHERE (sp.sy_status !=0 or sp.sy_status is null or sp.sy_status = '')
+          and sp.PLAN_STATUS <![CDATA[<>]]> 3
+          and (
+            IF ( (PLAN_LSCFSJ IS NOT NULL and PLAN_LSCFSJ != ''), DATE_FORMAT( PLAN_LSCFSJ, '%Y-%m-%d' ) = #{thatDay}, (DATE_FORMAT(NEXT_CYCLE_TIME, '%Y-%m-%d' )=#{thatDay} OR DATE_FORMAT( PLAN_START_TIME, '%Y-%m-%d' ) = #{thatDay} ))
+            )
+    </select>
+
+
+    <select id="selectExecutedServicePlanByPlanId" resultType="com.rootcloud.vo.service.ServicePlanVo">
+        SELECT
+            sp.*
+        FROM service_plan sp
+        WHERE (sp.sy_status !=0 or sp.sy_status is null or sp.sy_status = '')
+        and sp.SERVICE_PLAN_ID = #{planId}
+    </select>
+
+    <select id="selectData" resultType="com.rootcloud.domain.entity.sp.ServicePlanEntity">
+        select * from service_plan sp WHERE (sp.sy_status !=0 or sp.sy_status is null or sp.sy_status = '')
+    </select>
+
+    <update id="updateData">
+        update service_plan set NEXT_CYCLE_TIME=#{date} where SERVICE_PLAN_ID=#{id}
+    </update>
+
+    <select id="checkOrder" resultType="integer">
+        select count(1)
+        from service_plan a
+        join nx_todo_library b on a.SERVICE_PLAN_ID=b.SERVICE_PLAN_ID
+        join nx_order c on b.NX_ORDER_ID=c.NX_ORDER_ID
+        where a.SERVICE_PLAN_ID=#{servicePlanId}
+        and b.TIME=#{date} and c.SY_STATUS=1
+    </select>
+
+    <select id="checkOrderCount" resultType="integer">
+        select count(1)
+        from service_plan a
+                 join nx_todo_library b on a.SERVICE_PLAN_ID = b.SERVICE_PLAN_ID
+                 join nx_order c on b.NX_ORDER_ID = c.NX_ORDER_ID
+        where a.SERVICE_PLAN_ID = #{servicePlanId}
+          and b.TIME <![CDATA[>= #{startDate}]]>
+          and b.TIME <![CDATA[<= #{endDate}]]>
+          and c.SY_STATUS = 1
+          and (c.service_plan_order_status is null
+            or c.service_plan_order_status !='after')
+    </select>
+
+    <select id="lastServicePlanOrderStatus" resultType="string">
+        select a.ORDER_ORDERSTATUS_CODE
+        from nx_order a
+        join nx_todo_library b on a.NX_ORDER_ID=b.NX_ORDER_ID
+        join service_plan c on b.SERVICE_PLAN_ID=c.SERVICE_PLAN_ID
+        where c.SERVICE_PLAN_ID=#{servicePlanId} and a.SY_STATUS=1
+        order by a.SY_CREATETIME desc limit 1
+    </select>
+
+    <update id="updateServicePlanStatus">
+        update service_plan set PLAN_STATUS=#{status},NEXT_CYCLE_TIME=#{date},PLAN_ZTRQ=#{ztrq} where SERVICE_PLAN_ID=#{id}
+    </update>
+
+    <update id="updateTqcfrq">
+        update service_plan set PLAN_TQCFRQ=#{date} where SERVICE_PLAN_ID=#{id}
+    </update>
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/SpareFileMapper.xml b/nxgx-ifsm-base/src/main/resources/mapper/SpareFileMapper.xml
new file mode 100644
index 0000000..43cf7bf
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/SpareFileMapper.xml
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rootcloud.domain.mapper.SpareFilerMapper">
+
+  <select id="getSparePart" parameterType="String" resultType="com.rootcloud.domain.dto.NxSparePartVo">
+            SELECT
+            pj.WXHJ_AZWH as partAzwh,
+            pj.WXHJ_SNH as partSn,
+            pj.WXHJ_BJZT as partBjzt,
+            pj.WXHJ_BJZTCODE as partBjztbm,
+            pj.WXHJ_PJBM as partBjbm,
+            pj.WXHJ_SFGJBJ  as partSfgjbj,
+          (SELECT ORDER_DEVICECODE as  partSbbm from nx_order where NX_ORDER_ID = #{orderId})  as partSbbm,
+        (SELECT NX_JCXX_SBLB_ID from NX_JCXX_SBLB where SBLB_SBBM = o.ORDER_DEVICECODE and SY_ZHID=o.SY_ZHID) as partSbid,
+         np.FILE_PJMC as filePjmc,
+         np.FILE_GGXH as partGgxh,
+        np.FILE_LLSM as partSm,
+        np.FILE_SMYJZ as partSmyjz,
+        np.FILE_XTMK as partXtmk,
+        np.FILE_XTMKBM as partXtmkBm,
+        pj.WXHJ_BZ as partBz,
+        o.sy_zhid as syZhid,
+        from_unixtime(o.ORDER_SHTGSJ/1000,"%Y-%m-%d") as orderShtgsj
+        FROM
+        NX_BGB_WXHJ  as pj
+        join nx_order o  on pj.NX_ORDER_ID=o.NX_ORDER_ID
+        JOIN NX_PART_FILE as np on (np.FILE_PJBM  = pj.WXHJ_PJBM and o.SY_ZHID=np.SY_ZHID)
+        WHERE o.NX_ORDER_ID = #{orderId}
+  </select>
+
+    <select id="getSparePartBySbbmAndStatus" parameterType="com.rootcloud.domain.dto.NxSparePartVo" resultType="com.rootcloud.domain.dto.NxSparePartVo">
+        SELECT  * from NX_SPARE_PART where PART_SBBM = #{partSbbm} and PART_BJBM = #{partBjbm} and PART_AZWH = #{partAzwh} and PART_BJZT = '1'
+    </select>
+
+    <select id="getSparePartBySbbm" parameterType="com.rootcloud.domain.dto.NxSparePartVo" resultType="String">
+        SELECT  NX_SPARE_PART_ID from NX_SPARE_PART where PART_SBBM = #{partSbbm} and PART_BJBM = #{partBjbm}
+    </select>
+
+    <select id="getSparePartByAzwh" parameterType="com.rootcloud.domain.dto.NxSparePartVo" resultType="com.rootcloud.domain.dto.NxSparePartVo">
+        SELECT
+            PART_BJZT AS partBjzt,
+            NX_SPARE_PART_ID AS nxSparePartId,
+            PART_AZRQ as partAzrq
+        FROM
+            NX_SPARE_PART
+        where PART_AZWH = #{partAzwh} and PART_SBBM = #{partSbbm} and PART_BJZT = '1'
+        order by PART_AZRQ desc
+    </select>
+
+    <update id="updateNxSparePartGzsc" parameterType="com.rootcloud.domain.dto.NxSparePartVo">
+        UPDATE nx_spare_part
+        SET
+         PART_GZSC = #{partGzsc},
+         PART_DRGZSC = #{partDrgzsc}
+        WHERE NX_SPARE_PART_ID = #{nxSparePartId}
+    </update>
+
+    <update id="updateNxSparePart" parameterType="com.rootcloud.domain.dto.NxSparePartVo">
+        UPDATE nx_spare_part
+        SET
+         PART_GHRQ = CURDATE() ,
+         PART_BJZTBM = '2',
+         PART_BJZT = '2'
+        WHERE
+            (
+                NX_SPARE_PART_ID = #{nxSparePartId}
+            );
+    </update>
+
+    <update id="updateSparePart" parameterType="com.rootcloud.domain.dto.NxSparePartVo">
+        UPDATE nx_spare_part
+        SET
+         PART_GHRQ = CURDATE() ,
+         PART_BJZTBM = #{partBjztbm},
+         PART_BJZT = #{partBjztbm},
+        PART_SM = #{partSm},
+        PART_SN = #{partSn},
+        PART_AZWH = #{partAzwh}
+        WHERE
+            (
+                NX_SPARE_PART_ID = #{nxSparePartId}
+            );
+    </update>
+
+    <insert id="importSparePart" parameterType="com.rootcloud.domain.dto.NxSparePartVo">
+    INSERT INTO nx_spare_part (
+            `NX_SPARE_PART_ID`,
+            `PART_SBID`,
+            `PART_SBBM`,
+            `PART_AZWH`,
+            `PART_SN`,
+            `PART_BJMC`,
+            `PART_GGXH`,
+            `PART_AZRQ`,
+            `PART_GHRQ`,
+            `PART_GZSC`,
+            `PART_DRGZSC`,
+            `PART_SM`,
+            `PART_LYL`,
+            `SY_STATUS`,
+            `PART_BJZTBM`,
+            `PART_BJZT`,
+            `PART_BJBM`,
+            `PART_SMYJZ`,
+            `PART_BZ`,
+            `PART_XTMK`,
+            `PART_XTMKBM`
+        )
+        VALUES
+            (
+                #{nxSparePartId},
+                (select NX_JE_DEVICE_ID from nx_je_device where DEVICE_SBBM = #{partSbbm} limit 1),
+                #{partSbbm},
+                #{partAzwh},
+                #{partSn},
+                #{filePjmc},
+                #{partGgxh},
+                #{partAzrq},
+                #{partGhrq},
+				(#{partGzsc}+0),
+                (#{partGzsc}+0),
+                (#{partSm}+0),
+                (#{partLyl}+0),
+                '1',
+                #{partBjzt},
+                (SELECT DICTIONARYITEM_ITEMCODE from je_core_dictionaryitem where DICTIONARYITEM_DICTIONARY_ID = (SELECT JE_CORE_DICTIONARY_ID from je_core_dictionary WHERE DICTIONARY_DDCODE = 'NX_SBLB_BJZT') and DICTIONARYITEM_ITEMNAME =#{partBjzt}),
+                #{partBjbm},
+                (#{partSmyjz}+0),
+                #{partBz},
+                #{partXtmk},
+                #{partXtmkBm}
+            )
+    </insert>
+
+    <insert id="insertSparePart" parameterType="com.rootcloud.domain.dto.NxSparePartVo">
+        INSERT INTO nx_spare_part (
+            `NX_SPARE_PART_ID`,
+            `PART_SBID`,
+            `PART_SBBM`,
+            `PART_AZWH`,
+            `PART_SN`,
+            `PART_BJMC`,
+            `PART_GGXH`,
+            `PART_AZRQ`,
+            `PART_GHRQ`,
+            `PART_SM`,
+            `SY_STATUS`,
+            `PART_BJZTBM`,
+            `PART_BJZT`,
+            `PART_BJBM`,
+            `PART_SMYJZ`,
+            `PART_BZ`,
+            `PART_XTMK`,
+            `PART_XTMKBM`,
+            `SY_CREATETIME`,
+            `PART_GZSC`
+        )
+        VALUES
+            (
+                #{nxSparePartId},
+                #{partSbid},
+                #{partSbbm},
+                #{partAzwh},
+                #{partSn},
+                #{filePjmc},
+                #{partGgxh},
+                #{partAzrq},
+                #{partGhrq},
+                #{partSm},
+                '1',
+                '1',
+                '1',
+                #{partBjbm},
+                #{partSmyjz},
+                #{partBz},
+                #{partXtmk},
+                #{partXtmkBm},
+                now(),
+                #{partGzsc}
+            );
+
+
+    </insert>
+
+    <select id="getxtmkBypjbm" parameterType="com.rootcloud.domain.dto.NxSparePartVo" resultType="String">
+        SELECT FILE_XTMK from NX_PART_FILE where FILE_PJBM = #{partBjbm};
+    </select>
+
+    <select id="getxtmkBypjbm2" parameterType="com.rootcloud.domain.dto.NxSparePartVo" resultType="String">
+        SELECT FILE_XTMK from NX_PART_FILE where FILE_PJBM = #{partBjbm} and sy_zhid=#{syZhid}
+    </select>
+
+    <select id="getOrderData" resultType="com.rootcloud.domain.dto.NxSparePartVo">
+        SELECT a.SY_ZHID as syZhid,a.ORDER_DEVICECODE as partSbbm,c.NX_JCXX_SBLB_ID as partSbid,from_unixtime(a.ORDER_SHTGSJ/1000,"%Y-%m-%d") as orderShtgsj,
+               b.WXHJ_AZWH as partAzwh,
+               b.WXHJ_SNH as partSn,
+               b.WXHJ_BJZT as partBjzt,
+               b.WXHJ_BJZTCODE as partBjztbm,
+               b.WXHJ_PJBM as partBjbm,
+               b.WXHJ_SFGJBJ  as partSfgjbj,
+               d.FILE_PJMC as filePjmc,
+               d.FILE_GGXH as partGgxh,
+               d.FILE_LLSM as partSm,
+               d.FILE_SMYJZ as partSmyjz,
+               d.FILE_XTMK as partXtmk,
+               d.FILE_XTMKBM as partXtmkBm,
+               b.WXHJ_BZ as partBz
+        from nx_order a
+                join NX_BGB_WXHJ b on a.NX_ORDER_ID=b.NX_ORDER_ID
+                join nx_jcxx_sblb c on (a.ORDER_DEVICECODE=c.SBLB_SBBM and a.SY_ZHID=c.SY_ZHID)
+                join nx_part_file d on (b.WXHJ_PJBM=d.FILE_PJBM and a.SY_ZHID=d.SY_ZHID)
+        where a.ORDER_SERVICETYPE_CODE='001'
+        and a.SY_STATUS=1 and a.ORDER_SHTGSJ is not null and a.ORDER_SHTGSJ!=''
+        and b.WXHJ_SFGJBJ=1
+        <if test="sbId!=null and sbId!=''">
+            and c.NX_JCXX_SBLB_ID=#{sbId}
+        </if>
+        <if test="partId!=null and partId!=''">
+            and d.NX_PART_FILE_ID=#{partId}
+        </if>
+        order by a.ORDER_SHTGSJ asc
+    </select>
+
+    <select id="getSparePartBySbbmAndPjbm" parameterType="com.rootcloud.domain.dto.NxSparePartVo" resultType="com.rootcloud.domain.dto.NxSparePartVo">
+        SELECT
+            PART_BJZT AS partBjzt,
+            NX_SPARE_PART_ID AS nxSparePartId,
+            PART_AZRQ as partAzrq
+        FROM
+            NX_SPARE_PART
+        where PART_SBBM = #{partSbbm} and PART_BJBM = #{partBjbm}
+        order by PART_AZRQ desc
+    </select>
+
+    <select id="getDataByPartSbidAndPartBjbm" resultType="com.rootcloud.domain.entity.NxSparePartEntity">
+        select * from nx_spare_part
+        where PART_SBID=#{partSbid}
+        <if test="partAzwh!=null and partAzwh!=''"> and PART_AZWH=#{partAzwh}</if>
+        order by PART_AZRQ desc
+    </select>
+
+    <select id="getDataByPartSbidAndPartBjbmAndPartAzrq" resultType="com.rootcloud.domain.entity.NxSparePartEntity">
+        select * from nx_spare_part where PART_SBID=#{partSbid} and PART_AZRQ=#{partAzrq}
+        <if test="partAzwh!=null and partAzwh!=''"> and PART_AZWH=#{partAzwh}</if>
+    </select>
+
+    <select id="getWorkingHours" resultType="string">
+        select SUM(ONLINED_TIMES) from nx_device_working_times_day WHERE DEVICE_ID=#{partSbid}
+        and date_format(TIME,'%Y-%m-%d')>=#{partAzrq} and date_format(TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{partGhrq}
+    </select>
+
+    <update id="updateData">
+        UPDATE nx_spare_part
+        SET
+            PART_GHRQ = #{partGhrq} ,
+            PART_BJZTBM = '2',
+            PART_BJZT = '2',
+            PART_GZSC = #{partGzsc}
+        WHERE
+            (
+                NX_SPARE_PART_ID = #{nxSparePartId}
+                )
+    </update>
+</mapper>
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/TargetTypeDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/TargetTypeDao.xml
new file mode 100644
index 0000000..b685467
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/TargetTypeDao.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.dao.TargetTypeDAO">
+	<insert id="insert" parameterType="com.rootcloud.domain.vo.TargetTypeVO">
+		insert into rep_printer_target_type(targetName,targetCode)
+		values(#{targetName},#{targetCode})
+	</insert>
+
+	<update id="update" parameterType="com.rootcloud.domain.vo.TargetTypeVO">
+		update rep_printer_target_type
+		set
+		targetName = #{targetName},
+		targetCode = #{targetCode}
+		where id = #{id}
+	</update>
+
+	<delete id="deleteById">
+		delete from rep_printer_target_type where id = #{id}
+	</delete>
+
+	<select id="list" parameterType="com.rootcloud.domain.vo.TargetTypeVO" resultType="com.rootcloud.domain.vo.TargetTypeVO">
+		select id,targetName targetName, targetCode,
+		create_date createDate from rep_printer_target_type
+		where 1=1
+		<if test="targetName != '' and targetName != null">
+			and targetName=#{targetName}
+		</if>
+		<if test="targetCode != '' and targetCode != null">
+			and targetCode=#{targetCode}
+		</if>
+		order by id desc
+	</select>
+
+
+	<select id="getTargetTypeList" resultType="com.rootcloud.domain.vo.TargetTypeVO" >
+		select id, targetName as targetName, targetCode as targetCode, create_date as createDate, update_date as updateDate
+		from rep_printer_target_type
+	 </select>
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/TechnicalTaskDAO.xml b/nxgx-ifsm-base/src/main/resources/mapper/TechnicalTaskDAO.xml
new file mode 100644
index 0000000..6ab91a2
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/TechnicalTaskDAO.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.mapper.TechnicalTaskDAO">
+
+	<insert id="addTechnicalTaskData" parameterType="com.rootcloud.domain.vo.TechnicalTaskVO">
+		insert into technical_task(id,tenantId,technicalCode,deviceCode,deviceName,deviceXh,
+								   technicalComponent,technicalSparepart,technicalMethod,technicalHours,status,updateTime)
+		values
+			(#{id},#{tenantId},#{technicalCode},#{deviceCode},#{deviceName},#{deviceXh},
+			 #{technicalComponent},#{technicalSparepart},#{technicalMethod},#{technicalHours},#{status},#{updateTime})
+	</insert>
+
+	<select id="findTechnicalTaskList" parameterType="com.rootcloud.domain.vo.TechnicalTaskVO" resultType="com.rootcloud.domain.vo.TechnicalTaskVO">
+		select id,tenantId,technicalCode,deviceCode,deviceName,deviceXh,
+		technicalComponent,technicalSparepart,technicalMethod,technicalHours,status,updateTime
+		from technical_task
+		<where>
+			<if test="tenantId !=null and tenantId != ''">
+				and tenantId = #{tenantId}
+			</if>
+			and status = '0'
+			and updateTime <![CDATA[ >= ]]>  DATE_SUB(NOW(), INTERVAL 24 HOUR)
+		</where>
+		ORDER BY updateTime desc
+	</select>
+
+	<update id="updateTechnicalTaskStatus" parameterType="com.rootcloud.domain.vo.TechnicalTaskVO" >
+		update technical_task
+		<set>
+			<if test="null != status">status = #{status},</if>
+		</set>
+		<where>
+			<if test="null != tenantId  and tenantId != ''"> and tenantId = #{tenantId}</if>
+			<if test="null != technicalCode  and technicalCode != ''"> and technicalCode = #{technicalCode}</if>
+			<if test="null != deviceCode  and deviceCode != ''"> and deviceCode = #{deviceCode}</if>
+			<if test="null != id  and id != ''"> and id = #{id}</if>
+		</where>
+	</update>
+
+	<update id="updateTechnicalTask" parameterType="com.rootcloud.domain.vo.TechnicalTaskVO" >
+		update technical_task
+		<set>
+			<if test="null != orderId">orderId = #{orderId},</if>
+			<if test="null != orderNum">orderNum = #{orderNum},</if>
+		</set>
+		<where>
+			<if test="null != id  and id != ''"> and id = #{id}</if>
+		</where>
+	</update>
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/mapper/UserRoleDao.xml b/nxgx-ifsm-base/src/main/resources/mapper/UserRoleDao.xml
new file mode 100644
index 0000000..c55b641
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/mapper/UserRoleDao.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rootcloud.domain.mapper.UserRoleDao">
+
+	<select id="getUseListByRoleInfo" parameterType="com.rootcloud.domain.vo.UserRoleVO" resultType="com.rootcloud.domain.vo.UserRoleVO">
+		select userid as userId, USERNAME as userName,backUserCode as backUserCode,
+		roleIds as roleIds,roleNames as roleNames
+		from je_core_enduser
+		<where>
+			<if test="tenantId != null and tenantId != ''">
+				and zhid =#{tenantId}
+			</if>
+			<if test="userId != null and userId != ''">
+				and userId =#{userId}
+			</if>
+			and (roleIds like '%TWybnV3LWjHEWk7DugF%' or roleIds like '%10125624%')  <!--客户领导、客户-->
+		</where>
+	</select>
+
+
+
+</mapper>
diff --git a/nxgx-ifsm-base/src/main/resources/templates/error.html b/nxgx-ifsm-base/src/main/resources/templates/error.html
new file mode 100644
index 0000000..08616bc
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/templates/error.html
@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.thymeleaf.org ">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <link rel="shortcut icon" href="${baseUrl}/favicon.ico" />
+    <title>Your request cannot be processed</title>
+    <style>
+        ::-moz-selection {
+            background: #b3d4fc;
+            text-shadow: none;
+        }
+
+        ::selection {
+            background: #b3d4fc;
+            text-shadow: none;
+        }
+
+        html {
+            padding: 30px 10px;
+            font-size: 20px;
+            line-height: 1.4;
+            color: #737373;
+            background: #f0f0f0;
+            -webkit-text-size-adjust: 100%;
+            -ms-text-size-adjust: 100%;
+        }
+
+        html,
+        input {
+            font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+        }
+
+        body {
+            max-width: 500px;
+            _width: 500px;
+            padding: 30px 20px 50px;
+            border: 1px solid #b3b3b3;
+            border-radius: 4px;
+            margin: 0 auto;
+            box-shadow: 0 1px 10px #a7a7a7, inset 0 1px 0 #fff;
+            background: #fcfcfc;
+        }
+
+        h1 {
+            margin: 0 10px;
+            font-size: 50px;
+            text-align: center;
+        }
+
+        h1 span {
+            color: #bbb;
+        }
+
+        h3 {
+            margin: 1.5em 0 0.5em;
+        }
+
+        p {
+            margin: 1em 0;
+        }
+
+        ul {
+            padding: 0 0 0 40px;
+            margin: 1em 0;
+        }
+
+        .container {
+            max-width: 380px;
+            _width: 380px;
+            margin: 0 auto;
+        }
+
+        /* google search */
+
+        #goog-fixurl ul {
+            list-style: none;
+            padding: 0;
+            margin: 0;
+        }
+
+        #goog-fixurl form {
+            margin: 0;
+        }
+
+        #goog-wm-qt,
+        #goog-wm-sb {
+            border: 1px solid #bbb;
+            font-size: 16px;
+            line-height: normal;
+            vertical-align: top;
+            color: #444;
+            border-radius: 2px;
+        }
+
+        #goog-wm-qt {
+            width: 220px;
+            height: 20px;
+            padding: 5px;
+            margin: 5px 10px 0 0;
+            box-shadow: inset 0 1px 1px #ccc;
+        }
+
+        #goog-wm-sb {
+            display: inline-block;
+            height: 32px;
+            padding: 0 10px;
+            margin: 5px 0 0;
+            white-space: nowrap;
+            cursor: pointer;
+            background-color: #f5f5f5;
+            background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0), #f1f1f1);
+            background-image: -moz-linear-gradient(rgba(255, 255, 255, 0), #f1f1f1);
+            background-image: -ms-linear-gradient(rgba(255, 255, 255, 0), #f1f1f1);
+            background-image: -o-linear-gradient(rgba(255, 255, 255, 0), #f1f1f1);
+            -webkit-appearance: none;
+            -moz-appearance: none;
+            appearance: none;
+            *overflow: visible;
+            *display: inline;
+            *zoom: 1;
+        }
+
+        #goog-wm-sb:hover,
+        #goog-wm-sb:focus {
+            border-color: #aaa;
+            box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+            background-color: #f8f8f8;
+        }
+
+        #goog-wm-qt:hover,
+        #goog-wm-qt:focus {
+            border-color: #105cb6;
+            outline: 0;
+            color: #222;
+        }
+
+        input::-moz-focus-inner {
+            padding: 0;
+            border: 0;
+        }
+    </style>
+</head>
+<body>
+<div class="container">
+    <h1 th:text="#{error.title}">Your request cannot be processed <span>:(</span></h1>
+
+    <p th:text="#{error.subtitle}">Sorry, an error has occurred.</p>
+
+    <span th:text="#{error.status}">Status:</span>&nbsp;<span th:text="${error}"></span>&nbsp;(<span th:text="${error}"></span>)<br/>
+    <span th:if="${!#strings.isEmpty(message)}">
+        <span th:text="#{error.message}">Message:</span>&nbsp;<span th:text="${message}"></span><br/>
+    </span>
+
+    <script th:inline="text">
+        /*<![CDATA[*/
+        var GOOG_FIXURL_LANG = '[[${#locale.language}]]', GOOG_FIXURL_SITE = location.host;
+        /*]]>*/
+    </script>
+    <script src="https://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
+</div>
+</body>
+</html>
diff --git a/nxgx-ifsm-base/src/main/resources/templates/st/body.st b/nxgx-ifsm-base/src/main/resources/templates/st/body.st
new file mode 100644
index 0000000..b3bf1e0
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/templates/st/body.st
@@ -0,0 +1,19 @@
+$worksheet:{
+ <Worksheet ss:Name="$it.sheet$">
+  <Table ss:ExpandedColumnCount="$it.columnNum$" ss:ExpandedRowCount="$it.rowNum$" x:FullColumns="1"
+   x:FullRows="1" ss:DefaultColumnWidth="54" ss:DefaultRowHeight="14.25">
+   <Row>
+   $it.title:{
+   <Cell><Data ss:Type="String">$it$</Data></Cell>
+   }$
+   </Row>
+ $it.rows:{
+ <Row>
+ $it.result:{
+ <Cell><Data ss:Type="String">$it$</Data></Cell>
+ }$
+   </Row>
+ }$
+  </Table>
+ </Worksheet>
+}$
diff --git a/nxgx-ifsm-base/src/main/resources/templates/st/head.st b/nxgx-ifsm-base/src/main/resources/templates/st/head.st
new file mode 100644
index 0000000..6c85845
--- /dev/null
+++ b/nxgx-ifsm-base/src/main/resources/templates/st/head.st
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<?mso-application progid="Excel.Sheet"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:x="urn:schemas-microsoft-com:office:excel"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:html="http://www.w3.org/TR/REC-html40">
+ <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+  <Created>1996-12-17T01:32:42Z</Created>
+  <LastSaved>2013-08-02T09:21:24Z</LastSaved>
+  <Version>11.9999</Version>
+ </DocumentProperties>
+ <OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
+  <RemovePersonalInformation/>
+ </OfficeDocumentSettings>
+ <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+  <WindowHeight>4530</WindowHeight>
+  <WindowWidth>8505</WindowWidth>
+  <WindowTopX>480</WindowTopX>
+  <WindowTopY>120</WindowTopY>
+  <AcceptLabelsInFormulas/>
+  <ProtectStructure>False</ProtectStructure>
+  <ProtectWindows>False</ProtectWindows>
+ </ExcelWorkbook>
+ <Styles>
+  <Style ss:ID="Default" ss:Name="Normal">
+   <Alignment ss:Vertical="Bottom"/>
+   <Borders/>
+   <Font ss:FontName="宋体" x:CharSet="134" ss:Size="12"/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection/>
+  </Style>
+ </Styles>
diff --git a/nxgx-ifsm-base/src/test/java/com/everyone/test/DemoTest.java b/nxgx-ifsm-base/src/test/java/com/everyone/test/DemoTest.java
new file mode 100644
index 0000000..5a60884
--- /dev/null
+++ b/nxgx-ifsm-base/src/test/java/com/everyone/test/DemoTest.java
@@ -0,0 +1,177 @@
+package com.everyone.test;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import com.rootcloud.NXGXBaseApp;
+import com.rootcloud.common.DateUtil;
+import com.rootcloud.common.HttpClientUtil;
+import com.rootcloud.common.TokenUtil;
+import com.rootcloud.common.enums.HttpRequestMethedEnum;
+import com.rootcloud.vo.device.BaseDeviceVO;
+import com.rootcloud.vo.device.CommonDeviceHistorySituationVO;
+import com.rootcloud.vo.device.DeviceHistorySituationVO;
+import jline.internal.Log;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.ObjectUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @ClassName DemoTest
+ * @Description TODO
+ * @Author w-liuyi01
+ * @Date 2022/4/20 17:16
+ * @Version 1.0
+ */
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = NXGXBaseApp.class)
+public class DemoTest {
+
+    @Autowired
+    private TokenUtil tokenUtil;
+
+    @Value("${os.iam.superToken}")
+    private String superToken;
+
+    @Value("${os.iam.domain}")
+    private String reqUrl;
+
+
+    @Test
+    public void Test01() throws ParseException {
+        // TODO: 2022/4/20
+        callHistoryInterface("191QapNZHUY","191JYHoO4N2","2022-04-07T02:00:02.123Z","2022-04-21T02:00:02.123Z",1,10);
+    }
+
+
+    public void callHistoryInterface(String deviceId, String modelId, String startTime ,String endTime,Integer skip,Integer limit) throws ParseException {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Authorization", "Bearer "+tokenUtil.getToken());
+        CommonDeviceHistorySituationVO situationVO = new CommonDeviceHistorySituationVO();
+        try {
+             String resp = HttpClientUtil.sendHttp(HttpRequestMethedEnum.HttpGet, reqUrl+"historian-manage/v1/historian/models/" + modelId + "/things/" + deviceId+"?startTime="+startTime+"&endTime="+endTime+"&skip="+skip+"&limit="+limit, null, headers);
+//            Log.info("平台历史工况接口返回数据：{}",resp);
+           JSONObject jsonObject = new JSONObject(resp);
+            JSONArray array = jsonObject.getJSONArray("payload");
+            array.stream().forEach(temp->{
+                JSONObject obj = (JSONObject)temp;
+                List<Map<String,Object>> list = new ArrayList<>();
+                List<BaseDeviceVO> baseDeviceVOS = new ArrayList<>();
+                JSONArray array2=obj.getJSONArray("rows");
+                array2.stream().forEach(temp1->{
+                    JSONArray array1=obj.getJSONArray("columns");
+                    JSONArray array3 = (JSONArray)temp1;
+                    Map<String,Object> map = new HashMap<>();
+                    for(int i=0;i<array1.size();i++){
+                        map.put(array1.get(i).toString(),array3.get(i));
+                    }
+                    list.add(map);
+                });
+                for (int i=0;i<list.size();i++){
+                    BaseDeviceVO baseDeviceVO = new BaseDeviceVO();
+                    baseDeviceVO.setDeviceId(obj.get("thingId").toString());
+                    baseDeviceVO.setModelId(obj.get("modelId").toString());
+                    if (!ObjectUtils.isEmpty(baseDeviceVO)){
+                        baseDeviceVO.setDeviceSbbm("jeDeviceEntity.getDeviceSbbm()");
+                        baseDeviceVO.setDeviceSblx("jeDeviceEntity.getDeviceSblx()");
+                        baseDeviceVO.setDeviceSbmc("jeDeviceEntity.getDeviceSbmc()");
+                        baseDeviceVO.setDeviceSbxh("jeDeviceEntity.getDeviceSbxh()");
+                    }
+                    baseDeviceVO.setUpdateTime(list.get(i).get("time").toString());
+                    baseDeviceVOS.add(baseDeviceVO);
+                }
+                situationVO.setMapList(list);
+                situationVO.setBaseDeviceVOList(baseDeviceVOS);
+            });
+        } catch (Exception e) {
+            System.out.println("调用平台历史工况信息error");
+        }
+    }
+
+    @Test
+    public void Test03() {
+        String deviceId = "191QapNZHUY";
+        String modelId = "191JYHoO4N2";
+        CommonDeviceHistorySituationVO situationVO = new CommonDeviceHistorySituationVO();
+        HttpRequest request = HttpRequest.get(reqUrl +"historian-manage/v1/historian/models/" + modelId + "/things/" + deviceId);
+        Map<String, Object> map = new HashMap<>(16);
+        String startTime ="2022-04-07T02:00:02.123Z";
+        String endTime ="2022-04-21T02:00:02.123Z";
+        map.put("startTime", startTime);
+        map.put("endTime", endTime);
+        com.alibaba.fastjson.JSONArray properties = new com.alibaba.fastjson.JSONArray();
+        properties.add("__location__.state");
+        properties.add("__location__.city");
+        map.put("properties",properties.toString());
+        request.form(map);
+        request.header("Authorization", "Bearer " + tokenUtil.getToken());
+        request.header("accept", "application/json");
+        request.header("Content-Type", "application/json");
+
+        HttpResponse response = request.execute();
+        String result = response.body();
+        JSONObject jsonObject = new JSONObject(result);
+        JSONArray array = jsonObject.getJSONArray("payload");
+
+        array.stream().forEach(temp->{
+            JSONObject obj = (JSONObject)temp;
+            List<Map<String,Object>> list = new ArrayList<>();
+            List<BaseDeviceVO> baseDeviceVOS = new ArrayList<>();
+            JSONArray array2=obj.getJSONArray("rows");
+            array2.stream().forEach(temp1->{
+                JSONArray array1=obj.getJSONArray("columns");
+                JSONArray array3 = (JSONArray)temp1;
+                Map<String,Object> map1 = new HashMap<>();
+                for(int i=0;i<array1.size();i++){
+                    map1.put(array1.get(i).toString(),array3.get(i));
+                }
+                list.add(map1);
+            });
+            for (int i=0;i<list.size();i++){
+                BaseDeviceVO baseDeviceVO = new BaseDeviceVO();
+                baseDeviceVO.setDeviceId(obj.get("thingId").toString());
+                baseDeviceVO.setModelId(obj.get("modelId").toString());
+                if (!ObjectUtils.isEmpty(baseDeviceVO)){
+                    baseDeviceVO.setDeviceSbbm("jeDeviceEntity.getDeviceSbbm()");
+                    baseDeviceVO.setDeviceSblx("jeDeviceEntity.getDeviceSblx()");
+                    baseDeviceVO.setDeviceSbmc("jeDeviceEntity.getDeviceSbmc()");
+                    baseDeviceVO.setDeviceSbxh("jeDeviceEntity.getDeviceSbxh()");
+                }
+                baseDeviceVO.setUpdateTime(list.get(i).get("time").toString());
+                baseDeviceVOS.add(baseDeviceVO);
+            }
+            situationVO.setMapList(list);
+            situationVO.setBaseDeviceVOList(baseDeviceVOS);
+        });
+
+        //List<ModelEntity> list = JSONUtil.toList(array.toString(), ModelEntity.class);
+    }
+
+    @Test
+    public void testTime() throws ParseException {
+        String dtime1 = "2021-06-10 22:04:34";
+        Date date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(dtime1);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+        //format将Date型转换为String型，parse将String型转换为Date型
+        String UTCDate = sdf.format(date);
+        System.out.println(UTCDate);
+    }
+
+    @Test
+    public void testTime1() {
+        String s = DateUtil.reverseHandlerTime("2022-04-07T02:00:02.05Z");
+        System.out.println(s);
+    }
+
+
+}
diff --git a/nxgx-ifsm-base/src/test/java/com/rootcloud/NxgxApplicationTests.java b/nxgx-ifsm-base/src/test/java/com/rootcloud/NxgxApplicationTests.java
new file mode 100644
index 0000000..f93c961
--- /dev/null
+++ b/nxgx-ifsm-base/src/test/java/com/rootcloud/NxgxApplicationTests.java
@@ -0,0 +1,106 @@
+package com.rootcloud;
+
+import com.rootcloud.controller.*;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = NXGXBaseApp.class,
+        webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+//@ActiveProfiles("dev")
+@AutoConfigureMockMvc
+public class NxgxApplicationTests {
+
+    private Logger logger = LoggerFactory.getLogger(NxgxApplicationTests.class);
+
+    @Autowired
+    private MockMvc mockMvc;
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    @Autowired
+    protected WebApplicationContext wac;
+    @Autowired
+    private JobController jobController;
+    @Autowired
+    private DeviceController deviceController;
+    @Autowired
+    private AppDeviceController appDeviceController;
+    @Autowired
+    private DeviceHistorySituationController deviceHistorySituationController;
+    @Autowired
+    private WorkStatusMonitorController workStatusMonitorController;
+
+    @Before()  //这个方法在每个方法执行之前都会执行一遍
+    public void setup() {
+
+        mockMvc = MockMvcBuilders.webAppContextSetup(wac).build();  //初始化MockMvc对象
+
+
+    }
+
+
+    @org.junit.Test
+    public void getAllCategoryTest() throws Exception {
+        workStatusMonitorController.queryWorkStatus("CWnS7aGB5cfxZLXO3wv","0");
+   /*    DevicePropertyValueParam devicePropertyValueParam = new DevicePropertyValueParam();
+       devicePropertyValueParam.setDeviceId("19w5OHDnldK");
+       List<String> propertyIds = new ArrayList<>();
+       propertyIds.add("SB_ActivatorCost");
+       propertyIds.add("SB_BinderCost");
+       propertyIds.add("SB_MX_SandTotal_A");
+       propertyIds.add("SB_MX_SandTotal_B");
+       propertyIds.add("HMI_JobID");
+       propertyIds.add("HMI_BeginTime");
+       propertyIds.add("HMI_EndTime");
+       propertyIds.add("HMI_TotalTimeCost");
+       propertyIds.add("HMI_Thickness");
+       propertyIds.add("HMI_Volume");
+       propertyIds.add("HMI_CurPrintLayer");
+       propertyIds.add("HMI_TotalLayer");
+       devicePropertyValueParam.setPropertyIds(propertyIds);
+
+        appDeviceController.queryPropertyValueByParam(devicePropertyValueParam);*/
+       /* DeviceTrendParam deviceTrendParam = new DeviceTrendParam();
+        deviceTrendParam.setDeviceId1("1a9xTpUkLy8");
+        //deviceTrendParam.setDeviceId2("19AEOlfhd6g");
+        deviceTrendParam.setProperty1("HMI_Volume");
+        deviceTrendParam.setProperty2("HMI_TotalTimeCost");
+        deviceTrendParam.setTime("2022-05-21 00:00:00~2022-05-25 05:16:00");
+        deviceHistorySituationController.queryWorkTrendData(deviceTrendParam);*/
+        // deviceController.monthWorkTimeStatistics("19w5MvShZaE","2022-05-21");
+        //deviceController.display();
+
+    }
+//        //jobController.syncThingModelData();
+//        DeviceAlarmParam param = new DeviceAlarmParam();
+//        param.setTag("1");
+//        param.setTime("2021-12-20 00:00:00~2022-04-20 00:00:00");
+//        param.setPageSize(50);
+//        param.setCurrentPage(1);
+//        param.setAlarmRule("2");
+//        param.setDeviceId("199NDWUrRew");
+//        deviceController.queryDeviceAlarmInfo(param);
+
+//    String responseString = mockMvc.perform(
+//            get("/job/syncData")
+//                .contentType(MediaType.APPLICATION_JSON_UTF8)
+//                .param("pcode", "root")
+//                    .header("abc","123")
+//        ).andExpect(status().isOk())    //返回的状态是200
+//        .andDo(print())         //打印出请求和相应的内容
+//        .andReturn().getResponse().getContentAsString();   //将相应的数据转换为字符串
+//    System.out.println("--------返回的json = " + responseString);
+//    }
+
+}
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..92cdba3
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
+    <parent>
+        <groupId>com.irootech</groupId>
+        <artifactId>irootech-parent</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>com.rootcloud</groupId>
+    <artifactId>nxgx-base</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>nxgx-base</name>
+    <description>desc</description>
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    </properties>
+    <modules>
+        <module>nxgx-commons</module>
+        <module>nxgx-ifsm-base</module>
+    </modules>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>2.3.4.RELEASE</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>0.8.5</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <testFailureIgnore>true</testFailureIgnore>
+                    </configuration>
+                    <version>2.22.2</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/com/rootcloud/*/entity/*</exclude>
+                        <exclude>**/com/rootcloud/*/vo/*</exclude>
+                        <exclude>**/com/rootcloud/*/exception/*</exclude>
+                        <exclude>**/com/rootcloud/exception/*</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>post-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>3.0.0-M4</version>
+            </plugin>
+        </plugins>
+    </reporting>
+
+</project>