修改接口到对应controller

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

@@ -6,10 +6,14 @@ import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.Mould;
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.service.*;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -28,10 +32,6 @@ public class MouldController {
     @Autowired
     private UserService userService;
     @Autowired
-    private CompanyService companyService;
-    @Autowired
-    private MouldEquipmentService mouldEquipmentService;
-    @Autowired
     private ProjectService projectService;
     /**
      * 添加/修改模具设备
@@ -66,5 +66,21 @@ public class MouldController {
         msg = projectService.getModelListByCompanyId(user);
         return msg;
     }
+
+    /**
+     * 给项目分配模具获取该公司下的模具列表
+     * token 当前人唯一权限
+     * @return
+     */
+    @ApiOperation("模具列表")
+    @RequestMapping("/list")
+    @ResponseBody
+    public HttpRespMsg list(UserVO userVO, PageUtil page,String token) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User user = userService.getOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        BeanUtils.copyProperties(user,userVO);
+        msg = projectService.getModelListByUser(userVO,page);
+        return msg;
+    }
 }
 

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

@@ -4,6 +4,7 @@ package com.hssx.cloudmodel.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.MouldEquipmentVO;
 import com.hssx.cloudmodel.service.MouldEquipmentService;
 import com.hssx.cloudmodel.service.UserService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
