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/entity/NewsNotice.java

@@ -58,6 +58,11 @@ public class NewsNotice extends Model<NewsNotice> {
      */
     @TableField("content")
     private String content;
+    /**
+     * 文件类型 0-模具文档，1-零件文档，2-试模验收 3-保养方案 4-模具更新 5-模具报废
+     */
+    @TableField("belong_type")
+    private Integer belongType;
 
     /**
      * 时间
@@ -128,7 +133,16 @@ public class NewsNotice extends Model<NewsNotice> {
         return this.id;
     }
 
+    public Integer getBelongType() {
+        return belongType;
+    }
+
+    public void setBelongType(Integer belongType) {
+        this.belongType = belongType;
+    }
+
     @Override
+
     public String toString() {
         return "NewsNotice{" +
         "id=" + id +

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

@@ -1,11 +1,8 @@
 package com.hssx.cloudmodel.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
 
 /**
@@ -14,7 +11,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-08-10
+ * @since 2019-09-03
  */
 public class VnoticeUser extends Model<VnoticeUser> {
 
@@ -57,13 +54,13 @@ public class VnoticeUser extends Model<VnoticeUser> {
     private String projectName;
 
     /**
-     * 消息提醒类型0-审批，1-保养，2-告警
+     * 消息提醒类型0-审批，1-保养，2-告警，3-待报废
      */
     @TableField("notice_type")
     private Integer noticeType;
 
     /**
-     * 引用的外部表id(模具，文档，设备)
+     * 引用的外部表id(模具，文档，模具，模具)
      */
     @TableField("ref_id")
     private Integer refId;
@@ -78,9 +75,14 @@ public class VnoticeUser extends Model<VnoticeUser> {
      * 时间
      */
     @TableField("indate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
+    /**
+     * 文件类型
+     */
+    @TableField("blong_type")
+    private Integer blongType;
+
 
     public Integer getId() {
         return id;
@@ -162,6 +164,14 @@ public class VnoticeUser extends Model<VnoticeUser> {
         this.indate = indate;
     }
 
+    public Integer getBlongType() {
+        return blongType;
+    }
+
+    public void setBlongType(Integer blongType) {
+        this.blongType = blongType;
+    }
+
     @Override
     protected Serializable pkVal() {
         return null;
@@ -180,6 +190,7 @@ public class VnoticeUser extends Model<VnoticeUser> {
         ", refId=" + refId +
         ", content=" + content +
         ", indate=" + indate +
+        ", blongType=" + blongType +
         "}";
     }
 }

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

@@ -204,6 +204,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                         NewsNotice newsNotice = new NewsNotice();
                         newsNotice.setRefId(projectFile.getModelId());
                         newsNotice.setProjectId(project.getId());
+                        newsNotice.setBelongType(projectFile.getBlongType());
                         newsNotice.setProjectName(project.getProjectName() + "-" + mould.getModelName());
                         newsNotice.setNoticeType(Constant.APPROVEL_TYPE);
                         if (blongType == 0) {
@@ -250,6 +251,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 NewsNotice newsNotice = new NewsNotice();
                 newsNotice.setRefId(projectFile.getModelId());
                 newsNotice.setProjectId(project.getId());
+                newsNotice.setBelongType(projectFile.getBlongType());
                 newsNotice.setProjectName(project.getProjectName() + "-" + mould.getModelName());
                 newsNotice.setNoticeType(Constant.APPROVEL_TYPE);
                 if (blongType == 4) {
@@ -257,7 +259,6 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 }
                 newsNotice.setContent("有新的" + content + "申请记录,待您审批。");
                 newsNoticeMapper.insert(newsNotice);
-
                 for (ProjectApprove projectApprove : projectApproves) {
                     NewsNoticeUser newsNoticeUser = new NewsNoticeUser();
                     newsNoticeUser.setUserId(projectApprove.getApproverId());

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

@@ -49,11 +49,11 @@ public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements
         List<ProjectVO> list = new ArrayList<>();
         Integer type = 0;
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
-        System.out.println("user"+user);
+        System.out.println("user" + user);
         QueryWrapper<Project> qw = new QueryWrapper<>();
         Integer count = projectMapper.selectCount(qw.eq("manager_id", user.getId()));
         BeanUtils.copyProperties(user, userVO);
-        System.out.println("userVO"+userVO);
+        System.out.println("userVO" + userVO);
         if (user != null) {
             if (Constant.SYS_PARENT_ID == user.getParentId()) {
                 //平台超级管理员
@@ -101,12 +101,12 @@ public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements
                         power.setUserId(userVO.getId());
                         powerMapper.insert(power);
                     }
-                } else {
-                    msg.setError("对不起您没有该项权限!");
                 }
             } else {
-                msg.setError("用户不存或没登录!");
+                msg.setError("对不起您没有该项权限!");
             }
+        } else {
+            msg.setError("用户不存或没登录!");
         }
         return msg;
     }

cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_mould_equipment");
+        strategy.setInclude("vnotice_user");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -176,7 +176,7 @@
 
     <select id="getDetailById" resultMap="BaseResultMapVO">
     select
-        tbm.project_id project_id, tbm.setting_life setting_life, tbm.area area,tbm.equipment_id equipment_id,tbm.maintain_count maintain_count,is_maintain,
+        tbm.project_id project_id, tbm.setting_life setting_life,tbm.equipment_id equipment_id,tbm.maintain_count maintain_count,is_maintain,
         tbm.id id,tbm.model_no model_no, tbm.model_name,tbm.initial_modulus initial_modulus,tbp.manager_id managerId,tbm.produce_company_id produce_company_id,
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbco.company_name produceCompany,tbm.creator_id creator_id,tbm.holes,
         tbp.manager mangerName,tbco.company_address area,tbm.rfid rfid,tbm.oc_cycle oc_cycle,tbc.company_name companyName,tbm.pre_update_id,

cloud-model/src/main/resources/mapper/VnoticeUserMapper.xml

@@ -14,11 +14,12 @@
         <result column="ref_id" property="refId" />
         <result column="content" property="content" />
         <result column="indate" property="indate" />
+        <result column="belong_type" property="blongType" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, is_read, news_id, project_id, project_name, notice_type, ref_id, content, indate
+        id, user_id, is_read, news_id, project_id, project_name, notice_type, ref_id, content, indate, belong_type
     </sql>
 
 </mapper>