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

@@ -108,7 +108,7 @@ public class MouldController {
 
     /**
      * 模具详情
-     * 参数 id 模具id
+     * 参数 id 模具id,token 当前用户凭证
      * @return
      */
     @ApiOperation("模具详情")

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

@@ -31,6 +31,7 @@ public class UserVO extends User {
     private List<Project> projects;
     private String startTime;
     private String endTime;
+    private Integer mouleMap;//用于过滤地图概览
     /**
      * 图档类型0-2D,1-3D
      */

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

@@ -25,6 +25,7 @@ import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -145,10 +146,64 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
     public HttpRespMsg getMoildDetail(MouldVO mouldVO) {
         HttpRespMsg msg = new HttpRespMsg();
         Map<String, Object> map = new HashMap<>();
+        User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", mouldVO.getToken()));
+//        List<Integer> set = new ArrayList<>();
+//        set.add(-1);
+//        List<MouldVO> moulds = new ArrayList<>();
+//        if (currentUser.getId() != null) {
+//            //资产方管理员，获取他公司下的所有模具
+//            if (Constant.SYS_PARENT_ID == currentUser.getParentId()) {
+//                //超级管理员，获取平台所有模具
+//                moulds = mouldMapper.selectListByCondition(currentUser);
+//            } else if (Constant.SYS_ID == currentUser.getParentId()) {
+//
+//                if(Constant.ASSETS_COMPANY == currentUser.getSubordinateType()){
+//                    //资产方管理员
+//                    moulds = mouldMapper.selectListByCondition(userVO);
+//                }else if(Constant.PRODUCER_COMPANY == currentUser.getSubordinateType()){
+//                    set = customCompanyMapper.selectList(new QueryWrapper<CustomCompany>().eq("company_id", userVO.getCompanyId())).stream().map(CustomCompany::getProjectId).collect(Collectors.toList());
+//                    moulds = mouldMapper.selectListByConditionByProject(userVO, set);
+//                }
+//            } else {
+//                //普通用户或者项目经理
+//                //充当项目经理参与的项目
+//                if (userVO.getProjectId() != -1) {
+//                    set.add(userVO.getProjectId());
+//                    moulds = mouldMapper.selectListByConditionByProject(userVO, set);
+//                } else {
+//                    QueryWrapper<Project> qw = new QueryWrapper<>();
+//                    qw.eq("manager_id", userVO.getId());
+//                    List<Project> projects = projectMapper.selectList(qw);
+//                    if (projects.size() > 0) {
+//                        for (Project project : projects) {
+//                            set.add(project.getId());
+//                        }
+//                    }
+////                //充当普通人员参与的项目
+//                    List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("user_id", userVO.getId()));
+//                    if (projectUsers.size() > 0) {
+//                        for (ProjectUser projectUser : projectUsers) {
+//                            set.add(projectUser.getProjectId());
+//                        }
+//                    }
+////                //充当审批人员参与的项目
+//                    List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", userVO.getId()));
+//                    if (projectss.size() > 0) {
+//                        for (ProjectApprove projectUser : projectss) {
+//                            set.add(projectUser.getProjectId());
+//                        }
+//                    }
+//                    moulds = mouldMapper.selectListByConditionByProject(userVO, set);
+//                }
+//            }
+//            msg.data = moulds;
+//        } else {
+//            msg.setError("用户不存在，或者未登录！");
+//        }
+
         MouldVO mould = mouldMapper.getDetailById(mouldVO);
         map.put("vo", mould);
         ProjectVO vo = projectMapper.getProjectById(mould.getProjectId());
-        User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", mouldVO.getToken()));
         if (null == mould.getProjectId()) {
             map.put("update", 0);
             map.put("download", 0);

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

@@ -589,6 +589,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     public HttpRespMsg getModelListMapByUser(UserVO userVO) {
         HttpRespMsg msg = new HttpRespMsg();
         userVO.setProjectId(-1);
+        userVO.setMouleMap(-1);
         List<Integer> set = new ArrayList<>();
         set.add(-1);
         List<MouldVO> moulds = new ArrayList<>();

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

@@ -117,6 +117,9 @@
             <if test="userVO.projectId != -1">
                 AND tbm.project_id = #{userVO.projectId}
             </if>
+            <if test="userVO.mouleMap == -1">
+                AND tbmp.lng IS NOT NULL and tbmp.lat IS NOT NULL
+            </if>
         </where>
     </select>
     <select id="selectListByConditionByProject" resultMap="BaseResultMapVO">
@@ -147,6 +150,9 @@
             <if test="userVO.searchType == 1 and userVO.keyName != '' and userVO.keyName != null">
                 AND tbm.model_name like concat('%',#{userVO.keyName},'%')
             </if>
+            <if test="userVO.mouleMap == -1">
+                AND tbmp.lng IS NOT NULL and tbmp.lat IS NOT NULL
+            </if>
             AND tbm.project_id in
             <foreach item="item" index="index" collection="list"
                      open="(" separator="," close=")">