93666修改

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/ElevatorController.java

@@ -247,7 +247,14 @@ public class ElevatorController extends BaseController {
         for (Elevator ele : elevators ) {
             ElevatorDto eleDto = new ElevatorDto();
             BeanUtils.copyProperties(ele,eleDto);
-            eleDto.setUseSiteCategory(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getCode,eleDto.getUseSiteCategory())).getName());
+            if(!ValidationUtil.isEmpty(eleDto.getUseSiteCategory())) {
+                LambdaQueryWrapper<DataDictionary> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(DataDictionary::getCode, eleDto.getUseSiteCategory());
+                DataDictionary dataDictionary = iDataDictionaryService.getOne(wrapper);
+                if (!ValidationUtil.isEmpty(dataDictionary)) {
+                    eleDto.setUseSiteCategory(dataDictionary.getName());
+                }
+            }
             elevatorDtoList.add(eleDto);
         }
         return ResponseHelper.buildResponse(elevatorDtoList);
@@ -555,7 +562,18 @@ public class ElevatorController extends BaseController {
     @RequestMapping(value = "/getAddressList",method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "获取电梯的安装地址", notes = "获取电梯的安装地址")
     public ResponseModel<List<ElevatorDto>> getAddressList(@RequestBody ElevatorListDto elevatorListDto){
-        return ResponseHelper.buildResponse(elevatorMapper.getAddressList(elevatorListDto.getElevatorAddress()));
+        List<ElevatorDto> elevatorList = elevatorMapper.getAddressList(elevatorListDto.getElevatorAddress());
+        for(ElevatorDto elevatorDto : elevatorList){
+            if(!ValidationUtil.isEmpty(elevatorDto.getUseSiteCategory())) {
+                LambdaQueryWrapper<DataDictionary> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(DataDictionary::getCode, elevatorDto.getUseSiteCategory());
+                DataDictionary dataDictionary = iDataDictionaryService.getOne(wrapper);
+                if (!ValidationUtil.isEmpty(dataDictionary)) {
+                    elevatorDto.setUseSiteCategory(dataDictionary.getName());
+                }
+            }
+        }
+        return ResponseHelper.buildResponse(elevatorList);
     }
 
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TzsQyLogController.java

@@ -22,6 +22,8 @@ import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -49,12 +51,12 @@ public class TzsQyLogController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增96333操作记录日志表", notes = "新增96333操作记录日志表")
-    public boolean saveTzsQyLog(HttpServletRequest request,@RequestBody TzsQyLog data){
+    public ResponseModel<Boolean> saveTzsQyLog(HttpServletRequest request, @RequestBody TzsQyLog data){
 //        AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
 //        data.setRecUserId(me.getUserId());
 //        data.setRecUserName(me.getUserName());
 //        data.setRecDate(new Date());
-        return iTzsQyLogService.save(data);
+        return ResponseHelper.buildResponse(iTzsQyLogService.save(data));
     }
 
     /**

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

@@ -8,6 +8,8 @@ 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;
@@ -101,6 +103,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     @Autowired
     CtiServiceImpl ctiService;
 
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
+
     @Value("${duty.seats.role.ids}")
     private String dutySeatsRoleIds;
 
@@ -110,6 +115,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     @Override
     public Object selectAlertCalledById(Long id) {
         if(redisUtils.hasKey(RedisKey.TZS_ALERTCALLED_ID+id)){
+//        if(false){
             Object obj= redisUtils.get(RedisKey.TZS_ALERTCALLED_ID+id);
             return obj;
         }else{
@@ -126,7 +132,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                     formValue.add(value);
                 }
             }
-            AlertCalledDto alertCalledDto = BeanDtoVoUtils.convert(alertCalled,AlertCalledDto.class);
+            AlertCalledDto alertCalledDto = new AlertCalledDto();
+            BeanUtils.copyProperties(alertCalled,alertCalledDto);
             LambdaQueryWrapper<Elevator> elevatorQueryWrapper = new LambdaQueryWrapper<>();
             elevatorQueryWrapper.eq(Elevator::getRescueCode, alertCalled.getDeviceId());
             elevatorQueryWrapper.eq(Elevator::getRegisterCode, alertCalled.getRegistrationCode());
@@ -141,6 +148,18 @@ 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.setUseUnit(dataDictionary.getName());
+                } else {
+                    alertCalledDto.setUseUnit("");
+                }
+            } else {
+                alertCalledDto.setUseUnit("");
+            }
             String voiceRecord = "";
             VoiceRecordFile temp = voiceRecordFileServiceImpl.getOne(new LambdaQueryWrapper<VoiceRecordFile>().eq(VoiceRecordFile::getAlertId,id).eq(VoiceRecordFile::getAlertStageCode,"860").orderByAsc(VoiceRecordFile::getRecDate));
             if(temp != null) {