文档列表

cloud-model/src/main/java/com/hssx/cloudmodel/constant/Constant.java

@@ -35,12 +35,16 @@ public class Constant {
     public static final Integer UPDATE_AUTHORITY = 0;//修改权限
     public static final Integer DOWNLOAD_AUTHORITY = 1;//下载权限
     public static final Integer VIEW_AUTHORITY = 2;//浏览权限
+    public static final Integer MAINTAIN_TYPE = 1;//保养类型
+    public static final Integer APPROVEL_TYPE = 0;//审批类型
+    public static final Integer EMERGENCY_TYPE = 2;//告警类型
     public static final Integer APPROVAL_AUTHORITY = 3;//审批权限
     public static final String WARNING_NOTICE_TEMPLATE_ID = "-EpBbqgMN2cCBf6pUSlFXGNlstkeCidVEejTOhrGcy4";//告警通知模板id
     public static final String MAINTAIN_NOTICE_TEMPLATE_ID = "VcU9E2f3Nn4uR6S1z57VBaLeBAhEO4vfivo3Tug_BKE";//保养通知模板id
     public static final String WECHAT_SECRET = "473ee2fab33e6d8a885800403d777581";//secret
     public static final String WECHAT_APPID = "wx42c0f9d19a4756a7";//appId
-    public static final String PLAN_TYPE = "保养类型";//appId
+    public static final String PLAN_TYPE = "保养类型";//保养类型
+    public static final String MAIN_TAIN_NOTICE = "该模具需要保养，请前往处理";//保养通知
 //    public static void main(String[] args){
 //        System.out.println("222222");
 //        String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="

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

@@ -66,7 +66,7 @@ public class MouldEquipmentController {
 
     /**
      * 创建模具时获取资产方公司的设备列表
-     * 参数 belongCompanyId 当前登录人公司id
+     * 参数 belongCompanyId 当前登录人公司id,mouldId 模具id
      * @return
      */
     @ApiOperation("获取资产方公司的设备列表")

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

@@ -18,6 +18,7 @@ public class MouldEquipmentVO extends MouldEquipment {
     private String area;//所在科室
     private String planType;//计划类型
     private String name;
+    private Integer mouldId;//模具id
     /**
      * 模具编号
      */

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

@@ -106,7 +106,9 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
         List<Integer> ides = new ArrayList<>();
         List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().eq("company_id", mouldEquipmentVO.getBelongCompanyId()));
         for (Mould mould : moulds) {
-            ides.add(mould.getEquipmentId());
+            if(mould.getId() != mouldEquipmentVO.getMouldId()){
+                ides.add(mould.getEquipmentId());
+            }
         }
         if (ides.size() == 0) {
             ides.add(-1);

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

@@ -54,6 +54,8 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
     CompanyMapper companyMapper;
     @Resource
     ProjectUserMapper projectUserMapper;
+    @Resource
+    NewsNoticeMapper newsNoticeMapper;
 
     @Override
     public HttpRespMsg addAndUpdateMould(Mould mould, User user) {
@@ -181,7 +183,14 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 }
                 List<User> users = userMapper.selectList(new QueryWrapper<User>().in("id", userIds));
                 for (User u : users) {
-
+                    NewsNotice newsNotice = new NewsNotice();
+                    newsNotice.setNoticeType(Constant.MAINTAIN_TYPE);
+                    newsNotice.setProjectId(project.getId());
+                    newsNotice.setProjectName(project.getProjectName());
+                    newsNotice.setRefId(mould.getId());
+                    newsNotice.setContent(Constant.MAIN_TAIN_NOTICE);
+                    newsNoticeMapper.insert(newsNotice);
+                    NewsNoticeUser newsNoticeUser = new NewsNoticeUser();
                 }
             }
         }