Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/controller/CompanyController.java

@@ -153,5 +153,20 @@ public class CompanyController {
         msg = companyService.getCoutomCompanyAndMouldsByUser(userVO);
         return msg;
     }
+    /**
+     * 返回当前公司的关联公司列表
+     * 参数 token 用户身份凭证 id 公司id
+     * @return
+     */
+    @ApiOperation(value = "返回当前公司的关联公司列表")
+    @RequestMapping("/ownerRelateCompany")
+    @ResponseBody
+    public HttpRespMsg ownerRelateCompany(CompanyVO companyVO){
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = companyService.getOwnerRelateCompany(companyVO);
+        return msg;
+    }
+
+
 }
 

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldController.java

@@ -43,6 +43,7 @@ public class MouldController {
      * 添加参数：equipmentId 设备id， modelNo 模具编号 ,modelName 模具名称 ,maintainCount 保养设定次数："1,2,3"
      * 修改参数：id 模具id, settingLife 使用年限， initialModulus 初始模次 equipmentId 设备id，
      * produceCompanyId 生产方公司id,ocCycle 每模平均周期,rfid rfid码，maintainCount 保养设定次数："1,2,3"
+     * produceCompanyName 生产方公司的名称
      * @return
      */
     @ApiOperation("添加/修改模具")

cloud-model/src/main/java/com/hssx/cloudmodel/entity/vo/CompanyVO.java

@@ -29,6 +29,8 @@ public class CompanyVO extends Company{
         @TableField("x_lat")
         private String xLat;
 
+        private String token;
+
         private List<Mould> list  = new ArrayList<>();
 
         private List<Company> relateCompanyList = new ArrayList<>();

cloud-model/src/main/java/com/hssx/cloudmodel/service/CompanyService.java

@@ -35,4 +35,6 @@ public interface CompanyService extends IService<Company> {
     HttpRespMsg relationList(Integer companyType);
 
     HttpRespMsg detail(UserVO userVO);
+
+    HttpRespMsg getOwnerRelateCompany(CompanyVO companyVO);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java

@@ -22,6 +22,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -297,6 +298,36 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         return msg;
     }
 
+    @Override
+    public HttpRespMsg getOwnerRelateCompany(CompanyVO companyVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", companyVO.getToken()));
+        List<Integer> ides = new ArrayList<>();
+        ides.add(-1);
+        if(null == currentUser){
+            msg.setError("当前用户不存在或者不存在");
+            return msg;
+        }else{
+            Company company = companyMapper.selectById(companyVO.getId());
+            if(Constant.PRODUCER_COMPANY == company.getCompanyType()){
+                //生产方公司，返回关联的资产方公司列表
+                ides = assetCustomCompanyMapper.selectList(new QueryWrapper<AssetCustomCompany>().eq("custom_id", company.getId()))
+                        .stream()
+                        .map(AssetCustomCompany::getAssertId)
+                        .collect(Collectors.toList());
+                msg.data = companyMapper.selectList(new QueryWrapper<Company>().in("id",ides));
+            }else if(Constant.ASSETS_COMPANY == company.getCompanyType()){
+                //资产方公司，返回关联的生产方公司列表
+                ides = assetCustomCompanyMapper.selectList(new QueryWrapper<AssetCustomCompany>().eq("assert_id", company.getId()))
+                        .stream()
+                        .map(AssetCustomCompany::getCustomId)
+                        .collect(Collectors.toList());
+                msg.data = companyMapper.selectList(new QueryWrapper<Company>().in("id",ides));
+            }
+        }
+        return msg;
+    }
+
     @Override
     public HttpRespMsg deleteById(Integer id) {
         HttpRespMsg msg = new HttpRespMsg();