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

@@ -0,0 +1,21 @@
+package com.hssx.cloudmodel.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-08-16
+ */
+@RestController
+@RequestMapping("/assetcustomcompany")
+public class AssetCustomCompanyController {
+
+}
+

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

@@ -37,7 +37,7 @@ public class CompanyController {
     /**
      * 添加/修改公司
      *
-     * 参数：companyName 公司名 companyAddress 公司地址
+     * 参数：companyName 公司名 companyAddress 公司地址 companyIds 关联公司的ids "1,2,3"
      * companyType公司类型 0-资产方 1-生产方（yLng 经度  xLat 纬度）
      * flag   0-添加，1-修改
      * @return
@@ -46,9 +46,9 @@ public class CompanyController {
     @RequestMapping("/add")
     @ResponseBody
     public HttpRespMsg addAndUpdateRole(CompanyVO companyVO, HttpServletRequest request, Integer flag,
-                                        HttpServletResponse response) {
+                                        HttpServletResponse response,@RequestParam(required = false) String companyIds) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg = companyService.addAndUpdateRole(companyVO, flag);
+        msg = companyService.addAndUpdateRole(companyVO, flag,companyIds);
         return msg;
     }
 

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

@@ -58,16 +58,17 @@ public class UserController {
      * 添加/修改用户
      *
      * 参数：account 账号 username 用户名（账号使用者的名字）parentId 创建此用户的创建者id
-     * password 密码 ,mobile 手机号 ,roleName 角色名称, companyId 所属公司id
+     * password 密码 ,mobile 手机号 ,roleName 角色名称, companyId 所属公司id,
      * flag 0-添加，1-修改
+     * 注意：创建公司管理员的时候 ，addType 0
      * @return
      */
     @ApiOperation("添加/修改用户")
     @RequestMapping("/add")
     @ResponseBody
     public HttpRespMsg addAndUpdateUser(User user, HttpServletRequest request, Integer flag,
-                                        HttpServletResponse response) {
-        HttpRespMsg msg = userService.addAndUpdateUser(user, flag);
+                                        HttpServletResponse response,@RequestParam(required = false)Integer addType) {
+        HttpRespMsg msg = userService.addAndUpdateUser(user, flag,addType);
         return msg;
     }
 

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

@@ -0,0 +1,98 @@
+package com.hssx.cloudmodel.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-08-16
+ */
+@TableName("tb_asset_custom_company")
+public class AssetCustomCompany extends Model<AssetCustomCompany> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 资产方生产方互关联表主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 资产方公司id
+     */
+    @TableField("assert_id")
+    private Integer assertId;
+
+    /**
+     * 生产方id
+     */
+    @TableField("custom_id")
+    private Integer customId;
+
+    /**
+     * 关联时间
+     */
+    @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime indate;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getAssertId() {
+        return assertId;
+    }
+
+    public void setAssertId(Integer assertId) {
+        this.assertId = assertId;
+    }
+
+    public Integer getCustomId() {
+        return customId;
+    }
+
+    public void setCustomId(Integer customId) {
+        this.customId = customId;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "AssetCustomCompany{" +
+        "id=" + id +
+        ", assertId=" + assertId +
+        ", customId=" + customId +
+        ", indate=" + indate +
+        "}";
+    }
+}

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/AssetCustomCompanyMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.AssetCustomCompany;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-08-16
+ */
+public interface AssetCustomCompanyMapper extends BaseMapper<AssetCustomCompany> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.service;
+
+import com.hssx.cloudmodel.entity.AssetCustomCompany;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-08-16
+ */
+public interface AssetCustomCompanyService extends IService<AssetCustomCompany> {
+
+}

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

