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

@@ -57,6 +57,20 @@ public class MouldController {
         return msg;
     }
 
+    /**
+     * 更换模具云模盒
+     * mouldId 模具id  equipmentId 云模盒设备id token 用户身份凭证
+     * @return
+     */
+    @ApiOperation("更换模具云模盒")
+    @RequestMapping("/changeMouldEquipment")
+    @ResponseBody
+    public HttpRespMsg changeMouldEquipment(Mould mould, String token) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = mouldService.changeMouldEquipment(mould,token);
+        return msg;
+    }
+
     /**
      * 给项目分配模具获取该公司下的模具列表
      * parentId 当前人parentId ,id当前人id

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

@@ -76,7 +76,7 @@ public class Mould extends Model<Mould> {
     private Integer currentVersionId;
 
     /**
-     * 状态0-静止 1-运动
+     * 状态0-静止 1-运动 2-告警 3-待报废 4-已报废
      */
     @TableField("state")
     private String state;

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

@@ -30,4 +30,6 @@ public interface MouldService extends IService<Mould> {
     HttpRespMsg maintainMouldList(UserVO userVO);
 
     HttpRespMsg scrapMouldList(UserVO userVO);
+
+    HttpRespMsg changeMouldEquipment(Mould mould, String token);
 }

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

@@ -71,7 +71,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
             //修改
             Mould m = mouldMapper.selectOne(new QueryWrapper<Mould>().eq("model_no", mould.getModelNo()));
             if ((m != null && m.getId() == mould.getId()) || m == null) {
-                if(mould.getProduceCompanyId() != null){
+                if (mould.getProduceCompanyId() != null) {
                     Company company = companyMapper.selectById(mould.getProduceCompanyId());
                     mould.setArea(company.getCompanyAddress());
                 }
@@ -210,7 +210,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 //查询到之前模具保养的消息
                 NewsNotice oldNews = newsNoticeMapper.selectOne(new QueryWrapper<NewsNotice>().eq("ref_id", mould.getId()).eq("notice_type", 1));
                 NewsNotice newsNotice = new NewsNotice();
-                if(oldNews != null){
+                if (oldNews != null) {
                     NewsNotice newNews = new NewsNotice();
                     newNews.setId(oldNews.getId());
                     oldNews.setIndate(LocalDateTime.now());
@@ -224,7 +224,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
 //                        newsNoticeUser.setIsRead(0);
 //                        newsNoticeUserMapper.updateById(newsNoticeUser);
 //                    }
-                }else{
+                } else {
                     newsNotice.setNoticeType(Constant.MAINTAIN_TYPE);
                     newsNotice.setProjectId(project.getId());
                     newsNotice.setProjectName(project.getProjectName());
@@ -241,11 +241,11 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 }
             }
             //待报废消息通知
-            if(mould.getRunTimes()>mould.getSettingLife()){
+            if (mould.getRunTimes() > mould.getSettingLife()) {
                 //修改模具成待报废状态
                 Mould m = new Mould();
                 m.setId(mould.getId());
-                m.setState(3+"");//3-待报废状态
+                m.setState(3 + "");//3-待报废状态
                 mouldMapper.updateById(m);
                 NewsNotice oldNews = newsNoticeMapper.selectOne(new QueryWrapper<NewsNotice>().eq("ref_id", mould.getId()).eq("notice_type", 3));
                 NewsNotice newsNotice = new NewsNotice();
@@ -263,13 +263,13 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                     userIds.add(projectApprove.getApproverId());
                 }
                 List<User> users = userMapper.selectList(new QueryWrapper<User>().in("id", userIds));
-                if(oldNews != null){
+                if (oldNews != null) {
                     NewsNotice newNews = new NewsNotice();
                     newNews.setId(oldNews.getId());
                     oldNews.setIndate(LocalDateTime.now());
                     newsNoticeMapper.updateById(oldNews);
                     newsNoticeUserMapper.updateNewsNoticeUserByNewsNoticeId(oldNews.getId());
-                }else{
+                } else {
                     newsNotice.setNoticeType(Constant.MAINTAIN_TYPE);
                     newsNotice.setProjectId(project.getId());
                     newsNotice.setProjectName(project.getProjectName());
@@ -321,39 +321,39 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
         List<Mould> moulds = new ArrayList<>();
         if (currentUser.getId() != null) {
             //资产方管理员，获取他公司下的所有模具
-             if (Constant.SYS_ID == currentUser.getParentId()) {
-                 List<Project> projects = projectMapper.selectList(new QueryWrapper<Project>().eq("creator_id", currentUser.getId()));
-                 for (Project project : projects) {
-                     set.add(project.getId());
-                 }
+            if (Constant.SYS_ID == currentUser.getParentId()) {
+                List<Project> projects = projectMapper.selectList(new QueryWrapper<Project>().eq("creator_id", currentUser.getId()));
+                for (Project project : projects) {
+                    set.add(project.getId());
+                }
             } else {
                 //普通用户或者项目经理
                 //充当项目经理参与的项目
-                    QueryWrapper<Project> qw = new QueryWrapper<>();
-                    qw.eq("manager_id", currentUser.getId());
-                    List<Project> projects = projectMapper.selectList(qw);
-                    if (projects.size() > 0) {
-                        for (Project project : projects) {
-                            set.add(project.getId());
-                        }
+                QueryWrapper<Project> qw = new QueryWrapper<>();
+                qw.eq("manager_id", currentUser.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", currentUser.getId()));
-                    if (projectUsers.size() > 0) {
-                        for (ProjectUser projectUser : projectUsers) {
-                            set.add(projectUser.getProjectId());
-                        }
+                List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("user_id", currentUser.getId()));
+                if (projectUsers.size() > 0) {
+                    for (ProjectUser projectUser : projectUsers) {
+                        set.add(projectUser.getProjectId());
                     }
+                }
 //                //充当审批人员参与的项目
-                    List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", currentUser.getId()));
-                    if (projectss.size() > 0) {
-                        for (ProjectApprove projectUser : projectss) {
-                            set.add(projectUser.getProjectId());
-                        }
+                List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", currentUser.getId()));
+                if (projectss.size() > 0) {
+                    for (ProjectApprove projectUser : projectss) {
+                        set.add(projectUser.getProjectId());
                     }
-
                 }
-            moulds = mouldMapper.selectList(new QueryWrapper<Mould>().in("project_id",set));
+
+            }
+            moulds = mouldMapper.selectList(new QueryWrapper<Mould>().in("project_id", set).eq("is_maintain", 1));
             msg.data = moulds;
         } else {
             msg.setError("用户不存在，或者未登录！");
@@ -402,7 +402,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 }
 
             }
-            moulds = mouldMapper.selectList(new QueryWrapper<Mould>().in("project_id",set));
+            moulds = mouldMapper.selectList(new QueryWrapper<Mould>().in("project_id", set).eq("state", 3));
             msg.data = moulds;
         } else {
             msg.setError("用户不存在，或者未登录！");
@@ -410,6 +410,25 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
         return msg;
     }
 
+    @Override
+    public HttpRespMsg changeMouldEquipment(Mould mould, String token) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        if (currentUser != null) {
+            if(Constant.SYS_PARENT_ID == currentUser.getParentId()){
+                Mould m = new Mould();
+                m.setId(mould.getId());
+                m.setEquipmentId(mould.getEquipmentId());
+                mouldMapper.updateById(m);
+            }else{
+                msg.setError("您没有该项权限");
+            }
+        }else{
+            msg.setError("用户不存在或未登录");
+        }
+        return null;
+    }
+
     //告警模板推送通用接口
 
     /**