型号页面图片，添加图片，分类id,版本id

AutoSprout-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: C:/Users/aliyou/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证

AutoSprout-ui/src/views/device/model/index.vue

@@ -104,8 +104,6 @@
       <el-table-column label="添加时间" align="center" prop="createTime" />
       <el-table-column label="累计激活" align="center" prop="activationNum" />
       <el-table-column label="在线率" align="center" prop="onlineRate" />
-<!--      <el-table-column label="产品介绍" align="center" prop="introduce" />-->
-<!--      <el-table-column label="备注" align="center" prop="remark" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -136,7 +134,7 @@
     />
 
     <!-- 添加或修改型号列表对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="名称" prop="modelName">
           <el-input v-model="form.modelName" placeholder="请输入名称" />
@@ -146,17 +144,30 @@
         </el-form-item>
         <el-form-item label="图片" prop="picture">
           <image-upload v-model="form.picture"/>
-<!--          <el-input v-model="form.picture" placeholder="请输入图片" />-->
         </el-form-item>
 
         <el-form-item label="识别码" prop="idCode">
           <el-input v-model="form.idCode" placeholder="请输入识别码" />
         </el-form-item>
-        <el-form-item label="分类名称" prop="classifyName">
+        <el-form-item label="分类" prop="classifyId">
-          <el-input v-model="form.classifyName" placeholder="请输入分类名称" />
+          <el-select v-model="form.classifyId" filterable clearable placeholder="请选择" >
+            <el-option
+              v-for="item in classifyOptions"
+              :key="item.classifyId"
+              :label="item.classifyName"
+              :value="item.classifyId">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="硬件版本" prop="versionId">
+        <el-form-item label="版本" prop="versionId">
-          <el-input v-model="form.versionId" placeholder="请输入硬件版本" />
+          <el-select v-model="form.versionId" filterable clearable placeholder="请选择" >
+            <el-option
+              v-for="item in versionOptions"
+              :key="item.versionId"
+              :label="item.version"
+              :value="item.versionId">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="产品介绍" prop="introduce">
           <el-input v-model="form.introduce" type="textarea" placeholder="请输入内容" />
@@ -175,11 +186,17 @@
 
 <script>
 import { listModel, getModel, delModel, addModel, updateModel } from "@/api/device/model";
