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

@@ -48,6 +48,7 @@ public class Constant {
     public static final String PLAN_TYPE = "保养类型";//保养类型
     public static final String MAIN_TAIN_NOTICE = "该模具需要保养,请前往处理";//保养通知
     public static final String SCRAP_NOTICE = "该模具运行次数已超过寿命次数,请申请报废处理";//待报废
+    public static final String EMERGENCY_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/VnoticeUserController.java

@@ -1,19 +1,15 @@
 package com.hssx.cloudmodel.controller;
 
 
-import com.hssx.cloudmodel.entity.NewsNotice;
-import com.hssx.cloudmodel.entity.VnoticeUser;
 import com.hssx.cloudmodel.service.VnoticeUserService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 

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

@@ -3,8 +3,6 @@ package com.hssx.cloudmodel.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.constant.Constant;
 import com.hssx.cloudmodel.entity.*;
 import com.hssx.cloudmodel.entity.vo.MouldEquipmentVO;
@@ -20,14 +18,9 @@ import com.hssx.cloudmodel.util.ListUtil;
 import com.hssx.cloudmodel.util.WechatTemplateMessage;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.io.IOException;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -460,10 +453,12 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
             m.setId(mould.getId());
             m.setEquipmentId(mould.getEquipmentId());
             mouldMapper.updateById(m);
+            projectMapper.selectOne(new QueryWrapper<>());
             //通知资产方管理员
             NewsNotice newsNotice = new NewsNotice();
             User user = userMapper.selectOne(new QueryWrapper<User>().eq("company_id", mould.getCompanyId()).eq("parent_id", 1));
 
+            newsNotice.setContent("111");
         } else {
             msg.setError("用户不存在或未登录");
         }

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

@@ -5,7 +5,6 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.constant.Constant;
 import com.hssx.cloudmodel.entity.*;
-import com.hssx.cloudmodel.entity.vo.MouldVO;
 import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.mapper.*;
 import com.hssx.cloudmodel.service.UserService;
@@ -14,7 +13,6 @@ import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.ListUtil;
 import com.hssx.cloudmodel.util.MD5Util;
 import com.hssx.cloudmodel.util.PageUtil;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -213,14 +211,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 }
             } else if (flag == 1) {
                 //更新角色信息
-                Company company = companyMapper.selectById(user.getCompanyId());
-                if (Constant.ASSETS_COMPANY == company.getCompanyType()) {
-                    user.setSubordinateType(Constant.ASSETS_COMPANY);
-                    user.setTeamName("资产方");
-                } else if (Constant.PRODUCER_COMPANY == company.getCompanyType()) {
-                    user.setSubordinateType(Constant.PRODUCER_COMPANY);
-                    user.setTeamName("生产方");
-                }
+//                Company company = companyMapper.selectById(user.getCompanyId());
+//                if (Constant.ASSETS_COMPANY == company.getCompanyType()) {
+//                    user.setSubordinateType(Constant.ASSETS_COMPANY);
+//                    user.setTeamName("资产方");
+//                } else if (Constant.PRODUCER_COMPANY == company.getCompanyType()) {
+//                    user.setSubordinateType(Constant.PRODUCER_COMPANY);
+//                    user.setTeamName("生产方");
+//                }
                 userMapper.updateById(user);
             }
         } else if (Constant.SYS_ID == parentUser.getParentId()) {
@@ -297,14 +295,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 }
             } else if (flag == 1) {
                 //更新角色信息
-                Company company = companyMapper.selectById(user.getCompanyId());
-                if (Constant.ASSETS_COMPANY == company.getCompanyType()) {
-                    user.setSubordinateType(Constant.ASSETS_COMPANY);
-                    user.setTeamName("资产方");
-                } else if (Constant.PRODUCER_COMPANY == company.getCompanyType()) {
-                    user.setSubordinateType(Constant.PRODUCER_COMPANY);
-                    user.setTeamName("生产方");
-                }
+//                Company company = companyMapper.selectById(user.getCompanyId());
+//                if (Constant.ASSETS_COMPANY == company.getCompanyType()) {
+//                    user.setSubordinateType(Constant.ASSETS_COMPANY);
+//                    user.setTeamName("资产方");
+//                } else if (Constant.PRODUCER_COMPANY == company.getCompanyType()) {
+//                    user.setSubordinateType(Constant.PRODUCER_COMPANY);
+//                    user.setTeamName("生产方");
+//                }
                 userMapper.updateById(user);
             }
         } else {
@@ -397,14 +395,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 }
             } else if (flag == 1) {
                 //更新角色信息
-                Company company = companyMapper.selectById(user.getCompanyId());
-                if (Constant.ASSETS_COMPANY == company.getCompanyType()) {
-                    user.setSubordinateType(Constant.ASSETS_COMPANY);
-                    user.setTeamName("资产方");
-                } else if (Constant.PRODUCER_COMPANY == company.getCompanyType()) {
-                    user.setSubordinateType(Constant.PRODUCER_COMPANY);
-                    user.setTeamName("生产方");
-                }
+//                Company company = companyMapper.selectById(user.getCompanyId());
+//                if (Constant.ASSETS_COMPANY == company.getCompanyType()) {
+//                    user.setSubordinateType(Constant.ASSETS_COMPANY);
+//                    user.setTeamName("资产方");
+//                } else if (Constant.PRODUCER_COMPANY == company.getCompanyType()) {
+//                    user.setSubordinateType(Constant.PRODUCER_COMPANY);
+//                    user.setTeamName("生产方");
+//                }
                 userMapper.updateById(user);
             }
         }

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

@@ -4,12 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.constant.Constant;
-import com.hssx.cloudmodel.entity.NewsNotice;
 import com.hssx.cloudmodel.entity.NewsNoticeUser;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.entity.VnoticeUser;
-import com.hssx.cloudmodel.entity.vo.NewsNoticeVO;
-import com.hssx.cloudmodel.mapper.NewsNoticeMapper;
 import com.hssx.cloudmodel.mapper.NewsNoticeUserMapper;
 import com.hssx.cloudmodel.mapper.UserMapper;
 import com.hssx.cloudmodel.mapper.VnoticeUserMapper;