设备启用

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

@@ -1,21 +1,49 @@
 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.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;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
  * @author 吴涛涛
  * @since 2019-07-30
  */
-@RestController
+@Controller
 @RequestMapping("/mould")
 public class MouldController {
+    @Autowired
+    private MouldService mouldService;
+    /**
+     * 添加/修改模具设备
+     * 添加参数：modelName ，useLife 使用年限， equipmentNo 设备编号 ，
+     * belongCompanyId 所属公司id ，equipmentName 设备名称
+     * 修改时需多传的参数 id 设备id
+     * @return
+     */
+    @ApiOperation("添加/修改模具")
+    @RequestMapping("/addOrUpdate")
+    @ResponseBody
+    public HttpRespMsg addOrUpdate(Mould mould, String token) {
+        HttpRespMsg msg = new HttpRespMsg();
+//        QueryWrapper<User> qw = new QueryWrapper<>();
+//        qw.eq("head_imgurl",token);
+//        User user = userService.getOne(qw);
+//        msg = mouldEquipmentService.addAndUpdateMouldEquipment(mouldEquipment,user);
+        return msg;
+    }
+
+
 
 }
 

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

@@ -3,7 +3,6 @@ package com.hssx.cloudmodel.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.MouldEquipment;
-import com.hssx.cloudmodel.entity.Project;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.service.MouldEquipmentService;
 import com.hssx.cloudmodel.service.UserService;
@@ -12,12 +11,8 @@ 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.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
 
 /**
  *

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

@@ -62,6 +62,7 @@ public class ProjectController{
     @RequestMapping("/getUserListByCompanyIds")
     @ResponseBody
     public HttpRespMsg getUserListByCompanyIds(String companyIds){
+        System.out.println("companyIds"+companyIds);
         HttpRespMsg msg = projectService.getUserListByCompanyIds(companyIds);
         return msg;
     }

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

@@ -179,7 +179,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     public HttpRespMsg getUserListByCompanyIds(String companyIds) {
         HttpRespMsg msg = new HttpRespMsg();
         if(!"".equals(companyIds) && companyIds != null){
-            List<Integer> ids = ListUtil.convertIntegerIdsArrayToList("companyIds");
+            List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(companyIds);
             msg.data = userMapper.selectList(new QueryWrapper<User>().in("company_id",ids));
         }
         return msg;

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

@@ -53,7 +53,7 @@ public class ListUtil {
 		List<Integer> ids = new ArrayList<Integer>();
 		for (String a : array) {
 			if (a != null && a.length() > 0) {
-				ids.add(Integer.valueOf(a));
+				ids.add(Integer.parseInt(a));
 			}
 		}
 		return ids;