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

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

@@ -3,6 +3,7 @@ package com.hssx.cloudmodel.controller;
 
 import com.hssx.cloudmodel.service.PowerService;
 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;
@@ -27,14 +28,15 @@ public class PowerController {
 
     /**
      * 权限列表
-     * @param token 用户身份标识
+     * 参数 ：token 用户身份标识 pageNum 当前页码，pageSize 每页条数 keyName 关键字查询
+     *
      * @return
      */
     @ApiOperation("权限列表")
     @RequestMapping("/list")
     @ResponseBody
-    public HttpRespMsg list(String token){
-        HttpRespMsg msg = powerService.getList(token);
+    public HttpRespMsg list(String token, PageUtil page){
+        HttpRespMsg msg = powerService.getList(token,page);
         return msg;
     }
 

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

@@ -19,5 +19,6 @@ public class ProjectVO extends Project {
     private List<Mould> models = new ArrayList<>();
     private List<ProjectApprove>approves = new ArrayList<>();
     private List<CustomCompany> customCompanies = new ArrayList<>();
+    private List<Power>powers = new ArrayList<>();
 
 }

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

@@ -25,4 +25,6 @@ public interface ProjectMapper extends BaseMapper<Project> {
     ProjectVO getProjectById(@Param("id")Integer id);
 
     List<User> getProjectUserById(@Param("id")Integer id);
+
+    List<ProjectVO> selectUserPowerList(@Param("user") User user, @Param("type") Integer type);
 }

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

@@ -3,6 +3,7 @@ package com.hssx.cloudmodel.service;
 import com.hssx.cloudmodel.entity.Power;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
 
 /**
  * <p>
@@ -14,5 +15,5 @@ import com.hssx.cloudmodel.util.HttpRespMsg;
  */
 public interface PowerService extends IService<Power> {
 
-    HttpRespMsg getList(String token);
+    HttpRespMsg getList(String token,PageUtil page);
 }

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

@@ -1,17 +1,31 @@
 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.Power;
+import com.hssx.cloudmodel.entity.Project;
+import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.ProjectVO;
 import com.hssx.cloudmodel.mapper.PowerMapper;
+import com.hssx.cloudmodel.mapper.ProjectMapper;
+import com.hssx.cloudmodel.mapper.UserMapper;
 import com.hssx.cloudmodel.service.PowerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
+import net.sf.jsqlparser.expression.operators.arithmetic.Concat;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 吴涛涛
@@ -21,10 +35,40 @@ import javax.annotation.Resource;
 public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements PowerService {
     @Resource
     PowerMapper powerMapper;
+    @Resource
+    UserMapper userMapper;
+    @Resource
+    ProjectMapper projectMapper;
 
     @Override
-    public HttpRespMsg getList(String token) {
-
-        return null;
+    public HttpRespMsg getList(String token, PageUtil page) {
+        HttpRespMsg msg = new HttpRespMsg();
+        List<ProjectVO> list = new ArrayList<>();
+        Integer type = 0;
+        PageHelper.startPage(page.getPageNum(),page.getPageSize());
+        User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        QueryWrapper<Project> qw = new QueryWrapper<>();
+        Integer count = projectMapper.selectCount(qw.eq("manager_id", user.getId()));
+        if (user != null) {
+            if (Constant.SYS_PARENT_ID == user.getParentId()) {
+                //平台超级管理员
+                msg.setError("对不起你不具备该项权限!");
+            } else if (Constant.SYS_ID == user.getParentId()) {
+                //资产方管理员,展示此人创建所有项目对应的权限
+                list = projectMapper.selectUserPowerList(user,type);
+            } else if (count > 0) {
+                //项目经理
+                type = 1;
+                list = projectMapper.selectUserPowerList(user,type);
+            } else {
+                //普通用户
+                msg.setError("对不起你不具备该项权限!");
+            }
+            PageInfo<ProjectVO> pageInfos = new PageInfo<>(list);
+            msg.data = pageInfos;
+        } else {
+            msg.setError("用户不存或没登录!");
+        }
+        return msg;
     }
 }

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

@@ -57,6 +57,7 @@
         <result column="equipment_id" property="equipmentId"/>
         <result column="belong_project_grade" property="belongProjectGrade"/>
         <result column="produce_company_id" property="produceCompanyId"/>
+        <result column="run_times" property="runTimes" />
         <result column="projectName" property="projectName"/>
         <result column="mangerName" property="mangerName"/>
         <result column="equipmentNo" property="equipmentNo"/>
@@ -75,7 +76,7 @@
         tbm.id id,tbm.model_no model_no, tbm.model_name model_name,tbm.initial_modulus initial_modulus,tbm.rfid rfid,
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,
         tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.hill_number hillNumber,
-        tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName
+        tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName,tbm.run_times run_times
         from
         tb_mould tbm
         left join
@@ -109,7 +110,7 @@
         tbm.id id,tbm.model_no model_no, tbm.model_name model_name,tbm.initial_modulus initial_modulus,tbm.rfid rfid,
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,
         tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.hill_number hillNumber,
-        tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName
+        tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName,tbm.run_times run_times
         from
         tb_mould tbm
         left join
@@ -144,7 +145,7 @@
         tbm.id id,tbm.model_no model_no, tbm.model_name,tbm.initial_modulus initial_modulus,
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,
         tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbm.rfid rfid,
-        tbmp.equipment_no equipmentNo,tbmp.hill_number hillNumber,tbm.setting_life setting_life
+        tbmp.equipment_no equipmentNo,tbmp.hill_number hillNumber,tbm.setting_life setting_life,tbm.run_times run_times
         from
         tb_mould tbm
         left join

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

@@ -49,7 +49,7 @@
     <select id="getProjectListByUid" resultMap="BaseResultMapList">
         select
         p.id id,p.project_name project_name, p.creator creator,p.owner_company owner_company,
-        p.owner_company_name owner_company_name,
+        p.owner_company_name owner_company_name,p.manager_id manager_id,p.manager manager,
         p.indate indate
         from
         tb_project p
@@ -113,7 +113,7 @@
 
     <select id="getProjectById" resultMap="BaseResultMapVO">
     select
-        p.id id, p.project_name project_name, p.project_no project_no, p.creator_id creator_id,
+        p.id id, p.project_name project_name, p.project_no project_no, p.creator_id creator_id,p.manager_id manager_id,p.manager manager,
         p.creator creator, p.owner_company owner_company,p.owner_company_name owner_company_name,p.indate indate,
         m.id model_id, m.model_no model_no,m.model_name model_name,a.approver_id approver_id,a.approver_name approver_name,a.subordinate_type subordinate_type,
         c.company_id companyid,c.company_name companyname
@@ -151,4 +151,29 @@
           pu.project_id = #{id}
     </select>
 
+    <resultMap id="BaseResultMapPowerList" type="com.hssx.cloudmodel.entity.vo.ProjectVO">
+        <id column="id" property="id" />
+        <result column="project_name" property="projectName" />
+        <result column="project_no" property="projectNo" />
+        <result column="start_time" property="startTime" />
+        <result column="end_time" property="endTime" />
+        <result column="content" property="content" />
+        <result column="creator_id" property="creatorId" />
+        <result column="creator" property="creator" />
+        <result column="is_delete" property="isDelete" />
+        <result column="owner_company" property="ownerCompany" />
+        <result column="owner_company_name" property="ownerCompanyName" />
+        <result column="indate" property="indate" />
+        <result column="manager_id" property="managerId" />
+        <result column="manager" property="manager" />
+        <!--以下是分页插件的一对多-->
+        <collection property="powers" javaType="java.util.List" ofType="com.hssx.cloudmodel.entity.Power"
+                    select="queryPowerListById" column="id" >
+        </collection>
+    </resultMap>
+
+    <select id="selectUserPowerList" resultMap="BaseResultMapPowerList">
+
+    </select>
+
 </mapper>