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

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/Mould.java

@@ -118,16 +118,10 @@ public class Mould extends Model<Mould> {
     private String area;
 
     /**
-     * 工厂id
+     * 生产方公司名称
      */
-    @TableField("factory_id")
-    private Integer factoryId;
-
-    /**
-     * 工厂名称
-     */
-    @TableField("factory_name")
-    private String factoryName;
+    @TableField("project_company_name")
+    private String produceCompanyName;
 
     /**
      * 初始模次(保养设定次数)
@@ -298,21 +292,6 @@ public class Mould extends Model<Mould> {
         this.area = area;
     }
 
-    public Integer getFactoryId() {
-        return factoryId;
-    }
-
-    public void setFactoryId(Integer factoryId) {
-        this.factoryId = factoryId;
-    }
-
-    public String getFactoryName() {
-        return factoryName;
-    }
-
-    public void setFactoryName(String factoryName) {
-        this.factoryName = factoryName;
-    }
 
     public Integer getInitialModulus() {
         return initialModulus;
@@ -375,6 +354,18 @@ public class Mould extends Model<Mould> {
         return this.id;
     }
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getProduceCompanyName() {
+        return produceCompanyName;
+    }
+
+    public void setProduceCompanyName(String produceCompanyName) {
+        this.produceCompanyName = produceCompanyName;
+    }
+
     @Override
     public String toString() {
         return "Mould{" +
@@ -394,8 +385,6 @@ public class Mould extends Model<Mould> {
         ", rfid=" + rfid +
         ", settingLife=" + settingLife +
         ", area=" + area +
-        ", factoryId=" + factoryId +
-        ", factoryName=" + factoryName +
         ", initialModulus=" + initialModulus +
         ", equipmentId=" + equipmentId +
         ", belongProjectGrade=" + belongProjectGrade +

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();

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

@@ -85,6 +85,10 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
             if (count > 0) {
                 msg.setError("当前模具编号已存在，请重新输入其他模具编号");
             } else {
+                if (mould.getProduceCompanyId() != null) {
+                    Company company = companyMapper.selectById(mould.getProduceCompanyId());
+                    mould.setArea(company.getCompanyAddress());
+                }
                 mould.setCreatorId(user.getId());
                 mould.setCompanyId(user.getCompanyId());
                 mouldMapper.insert(mould);

cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -20,12 +20,11 @@
         <result column="rfid" property="rfid" />
         <result column="setting_life" property="settingLife" />
         <result column="area" property="area" />
-        <result column="factory_id" property="factoryId" />
-        <result column="factory_name" property="factoryName" />
         <result column="initial_modulus" property="initialModulus" />
         <result column="equipment_id" property="equipmentId" />
         <result column="belong_project_grade" property="belongProjectGrade" />
         <result column="produce_company_id" property="produceCompanyId" />
+        <result column="produce_company_name" property="produceCompanyName" />
         <result column="run_times" property="runTimes" />
         <result column="is_maintain" property="isMaintain" />
         <result column="maintain_count" property="maintainCount" />
@@ -54,8 +53,7 @@
         <result column="rfid" property="rfid"/>
         <result column="setting_life" property="settingLife"/>
         <result column="area" property="area"/>
-        <result column="factory_id" property="factoryId"/>
-        <result column="factory_name" property="factoryName"/>
+        <result column="produce_company_name" property="produceCompanyName"/>
         <result column="initial_modulus" property="initialModulus"/>
         <result column="equipment_id" property="equipmentId"/>
         <result column="belong_project_grade" property="belongProjectGrade"/>