文档列表

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

@@ -102,6 +102,20 @@ public class MouldController {
         return msg;
     }
 
+    /**
+     * 模具详情
+     * 参数 id 模具id
+     * @return
+     */
+    @ApiOperation("删除模具")
+    @RequestMapping("/delMould")
+    @ResponseBody
+    public HttpRespMsg delMould(Mould mould){
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = mouldService.delMoule(mould);
+        return msg;
+    }
+
     /**
      * 模具保养提醒
      */

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

@@ -21,4 +21,6 @@ public interface MouldService extends IService<Mould> {
     HttpRespMsg getMoildDetail(MouldVO mould);
 
     HttpRespMsg maintenanceReminder() throws Exception;
+
+    HttpRespMsg delMoule(Mould mould);
 }

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

@@ -87,7 +87,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
         HttpRespMsg msg = new HttpRespMsg();
         Map<String, Object> map = new HashMap<>();
         MouldVO mould = mouldMapper.getDetailById(mouldVO);
-        map.put("vo",mould);
+        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()) {
@@ -96,8 +96,8 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
             map.put("view", 0);
             map.put("approve", 0);
         } else {
-            List<CustomCompany> list = customCompanyMapper.selectList(new QueryWrapper<CustomCompany>().eq("project_id",mould.getProjectId()));
-            map.put("customCompany",list);
+            List<CustomCompany> list = customCompanyMapper.selectList(new QueryWrapper<CustomCompany>().eq("project_id", mould.getProjectId()));
+            map.put("customCompany", list);
             if (Constant.SYS_PARENT_ID == currentUser.getParentId()) {
                 //当前人超级管理员 ,对项目只可以浏览
                 map.put("update", 0);
@@ -157,14 +157,14 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
         //查询所有被分配到项目的模具
         List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().isNotNull("project_id"));
         for (Mould mould : moulds) {
-            if(mould.getInitialModulus()<mould.getRunTimes()){
+            if (mould.getInitialModulus() < mould.getRunTimes()) {
                 //提示保养，向模具资产方人员公众号推送消息
                 User user = userMapper.selectOne(new QueryWrapper<User>().eq("parent_id", Constant.SYS_ID).eq("company_id", mould.getCompanyId()));
                 MouldEquipmentVO mouldEquipmentVO = new MouldEquipmentVO();
                 mouldEquipmentVO.setPlanType(Constant.PLAN_TYPE);
                 mouldEquipmentVO.setArea(mould.getArea());
                 mouldEquipmentVO.setName(mould.getModelName());
-                msg = sendMaintainTemplateMessage(Constant.MAINTAIN_NOTICE_TEMPLATE_ID,user.getOpenid(),Constant.WECHAT_APPID,Constant.WECHAT_SECRET,mouldEquipmentVO);
+                msg = sendMaintainTemplateMessage(Constant.MAINTAIN_NOTICE_TEMPLATE_ID, user.getOpenid(), Constant.WECHAT_APPID, Constant.WECHAT_SECRET, mouldEquipmentVO);
                 //添加通知消息
                 Project project = projectMapper.selectById(mould.getProjectId());
                 //查询到参与该项目的人
@@ -176,10 +176,28 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                     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));
+                for (User u : users) {
 
+                }
             }
         }
-        return null;
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg delMoule(Mould mould) {
+        HttpRespMsg msg = new HttpRespMsg();
+        Mould newMould = mouldMapper.selectById(mould.getId());
+        if (null != mould.getProjectId()) {
+            msg.setError("该模具已被应用到项目，不提供删除操作");
+        } else {
+            mouldMapper.deleteById(newMould.getId());
+        }
+        return msg;
     }
 
     //告警模板推送通用接口