解决冲突

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

@@ -3,16 +3,20 @@ package com.yeejoin.amos.boot.module.tzs.biz.controller;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.tzs.api.common.MobileLoginParam;
 import com.yeejoin.amos.boot.module.tzs.api.service.ISafetyService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 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;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 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.Map;
 
 /**
  * @Author cpp
@@ -30,9 +34,9 @@ public class SafetyController extends BaseController {
     @ApiOperation(value = "移动端登录", notes = "移动端登录")
     @PostMapping(value = "/mobile/login")
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    public Object loginFromApp(@RequestBody MobileLoginParam param) {
+    public ResponseModel<Map<String, Object>> loginFromApp(@RequestBody MobileLoginParam param) {
         buildRequestContext();
-        return iSafetyService.loginFromApp(param);
+        return ResponseHelper.buildResponse(iSafetyService.loginFromApp(param));
     }
     protected void buildRequestContext() {
         String token = getToken();
@@ -42,7 +46,7 @@ public class SafetyController extends BaseController {
         RequestContext.setProduct(product);
         RequestContext.setAppKey(appKey);
     }
-
+    
 
 
 }

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

@@ -96,7 +96,7 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 		tzCylinderInfoDto.setCylinderStatus(data3 != null ? data3.getName() : null);
 		TzCylinderTagsDto tzCylinderTagsDto = tzCylinderMapper.getTzCylinderTagsDto(orgCode);
 
-		if (!ValidationUtil.isEmpty(tzCylinderTagsDto.getGasCylinderStamp())) {
+		if ( !ValidationUtil.isEmpty(tzCylinderTagsDto) && !ValidationUtil.isEmpty(tzCylinderTagsDto.getGasCylinderStamp())) {
 
 			tzCylinderTagsDto.setGasCylinderStamp(tzCylinderTagsDto.getGasCylinderStamp());
 		}