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

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

@@ -57,15 +57,15 @@ public class MouldMaintainController {
 
     /**
      * 保养列表
-     * token 用户身份凭证,pageNum 当前页码，pageSize 每页条数
+     * token 用户身份凭证,pageNum 当前页码，pageSize 每页条数,mouldId 模具id
      * @return
      */
     @ApiOperation("保养列表")
     @RequestMapping("/list")
     @ResponseBody
-    public HttpRespMsg uploadFile(String token, PageUtil page) throws Exception {
+    public HttpRespMsg uploadFile(UserVO userVO, PageUtil page) throws Exception {
         HttpRespMsg msg = new HttpRespMsg();
-        msg = mouldMaintainService.getList(token,page);
+        msg = mouldMaintainService.getList(userVO,page);
         return msg;
     }
 

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

@@ -6,6 +6,7 @@ import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.service.PartService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -21,10 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -53,7 +51,7 @@ public class PartController {
     @ResponseBody
     public HttpRespMsg importAppLogin(
             @RequestParam(value = "file", required = false) MultipartFile file,
-            UserVO userVO) {
+            UserVO userVO) throws IOException, InvalidFormatException {
         HttpRespMsg msg = new HttpRespMsg();
         msg = partService.importPartExcel(file, userVO);
         return msg;

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

@@ -3,6 +3,7 @@ package com.hssx.cloudmodel.service;
 import com.hssx.cloudmodel.entity.MouldMaintain;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.entity.vo.MouldVO;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 import org.springframework.web.multipart.MultipartFile;
@@ -19,5 +20,5 @@ public interface MouldMaintainService extends IService<MouldMaintain> {
 
     HttpRespMsg addMaintain(MultipartFile file, String path, MouldMaintain mouldMaintain,String token);
 
-    HttpRespMsg getList(String token,PageUtil page);
+    HttpRespMsg getList(UserVO userVO, PageUtil page);
 }

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

@@ -4,9 +4,11 @@ import com.hssx.cloudmodel.entity.Part;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 /**
  * <p>
@@ -18,7 +20,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 public interface PartService extends IService<Part> {
 
-    HttpRespMsg importPartExcel(MultipartFile file, UserVO userVO);
+    HttpRespMsg importPartExcel(MultipartFile file, UserVO userVO) throws IOException, InvalidFormatException;
 
     HttpRespMsg add(Part part, UserVO userVO);
 

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

@@ -153,6 +153,9 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     dynamics.setMouldId(userVO.getMouldId());
                     dynamics.setBelongType(blongType);
                     mouldOperationDynamicsMapper.insert(dynamics);
+                    //添加消息通知记录
+//                    projectMapper.selectOne(new )
+                    NewsNotice newsNotice = new NewsNotice();
                 }
                 msg.data = projectFile;
             }

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

@@ -7,6 +7,7 @@ import com.hssx.cloudmodel.constant.Constant;
 import com.hssx.cloudmodel.entity.*;
 import com.hssx.cloudmodel.entity.vo.MouldFileVO;
 import com.hssx.cloudmodel.entity.vo.MouldVO;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.mapper.*;
 import com.hssx.cloudmodel.service.MouldMaintainService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -96,49 +97,51 @@ public class MouldMaintainServiceImpl extends ServiceImpl<MouldMaintainMapper, M
     }
 
     @Override
-    public HttpRespMsg getList(String token, PageUtil page) {
+    public HttpRespMsg getList(UserVO userVO, PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
         List<Integer> proIds = new ArrayList<>();
-        User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         List<MouldMaintain> mouldMaintains = new ArrayList<>();
         if (currentUser != null) {
-            //资产方管理员，获取他公司下的所有模具
             PageHelper.startPage(page.getPageNum(), page.getPageSize());
-            if (Constant.SYS_ID == currentUser.getParentId()) {
-                QueryWrapper<Project> qw = new QueryWrapper<>();
-                List<Project> projects = projectMapper.selectList(qw.eq("creator_id", currentUser.getId()));
-                for (Project pro : projects) {
-                    proIds.add(pro.getId());
-                }
-                mouldMaintains = mouldMaintainMapper.selectListByProject(proIds);
-            } else if (Constant.SYS_PARENT_ID == currentUser.getParentId()) {
-                //系统管理员
-                mouldMaintains = mouldMaintainMapper.selectList(new QueryWrapper<MouldMaintain>());
-            } else {
-                QueryWrapper<Project> qw = new QueryWrapper<>();
-                qw.eq("manager_id", currentUser.getId());
-                List<Project> projects = projectMapper.selectList(qw);
-                if (projects.size() > 0) {
-                    for (Project project : projects) {
-                        proIds.add(project.getId());
-                    }
-                }
-//                //充当普通人员参与的项目
-                List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("user_id",currentUser.getId()));
-                if (projectUsers.size() > 0) {
-                    for (ProjectUser projectUser : projectUsers) {
-                        proIds.add(projectUser.getProjectId());
-                    }
-                }
-                //充当审批人员参与的项目
-                List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", currentUser.getId()));
-                if (projectss.size() > 0) {
-                    for (ProjectApprove projectUser : projectss) {
-                        proIds.add(projectUser.getProjectId());
-                    }
-                }
-                mouldMaintains = mouldMaintainMapper.selectListByProject(proIds);
-            }
+            mouldMaintains = mouldMaintainMapper.selectList(new QueryWrapper<MouldMaintain>().eq("mould_id",userVO.getMouldId()));
+//            //资产方管理员，获取他公司下的所有模具
+//            PageHelper.startPage(page.getPageNum(), page.getPageSize());
+//            if (Constant.SYS_ID == currentUser.getParentId()) {
+//                QueryWrapper<Project> qw = new QueryWrapper<>();
+//                List<Project> projects = projectMapper.selectList(qw.eq("creator_id", currentUser.getId()));
+//                for (Project pro : projects) {
+//                    proIds.add(pro.getId());
+//                }
+//                mouldMaintains = mouldMaintainMapper.selectListByProject(proIds);
+//            } else if (Constant.SYS_PARENT_ID == currentUser.getParentId()) {
+//                //系统管理员
+//                mouldMaintains = mouldMaintainMapper.selectList(new QueryWrapper<MouldMaintain>());
+//            } else {
+//                QueryWrapper<Project> qw = new QueryWrapper<>();
+//                qw.eq("manager_id", currentUser.getId());
+//                List<Project> projects = projectMapper.selectList(qw);
+//                if (projects.size() > 0) {
+//                    for (Project project : projects) {
+//                        proIds.add(project.getId());
+//                    }
+//                }
+////                //充当普通人员参与的项目
+//                List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("user_id",currentUser.getId()));
+//                if (projectUsers.size() > 0) {
+//                    for (ProjectUser projectUser : projectUsers) {
+//                        proIds.add(projectUser.getProjectId());
+//                    }
+//                }
+//                //充当审批人员参与的项目
+//                List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", currentUser.getId()));
+//                if (projectss.size() > 0) {
+//                    for (ProjectApprove projectUser : projectss) {
+//                        proIds.add(projectUser.getProjectId());
+//                    }
+//                }
+//                mouldMaintains = mouldMaintainMapper.selectListByProject(proIds);
+//            }
             PageInfo<MouldMaintain> pageInfos = new PageInfo<>(mouldMaintains);
             msg.data = pageInfos;
         } else {

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

@@ -13,6 +13,7 @@ import com.hssx.cloudmodel.mapper.UserMapper;
 import com.hssx.cloudmodel.service.PartService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -24,10 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -50,12 +48,12 @@ public class PartServiceImpl extends ServiceImpl<PartMapper, Part> implements Pa
     @Resource
     MouldMapper mouldMapper;
     @Override
-    public HttpRespMsg importPartExcel(MultipartFile file, UserVO userVO) {
+    public HttpRespMsg importPartExcel(MultipartFile file, UserVO userVO) throws IOException, InvalidFormatException {
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         if(user != null){
             List<Part> parts = partMapper.selectList(new QueryWrapper<Part>().eq("mould_id",userVO.getMouldId()));
-            try {
+//            try {
                 File f = null;
                 if ("".equals(file) || file.getSize() <= 0) {
                     file = null;
@@ -72,12 +70,14 @@ public class PartServiceImpl extends ServiceImpl<PartMapper, Part> implements Pa
                 XSSFWorkbook wookbook = new XSSFWorkbook(f);
                 XSSFSheet sheet = wookbook.getSheetAt(0);
                 int s = sheet.getLastRowNum();
+            System.out.println("s==========>"+s);
                 // 遍历当前sheet中的所有行，第一行是数据对应的字段，不是数据，
                 // 故从第二行开始遍历拿数据（如果有标题的话，则从第三行开始拿数据）
                 for (int j = 1; j < sheet.getLastRowNum() + 1; j++) {
                     XSSFRow row = sheet.getRow(j);
                     //新建零件
                     Part part = new Part();
+                    part.setMouldId(mould.getId());
                     // 遍历所有的列，下面的10是excle表格里共有10列即对应了10个字段
                     for (int y = 0; y < 2; y++) {
                         XSSFCell cell = row.getCell(y);
@@ -113,11 +113,11 @@ public class PartServiceImpl extends ServiceImpl<PartMapper, Part> implements Pa
                     part.setCreator(user.getUsername());
                     partMapper.insert(part);
                 }
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-                msg.setError(e.getMessage());
-                return msg;
-            }
+//            } catch (Exception e) {
+//                log.error(e.getMessage(), e);
+//                msg.setError(e.getMessage());
+//                return msg;
+//            }
         }else{
             msg.setError("用户不存在或者未登录");
         }

cloud-model/src/main/resources/application-prod.properties

@@ -3,6 +3,7 @@
 server.port=9099
 server.servlet.context-path=/
 server.tomcat.uri-encoding=UTF-8
+server.tomcat.max-http-post-size=-1
 # ####################################################################################################
 # thymeleaf ÅäÖÃ
 spring.thymeleaf.cache=false

cloud-model/src/main/resources/application.properties

@@ -3,6 +3,7 @@
 server.port=8099
 server.servlet.context-path=/
 server.tomcat.uri-encoding=UTF-8
+server.tomcat.max-http-post-size=-1
 # ####################################################################################################
 # thymeleaf ÅäÖÃ
 spring.thymeleaf.cache=false

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

@@ -131,10 +131,6 @@
         tb_company tbc
         on
         tbc.id = tbm.company_id
-        left join
-        tb_company tbco
-        on
-        tbco.id = tbm.produce_company_id
         <where>
             <if test="userVO.searchType == 0 and userVO.keyName != '' and userVO.keyName != null">
                 AND tbm.model_no like concat('%',#{userVO.keyName},'%')
@@ -155,7 +151,7 @@
         tbm.project_id project_id, tbm.setting_life setting_life, tbm.area area,tbm.equipment_id equipment_id,
         tbm.id id,tbm.model_no model_no, tbm.model_name,tbm.initial_modulus initial_modulus,tbp.manager_id managerId,
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbco.company_name produceCompany,tbm.creator_id creator_id,
-        tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbm.rfid rfid,tbm.oc_cycle oc_cycle,
+        tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbm.rfid rfid,tbm.oc_cycle oc_cycle,tbc.company_name companyName,
         tbmp.equipment_no equipmentNo,tbmp.hill_number hillNumber,tbm.setting_life setting_life,tbm.run_times run_times
         from
         tb_mould tbm
@@ -170,6 +166,10 @@
         tb_company tbco
         on
         tbco.id = tbm.produce_company_id
+        left join
+        tb_company tbc
+        on
+        tbc.id = tbm.company_id
         where
         tbm.id = #{mouldVO.id}
     </select>

ys_vue/src/views/detection/maintenance.vue

@@ -21,17 +21,17 @@
 
     <!--列表-->
     <el-table
-      :data="moulds"
+      :data="records"
       highlight-current-row
       :height="tableHeight"
       v-loading="listLoading"
       style="width: 100%;"
     >
       <el-table-column type="index" width="60"></el-table-column>
-      <el-table-column prop="maintenancer" label="保养人" width="100" sortable></el-table-column>
-      <el-table-column prop="plan" label="保养方案" sortable></el-table-column>
-      <el-table-column prop="picture" label="保养照片" width="200" sortable></el-table-column>
-      <el-table-column prop="closeTime" label="关闭时间" width="200" sortable></el-table-column>
+      <el-table-column prop="maintainUserName" label="保养人" width="100" sortable></el-table-column>
+      <el-table-column prop="maintainType" label="保养方案" sortable></el-table-column>
+      <el-table-column prop="fileName" label="保养照片" width="200" sortable></el-table-column>
+      <el-table-column prop="indate" label="关闭时间" width="200" sortable></el-table-column>
     </el-table>
 
     <!--工具条-->
@@ -112,38 +112,26 @@ import util from "../../common/js/util";
 export default {
   data() {
     return {
+      //本页模具ID
+      mouldId: null,
       options: [{ value: "aaa", label: "123" }, { value: "bbb", label: "456" }],
-      //临时数据
-      moulds: [
-        {
-          maintenancer: "张有财",
-          plan: "100kb",
-          picture: "张富贵",
-          closeTime: "2019-07-24",
-          state: "已通过"
-        },
-        {
-          maintenancer: "刘没财",
-          plan: "200kb",
-          picture: "刘穷比",
-          closeTime: "2019-07-23",
-          state: "未通过"
-        }
-      ],
+      //记录
+      records: [],
       //标题栏过滤器
       filters: {
         name: "",
         value: ""
       },
       listLoading: false,
+      page: 1,
+      size: 20,
       total: 0,
       tableHeight: 0,
       formRules: {},
       //保养界面 种类
       type: [
         { label: "动作", value: 0 },
-        { label: "小动作", value: 1 },
-        { label: "大动作", value: 2 }
+        { label: "易损件", value: 1 }
       ],
       //保养界面 动作
       action: [
@@ -170,14 +158,14 @@ export default {
     };
   },
   methods: {
-    //  分页
+    //分页
     handleCurrentChange(val) {
       this.page = val;
-      // this.getUsers();
+      this.getList();
     },
     handleSizeChange(val) {
       this.size = val;
-      // this.getUsers();
+      this.getList();
     },
     selsChange: function(sels) {
       this.sels = sels;
@@ -194,11 +182,11 @@ export default {
       this.listLoading = true;
       this.http.post(
         this.port.mold.moldMaintainList,
-        {},
+        { mouldId: this.mouldId, pageSize: this.size, pageNum: this.page },
         res => {
           this.listLoading = false;
           if (res.code == "ok") {
-            console.log(res);
+            this.records = res.data.list;
           } else {
             this.$message({
               message: res.msg,
@@ -215,14 +203,17 @@ export default {
         }
       );
     },
-    //模具保养
+    //模具保养 N/A
     maintain() {
       this.http.post(
         this.port.mold.moldMaintain,
         {},
         res => {
           if (res.code == "ok") {
-            console.log(res);
+            this.$message({
+              message: "保养完成",
+              type: "success"
+            });
           } else {
             this.$message({
               message: res.msg,
@@ -245,8 +236,8 @@ export default {
     this.tableHeight = height - 260;
   },
   mounted() {
-    var mouldId = this.$route.params.id; //传到当前页面的模具编号
-    // this.getList();
+    this.mouldId = this.$route.params.id; //传到当前页面的模具编号
+    this.getList();
   }
 };
 </script>