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/constant/Constant.java

@@ -45,6 +45,7 @@ public class Constant {
     public static final String WECHAT_APPID = "wx42c0f9d19a4756a7";//appId
     public static final String PLAN_TYPE = "保养类型";//保养类型
     public static final String MAIN_TAIN_NOTICE = "该模具需要保养,请前往处理";//保养通知
+    public static final String SCRAP_NOTICE = "该模具运行次数已超过寿命次数,请申请报废处理";//待报废
     public static final String MAINTAIN_NAME_FIRST = "动作";//保养类型名称0
     public static final String MAINTAIN_NAME_SECOND = "易损件";//保养类型名称1
     public static final String MAINTAIN_WAY_FIRST = "喷漆";//对应保养类型动作

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

@@ -149,5 +149,16 @@ public class MouldController {
         HttpRespMsg msg = mouldService.maintainMouldList(userVO);
         return msg;
     }
+    /**
+     * 需要保养的模具列表
+     * 参数 token 用户凭证
+     */
+    @ApiOperation("报废提醒的模具列表")
+    @RequestMapping("/scrapMouldList")
+    @ResponseBody
+    public HttpRespMsg scrapMouldList(UserVO userVO) throws Exception {
+        HttpRespMsg msg = mouldService.scrapMouldList(userVO);
+        return msg;
+    }
 }
 

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

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

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

@@ -213,6 +213,16 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 if (isPass == 1) {
                     if (oldData.getState() == 2) {//生产方也审核通过了
                         mf.setState(3);
+                        //审批的是模具报废文件
+                        if(oldData.getBlongType()==5){
+                            //将模具修改为已报废
+                            Mould mould = new Mould();
+                            mould.setId(oldData.getModelId());
+                            mould.setState(4+"");//4已报废状态
+                            mouldMapper.updateById(mould);
+                        }
+
+
                     } else {
                         mf.setState(1);
                     }
@@ -225,6 +235,13 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 if (isPass == 1) {
                     if (oldData.getState() == 1) {//资产方也审核通过了
                         mf.setState(3);
+                        //将模具修改为已报废
+                        if(oldData.getBlongType()==5){
+                            Mould mould = new Mould();
+                            mould.setId(oldData.getModelId());
+                            mould.setState(4+"");//4已报废状态
+                            mouldMapper.updateById(mould);
+                        }
                     } else {
                         mf.setState(2);
                     }

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

@@ -178,6 +178,8 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                     }
                 }
             }
+            //添加通知消息
+            Project project = projectMapper.selectById(mould.getProjectId());
             if (noticeCount != 0) {
                 //需要保养
                 Mould m = new Mould();
@@ -192,7 +194,6 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
 //                mouldEquipmentVO.setName(mould.getModelName());
 //                msg = sendMaintainTemplateMessage(Constant.MAINTAIN_NOTICE_TEMPLATE_ID, user.getOpenid(), Constant.WECHAT_APPID, Constant.WECHAT_SECRET, mouldEquipmentVO);
                 //添加通知消息
-                Project project = projectMapper.selectById(mould.getProjectId());
                 //查询到参与该项目的人
                 List<Integer> userIds = new ArrayList<>();
                 userIds.add(project.getCreatorId());
@@ -239,6 +240,51 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                     }
                 }
             }
+            //待报废消息通知
+            if(mould.getRunTimes()>mould.getSettingLife()){
+                //修改模具成待报废状态
+                Mould m = new Mould();
+                m.setId(mould.getId());
+                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();
+                //添加通知消息
+                //查询到参与该项目的人
+                List<Integer> userIds = new ArrayList<>();
+                userIds.add(project.getCreatorId());
+                userIds.add(project.getManagerId());
+                List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("project_id", project.getId()));
+                for (ProjectUser projectUser : projectUsers) {
+                    userIds.add(projectUser.getUserId());
+                }
+                List<ProjectApprove> projectApproves = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("project_id", project.getId()));
+                for (ProjectApprove projectApprove : projectApproves) {
+                    userIds.add(projectApprove.getApproverId());
+                }
+                List<User> users = userMapper.selectList(new QueryWrapper<User>().in("id", userIds));
+                if(oldNews != null){
+                    NewsNotice newNews = new NewsNotice();
+                    newNews.setId(oldNews.getId());
+                    oldNews.setIndate(LocalDateTime.now());
+                    newsNoticeMapper.updateById(oldNews);
+                    newsNoticeUserMapper.updateNewsNoticeUserByNewsNoticeId(oldNews.getId());
+                }else{
+                    newsNotice.setNoticeType(Constant.MAINTAIN_TYPE);
+                    newsNotice.setProjectId(project.getId());
+                    newsNotice.setProjectName(project.getProjectName());
+                    newsNotice.setRefId(mould.getId());
+                    newsNotice.setContent(Constant.SCRAP_NOTICE);
+                    newsNoticeMapper.insert(newsNotice);
+                    for (User u : users) {
+                        //添加通知的消息
+                        NewsNoticeUser newsNoticeUser = new NewsNoticeUser();
+                        newsNoticeUser.setNewsId(newsNotice.getId());
+                        newsNoticeUser.setUserId(u.getId());
+                        newsNoticeUserMapper.insert(newsNoticeUser);
+                    }
+                }
+            }
         }
         return msg;
     }
@@ -315,6 +361,55 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
         return msg;
     }
 
+    @Override
+    public HttpRespMsg scrapMouldList(UserVO userVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
+        List<Integer> set = new ArrayList<>();
+        set.add(-1);
+        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());
+                }
+            } 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());
+                    }
+                }
+//                //充当普通人员参与的项目
+                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());
+                    }
+                }
+
+            }
+            moulds = mouldMapper.selectList(new QueryWrapper<Mould>().in("project_id",set));
+            msg.data = moulds;
+        } else {
+            msg.setError("用户不存在，或者未登录！");
+        }
+        return msg;
+    }
+
     //告警模板推送通用接口
 
     /**