Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/EquipmentController.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentIndexDto;
@@ -77,11 +78,15 @@ public class EquipmentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增装备信息表", notes = "新增装备信息表")
-    public ResponseModel<EquipmentDto> save(@RequestBody EquipmentDto model) {
-        model = equipmentServiceImpl.createEquipment(model);
-        return ResponseHelper.buildResponse(model);
-    }
+    public ResponseModel save(@RequestBody EquipmentDto model) {
+        try {
+            model = equipmentServiceImpl.createEquipment(model);
+            return CommonResponseUtil.success(model);
+        } catch (Exception e) {
+            return CommonResponseUtil.failure("该手机号已经注册");
+        }
 
+    }
 
     /**
      * 根据sequenceNbr查询

amos-boot-system-equip/src/main/resources/mapper/ConfirmAlarmMapper.xml

@@ -19,15 +19,7 @@
 			ala.equipment_specific_index_name,
 			ala.type as equipment_specific_index_key,
 			concat(ala.equipment_specific_name,ala.equipment_specific_index_name) as alarmContent,
-			(
-			 SELECT
-				ws.full_name
-				FROM
-				wl_warehouse_structure ws,wl_stock_detail sd
-				WHERE
-				ws.id = sd.warehouse_structure_id
-				and sd.equipment_specific_id = ala.equipment_specific_id
-			) AS alarmPlace,
+			ala.location AS alarmPlace,
 			ala.create_date as create_date,
 			ala.location as location,
 			if(spe.code is null,ala.equipment_specific_name,concat(ala.equipment_specific_name,'(',spe.code,')')) as equipmentName,