@@ -71,9 +72,9 @@ public class MouldEquipmentController {
     @ApiOperation("获取资产方公司的设备列表")
     @RequestMapping("/getMouldEquipmentList")
     @ResponseBody
-    public HttpRespMsg getMouldEquipmentList(MouldEquipment mouldEquipment){
+    public HttpRespMsg getMouldEquipmentList(MouldEquipmentVO mouldEquipmentVO){
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data = mouldEquipmentService.list(new QueryWrapper<MouldEquipment>().eq("belong_company_id", mouldEquipment.getBelongCompanyId()));
+        msg.data = mouldEquipmentService.getListByCompanyId(mouldEquipmentVO);
         return msg;
     }
 

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

@@ -0,0 +1,21 @@
+package com.hssx.cloudmodel.entity.vo;
+
+import com.hssx.cloudmodel.entity.MouldEquipment;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 08 - 05 14:00
+ * Description:<描述>
+ * Version: 1.0
+ */
+public class MouldEquipmentVO extends MouldEquipment {
+    private String companyName;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.hssx.cloudmodel.entity.vo;
+
+import com.hssx.cloudmodel.entity.Mould;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 08 - 05 13:49
+ * Description:<描述>
+ * Version: 1.0
+ */
+public class MouldVO extends Mould {
+    private String mouldEquipmentNo;
+    private String projectName;
+}

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

@@ -11,6 +11,24 @@ import com.hssx.cloudmodel.entity.User;
 public class UserVO extends User {
     private String companyName;
     private String roleName;
+    private String keyName;//项目名称
+    private Integer serchType;//搜索类型0-项目名称，1-模具编号
+
+    public String getKeyName() {
+        return keyName;
+    }
+
+    public void setKeyName(String keyName) {
+        this.keyName = keyName;
+    }
+
+    public Integer getSerchType() {
+        return serchType;
+    }
+
+    public void setSerchType(Integer serchType) {
+        this.serchType = serchType;
+    }
 
     public String getCompanyName() {
         return companyName;

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

@@ -2,6 +2,9 @@ package com.hssx.cloudmodel.mapper;
 
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hssx.cloudmodel.entity.vo.MouldEquipmentVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MouldEquipmentMapper extends BaseMapper<MouldEquipment> {
 
+    List<MouldEquipmentVO> getListByCompanyId(Integer belongCompanyId);
 }

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

@@ -3,8 +3,12 @@ package com.hssx.cloudmodel.mapper;
 import com.hssx.cloudmodel.entity.Mould;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hssx.cloudmodel.entity.Project;
+import com.hssx.cloudmodel.entity.vo.MouldVO;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -16,4 +20,6 @@ import org.apache.ibatis.annotations.Param;
 public interface MouldMapper extends BaseMapper<Mould> {
 
     void updateMouldByProjectId(@Param("project") Project project);
+
+    List<MouldVO> selectListByCondition(UserVO userVO);
 }

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

@@ -3,6 +3,7 @@ package com.hssx.cloudmodel.service;
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.MouldEquipmentVO;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 
@@ -21,4 +22,6 @@ public interface MouldEquipmentService extends IService<MouldEquipment> {
     HttpRespMsg isUse(MouldEquipment mouldEquipment, User user);
 
     HttpRespMsg getList(User user,PageUtil page);
+
+    HttpRespMsg getListByCompanyId(MouldEquipmentVO mouldEquipmentVO);
 }

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

@@ -4,6 +4,7 @@ import com.hssx.cloudmodel.entity.Factory;
 import com.hssx.cloudmodel.entity.Project;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 
@@ -30,4 +31,6 @@ public interface ProjectService extends IService<Project> {
     HttpRespMsg getUserListByCompanyIds(String companyIds,Integer adminId);
 
     HttpRespMsg getModelListByCompanyId(User user);
+
+    HttpRespMsg getModelListByUser(UserVO user, PageUtil page);
 }

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

@@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.constant.Constant;
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.MouldEquipmentVO;
 import com.hssx.cloudmodel.mapper.MouldEquipmentMapper;
 import com.hssx.cloudmodel.service.MouldEquipmentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -65,18 +66,26 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
     }
 
     @Override
-    public HttpRespMsg getList(User user,PageUtil page) {
+    public HttpRespMsg getList(User user, PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
-        if(user != null){
-            if(Constant.SYS_PARENT_ID == user.getParentId()){
-                PageHelper.startPage(page.getPageNum(),page.getPageSize());
+        if (user != null) {
+            if (Constant.SYS_PARENT_ID == user.getParentId()) {
+                PageHelper.startPage(page.getPageNum(), page.getPageSize());
                 List<MouldEquipment> mouldEquipments = mouldEquipmentMapper.selectList(new QueryWrapper<MouldEquipment>());
                 PageInfo<MouldEquipment> pageInfo = new PageInfo<>(mouldEquipments);
                 msg.data = pageInfo;
-            }else{
+            } else {
                 msg.setError("对不起！您不含有查看该列表的权利。");
             }
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg getListByCompanyId(MouldEquipmentVO mouldEquipmentVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        List<MouldEquipmentVO> list = mouldEquipmentMapper.getListByCompanyId(mouldEquipmentVO.getBelongCompanyId());
+        msg.data = list;
+        return msg;
+    }
 }

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

@@ -5,7 +5,9 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.constant.Constant;
 import com.hssx.cloudmodel.entity.*;
+import com.hssx.cloudmodel.entity.vo.MouldVO;
 import com.hssx.cloudmodel.entity.vo.ProjectVO;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.mapper.*;
 import com.hssx.cloudmodel.service.ProjectService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,9 +20,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.jws.soap.SOAPBinding;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Spliterator;
+import java.util.*;
 
 /**
  * <p>
@@ -224,4 +224,31 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         msg.data =  mouldMapper.selectList(qw);
         return msg;
     }
+
+    @Override
+    public HttpRespMsg getModelListByUser(UserVO userVO, PageUtil page) {
+        HttpRespMsg msg = new HttpRespMsg();
+        List<Integer> set = new ArrayList<>();
+        if(userVO.getId() != null){
+            //资产方管理员，获取他公司下的所有模具
+            if(Constant.SYS_ID == userVO.getParentId()){
+                PageHelper.startPage(page.getPageNum(),page.getPageSize());
+                List<MouldVO> moulds = mouldMapper.selectListByCondition(userVO);
+                PageInfo<MouldVO> pageInfo = new PageInfo<>(moulds);
+                msg.data = pageInfo;
+            }else{
+                //普通用户或者项目经理
+                //充当项目经理参与的项目
+                List<Project> project = projectMapper.selectList(new QueryWrapper<Project>().eq("manager_id", userVO.getId()));
+//                if(){
+//
+//                }
+                //充当普通人员参与的项目
+
+            }
+        }else{
+            msg.setError("用户不存在，或者未登录！");
+        }
+        return msg;
+    }
 }

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

@@ -14,10 +14,34 @@
         <result column="is_use" property="isUse" />
         <result column="hill_number" property="hillNumber" />
     </resultMap>
+    <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldEquipmentVO">
+        <id column="id" property="id" />
+        <result column="equipment_name" property="equipmentName" />
+        <result column="start_time" property="startTime" />
+        <result column="end_time" property="endTime" />
+        <result column="use_life" property="useLife" />
+        <result column="belong_company_id" property="belongCompanyId" />
+        <result column="companyName" property="companyName" />
+        <result column="equipment_no" property="equipmentNo" />
+        <result column="is_use" property="isUse" />
+        <result column="hill_number" property="hillNumber" />
+    </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, is_use, hill_number
     </sql>
 
+    <select id="getListByCompanyId" resultMap="BaseResultMapVO">
+        select
+          tbme.id id, tbme.equipment_name equipment_name, tbme.start_time start_time, tbme.end_time end_time,
+          tbme.use_life use_life, tbme.belong_company_id belong_company_id, tbme.equipment_no equipment_no,
+          tbme.is_use, tbme.hill_number,tbc.company_name companyName
+        from
+          tb_mould_equipment tbme
+        left join
+          tb_company tbc
+        on
+          tbme.belong_company_id = tbc.id
+    </select>
 </mapper>

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

@@ -27,6 +27,31 @@
         <result column="belong_project_grade" property="belongProjectGrade" />
         <result column="produce_company_id" property="produceCompanyId" />
     </resultMap>
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldVO">
+        <id column="id" property="id" />
+        <result column="model_no" property="modelNo" />
+        <result column="model_name" property="modelName" />
+        <result column="water_gap" property="waterGap" />
+        <result column="tonnage" property="tonnage" />
+        <result column="oc_cycle" property="ocCycle" />
+        <result column="daily_output" property="dailyOutput" />
+        <result column="company_id" property="companyId" />
+        <result column="current_version_id" property="currentVersionId" />
+        <result column="state" property="state" />
+        <result column="is_delete" property="isDelete" />
+        <result column="creator_id" property="creatorId" />
+        <result column="project_id" property="projectId" />
+        <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" />
+    </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -35,4 +60,12 @@
     <update id="updateMouldByProjectId">
         update tb_mould set project_id = null where project_id = #{project.id}
     </update>
+
+    <select id="selectListByCondition" resultMap="BaseResultMapVO">
+        select model_no
+        from
+          tb_mould
+        left join
+
+    </select>
 </mapper>