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

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -181,7 +181,7 @@ public interface IOrgUsrService {
 
     List<OrgUsrExcelDto> exportToExcel();
 
-    UserUnitDto getUserUnit(String id, String type, String code);
+    UserUnitDto getUserUnit(String userId);
 
 	/**
 	 * 根据登陆人获取公司部门人员树

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -360,14 +360,14 @@ public class OrgUsrController extends BaseController {
     /**
      * 获取用户单位归属
      *
-     * @param id
+     * @param userId
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/getUserUnit", method = RequestMethod.GET)
+    @RequestMapping(value = "/{userId}/userUnit", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取用户单位归属", notes = "获取用户单位归属")
-    public ResponseModel<UserUnitDto> getUserUnit(@RequestParam String id, @RequestParam String type, @RequestParam String code) {
-        return ResponseHelper.buildResponse(iOrgUsrService.getUserUnit(id, type, code));
+    public ResponseModel<UserUnitDto> getUserUnit(@PathVariable String userId) {
+        return ResponseHelper.buildResponse(iOrgUsrService.getUserUnit(userId));
     }
 
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -46,6 +46,11 @@ import java.util.stream.Collectors;
 
 @Service
 public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapper> implements IOrgUsrService {
+
+    private static final String TYPE = "PERSON,COMPANY";
+
+    private static final String CODE = "amosAccount";
+
     @Autowired
     DynamicFormInstanceServiceImpl alertFormValueServiceImpl;
     @Autowired
@@ -1003,13 +1008,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public UserUnitDto getUserUnit(String id, String type, String code) {
-        if (StringUtils.isNotBlank(id) && StringUtils.isNotBlank(type) && StringUtils.isNotBlank(code)) {
-            String[] typeArr = type.split(",");
+    public UserUnitDto getUserUnit(String userId) {
+        if (StringUtils.isNotBlank(userId)) {
+            String[] typeArr = TYPE.split(",");
             //	业主单位
-            List<UserUnitDto> list = orgUsrMapper.getUserUnit(id, typeArr[0], null);
+            List<UserUnitDto> list = orgUsrMapper.getUserUnit(userId, typeArr[0], null);
             //     维保单位
-            List<DynamicFormInstance> instanceList = alertFormValueServiceImpl.getInstanceByCodeAndValue(code, id);
+            List<DynamicFormInstance> instanceList = alertFormValueServiceImpl.getInstanceByCodeAndValue(CODE, userId);
             if (!CollectionUtils.isEmpty(list) && !CollectionUtils.isEmpty(instanceList)) {
                 throw new RuntimeException("人员绑定单位重复！");
             } else {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireTeamServiceImpl.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+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.Menu;
 import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
@@ -56,6 +58,9 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
     @Autowired
     OrgUsrServiceImpl orgUsrService;
 
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
+
     /**
      * 获取监控大队列表
      *
@@ -185,6 +190,11 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
             FireTeam parentTeam = getById(fireTeam.getParent());
             fireTeam.setTreeCode(parentTeam.getTreeCode() + TreeParser.genTreeCode());
         }
+
+        DataDictionary dataDictionary = iDataDictionaryService.getById(fireTeam.getTypeCode());
+        if(null !=dataDictionary ) {
+            fireTeam.setType(dataDictionary.getName());
+        }
         if (ValidationUtil.isEmpty(fireTeam.getSequenceNbr())) {
             save(fireTeam);
         } else {