+import {listClassify} from "@/api/device/classify";
+import {listVersion} from "@/api/device/version";
 
 export default {
   name: "Model",
   data() {
     return {
+      //分类列表
+      classifyOptions: [],
+      //版本列表
+      versionOptions: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -211,17 +228,34 @@ export default {
         introduce: null,
       },
       // 表单参数
-      form: {},
+      form: {
+        params:{
+          classifyList: null
+        }
+      },
       // 表单校验
       rules: {
-        classifyId: [
+        modelName: [
-          { required: true, message: "分类ID不能为空", trigger: "blur" }
+          { required: true, message: "名称不能为空", trigger: "blur" }
         ],
+        model: [
+          { required: true, message: "型号不能为空", trigger: "blur" }
+        ],
+        idCode: [
+          { required: true, message: "识别码不能为空", trigger: "blur" }
+        ],
+        // classifyId: [
+        //   { required: true, message: "分类不能为空", trigger: "blur" }
+        // ],
+        // versionId: [
+        //   { required: true, message: "版本不能为空", trigger: "blur" }
+        // ]
       }
     };
   },
   created() {
     this.getList();
+
   },
   methods: {
     /** 查询型号列表列表 */
@@ -279,6 +313,14 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加型号列表";
+      this.loading = true;
+      listClassify(this.queryParams).then(response => {
+        this.classifyOptions = response.rows;
+        listVersion(this.queryParams).then(response => {
+          this.versionOptions = response.rows;
+          this.loading = false;
+        });
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

AutoSprout-ui/src/views/device/version/index.vue

@@ -78,9 +78,9 @@
       <el-table-column label="版本id" align="center" prop="versionId" />
       <el-table-column label="型号id" align="center" prop="modelId" />
       <el-table-column label="版本号" align="center" prop="version" />
-      <el-table-column label="大小" align="center" prop="size" />
+      <el-table-column label="大小(K)" align="center" prop="size" />
-      <el-table-column label="升级要求" align="center" prop="require" />
+      <el-table-column label="升级要求" align="center" prop="upgradeRequire" />
-      <el-table-column label="描述" align="center" prop="describe" />
+      <el-table-column label="描述" align="center" prop="upgradeDescribe" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -119,14 +119,14 @@
         <el-form-item label="版本号" prop="version">
           <el-input v-model="form.version" placeholder="请输入版本号" />
         </el-form-item>
-        <el-form-item label="大小" prop="size">
+        <el-form-item label="大小(K)" prop="size">
           <el-input v-model="form.size" placeholder="请输入大小" />
         </el-form-item>
-        <el-form-item label="升级要求" prop="require">
+        <el-form-item label="升级要求" prop="upgradeRequire">
-          <el-input v-model="form.require" placeholder="请输入升级要求" />
+          <el-input v-model="form.upgradeRequire" placeholder="请输入升级要求" />
         </el-form-item>
-        <el-form-item label="描述" prop="describe">
+        <el-form-item label="描述" prop="upgradeDescribe">
-          <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.upgradeDescribe" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -167,8 +167,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         version: null,
-        require: null,
+        upgradeRequire: null,
-        describe: null
+        upgradeDescribe: null
       },
       // 表单参数
       form: {},
@@ -206,8 +206,8 @@ export default {
         updateBy: null,
         updateTime: null,
         size: null,
-        require: null,
+        upgradeRequire: null,
-        describe: null
+        upgradeDescribe: null
       };
       this.resetForm("form");
     },

AutoSprout-watering/src/main/java/com/ruoyi/device/controller/AsModelController.java

@@ -77,6 +77,7 @@ public class AsModelController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody AsModel asModel)
     {
+        asModel.setCreateBy(getUsername());
         return toAjax(asModelService.insertAsModel(asModel));
     }
 

AutoSprout-watering/src/main/java/com/ruoyi/device/domain/AsDeviceVersion.java

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 固件版本对象 as_device_version
  * 
  * @author qiuzhenzhao
- * @date 2023-11-11
+ * @date 2023-11-13
  */
 @Data
 @TableName(value = "as_device_version")
@@ -35,10 +35,10 @@ public class AsDeviceVersion extends BaseEntity
 
     /** 升级要求 */
     @Excel(name = "升级要求")
-    private String require;
+    private String upgradeRequire;
 
-    /** 描述 */
+    /** 升级 */
-    @Excel(name = "描述")
+    @Excel(name = "升级")
-    private String describe;
+    private String upgradeDescribe;
 
 }

AutoSprout-watering/src/main/java/com/ruoyi/device/mapper/AsDeviceVersionMapper.java

@@ -3,7 +3,6 @@ package com.ruoyi.device.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.device.domain.AsDeviceClassify;
 import com.ruoyi.device.domain.AsDeviceVersion;
 
 /**

AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceVersionServiceImpl.java

@@ -4,14 +4,13 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.device.domain.AsDeviceClassify;
-import com.ruoyi.device.mapper.AsDeviceClassifyMapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.device.mapper.AsDeviceVersionMapper;
 import com.ruoyi.device.domain.AsDeviceVersion;
 import com.ruoyi.device.service.IAsDeviceVersionService;
 
+import javax.annotation.Resource;
+
 /**
  * 固件版本Service业务层处理
  * 
@@ -21,7 +20,7 @@ import com.ruoyi.device.service.IAsDeviceVersionService;
 @Service
 public class AsDeviceVersionServiceImpl extends ServiceImpl<AsDeviceVersionMapper, AsDeviceVersion> implements IAsDeviceVersionService
 {
-    @Autowired
+    @Resource
     private AsDeviceVersionMapper asDeviceVersionMapper;
 
     /**

AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsModelServiceImpl.java

@@ -10,7 +10,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.device.domain.AsDevice;
+import com.ruoyi.device.domain.AsDeviceClassify;
 import com.ruoyi.device.domain.AsDeviceVersion;
+import com.ruoyi.device.mapper.AsDeviceClassifyMapper;
 import com.ruoyi.device.mapper.AsDeviceMapper;
 import com.ruoyi.device.mapper.AsDeviceVersionMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +38,12 @@ public class AsModelServiceImpl extends ServiceImpl<AsModelMapper, AsModel> impl
     @Resource
     private AsDeviceMapper deviceMapper;
 
+    @Resource
+    private AsDeviceClassifyMapper classifyMapper;
+
+    @Resource
+    private AsDeviceVersionMapper versionMapper;
+
     /**
      * 查询型号列表
      * 
@@ -93,6 +101,8 @@ public class AsModelServiceImpl extends ServiceImpl<AsModelMapper, AsModel> impl
     public int insertAsModel(AsModel asModel)
     {
         asModel.setCreateTime(DateUtils.getNowDate());
+        AsDeviceClassify deviceClassify = classifyMapper.selectAsDeviceClassifyByClassifyId(asModel.getClassifyId());
+        asModel.setClassifyName(deviceClassify.getClassifyName());
         return asModelMapper.insertAsModel(asModel);
     }
 

AutoSprout-watering/src/main/resources/mapper/device/AsDeviceVersionMapper.xml

@@ -13,20 +13,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="size"    column="size"    />
-        <result property="require"    column="require"    />
+        <result property="upgradeRequire"    column="upgrade_require"    />
-        <result property="describe"    column="describe"    />
+        <result property="upgradeDescribe"    column="upgrade_describe"    />
     </resultMap>
 
     <sql id="selectAsDeviceVersionVo">
-        select version_id, model_id, version, create_by, create_time, update_by, update_time, size, require, describe from as_device_version
+        select version_id, model_id, version, create_by, create_time, update_by, update_time, size, upgrade_require, upgrade_describe from as_device_version
     </sql>
 
     <select id="selectAsDeviceVersionList" parameterType="AsDeviceVersion" resultMap="AsDeviceVersionResult">
         <include refid="selectAsDeviceVersionVo"/>
         <where>  
+            <if test="modelId != null "> and model_id = #{modelId}</if>
             <if test="version != null  and version != ''"> and version = #{version}</if>
-            <if test="require != null  and require != ''"> and require = #{require}</if>
+            <if test="size != null "> and size = #{size}</if>
-            <if test="describe != null  and describe != ''"> and describe = #{describe}</if>
+            <if test="upgradeRequire != null  and upgradeRequire != ''"> and upgrade_require = #{upgradeRequire}</if>
+            <if test="upgradeDescribe != null  and upgradeDescribe != ''"> and upgrade_describe = #{upgradeDescribe}</if>
         </where>
     </select>
     
@@ -45,8 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="size != null">size,</if>
-            <if test="require != null">require,</if>
+            <if test="upgradeRequire != null">upgrade_require,</if>
-            <if test="describe != null">describe,</if>
+            <if test="upgradeDescribe != null">upgrade_describe,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="modelId != null">#{modelId},</if>
@@ -56,8 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="size != null">#{size},</if>
-            <if test="require != null">#{require},</if>
+            <if test="upgradeRequire != null">#{upgradeRequire},</if>
-            <if test="describe != null">#{describe},</if>
+            <if test="upgradeDescribe != null">#{upgradeDescribe},</if>
          </trim>
     </insert>
 
@@ -71,8 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="size != null">size = #{size},</if>
-            <if test="require != null">require = #{require},</if>
+            <if test="upgradeRequire != null">upgrade_require = #{upgradeRequire},</if>
-            <if test="describe != null">describe = #{describe},</if>
+            <if test="upgradeDescribe != null">upgrade_describe = #{upgradeDescribe},</if>
         </trim>
         where version_id = #{versionId}
     </update>