模具添加

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

@@ -3,17 +3,15 @@ package com.hssx.cloudmodel.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.Mould;
-import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.service.MouldService;
+import com.hssx.cloudmodel.service.UserService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author 吴涛涛
@@ -24,11 +22,14 @@ import org.springframework.web.bind.annotation.RestController;
 public class MouldController {
     @Autowired
     private MouldService mouldService;
+    @Autowired
+    private UserService userService;
     /**
      * 添加/修改模具设备
-     * 添加参数：modelName ，settingLife 使用年限， equipmentNo 设备编号 ，
+     * 添加参数：equipmentId 设备id， modelNo 模具编号
+     * 修改参数：id 模具id, modelName 模具名称，settingLife 使用年限， initialModulus 初始模次 equipmentId 设备id，
+     * produceCompanyId 生产方公司id,ocCycle 每模平均周期,rfid rfid码，area 工厂地址，factoryId 工厂id,factoryName 工厂名称
      * belongCompanyId 所属公司id ，equipmentName 设备名称
-     * 修改时需多传的参数 id 设备id
      * @return
      */
     @ApiOperation("添加/修改模具")
@@ -38,12 +39,9 @@ public class MouldController {
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<User> qw = new QueryWrapper<>();
         qw.eq("head_imgurl",token);
-//        User user = userService.getOne(qw);
-//        msg = mouldService.addAndUpdateMould(mouldEquipment,user);
+        User user = userService.getOne(qw);
+        msg = mouldService.addAndUpdateMould(mould,user);
         return msg;
     }
-
-
-
 }
 

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

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 
 /**
@@ -43,12 +42,12 @@ public class ProjectController{
     @RequestMapping("/add")
     @ResponseBody
     public HttpRespMsg addAndUpdateProject(Project project, HttpServletRequest request, Integer flag,String customerCompanyIds,
-                                           String customerCompanyNames, String token,@RequestParam(required = false) String userIds) {
+                                           String customerCompanyNames, String token,@RequestParam(required = false) String userIds,String modelIds) {
         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,userIds,customerCompanyIds,customerCompanyNames);
+        msg = projectService.addAndUpdateProject(project, flag, user,userIds,customerCompanyIds,customerCompanyNames,modelIds);
         return msg;
     }
 

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

@@ -2,6 +2,8 @@ package com.hssx.cloudmodel.service;
 
 import com.hssx.cloudmodel.entity.Mould;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.util.HttpRespMsg;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface MouldService extends IService<Mould> {
 
+    HttpRespMsg addAndUpdateMould(Mould mould, User user);
 }

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,String userIds,String customerCompanyIds,String customerCompanyNames);
+    HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user,String userIds,String customerCompanyIds,String customerCompanyNames,String modelIds);
 
     HttpRespMsg handOutProject(Project project, String userIds);
 

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

@@ -1,9 +1,12 @@
 package com.hssx.cloudmodel.service.impl;
 
 import com.hssx.cloudmodel.entity.Mould;
+import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.mapper.MouldMapper;
 import com.hssx.cloudmodel.service.MouldService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,5 +19,17 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements MouldService {
-
+    @Autowired
+    MouldMapper mouldMapper;
+    @Override
+    public HttpRespMsg addAndUpdateMould(Mould mould, User user) {
+        if(mould.getId() != null){
+            //修改
+            mouldMapper.updateById(mould);
+        }else{
+            mould.setCreatorId(user.getId());
+            mouldMapper.insert(mould);
+        }
+        return null;
+    }
 }

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

@@ -44,7 +44,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     CustomCompanyMapper customCompanyMapper;
 
     @Override
-    public HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user,String userIds,String customerCompanyIds,String customerCompanyNames) {
+    public HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user,String userIds,
+                                           String customerCompanyIds,String customerCompanyNames,String modelIds) {
         HttpRespMsg msg = new HttpRespMsg();
         if(user != null){
             QueryWrapper<Project> qw = new QueryWrapper<>();