Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

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

@@ -1,7 +1,9 @@
 package com.hssx.cloudmodel.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.Company;
+import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.service.CompanyService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
@@ -15,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 
 /**
@@ -77,5 +80,35 @@ public class CompanyController {
         return msg;
     }
 
+    /**
+     * 创建模具获取的(资产方)公司列表
+     * @return
+     */
+    @ApiOperation("创建模具获取的公司列表")
+    @RequestMapping("/getCompanys")
+    @ResponseBody
+    public HttpRespMsg getcompanys() {
+        HttpRespMsg msg = new HttpRespMsg();
+        QueryWrapper<Company> qw = new QueryWrapper<>();
+        qw.eq("company_type",0);
+        msg.data  = companyService.list(qw);
+        return msg;
+    }
+
+    /**
+     * 创建账号是所获取的公司列表
+     * parentId 当前用户的上级id id 当前用户id
+     * @return
+     */
+    @ApiOperation(value = "获取公司列表")
+    @RequestMapping("/getCompanyList")
+    @ResponseBody
+    public HttpRespMsg getCompanyList(User user){
+        HttpRespMsg msg = new HttpRespMsg();
+        List<Company> list = companyService.getIdAndNamelist(user);
+        msg.data = list;
+        return msg;
+    }
+
 }
 

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-08-02
  */
 @RestController
-@RequestMapping("/custom-company")
+@RequestMapping("/customcompany")
 public class CustomCompanyController {
 
 }

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

@@ -6,10 +6,7 @@ import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.Mould;
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.hssx.cloudmodel.entity.User;
-import com.hssx.cloudmodel.service.CompanyService;
-import com.hssx.cloudmodel.service.MouldEquipmentService;
-import com.hssx.cloudmodel.service.MouldService;
-import com.hssx.cloudmodel.service.UserService;
+import com.hssx.cloudmodel.service.*;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +31,8 @@ public class MouldController {
     private CompanyService companyService;
     @Autowired
     private MouldEquipmentService mouldEquipmentService;
+    @Autowired
+    private ProjectService projectService;
     /**
      * 添加/修改模具设备
      * 添加参数：equipmentId 设备id， modelNo 模具编号 ,modelName 模具名称
@@ -53,34 +52,19 @@ public class MouldController {
         msg = mouldService.addAndUpdateMould(mould,user);
         return msg;
     }
-    /**
-     * 创建模具获取的(资产方)公司列表
-     * @return
-     */
-    @ApiOperation("创建模具获取的公司列表")
-    @RequestMapping("/getcompanys")
-    @ResponseBody
-    public HttpRespMsg getcompanys() {
-        HttpRespMsg msg = new HttpRespMsg();
-        QueryWrapper<Company> qw = new QueryWrapper<>();
-        qw.eq("company_type",0);
-        msg.data  = companyService.list(qw);
-        return msg;
-    }
 
     /**
-     * 获取资产方公司的设备列表
-     * 参数 belongCompanyId 当前登录人公司id
+     * 给项目分配模具获取该公司下的模具列表
+     * parentId 当前人parentId
      * @return
      */
-    @ApiOperation("获取资产方公司的设备列表")
-    @RequestMapping("/getMouldEquipmentList")
+    @ApiOperation("获取该公司下的模具列表")
+    @RequestMapping("/modelList")
     @ResponseBody
-    public HttpRespMsg getMouldEquipmentList(MouldEquipment mouldEquipment){
+    public HttpRespMsg addAndUpdateProject(User user) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data = mouldEquipmentService.list(new QueryWrapper<MouldEquipment>().eq("belong_company_id", mouldEquipment.getBelongCompanyId()));
+        msg = projectService.getModelListByCompanyId(user);
         return msg;
     }
-
 }
 

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

@@ -7,10 +7,12 @@ import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.service.MouldEquipmentService;
 import com.hssx.cloudmodel.service.UserService;
 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.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 
@@ -60,5 +62,38 @@ public class MouldEquipmentController {
         msg = mouldEquipmentService.isUse(mouldEquipment,user);
         return msg;
     }
+
+    /**
+     * 创建模具时获取资产方公司的设备列表
+     * 参数 belongCompanyId 当前登录人公司id
+     * @return
+     */
+    @ApiOperation("获取资产方公司的设备列表")
+    @RequestMapping("/getMouldEquipmentList")
+    @ResponseBody
+    public HttpRespMsg getMouldEquipmentList(MouldEquipment mouldEquipment){
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = mouldEquipmentService.list(new QueryWrapper<MouldEquipment>().eq("belong_company_id", mouldEquipment.getBelongCompanyId()));
+        return msg;
+    }
+
+    /**
+     * 设备列表(仅仅只有超级管理员能够看到)
+     * 参数 token 用户唯一身份凭证
+     * @return
+     */
+    @ApiOperation("设备列表")
+    @RequestMapping("/getEquipmentList")
+    @ResponseBody
+    public HttpRespMsg getMouldEquipmentList(@RequestParam(required = false) String token, PageUtil page){
+        HttpRespMsg msg = new HttpRespMsg();
+        QueryWrapper<User> qw = new QueryWrapper<>();
+        qw.eq("head_imgurl",token);
+        User user = userService.getOne(qw);
+        msg = mouldEquipmentService.getList(user,page);
+        return msg;
+    }
+
+
 }
 

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

@@ -51,35 +51,6 @@ public class ProjectController{
         return msg;
     }
 