@@ -20,7 +20,7 @@ import java.util.List;
  */
 public interface CompanyService extends IService<Company> {
 
-    HttpRespMsg addAndUpdateRole(CompanyVO company, Integer flag);
+    HttpRespMsg addAndUpdateRole(CompanyVO company, Integer flag,String companyIds);
 
     HttpRespMsg pageList(PageUtil page, String keyName,Integer companyType);
 

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

@@ -18,7 +18,7 @@ import javax.servlet.http.HttpServletRequest;
  */
 public interface UserService extends IService<User> {
 
-    HttpRespMsg addAndUpdateUser(User user, Integer flag);
+    HttpRespMsg addAndUpdateUser(User user, Integer flag,Integer addType);
 
     HttpRespMsg login(UserVO userVO, HttpServletRequest request);
 

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

@@ -0,0 +1,20 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.hssx.cloudmodel.entity.AssetCustomCompany;
+import com.hssx.cloudmodel.mapper.AssetCustomCompanyMapper;
+import com.hssx.cloudmodel.service.AssetCustomCompanyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-08-16
+ */
+@Service
+public class AssetCustomCompanyServiceImpl extends ServiceImpl<AssetCustomCompanyMapper, AssetCustomCompany> implements AssetCustomCompanyService {
+
+}

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

@@ -9,6 +9,7 @@ import com.hssx.cloudmodel.mapper.*;
 import com.hssx.cloudmodel.service.CompanyService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.ListUtil;
 import com.hssx.cloudmodel.util.PageUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,9 +44,14 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     ProjectUserMapper projectUserMapper;
     @Resource
     ProjectApproveMapper projectApproveMapper;
+    @Resource
+    AssetCustomCompanyMapper assetCustomCompanyMapper;
+    @Resource
+    CustomCompanyMapper customCompanyMapper;
+
 
     @Override
-    public HttpRespMsg addAndUpdateRole(CompanyVO companyVO, Integer flag) {
+    public HttpRespMsg addAndUpdateRole(CompanyVO companyVO, Integer flag, String companyIds) {
         HttpRespMsg msg = new HttpRespMsg();
         Company company = new Company();
         if (flag == 0) {
@@ -58,32 +64,78 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             } else {
                 if (companyVO.getCompanyType() == 0) {
                     //资产方直接添加
-                    BeanUtils.copyProperties(companyVO,company);
+                    BeanUtils.copyProperties(companyVO, company);
                     companyMapper.insert(company);
-                }else if (companyVO.getCompanyType() == 1){
+                    if (companyIds != null) {
+                        List<Integer> ides = ListUtil.convertIntegerIdsArrayToList(companyIds);
+                        for (Integer ide : ides) {
+                            if (assetCustomCompanyMapper.selectCount(new QueryWrapper<AssetCustomCompany>().eq("assert_id", company.getId()).eq("custom_id", ide)) == 0) {
+                                AssetCustomCompany assetCustomCompany = new AssetCustomCompany();
+                                assetCustomCompany.setAssertId(company.getId());
+                                assetCustomCompany.setCustomId(ide);
+                                assetCustomCompanyMapper.insert(assetCustomCompany);
+                            }
+                        }
+                    }
+                } else if (companyVO.getCompanyType() == 1) {
                     //生产方
-                    BeanUtils.copyProperties(companyVO,company);
+                    BeanUtils.copyProperties(companyVO, company);
                     companyMapper.insert(company);
+                    if (companyIds != null) {
+                        List<Integer> ides = ListUtil.convertIntegerIdsArrayToList(companyIds);
+                        for (Integer ide : ides) {
+                            if (assetCustomCompanyMapper.selectCount(new QueryWrapper<AssetCustomCompany>().eq("assert_id", ide).eq("custom_id", company.getId())) == 0) {
+                                AssetCustomCompany assetCustomCompany = new AssetCustomCompany();
+                                assetCustomCompany.setAssertId(ide);
+                                assetCustomCompany.setCustomId(company.getId());
+                                assetCustomCompanyMapper.insert(assetCustomCompany);
+                            }
+                        }
+                    }
                     LngLatCompany factory = new LngLatCompany();
                     factory.setxLat(companyVO.getXLat());
                     factory.setyLng(companyVO.getYLng());
                     factory.setCompanyId(company.getId());
                     lngLatCompanyMapper.insert(factory);
                 }
+                msg.data = company;
             }
         } else if (flag == 1) {
             //更新公司信息
-            BeanUtils.copyProperties(companyVO,company);
+            BeanUtils.copyProperties(companyVO, company);
             if (companyVO.getCompanyType() == 0) {
                 //修改资产方
-                BeanUtils.copyProperties(companyVO,company);
+                BeanUtils.copyProperties(companyVO, company);
+                List<AssetCustomCompany> list = assetCustomCompanyMapper.selectList(new QueryWrapper<AssetCustomCompany>().eq("assert_id", company.getId()));
+                //判断所关联的生产方是否已被应用到项目
+                List<Integer> idess = new ArrayList<>();
+                idess.add(-1);
+                for (AssetCustomCompany assetCustomCompany : list) {
+                    idess.add(assetCustomCompany.getCustomId());
+                }
+                Integer count = customCompanyMapper.selectCount(new QueryWrapper<CustomCompany>().in("company_id", idess));
+                if (count > 0) {
+                    msg.setError("当前公司所生产方公司已被用用到项目，不可执行修改操作。");
+                    return msg;
+                }
+                if (companyIds != null) {
+                    List<Integer> ides = ListUtil.convertIntegerIdsArrayToList(companyIds);
+                    for (Integer ide : ides) {
+                        if (assetCustomCompanyMapper.selectCount(new QueryWrapper<AssetCustomCompany>().eq("assert_id", company.getId()).eq("custom_id", ide)) == 0) {
+                            AssetCustomCompany assetCustomCompany = new AssetCustomCompany();
+                            assetCustomCompany.setAssertId(company.getId());
+                            assetCustomCompany.setCustomId(ide);
+                            assetCustomCompanyMapper.insert(assetCustomCompany);
+                        }
+                    }
+                }
                 companyMapper.updateById(company);
-            }else if (companyVO.getCompanyType() == 1){
+            } else if (companyVO.getCompanyType() == 1) {
                 //生产方
-                BeanUtils.copyProperties(companyVO,company);
+                BeanUtils.copyProperties(companyVO, company);
                 companyMapper.updateById(company);
                 QueryWrapper<LngLatCompany> qw = new QueryWrapper<>();
-                qw.eq("company_id",companyVO.getId());
+                qw.eq("company_id", companyVO.getId());
                 LngLatCompany lngLatCompany = lngLatCompanyMapper.selectOne(qw);
                 LngLatCompany factory = new LngLatCompany();
                 factory.setxLat(companyVO.getXLat());
@@ -91,24 +143,48 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                 factory.setCompanyId(company.getId());
                 factory.setId(lngLatCompany.getId());
                 lngLatCompanyMapper.updateById(factory);
+                List<AssetCustomCompany> list = assetCustomCompanyMapper.selectList(new QueryWrapper<AssetCustomCompany>().eq("assert_id", company.getId()));
+                //判断所关联的生产方是否已被应用到项目
+                List<Integer> idess = new ArrayList<>();
+                idess.add(-1);
+                for (AssetCustomCompany assetCustomCompany : list) {
+                    idess.add(assetCustomCompany.getCustomId());
+                }
+                Integer count = customCompanyMapper.selectCount(new QueryWrapper<CustomCompany>().eq("company_id", company.getId()));
+                if (count > 0) {
+                    msg.setError("当前公司已和所关联的资产方合作相关项目，不可执行修改操作。");
+                    return msg;
+                }
+                if (companyIds != null) {
+                    List<Integer> ides = ListUtil.convertIntegerIdsArrayToList(companyIds);
+                    for (Integer ide : ides) {
+                        if (assetCustomCompanyMapper.selectCount(new QueryWrapper<AssetCustomCompany>().eq("assert_id", company.getId()).eq("custom_id", ide)) == 0) {
+                            AssetCustomCompany assetCustomCompany = new AssetCustomCompany();
+                            assetCustomCompany.setAssertId(company.getId());
+                            assetCustomCompany.setCustomId(ide);
+                            assetCustomCompanyMapper.insert(assetCustomCompany);
+                        }
+                    }
+                }
             }
+            msg.data = company;
         }
         return msg;
     }
 
     @Override
-    public HttpRespMsg pageList(PageUtil page, String keyName,Integer companyType) {
+    public HttpRespMsg pageList(PageUtil page, String keyName, Integer companyType) {
         HttpRespMsg msg = new HttpRespMsg();
         List<CompanyVO> list = new ArrayList<>();
         System.out.println(page);
         Integer start = (page.getPageNum() - 1) * page.getPageSize();
-        if(companyType == 0){
-            list = companyMapper.getListByKeyName(keyName, start, page.getPageSize(),companyType);
+        if (companyType == 0) {
+            list = companyMapper.getListByKeyName(keyName, start, page.getPageSize(), companyType);
             Integer count = list.size();
             page.setTotal(count);
             page.setPages(page.getTotal());
-        }else{
-            list = companyMapper.getCustomerListByKeyName(keyName, start, page.getPageSize(),companyType);
+        } else {
+            list = companyMapper.getCustomerListByKeyName(keyName, start, page.getPageSize(), companyType);
             Integer count = list.size();
             page.setTotal(count);
             page.setPages(page.getTotal());
@@ -192,7 +268,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                     set.add(projectUser.getProjectId());
                 }
             }
-            List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().in("project_id",set));
+            List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().in("project_id", set));
             for (Mould mould : moulds) {
                 mouldIds.add(mould.getId());
             }

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

@@ -95,7 +95,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     }
                 } else if (Constant.SYS_ID == userVO.getParentId()) {
                     //资产方管理员,看到自己创建的项目
-                    qw.select("id").eq("creator_id",user.getId());
+                    qw.select("id").eq("creator_id", user.getId());
                     projects = projectMapper.selectList(qw);
                     for (Project project : projects) {
                         set.add(project.getId());
@@ -155,7 +155,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     }
 
     @Override
-    public HttpRespMsg addAndUpdateUser(User user, Integer flag) {
+    public HttpRespMsg addAndUpdateUser(User user, Integer flag, Integer addType) {
         //获取该账号的创建者
         User parentUser = userMapper.selectById(user.getParentId());
         HttpRespMsg msg = new HttpRespMsg();
@@ -190,6 +190,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         user.setTeamName("生产方");
                     }
                     userMapper.insert(user);
+                    if (addType == 0) {
+                        Company com = new Company();
+                        com.setId(user.getCompanyId());
+                        com.setAdministrator(user.getUsername());
+                        com.setAdministratorId(user.getId());
+                        companyMapper.updateById(com);
+                    }
                 }
             } else if (flag == 1) {
                 //更新角色信息
@@ -215,7 +222,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     if (existingUser.getParentId() == parentUser.getId()) {
                         msg.setError("该账号已存在，请勿重新创建");
                         return msg;
-                    }else{
+                    } else {
                         //此时用户已经有了，则建立一条合作公司的关系
                         UserCompany userCompany = new UserCompany();
                         userCompany.setUserId(existingUser.getId());
@@ -276,10 +283,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     //当前账号已被创建
                     User existingUser = userMapper.selectOne(qw);
                     //判断创建该账号的是admin或者是项目经理自己创建的账号，如果再次创建直接提示创建重复
-                    if(existingUser.getParentId() == managerParent.getId() || existingUser.getParentId() == parentUser.getId()){
+                    if (existingUser.getParentId() == managerParent.getId() || existingUser.getParentId() == parentUser.getId()) {
                         msg.setError("该账号已存在，请勿重新创建");
                         return msg;
-                    }else{
+                    } else {
                         //此时用户已经有了，则建立一条合作公司的关系
                         UserCompany userCompany = new UserCompany();
                         userCompany.setUserId(existingUser.getId());

cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_company");
+        strategy.setInclude("tb_asset_custom_company");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.AssetCustomCompanyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.AssetCustomCompany">
+        <id column="id" property="id" />
+        <result column="assert_id" property="assertId" />
+        <result column="custom_id" property="customId" />
+        <result column="indate" property="indate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, assert_id, custom_id, indate
+    </sql>
+
+</mapper>

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

@@ -206,7 +206,7 @@
         <result column="project_name" property="projectName" />
         <result column="project_id" property="projectId" />
         <result column="user_id" property="userId" />
-        <result column="username" property="username" />
+        <result column="username" property="username"/>
         <result column="company_name" property="companyName" />
         <result column="powerString" property="powerString" />
         <collection property="powers" javaType="java.util.List" ofType="com.hssx.cloudmodel.entity.Power"