修改提交，管理员开放可以随时更换云模盒

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

@@ -0,0 +1,49 @@
+package com.hssx.cloudmodel.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.VulnerableParts;
+import com.hssx.cloudmodel.entity.vo.UserVO;
+import com.hssx.cloudmodel.mapper.VulnerablePartsMapper;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author seya
+ * @since 2020-04-21
+ */
+@RestController
+@RequestMapping("/vulnerable-parts")
+public class VulnerablePartsController {
+    @Resource
+    VulnerablePartsMapper vulnerablePartsMapper;
+
+    /**
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @ApiOperation(value = "获取易损件列表", notes = "获取易损件列表")
+    @RequestMapping("/getVulnerablePartsList")
+    @ResponseBody
+    public HttpRespMsg getVulnerablePartsList(HttpServletRequest request,
+                                HttpServletResponse response) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = vulnerablePartsMapper.selectList(new QueryWrapper<VulnerableParts>());
+        return msg;
+    }
+}
+

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

@@ -0,0 +1,56 @@
+package com.hssx.cloudmodel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author seya
+ * @since 2020-04-21
+ */
+public class VulnerableParts extends Model<VulnerableParts> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("name")
+    private String name;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "VulnerableParts{" +
+        "id=" + id +
+        ", name=" + name +
+        "}";
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.VulnerableParts;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author seya
+ * @since 2020-04-21
+ */
+public interface VulnerablePartsMapper extends BaseMapper<VulnerableParts> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.service;
+
+import com.hssx.cloudmodel.entity.VulnerableParts;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author seya
+ * @since 2020-04-21
+ */
+public interface VulnerablePartsService extends IService<VulnerableParts> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.hssx.cloudmodel.entity.VulnerableParts;
+import com.hssx.cloudmodel.mapper.VulnerablePartsMapper;
+import com.hssx.cloudmodel.service.VulnerablePartsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author seya
+ * @since 2020-04-21
+ */
+@Service
+public class VulnerablePartsServiceImpl extends ServiceImpl<VulnerablePartsMapper, VulnerableParts> implements VulnerablePartsService {
+
+}

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

@@ -92,11 +92,17 @@ public class CodeGenerator {
 
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://47.100.37.243:7644/cloud_mould?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
+
+
 //        dsc.setSchemaName("public");
+        dsc.setUrl("jdbc:mysql://47.100.37.243:7644/cloud_mould?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("Ziyu1026!@");
+
+//        dsc.setUrl("jdbc:mysql://localhost:3306/cloud_mould?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
+//        dsc.setUsername("root");
+//        dsc.setPassword("Ziyu1026!@");
         mpg.setDataSource(dsc);
 
         // 包配置
@@ -204,7 +210,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("equipment_send_command");
+        strategy.setInclude("vulnerable_parts");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.VulnerablePartsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.VulnerableParts">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name
+    </sql>
+
+</mapper>

cloud-socket/src/com/js/kbt/socket/WorkerGroup.java

@@ -8,7 +8,7 @@ import io.netty.channel.nio.NioEventLoopGroup;
 public class WorkerGroup extends NioEventLoopGroup {
 
     /** 业务出现线程大小 */
-    private static final int BIZTHREADSIZE = 30;
+    private static final int BIZTHREADSIZE = 100;
     
     public WorkerGroup(){
 	super(BIZTHREADSIZE);

website/src/main/resources/application.properties

@@ -22,9 +22,9 @@ spring.thymeleaf.jackson.date-format=yyyy-MM-dd HH:mm:ss
 # ####################################################################################################
 # Êý¾ÝÔ´ÅäÖÃ
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://47.100.37.243:7644/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
-spring.datasource.password=p011430seya1026
+spring.datasource.password=Ziyu1026!@
 #spring.datasource.druid.test-on-borrow=true
 #spring.datasource.druid.test-while-idle=true
 # ####################################################################################################

website/src/main/resources/templates/index.html

@@ -160,7 +160,7 @@
             <div class="heading text-center">
                 <h2>成功案例</h2>
             </div>
-            <div class="row">
+            <div class="row" style="margin:0 auto; justify-content:center;">
                 <div class="col-lg-3" th:each="item : ${articles}">
                     <a th:href="@{'caseDetail?id='+${item.id}}" >
                         <div class="home-blog-post">

ys_int/src/port.js

@@ -70,8 +70,8 @@ export default {
         importPart: '/part/importAppLogin',//零件的excel导入
         partUpload: '/mouldfile/uploadPartFileList', //零件文档的批量上传
 
-        download: '/mouldfile/download',
-
+        getVulnerablePartsList: '/vulnerable-parts/getVulnerablePartsList',
+        moldMaintain: '/mouldmaintain/maintain', //维护
         moldMaintain: '/mouldmaintain/maintain', //维护
         moldMaintainList: '/mouldmaintain/list', //获取列表
         moldMaintainListGet: '/mould/maintainMouldList', //主页获取保养模具列表

ys_int/src/views/detection/maintenance.vue

@@ -35,7 +35,7 @@
             <el-col :span="8" :offset="1" style="line-height: 32px;">
                 {{$t('runTest.stage')}}：{{warningInfo}}
                 <el-button size="small" type="primary"  @click="warningFormVisible = true" style="margin-left: 16px;"
-                    v-if="!(user.parentId == 1 && user.subordinateType == 1) && stage != 0">
+                    v-if="user.parentId == 0 || (!(user.parentId == 1 && user.subordinateType == 1) && stage != 0)">
                     {{$t('runTest.immediate')}}
                 </el-button>
             </el-col>
@@ -96,7 +96,7 @@
                     <template slot-scope="scope">
                         <span v-if="scope.row.maintainType == 0">{{$t('runTest.spray')}}</span>
                         <span v-else-if="scope.row.maintainType == 1">{{$t('runTest.check')}}</span>
-                        <span v-else="scope.row.maintainType == 2">{{$t('runTest.vulnerable')}}</span>
+                        <span v-else-if="scope.row.maintainType == 2">{{$t('runTest.vulnerable')}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column prop="fileName" :label="$t('runTest.fileName')" width="200" sortable>
@@ -140,8 +140,8 @@
 
                 <!-- 保养类型为1时 选择易损件ID -->
                 <el-form-item v-if="type.value == 1" :label="$t('runTest.vulnerable')" prop="vulnerable">
-                    <el-select v-model="vulnerable.value" clearable filterable :placeholder="$t('runTest.inputVulnerable')" style="width: 500px;">
-                        <el-option v-for="item in vulnerable" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                    <el-select v-model="vulnerable.id" clearable filterable :placeholder="$t('runTest.inputVulnerable')" style="width: 500px;">
+                        <el-option v-for="item in vulnerable" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
 
@@ -332,6 +332,26 @@
                 this.maintenanceFormVisible = true;
             },
 
+            getVulnerableList() {
+                this.http.post( this.port.mold.getVulnerablePartsList, {},
+                res => {
+                    if (res.code == "ok") {
+                        this.vulnerable = res.data;
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                });
+            },
+
             //获取记录
             getList() {
                 this.listLoading = true;
@@ -426,10 +446,10 @@
                         }
                         form.append("ways", this.action.value);
                     } else {
-                        if (this.vulnerable.value == null) {
+                        if (this.vulnerable.id == null) {
                             return;
                         }
-                        form.append("ways", this.vulnerable.value); //后面应该换成易损件的ID
+                        form.append("ways", this.vulnerable.id); //后面应该换成易损件的ID
                     }
                     this.http.uploadFile( this.port.mold.moldMaintain, form,
                     res => {
@@ -839,7 +859,7 @@
             this.getList();
             this.getDetail();
             this.getAlternativeEquipment();
-           
+            this.getVulnerableList();//获取易损件列表
             const that = this
             window.onresize = function temp() {
                 that.echarts2.resize();