-    /**
-     * 获取该公司下的模具列表
-     * parentId 当前人parentId
-     * @return
-     */
-    @ApiOperation("获取该公司下的模具列表")
-    @RequestMapping("/modelList")
-    @ResponseBody
-    public HttpRespMsg addAndUpdateProject(User user) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg = projectService.getModelListByCompanyId(user);
-        return msg;
-    }
-
-    /**
-     * 根据公司id获取公司下的人员
-     * 参数：companyIds 公司ids ,id当前操作人的id
-     *
-     * @return
-     */
-    @ApiOperation("根据公司id获取公司下的人员")
-    @RequestMapping("/getUserListByCompanyIds")
-    @ResponseBody
-    public HttpRespMsg getUserListByCompanyIds(String companyIds,Integer id){
-        System.out.println("companyIds"+companyIds);
-        HttpRespMsg msg = projectService.getUserListByCompanyIds(companyIds,id);
-        return msg;
-    }
-
     /**
      * 分配项目
      * 参数: pageNum 当前页码，pageSize 每页条数 keyName 关键字查询 token 用户唯一凭证
@@ -95,20 +66,6 @@ public class ProjectController{
         return msg;
     }
 
-    /**
-     * 获取用户列表
-     * 参数: companyId 公司id，subordinateType 所属方 0-供应商 1-客户
-     * 以上两参数可以都不传，或者选择传其中一个
-     * @return
-     */
-    @ApiOperation("获取用户列表")
-    @RequestMapping("/getUserList")
-    @ResponseBody
-    public HttpRespMsg getUserByCompanyIdOrSubordinateType(User user) {
-        HttpRespMsg msg = projectService.getUserByCompanyIdOrSubordinateType(user);
-        return msg;
-    }
-
     /**
      * 项目详情
      * 参数: id 项目id

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.service.CompanyService;
+import com.hssx.cloudmodel.service.ProjectService;
 import com.hssx.cloudmodel.service.UserService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.MD5Util;
@@ -33,6 +34,8 @@ public class UserController {
     private UserService userService;
     @Autowired
     private CompanyService companyService;
+    @Autowired
+    private ProjectService projectService;
 
     /**
      *
@@ -50,21 +53,6 @@ public class UserController {
         return msg;
     }
 
-    /**
-     * 创建账号是所获取的公司列表
-     * parentId 当前用户的上级id id 当前用户id
-     * @return
-     */
-    @ApiOperation(value = "获取公司列表")
-    @RequestMapping("/getCompanyList")
-    @ResponseBody
-    public HttpRespMsg getCompanyList(User user){
-        HttpRespMsg msg = new HttpRespMsg();
-        List<Company> list = companyService.getIdAndNamelist(user);
-        msg.data = list;
-        return msg;
-    }
-
     /**
      * 添加/修改用户
      *
@@ -135,5 +123,34 @@ public class UserController {
         }
         return msg;
     }
+
+    /**
+     * 给项目分配参与人的时候根据公司id获取公司下的人员
+     * 参数：companyIds 公司ids ,id当前操作人的id
+     *
+     * @return
+     */
+    @ApiOperation("根据公司id获取公司下的人员")
+    @RequestMapping("/getUserListByCompanyIds")
+    @ResponseBody
+    public HttpRespMsg getUserListByCompanyIds(String companyIds,Integer id){
+        System.out.println("companyIds"+companyIds);
+        HttpRespMsg msg = projectService.getUserListByCompanyIds(companyIds,id);
+        return msg;
+    }
+
+    /**
+     * 获取用户列表
+     * 参数: companyId 公司id，subordinateType 所属方 0-供应商 1-客户
+     * 以上两参数可以都不传，或者选择传其中一个
+     * @return
+     */
+    @ApiOperation("获取用户列表")
+    @RequestMapping("/getUserList")
+    @ResponseBody
+    public HttpRespMsg getUserByCompanyIdOrSubordinateType(User user) {
+        HttpRespMsg msg = projectService.getUserByCompanyIdOrSubordinateType(user);
+        return msg;
+    }
 }
 

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

@@ -4,6 +4,7 @@ import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
 
 /**
  * <p>
@@ -18,4 +19,6 @@ public interface MouldEquipmentService extends IService<MouldEquipment> {
     HttpRespMsg addAndUpdateMouldEquipment(MouldEquipment mouldEquipment, User user);
 
     HttpRespMsg isUse(MouldEquipment mouldEquipment, User user);
+
+    HttpRespMsg getList(User user,PageUtil page);
 }

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

@@ -1,16 +1,22 @@
 package com.hssx.cloudmodel.service.impl;
 
+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.MouldEquipment;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.mapper.MouldEquipmentMapper;
 import com.hssx.cloudmodel.service.MouldEquipmentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.List;
 
 /**
  * <p>
@@ -57,4 +63,20 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg getList(User user,PageUtil page) {
+        HttpRespMsg msg = new HttpRespMsg();
+        if(user != null){
+            if(Constant.SYS_PARENT_ID == user.getParentId()){
+                PageHelper.startPage(page.getPageNum(),page.getPageSize());
+                List<MouldEquipment> mouldEquipments = mouldEquipmentMapper.selectList(new QueryWrapper<MouldEquipment>());
+                PageInfo<MouldEquipment> pageInfo = new PageInfo<>(mouldEquipments);
+                msg.data = pageInfo;
+            }else{
+                msg.setError("对不起！您不含有查看该列表的权利。");
+            }
+        }
+        return msg;
+    }
 }