模具详情

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

@@ -2,9 +2,7 @@ package com.hssx.cloudmodel.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.MouldVO;
 import com.hssx.cloudmodel.entity.vo.UserVO;
@@ -14,7 +12,6 @@ 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;

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

@@ -80,7 +80,7 @@ public class MouldEquipmentController {
 
     /**
      * 设备列表(仅仅只有超级管理员能够看到)
-     * 参数 token 用户唯一身份凭证
+     * 参数 token 用户唯一身份凭证 pageNum 当前页码，pageSize 每页条数 keyName 关键字查询
      * @return
      */
     @ApiOperation("设备列表")

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

@@ -31,9 +31,9 @@ public class ProjectController{
     /**
      * 添加/修改项目
      * 参数：projectName 项目名 ,customerCompanyIds 客户方公司ids "1,2,3",customerCompanyNames 客户方公司名字“1,2,3”
-     * managerId 项目经理id 非必传
+     * managerId 项目经理id  managerName 项目经理name
      * 修改时/添加时分配项目: id 项目id ，userIds 参与项目的用户id 如：“1,2,3”(多个或者一个)()
-     * managerId 项目经理id 非必传，  modelIds 模具ids 如 :"1,2,3"
+     * managerId 项目经理id 非必传，managerId 项目经理  modelIds 模具ids 如 :"1,2,3"
      * flag 0-添加，1-修改
      *
      * @return
@@ -52,7 +52,7 @@ public class ProjectController{
     }
 
     /**
-     * 分配项目
+     * 项目列表
      * 参数: pageNum 当前页码，pageSize 每页条数 keyName 关键字查询 token 用户唯一凭证
      *
      * @return
@@ -60,7 +60,7 @@ public class ProjectController{
     @ApiOperation("项目列表")
     @RequestMapping("/list")
     @ResponseBody
-    public HttpRespMsg handOutProject(@RequestParam(required = false) String keyName, PageUtil page, String token) {
+    public HttpRespMsg list(@RequestParam(required = false) String keyName, PageUtil page, String token) {
         User currentUser = userService.getOne(new QueryWrapper<User>().eq("head_imgurl", token));
         HttpRespMsg msg = projectService.getList(keyName,page,currentUser);
         return msg;
@@ -79,5 +79,18 @@ public class ProjectController{
         return msg;
     }
 
+    /**
+     * 筛选模具列表时作为筛选条件所加载的项目列表
+     * 参数: token 用户身份凭证
+     * @return
+     */
+    @ApiOperation("项目详情")
+    @RequestMapping("/projectList")
+    @ResponseBody
+    public HttpRespMsg getProjectList(String token){
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = projectService.getListByUser(token);
+        return msg;
+    }
 }
 

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

@@ -33,4 +33,6 @@ public interface ProjectService extends IService<Project> {
     HttpRespMsg getModelListByCompanyId(User user);
 
     HttpRespMsg getModelListByUser(UserVO user, PageUtil page);
+
+    HttpRespMsg getListByUser(String token);
 }

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

@@ -44,10 +44,21 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
         if (user.getParentId() == 0) {
             if (mouldEquipment.getId() == null) {
                 //添加设备
-                mouldEquipmentMapper.insert(mouldEquipment);
+                //查询当前设备编号的模具是否存在
+                Integer count = mouldMapper.selectCount(new QueryWrapper<Mould>().eq("equipment_no", mouldEquipment.getEquipmentNo()));
+                if (count > 0) {
+                    msg.setError("当前设备编号已存在，请重新输入其他模具编号");
+                } else {
+                    mouldEquipmentMapper.insert(mouldEquipment);
+                }
             } else {
                 //修改设备
-                mouldEquipmentMapper.updateById(mouldEquipment);
+                MouldEquipment m = mouldEquipmentMapper.selectOne(new QueryWrapper<MouldEquipment>().eq("equipment_no", mouldEquipment.getEquipmentNo()));
+                if ((m != null && m.getId() == mouldEquipment.getId()) || m == null) {
+                    mouldEquipmentMapper.updateById(mouldEquipment);
+                } else {
+                    msg.setError("当前设备编号已存在，请重新输入其他模具编号");
+                }
             }
         } else {
             msg.setError("对不起，您不是管理员，不具备设备创建或修改的权限");
@@ -97,10 +108,10 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
         for (Mould mould : moulds) {
             ides.add(mould.getEquipmentId());
         }
-        if(ides.size()==0){
+        if (ides.size() == 0) {
             ides.add(-1);
         }
-        List<MouldEquipmentVO> list = mouldEquipmentMapper.getListByCompanyId(mouldEquipmentVO.getBelongCompanyId(),ides);
+        List<MouldEquipmentVO> list = mouldEquipmentMapper.getListByCompanyId(mouldEquipmentVO.getBelongCompanyId(), ides);
         msg.data = list;
         return msg;
     }

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

@@ -44,6 +44,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 msg.setError("当前模具编号已存在，请重新输入其他模具编号");
             }else{
                 mould.setCreatorId(user.getId());
+                mould.setCompanyId(user.getCompanyId());
                 mouldMapper.insert(mould);
             }
         }

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

@@ -270,4 +270,43 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg getListByUser(String token) {
+        HttpRespMsg msg = new HttpRespMsg();
+        List<Integer> ides = new ArrayList<>();
+        ides.add(-1);
+        User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        List<Project>projects = new ArrayList<>();
+        if(user != null){
+            QueryWrapper<Project> qw = new QueryWrapper<>();
+            qw.select("id","project_name");
+            if(Constant.SYS_PARENT_ID == user.getParentId()){
+                //系统超级管理员，可获得所有项目
+                projects = projectMapper.selectList(qw);
+            }else if(Constant.SYS_ID == user.getParentId()){
+                //资产方管理员
+                qw.eq("owner_company",user.getCompanyId());
+                projects = projectMapper.selectList(qw);
+            }else{
+                QueryWrapper<Project> qwPro = new QueryWrapper<>();
+                qwPro.eq("manager_id", user.getId());
+                List<Project> projectList = projectMapper.selectList(qw);
+                for (Project project : projectList) {
+                    ides.add(project.getId());
+                }
+                //项目经理或者普通用户
+                List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("user_id", user.getId()));
+                for (ProjectUser projectUser : projectUsers) {
+                    ides.add(projectUser.getProjectId());
+                }
+                qw.in("id",ides);
+                projects = projectMapper.selectList(qw);
+            }
+            msg.data = projects;
+        }else{
+            msg.setError("当前用户未登录，或者用户不存在");
+        }
+        return msg;
+    }
 }

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

@@ -51,6 +51,7 @@
                  open="(" separator="," close=")">
             #{item}
         </foreach>
+        and tbme.is_use = 1
     </select>
     <select id="getList" resultMap="BaseResultMapVO">
         select