项目的分配

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

@@ -0,0 +1,21 @@
+package com.hssx.cloudmodel.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+@RestController
+@RequestMapping("/mould")
+public class MouldController {
+
+}
+

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

@@ -33,6 +33,7 @@ public class ProjectController{
      * 添加/修改项目
      * 参数：projectName 项目名 ,customerCompany 客户方公司id
      * customerCompanyName 客户方公司名称 chargerId 负责人id,charger 负责人姓名
+     * 修改时分配项目: id 项目id ，userIds 参与项目的用户id 如：“1,2,3”(多个或者一个)
      * flag 0-添加，1-修改
      *
      * @return
@@ -41,26 +42,12 @@ public class ProjectController{
     @RequestMapping("/add")
     @ResponseBody
     public HttpRespMsg addAndUpdateProject(Project project, HttpServletRequest request, Integer flag,
-                                           HttpServletResponse response, String token) {
+                                           HttpServletResponse response, String token,@RequestParam(required = false) String userIds) {
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<User> qw = new QueryWrapper<>();
         qw.eq("head_imgurl",token);
         User user = userService.getOne(qw);
-        msg = projectService.addAndUpdateProject(project, flag, user);
-        return msg;
-    }
-
-    /**
-     * 分配项目
-     * 参数：id 项目id ，userIds 参与项目的用户id 如：“1,2,3”(多个或者一个)
-     *
-     * @return
-     */
-    @ApiOperation("分配项目")
-    @RequestMapping("/ handOutProject")
-    @ResponseBody
-    public HttpRespMsg handOutProject(Project project, String userIds) {
-        HttpRespMsg msg = projectService.handOutProject(project, userIds);
+        msg = projectService.addAndUpdateProject(project, flag, user,userIds);
         return msg;
     }
 

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

@@ -0,0 +1,21 @@
+package com.hssx.cloudmodel.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+@RestController
+@RequestMapping("/project-file")
+public class ProjectFileController {
+
+}
+

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

@@ -0,0 +1,335 @@
+package com.hssx.cloudmodel.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+@TableName("tb_mould")
+public class Mould extends Model<Mould> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 模具编号
+     */
+    @TableField("model_no")
+    private String modelNo;
+
+    /**
+     * 模具名称
+     */
+    @TableField("model_name")
+    private String modelName;
+
+    /**
+     * 水隙
+     */
+    @TableField("water_gap")
+    private BigDecimal waterGap;
+
+    /**
+     * 吨位
+     */
+    @TableField("tonnage")
+    private BigDecimal tonnage;
+
+    /**
+     * 电量
+     */
+    @TableField("hill_number")
+    private String hillNumber;
+
+    /**
+     * 每模平均周期
+     */
+    @TableField("oc_cycle")
+    private BigDecimal ocCycle;
+
+    /**
+     * 日输出量
+     */
+    @TableField("daily_output")
+    private BigDecimal dailyOutput;
+
+    /**
+     * 所属客户公司id
+     */
+    @TableField("company_id")
+    private Integer companyId;
+
+    /**
+     * 当前版本id
+     */
+    @TableField("current_version_id")
+    private Integer currentVersionId;
+
+    /**
+     * 状态
+     */
+    @TableField("state")
+    private String state;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_delete")
+    private Integer isDelete;
+
+    /**
+     * 创建者id
+     */
+    @TableField("creator_id")
+    private Integer creatorId;
+
+    /**
+     * 项目id
+     */
+    @TableField("project_id")
+    private Integer projectId;
+
+    /**
+     * 模具对应的射频识别
+     */
+    @TableField("rfid")
+    private String rfid;
+
+    /**
+     * 使用寿命
+     */
+    @TableField("setting_life")
+    private Integer settingLife;
+
+    /**
+     * 工厂位置
+     */
+    @TableField("area")
+    private String area;
+
+    /**
+     * 工厂id
+     */
+    @TableField("factory_id")
+    private Integer factoryId;
+
+    /**
+     * 工厂名称
+     */
+    @TableField("factory_name")
+    private String factoryName;
+
+    /**
+     * 初始模次(保养设定次数)
+     */
+    @TableField("initial_modulus")
+    private Integer initialModulus;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getModelNo() {
+        return modelNo;
+    }
+
+    public void setModelNo(String modelNo) {
+        this.modelNo = modelNo;
+    }
+
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    public BigDecimal getWaterGap() {
+        return waterGap;
+    }
+
+    public void setWaterGap(BigDecimal waterGap) {
+        this.waterGap = waterGap;
+    }
+
+    public BigDecimal getTonnage() {
+        return tonnage;
+    }
+
+    public void setTonnage(BigDecimal tonnage) {
+        this.tonnage = tonnage;
+    }
+
+    public String getHillNumber() {
+        return hillNumber;
+    }
+
+    public void setHillNumber(String hillNumber) {
+        this.hillNumber = hillNumber;
+    }
+
+    public BigDecimal getOcCycle() {
+        return ocCycle;
+    }
+
+    public void setOcCycle(BigDecimal ocCycle) {
+        this.ocCycle = ocCycle;
+    }
+
+    public BigDecimal getDailyOutput() {
+        return dailyOutput;
+    }
+
+    public void setDailyOutput(BigDecimal dailyOutput) {
+        this.dailyOutput = dailyOutput;
+    }
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    public Integer getCurrentVersionId() {
+        return currentVersionId;
+    }
+
+    public void setCurrentVersionId(Integer currentVersionId) {
+        this.currentVersionId = currentVersionId;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public Integer getCreatorId() {
+        return creatorId;
+    }
+
+    public void setCreatorId(Integer creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    public Integer getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Integer projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getRfid() {
+        return rfid;
+    }
+
+    public void setRfid(String rfid) {
+        this.rfid = rfid;
+    }
+
+    public Integer getSettingLife() {
+        return settingLife;
+    }
+
+    public void setSettingLife(Integer settingLife) {
+        this.settingLife = settingLife;
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public Integer getFactoryId() {
+        return factoryId;
+    }
+
+    public void setFactoryId(Integer factoryId) {
+        this.factoryId = factoryId;
+    }
+
+    public String getFactoryName() {
+        return factoryName;
+    }
+
+    public void setFactoryName(String factoryName) {
+        this.factoryName = factoryName;
+    }
+
+    public Integer getInitialModulus() {
+        return initialModulus;
+    }
+
+    public void setInitialModulus(Integer initialModulus) {
+        this.initialModulus = initialModulus;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "Mould{" +
+        "id=" + id +
+        ", modelNo=" + modelNo +
+        ", modelName=" + modelName +
+        ", waterGap=" + waterGap +
+        ", tonnage=" + tonnage +
+        ", hillNumber=" + hillNumber +
+        ", ocCycle=" + ocCycle +
+        ", dailyOutput=" + dailyOutput +
+        ", companyId=" + companyId +
+        ", currentVersionId=" + currentVersionId +
+        ", state=" + state +
+        ", isDelete=" + isDelete +
+        ", creatorId=" + creatorId +
+        ", projectId=" + projectId +
+        ", rfid=" + rfid +
+        ", settingLife=" + settingLife +
+        ", area=" + area +
+        ", factoryId=" + factoryId +
+        ", factoryName=" + factoryName +
+        ", initialModulus=" + initialModulus +
+        "}";
+    }
+}

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

@@ -0,0 +1,170 @@
+package com.hssx.cloudmodel.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+@TableName("tb_project_file")
+public class ProjectFile extends Model<ProjectFile> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 项目文件主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 项目id
+     */
+    @TableField("project_id")
+    private Integer projectId;
+
+    /**
+     * 上传者id
+     */
+    @TableField("uploader_id")
+    private Integer uploaderId;
+
+    /**
+     * 上传者姓名
+     */
+    @TableField("uploader")
+    private String uploader;
+
+    /**
+     * 文件名
+     */
+    @TableField("file_name")
+    private String fileName;
+
+    /**
+     * 文件地址/服务器文件名
+     */
+    @TableField("url")
+    private String url;
+
+    /**
+     * 文件类型
+     */
+    @TableField("file_type")
+    private String fileType;
+
+    /**
+     * 文件大小
+     */
+    @TableField("file_size")
+    private String fileSize;
+
+    /**
+     * 上传时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Integer projectId) {
+        this.projectId = projectId;
+    }
+
+    public Integer getUploaderId() {
+        return uploaderId;
+    }
+
+    public void setUploaderId(Integer uploaderId) {
+        this.uploaderId = uploaderId;
+    }
+
+    public String getUploader() {
+        return uploader;
+    }
+
+    public void setUploader(String uploader) {
+        this.uploader = uploader;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getFileType() {
+        return fileType;
+    }
+
+    public void setFileType(String fileType) {
+        this.fileType = fileType;
+    }
+
+    public String getFileSize() {
+        return fileSize;
+    }
+
+    public void setFileSize(String fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "ProjectFile{" +
+        "id=" + id +
+        ", projectId=" + projectId +
+        ", uploaderId=" + uploaderId +
+        ", uploader=" + uploader +
+        ", fileName=" + fileName +
+        ", url=" + url +
+        ", fileType=" + fileType +
+        ", fileSize=" + fileSize +
+        ", indate=" + indate +
+        "}";
+    }
+}

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

@@ -4,7 +4,6 @@ import com.hssx.cloudmodel.entity.Mould;
 import com.hssx.cloudmodel.entity.Project;
 import com.hssx.cloudmodel.entity.User;
 
-import javax.jws.soap.SOAPBinding;
 import java.util.ArrayList;
 import java.util.List;
 

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/MouldMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.Mould;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+public interface MouldMapper extends BaseMapper<Mould> {
+
+}

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/ProjectFileMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.ProjectFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+public interface ProjectFileMapper extends BaseMapper<ProjectFile> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.service;
+
+import com.hssx.cloudmodel.entity.Mould;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+public interface MouldService extends IService<Mould> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.service;
+
+import com.hssx.cloudmodel.entity.ProjectFile;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+public interface ProjectFileService extends IService<ProjectFile> {
+
+}

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

@@ -17,7 +17,7 @@ import com.hssx.cloudmodel.util.PageUtil;
  */
 public interface ProjectService extends IService<Project> {
 
-    HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user);
+    HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user,String userIds);
 
     HttpRespMsg handOutProject(Project project, String userIds);
 

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

@@ -0,0 +1,20 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.hssx.cloudmodel.entity.Mould;
+import com.hssx.cloudmodel.mapper.MouldMapper;
+import com.hssx.cloudmodel.service.MouldService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+@Service
+public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements MouldService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.hssx.cloudmodel.entity.ProjectFile;
+import com.hssx.cloudmodel.mapper.ProjectFileMapper;
+import com.hssx.cloudmodel.service.ProjectFileService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-30
+ */
+@Service
+public class ProjectFileServiceImpl extends ServiceImpl<ProjectFileMapper, ProjectFile> implements ProjectFileService {
+
+}

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

@@ -45,7 +45,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     CompanyMapper companyMapper;
 
     @Override
-    public HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user) {
+    public HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user,String userIds) {
         HttpRespMsg msg = new HttpRespMsg();
         if(user != null){
             QueryWrapper<Project> qw = new QueryWrapper<>();
@@ -72,9 +72,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     project.setCreatorId(user.getId());
                     project.setCreator(user.getUsername());
                     projectMapper.insert(project);
+                    //分配人员
+                    this.handOutProject(project, userIds);
                 }
             }else if(flag == 1){
                 projectMapper.updateById(project);
+                //删除之前分配的人员
+                QueryWrapper<ProjectUser> qwPro = new QueryWrapper<>();
+                qwPro.eq("project_id",project.getId());
+                projectUserMapper.delete(qwPro);
+                //再次重新分配
+                this.handOutProject(project, userIds);
             }
         }else{
             msg.setError("当前角色涉及权限问题，请重新登录");

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

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.MouldMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.Mould">
+        <id column="id" property="id" />
+        <result column="model_no" property="modelNo" />
+        <result column="model_name" property="modelName" />
+        <result column="water_gap" property="waterGap" />
+        <result column="tonnage" property="tonnage" />
+        <result column="hill_number" property="hillNumber" />
+        <result column="oc_cycle" property="ocCycle" />
+        <result column="daily_output" property="dailyOutput" />
+        <result column="company_id" property="companyId" />
+        <result column="current_version_id" property="currentVersionId" />
+        <result column="state" property="state" />
+        <result column="is_delete" property="isDelete" />
+        <result column="creator_id" property="creatorId" />
+        <result column="project_id" property="projectId" />
+        <result column="rfid" property="rfid" />
+        <result column="setting_life" property="settingLife" />
+        <result column="area" property="area" />
+        <result column="factory_id" property="factoryId" />
+        <result column="factory_name" property="factoryName" />
+        <result column="initial_modulus" property="initialModulus" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, model_no, model_name, water_gap, tonnage, hill_number, oc_cycle, daily_output, company_id, current_version_id, state, is_delete, creator_id, project_id, rfid, setting_life, area, factory_id, factory_name, initial_modulus
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.ProjectFileMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.ProjectFile">
+        <id column="id" property="id" />
+        <result column="project_id" property="projectId" />
+        <result column="uploader_id" property="uploaderId" />
+        <result column="uploader" property="uploader" />
+        <result column="file_name" property="fileName" />
+        <result column="url" property="url" />
+        <result column="file_type" property="fileType" />
+        <result column="file_size" property="fileSize" />
+        <result column="indate" property="indate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, project_id, uploader_id, uploader, file_name, url, file_type, file_size, indate
+    </sql>
+
+</mapper>

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

@@ -35,7 +35,9 @@
         <result column="charger_id" property="chargerId" />
         <result column="charger" property="charger" />
         <collection property="models" ofType="com.hssx.cloudmodel.entity.Mould">
-
+            <id column="id" property="id" />
+            <result column="model_no" property="modelNo" />
+            <result column="model_name" property="modelName" />
         </collection>
     </resultMap>