96333 问题修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/RuleDangerService.java

 package com.yeejoin.amos.latentdanger.business.service.impl;
 
-import com.google.common.collect.Sets;
 import com.yeejoin.amos.boot.biz.common.constants.RuleConstant;
 import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
@@ -8,7 +7,6 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.rule.RuleTrigger;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import com.yeejoin.amos.latentdanger.business.dto.LatentDangerRo;
 import com.yeejoin.amos.latentdanger.business.feign.JcsFeignClient;
@@ -17,15 +15,16 @@ import com.yeejoin.amos.latentdanger.common.enums.LatentDangerState;
 import com.yeejoin.amos.latentdanger.dao.entity.LatentDanger;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @Author: xl
@@ -48,7 +47,8 @@ public class RuleDangerService {
         latentDangerRo.setTerminal(RuleConstant.APP);
         List<RoleModel> result = Privilege.roleClient.queryRoleList(roleName, null).getResult();
         if (result.size() > 0) {
-            List<AgencyUserModel> userModels = Privilege.agencyUserClient.queryByRoleId(String.valueOf(result.get(0).getSequenceNbr()), null).getResult();
+            List<AgencyUserModel> userModels =
+                    Privilege.agencyUserClient.queryByRoleId(String.valueOf(result.get(0).getSequenceNbr()), null).getResult();
 
             //只发送给本部门的人员
             Long pointId = latentDanger.getBizInfo().getLong("pointId");

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/async/AsyncTask.java

@@ -171,7 +171,9 @@ public class AsyncTask {
         try {
             List<RoleModel> result = Privilege.roleClient.queryRoleList(roleName, null).getResult();
             if (result.size() > 0) {
-                List<AgencyUserModel> userModels = Privilege.agencyUserClient.queryByRoleId(String.valueOf(result.get(0).getSequenceNbr()), null).getResult();
+                List<AgencyUserModel> userModels =
+                        Privilege.agencyUserClient.queryByRoleId(String.valueOf(result.get(0).getSequenceNbr()), null
+                                ).getResult();
                 List<String> userIds = userModels.stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
                 model.setRecivers(userIds);
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/feign/RemoteSecurityService.java

 package com.yeejoin.amos.latentdanger.feign;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-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.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -41,6 +21,25 @@ import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.amos.latentdanger.business.util.CommonResponse;
 import com.yeejoin.amos.latentdanger.business.util.Toke;
 import com.yeejoin.amos.latentdanger.common.remote.IAMOSSecurityServer;
+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.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 @Service("remoteSecurityService-danger")
 public class RemoteSecurityService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanTaskServiceImpl.java

@@ -6,9 +6,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.beust.jcommander.internal.Sets;
 import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.biz.common.enums.RuleTypeEnum;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -17,8 +18,19 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import com.yeejoin.amos.supervision.business.constants.XJConstant;
-import com.yeejoin.amos.supervision.business.dao.mapper.*;
-import com.yeejoin.amos.supervision.business.dao.repository.*;
+import com.yeejoin.amos.supervision.business.dao.mapper.CheckReportMapper;
+import com.yeejoin.amos.supervision.business.dao.mapper.HiddenDangerMapper;
+import com.yeejoin.amos.supervision.business.dao.mapper.PlanMapper;
+import com.yeejoin.amos.supervision.business.dao.mapper.PlanTaskDetailMapper;
+import com.yeejoin.amos.supervision.business.dao.mapper.PlanTaskMapper;
+import com.yeejoin.amos.supervision.business.dao.mapper.PointMapper;
+import com.yeejoin.amos.supervision.business.dao.mapper.RoutePointItemMapper;
+import com.yeejoin.amos.supervision.business.dao.repository.ICheckDao;
+import com.yeejoin.amos.supervision.business.dao.repository.IPlanDao;
+import com.yeejoin.amos.supervision.business.dao.repository.IPlanTaskDao;
+import com.yeejoin.amos.supervision.business.dao.repository.IPlanTaskDetailDao;
+import com.yeejoin.amos.supervision.business.dao.repository.IPointInputItemDao;
+import com.yeejoin.amos.supervision.business.dao.repository.IRoutePointDao;
 import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto;
 import com.yeejoin.amos.supervision.business.entity.mybatis.CheckChkExListBo;
 import com.yeejoin.amos.supervision.business.entity.mybatis.PointCheckDetailBo;
@@ -37,23 +49,28 @@ import com.yeejoin.amos.supervision.business.vo.CalDateVo;
 import com.yeejoin.amos.supervision.business.vo.CodeOrderVo;
 import com.yeejoin.amos.supervision.business.vo.LeavePlanTaskVo;
 import com.yeejoin.amos.supervision.business.vo.PlanTaskVo;
-import com.yeejoin.amos.supervision.common.enums.*;
-import com.yeejoin.amos.boot.biz.common.enums.RuleTypeEnum;
+import com.yeejoin.amos.supervision.common.enums.PlanStatusEnum;
+import com.yeejoin.amos.supervision.common.enums.PlanTaskDetailIsFinishEnum;
+import com.yeejoin.amos.supervision.common.enums.PlanTaskFinishStatusEnum;
 import com.yeejoin.amos.supervision.core.common.dto.DangerDto;
 import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
 import com.yeejoin.amos.supervision.core.common.response.AppCheckInputRespone;
 import com.yeejoin.amos.supervision.core.common.response.AppPointCheckRespone;
 import com.yeejoin.amos.supervision.core.util.DateUtil;
 import com.yeejoin.amos.supervision.core.util.StringUtil;
-import com.yeejoin.amos.supervision.dao.entity.*;
+import com.yeejoin.amos.supervision.dao.entity.Check;
+import com.yeejoin.amos.supervision.dao.entity.CheckReport;
+import com.yeejoin.amos.supervision.dao.entity.HiddenDanger;
+import com.yeejoin.amos.supervision.dao.entity.Plan;
+import com.yeejoin.amos.supervision.dao.entity.PlanTask;
+import com.yeejoin.amos.supervision.dao.entity.PlanTaskDetail;
+import com.yeejoin.amos.supervision.dao.entity.Point;
 import com.yeejoin.amos.supervision.exception.YeeException;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
 import com.yeejoin.amos.supervision.quartz.IJobService;
 import org.apache.commons.collections.CollectionUtils;
-import com.google.common.collect.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
@@ -68,7 +85,17 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import java.sql.Time;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/feign/RemoteSecurityService.java

 package com.yeejoin.amos.supervision.feign;
 
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import com.yeejoin.amos.feign.systemctl.model.MessageModel;
-import com.yeejoin.amos.supervision.business.feign.JCSFeignClient;
-import com.yeejoin.amos.supervision.common.remote.IAMOSSecurityServer;
-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.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -42,9 +19,29 @@ import com.yeejoin.amos.feign.privilege.model.PermissionModel;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import com.yeejoin.amos.supervision.business.feign.JCSFeignClient;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
 import com.yeejoin.amos.supervision.business.util.Toke;
-import org.typroject.tyboot.core.foundation.context.RequestContextModel;
+import com.yeejoin.amos.supervision.common.remote.IAMOSSecurityServer;
+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.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 @Service("remoteSecurityService")
 public class RemoteSecurityService {

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -541,12 +541,10 @@
 		ifnull ( ibjui."LONGITUDE_LATITUDE"::json->> 'longitude', null ) AS longitude,
 		a.alert_stage AS alertStatus,
 		ibjui.RECORD AS elevatorId,
-		ibjri.SUPERVISORY_CODE AS elevatorCode
+		ibjoi.SUPERVISORY_CODE AS elevatorCode
 		FROM tz_alert_called a
-		LEFT JOIN tcb_elevator e ON e.sequence_nbr = a.equipment_id
 		LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjoi.RECORD = a.equipment_id
 		LEFT JOIN idx_biz_jg_use_info ibjui ON ibjui.RECORD = ibjoi.RECORD
-		LEFT JOIN idx_biz_jg_register_info ibjri ON ibjri.RECORD = ibjoi.RECORD
 		WHERE a.is_delete = 0
 		<choose>
 			<when test="isHistory == true">

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/ElevatorMapper.xml

@@ -332,7 +332,6 @@
     <select id="selectElevatorList" resultType="java.util.Map">
         SELECT
         jui.RECORD AS sequenceNbr,
-        jui.USE_UNIT_NAME AS useUnit,
         ifnull ( joi.CODE96333, null ) AS rescueCode,
         ifnull ( joi.SUPERVISORY_CODE, null ) AS registerCode,
         ifnull ( jui.USE_UNIT_NAME, null ) AS useUnit,
@@ -362,9 +361,8 @@
             AND jui.RECORD = #{elevator.originalId}
         </if>
         <if test="elevator.address!=null and elevator.address!='' ">
-            AND jui.ADDRESS = #{elevator.address}
+            AND jui.ADDRESS like concat('%', #{elevator.address}, '%')
         </if>
-        limit 1
     </select>
     <select id="selectRegisterFiles" resultType="java.util.Map">
         select USE_REGISTRATION_CERTIFICATE, USE_SIGN, PRODUCT_PHOTO
@@ -430,7 +428,6 @@
 
                     </if>
         </where>
-limit 10
     </select>
 
     <select id="selectElevatorEsList" resultType="java.util.Map">
@@ -478,8 +475,7 @@ limit 10
             ibjui."USE_UNIT_CREDIT_CODE" AS useCode
         FROM
             idx_biz_jg_maintenance_record_info ibjmri
-                LEFT JOIN idx_biz_jg_use_info ibjui ON ibjmri."RECORD" = ibjui."RECORD"
-                LEFT JOIN tz_base_enterprise_info tbei ON ibjui."USE_UNIT_CREDIT_CODE" = tbei.use_code
+                LEFT JOIN tz_base_enterprise_info tbei ON ibjmri."ME_UNIT_CREDIT_CODE" = tbei.use_code
         where
             ibjmri.RECORD = #{sequenceNbr}
         order by ibjmri.REC_DATE
@@ -491,7 +487,8 @@ limit 10
             ibjui.SAFETY_MANAGER AS manager,
             ibjui.PHONE AS managerPhone,
             ibjui.USE_UNIT_NAME as useUnitName,
-            tbei.address AS address
+            tbei.address AS address,
+            tbei.sequence_nbr AS unitId
         FROM
             idx_biz_jg_use_info ibjui
             LEFT JOIN tz_base_enterprise_info tbei ON ibjui.USE_UNIT_CREDIT_CODE = tbei.use_code

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/UseUnitController.java

@@ -7,11 +7,10 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import com.yeejoin.amos.boot.module.elevator.api.dto.DutyPersonDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.UseUnitDto;
-import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.elevator.api.entity.UseUnit;
 import com.yeejoin.amos.boot.module.elevator.api.service.IUseUnitService;
-import com.yeejoin.amos.boot.module.elevator.api.dto.DutyPersonDto;
 import com.yeejoin.amos.boot.module.elevator.biz.service.impl.ElevatorServiceImpl;
 import com.yeejoin.amos.boot.module.elevator.biz.utils.BeanDtoVoUtils;
 import io.swagger.annotations.Api;
@@ -27,7 +26,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -232,6 +230,8 @@ public class UseUnitController extends BaseController {
         UseUnitDto useUnitVo = new UseUnitDto();
         useUnitVo.setUseUnitName(ObjectUtils.isEmpty(useUnitMap.get("useUnitName")) ? null : String.valueOf(useUnitMap.get("useUnitName")));
         useUnitVo.setAddress(ObjectUtils.isEmpty(useUnitMap.get("address")) ? null : String.valueOf(useUnitMap.get("address")));
+        useUnitVo.setSequenceNbr(ObjectUtils.isEmpty(useUnitMap.get("unitId")) ? null : Long.valueOf(useUnitMap.get(
+                "unitId").toString()));
         List<DutyPersonDto> dutyPersonList = new ArrayList<DutyPersonDto>();
         DutyPersonDto principal = new DutyPersonDto();
         principal.setDeptName("主要负责人");

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertCalledServiceImpl.java

@@ -8,15 +8,31 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
-import com.yeejoin.amos.boot.module.elevator.api.dto.*;
-import com.yeejoin.amos.boot.module.elevator.api.entity.*;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertCalledDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertCalledFormDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertCalledObjsDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertCalledQueryDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertCalledRecordDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertHandlerDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertHandlerInfoDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertPaperInfoDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.FormValue;
+import com.yeejoin.amos.boot.module.elevator.api.dto.TzsCitInfoDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.WechatMyBusinessListDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.WechatMyBussinessDto;
+import com.yeejoin.amos.boot.module.elevator.api.entity.AlertCalled;
+import com.yeejoin.amos.boot.module.elevator.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.elevator.api.entity.DispatchPaper;
+import com.yeejoin.amos.boot.module.elevator.api.entity.DispatchTask;
+import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
+import com.yeejoin.amos.boot.module.elevator.api.entity.TzsCitInfo;
+import com.yeejoin.amos.boot.module.elevator.api.entity.VoiceRecordFile;
 import com.yeejoin.amos.boot.module.elevator.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.elevator.api.enums.DispatchPaperEnums;
 import com.yeejoin.amos.boot.module.elevator.api.enums.EquipmentClassifityEnum;
@@ -41,7 +57,15 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -161,18 +185,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 //                alertCalledDto.setUseUnit(elevator.getUseUnit());
 //                alertCalledDto.setRegionCode(elevator.getRegionCode());
 //            }
-            if(!ValidationUtil.isEmpty(alertCalledDto.getUseSiteCategory())) {
-                LambdaQueryWrapper<DataDictionary> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(DataDictionary::getCode, alertCalledDto.getUseSiteCategory());
-                DataDictionary dataDictionary = iDataDictionaryService.getOne(wrapper);
-                if (!ValidationUtil.isEmpty(dataDictionary)) {
-                    alertCalledDto.setUseSiteCategory(dataDictionary.getName());
-                } else {
-                    alertCalledDto.setUseSiteCategory("");
-                }
-            } else {
-                alertCalledDto.setUseSiteCategory("");
-            }
             String voiceRecord = "";
             VoiceRecordFile temp = voiceRecordFileServiceImpl.getOne(new LambdaQueryWrapper<VoiceRecordFile>().eq(VoiceRecordFile::getAlertId,id).eq(VoiceRecordFile::getAlertStageCode,"860").orderByAsc(VoiceRecordFile::getRecDate));
             if(temp != null) {

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/DispatchPaperServiceImpl.java

@@ -18,8 +18,6 @@ import com.yeejoin.amos.boot.module.elevator.api.dto.RescueProcessDto;
 import com.yeejoin.amos.boot.module.elevator.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.elevator.api.entity.DispatchPaper;
 import com.yeejoin.amos.boot.module.elevator.api.entity.DispatchTask;
-import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
-import com.yeejoin.amos.boot.module.elevator.api.entity.MaintenanceUnit;
 import com.yeejoin.amos.boot.module.elevator.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.elevator.api.enums.DispatchPaperEnums;
 import com.yeejoin.amos.boot.module.elevator.api.enums.TzsCommonParam;
@@ -181,7 +179,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         Map<String,Object> map  = elevatorServiceImpl.selectByAlertId(alertId);
         if(!ObjectUtils.isEmpty(map.get("sequenceNbr"))) {
             List<Map<String,Object>> mapList = elevatorMapper.selectMtByAlertId(String.valueOf(map.get("sequenceNbr")));
-            if(ObjectUtils.isEmpty(mapList)){
+            if(!ObjectUtils.isEmpty(mapList)){
                 dispatchPaper.setRepairOrgCreditCode(String.valueOf(mapList.get(0).get("useCode")));
             }
         }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/DispatchTaskServiceImpl.java

@@ -24,21 +24,18 @@ import com.yeejoin.amos.boot.module.elevator.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.elevator.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.elevator.api.entity.DispatchPaper;
 import com.yeejoin.amos.boot.module.elevator.api.entity.DispatchTask;
-import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
-import com.yeejoin.amos.boot.module.elevator.api.entity.MaintenanceUnit;
 import com.yeejoin.amos.boot.module.elevator.api.entity.RescueProcess;
 import com.yeejoin.amos.boot.module.elevator.api.entity.RescueStation;
 import com.yeejoin.amos.boot.module.elevator.api.entity.Template;
-import com.yeejoin.amos.boot.module.elevator.api.entity.UseUnit;
+import com.yeejoin.amos.boot.module.elevator.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.elevator.api.entity.WechatRelation;
 import com.yeejoin.amos.boot.module.elevator.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.elevator.api.enums.DispatchPaperEnums;
 import com.yeejoin.amos.boot.module.elevator.api.enums.TzsCommonParam;
 import com.yeejoin.amos.boot.module.elevator.api.mapper.DispatchTaskMapper;
 import com.yeejoin.amos.boot.module.elevator.api.service.IDispatchTaskService;
-import com.yeejoin.amos.boot.module.elevator.api.service.IMaintenanceUnitService;
 import com.yeejoin.amos.boot.module.elevator.api.service.IRescueStationService;
-import com.yeejoin.amos.boot.module.elevator.api.service.IUseUnitService;
+import com.yeejoin.amos.boot.module.elevator.api.service.ITzBaseEnterpriseInfoService;
 import com.yeejoin.amos.boot.module.elevator.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -89,10 +86,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
     AlertFormValueServiceImpl iAlertFormValueService;
 
     @Autowired
-    IUseUnitService iUseUnitService;
-
-    @Autowired
-    IMaintenanceUnitService iMaintenanceUnitService;
+    ITzBaseEnterpriseInfoService enterpriseInfoService;
 
     @Autowired
     IRescueStationService iRescueStationService;
@@ -835,10 +829,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
         flag = this.save(dispatchTask);
         if(flag) { // 创建好派遣任务单以后根据任务单类型修改派遣单信息
             // 社会信用代码 根据类型查找放入
-            MaintenanceUnit maintenanceUnit = null;
+	        TzBaseEnterpriseInfo maintenanceUnit;
             switch (dispatchTask.getOrgTypeCode()) {
                 case "useUnit": // 使用单位
-                    UseUnit useUnit = iUseUnitService.getById(dispatchTask.getResponseOrgId());
+	                TzBaseEnterpriseInfo useUnit =
+			                enterpriseInfoService.getById(dispatchTask.getResponseOrgId());
                     dispatchPaper.setUseOrgId(useUnit.getSequenceNbr());
                     dispatchPaper.setUseOrgTaskId(dispatchTask.getSequenceNbr());
                     if(AlertStageEnums.getEnumById(dispatchPaper.getAlertCode()).getCode().equals(AlertStageEnums.KRJY.getCode())) {
@@ -851,13 +846,13 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                     }
                     break;
                 case "repairUnit":
-                    maintenanceUnit  = iMaintenanceUnitService.getById(dispatchTask.getResponseOrgId());
+                    maintenanceUnit = enterpriseInfoService.getById(dispatchTask.getResponseOrgId());
                     dispatchPaper.setRepairOrgId(maintenanceUnit.getSequenceNbr());
                     dispatchPaper.setRepairOrgTaskId(dispatchTask.getSequenceNbr());
                     break;
                 case "levelOneUnit":
-                    maintenanceUnit  = iMaintenanceUnitService.getById(dispatchTask.getResponseOrgId());
-                    String socialCreditCode = maintenanceUnit.getSocialCreditCode();
+	                maintenanceUnit = enterpriseInfoService.getById(dispatchTask.getResponseOrgId());
+	                String socialCreditCode = maintenanceUnit.getUseCode();
                     dispatchPaper.setRepairOrgId(maintenanceUnit.getSequenceNbr());
                     dispatchPaper.setRepairOrgTaskId(dispatchTask.getSequenceNbr());
                     // 修改动态字段

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/ElevatorServiceImpl.java

@@ -13,19 +13,21 @@ import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
-import com.yeejoin.amos.boot.module.elevator.api.dto.*;
-import com.yeejoin.amos.boot.module.elevator.api.entity.*;
-import com.yeejoin.amos.boot.module.elevator.api.enums.EquimentEnum;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertCalledDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDtoNew;
+import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorInsureDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorWlInfoDto;
+import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
+import com.yeejoin.amos.boot.module.elevator.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.elevator.api.enums.TzsCommonParam;
 import com.yeejoin.amos.boot.module.elevator.api.mapper.ElevatorMapper;
-import com.yeejoin.amos.boot.module.elevator.api.service.IElevatorInsureRelationService;
 import com.yeejoin.amos.boot.module.elevator.api.service.IElevatorService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
@@ -212,8 +214,9 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
     public Map<String,Object> selectByAlertId(Long alertId) {
         AlertCalledDto alertCalledDto = alertCalledServiceImpl.queryBySeq(alertId);
         if (ValidationUtil.isEmpty(alertCalledDto)
-                || ValidationUtil.isEmpty(alertCalledDto.getDeviceId()))
-            throw new BadRequest("警情不存在或者设备编码不存在");
+                || ValidationUtil.isEmpty(alertCalledDto.getDeviceId())) {
+	        throw new BadRequest("警情不存在或者设备编码不存在");
+        }
         // 设备类型 和 编码 确定设备的使用单位或者维保单位
         String equipmentClassificationCode = alertCalledDto.getEquipmentClassificationCode();
         String deviceId = alertCalledDto.getEquipmentId();
@@ -224,8 +227,9 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
 //        LambdaQueryWrapper<Elevator> queryWrapper = new LambdaQueryWrapper<>();
 //        queryWrapper.eq(Elevator::getSequenceNbr, deviceId);
 //        Elevator elevator = this.getOne(queryWrapper);
-        if (ValidationUtil.isEmpty(map))
-            throw new BadRequest("设备未找到");
+        if (ValidationUtil.isEmpty(map)) {
+	        throw new BadRequest("设备未找到");
+        }
         return map;
     }