模型更新

ruoyi-admin/src/main/resources/application-druid.yml

@@ -13,7 +13,7 @@ spring:
       slave:
         # 从数据源开关/默认关闭
         enabled: false
-        url: jdbc:mysql://39.98.38.2:13306/sh_project?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://39.98.38.2:13306/sh_sh_model?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: zj-hhst
         password: ENC(10zA4Za2Kj2pvnRnLDYCWWkP71Dcsavw)
       # 初始连接数

ruoyi-admin/src/main/resources/application-test.yml

@@ -13,7 +13,7 @@ spring:
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
-        enabled: false
+        enabled: true
         #url: jdbc:mysql://192.168.0.146:3306/sh_project?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         url: jdbc:mysql://39.98.38.2:13306/sh_model?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: shmodel

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/MdModelFileController.java

@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.interfaces.domain.MdModelFile;
 import com.ruoyi.interfaces.service.IMdModelFileService;
+import com.ruoyi.interfaces.service.IMdModelInfoService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,7 @@ public class MdModelFileController extends BaseController
     @Autowired
     private IMdModelFileService mdModelFileService;
 
+
     /**
      * 查询模型文件信息列表
      */
@@ -79,6 +81,7 @@ public class MdModelFileController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody MdModelFile mdModelFile)
     {
+
         return toAjax(mdModelFileService.insertMdModelFile(mdModelFile));
     }
 

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/MdModelInfoController.java

@@ -22,17 +22,17 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 模型信息Controller
- * 
+ *
  * @author ruoyi
  * @date 2025-07-15
  */
 @RestController
 @RequestMapping("/model/info")
-public class MdModelInfoController extends BaseController
-{
+public class MdModelInfoController extends BaseController {
     @Autowired
     private IMdModelInfoService mdModelInfoService;
 
@@ -41,8 +41,7 @@ public class MdModelInfoController extends BaseController
      */
     @ApiOperation("查询模型信息列表")
     @GetMapping("/list")
-    public TableDataInfo list(MdModelInfo mdModelInfo)
-    {
+    public TableDataInfo list(MdModelInfo mdModelInfo) {
         startPage();
         List<MdModelInfo> list = mdModelInfoService.selectMdModelInfoList(mdModelInfo);
         return getDataTable(list);
@@ -54,8 +53,7 @@ public class MdModelInfoController extends BaseController
     @ApiOperation("导出模型信息列表")
     @Log(title = "模型信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, MdModelInfo mdModelInfo)
-    {
+    public void export(HttpServletResponse response, MdModelInfo mdModelInfo) {
         List<MdModelInfo> list = mdModelInfoService.selectMdModelInfoList(mdModelInfo);
         ExcelUtil<MdModelInfo> util = new ExcelUtil<MdModelInfo>(MdModelInfo.class);
         util.exportExcel(response, list, "模型信息数据");
@@ -66,8 +64,7 @@ public class MdModelInfoController extends BaseController
      */
     @ApiOperation("获取模型信息详细信息")
     @GetMapping(value = "/{mdid}")
-    public AjaxResult getInfo(@PathVariable("mdid") String mdid)
-    {
+    public AjaxResult getInfo(@PathVariable("mdid") String mdid) {
         return success(mdModelInfoService.selectMdModelInfoByMdid(mdid));
     }
 
@@ -77,9 +74,8 @@ public class MdModelInfoController extends BaseController
     @ApiOperation("新增模型信息")
     @Log(title = "模型信息", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody MdModelInfo mdModelInfo)
-    {
-        return toAjax(mdModelInfoService.insertMdModelInfo(mdModelInfo));
+    public AjaxResult add(@RequestBody MdModelInfo mdModelInfo) {
+        return AjaxResult.success(mdModelInfoService.insertMdModelInfo(mdModelInfo));
     }
 
     /**
@@ -88,8 +84,7 @@ public class MdModelInfoController extends BaseController
     @ApiOperation("修改模型信息")
     @Log(title = "模型信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody MdModelInfo mdModelInfo)
-    {
+    public AjaxResult edit(@RequestBody MdModelInfo mdModelInfo) {
         return toAjax(mdModelInfoService.updateMdModelInfo(mdModelInfo));
     }
 
@@ -98,9 +93,8 @@ public class MdModelInfoController extends BaseController
      */
     @ApiOperation("删除模型信息")
     @Log(title = "模型信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{mdids}")
-    public AjaxResult remove(@PathVariable String[] mdids)
-    {
+    @DeleteMapping("/{mdids}")
+    public AjaxResult remove(@PathVariable String[] mdids) {
         return toAjax(mdModelInfoService.deleteMdModelInfoByMdids(mdids));
     }
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/MdModelInfo.java

@@ -230,6 +230,11 @@ public class MdModelInfo extends BaseEntity {
      */
     private String registrant;
 
+    public MdModelInfo(String mdid, String fileid) {
+        this.mdid = mdid;
+        this.mirrorImageDesc = fileid;
+    }
+
     public String getRegistrant() {
         return registrant;
     }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/IMdModelFileService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.interfaces.service;
 
 import com.ruoyi.interfaces.domain.MdModelFile;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -59,4 +60,12 @@ public interface IMdModelFileService
      * @return 结果
      */
     public int deleteMdModelFileByFileid(String fileid);
+
+    /**
+     * 上传文件记录
+     * @param accountMdModelFile
+     * @param accountFile
+     * @return
+     */
+    int insertMdModelFile(MdModelFile accountMdModelFile, MultipartFile accountFile);
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/IMdModelInfoService.java

@@ -34,7 +34,7 @@ public interface IMdModelInfoService
      * @param mdModelInfo 模型信息
      * @return 结果
      */
-    public int insertMdModelInfo(MdModelInfo mdModelInfo);
+    public String insertMdModelInfo(MdModelInfo mdModelInfo);
 
     /**
      * 修改模型信息

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/MdModelFileServiceImpl.java

@@ -1,13 +1,20 @@
 package com.ruoyi.interfaces.service.impl;
 
+import java.io.IOException;
 import java.util.List;
 
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.interfaces.domain.MdModelFile;
+import com.ruoyi.interfaces.domain.MdModelInfo;
 import com.ruoyi.interfaces.mapper.MdModelFileMapper;
 import com.ruoyi.interfaces.service.IMdModelFileService;
+import com.ruoyi.interfaces.service.IMdModelInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 模型文件信息Service业务层处理
@@ -21,6 +28,9 @@ public class MdModelFileServiceImpl implements IMdModelFileService
     @Autowired
     private MdModelFileMapper mdModelFileMapper;
 
+    @Autowired
+    private IMdModelInfoService mdModelInfoService;
+
     /**
      * 查询模型文件信息
      * 
@@ -55,7 +65,11 @@ public class MdModelFileServiceImpl implements IMdModelFileService
     public int insertMdModelFile(MdModelFile mdModelFile)
     {
         mdModelFile.setFileid(IdUtils.fastUUID());
-        return mdModelFileMapper.insertMdModelFile(mdModelFile);
+        mdModelFile.setModifyBy(DateUtils.getNowDate());
+        mdModelFileMapper.insertMdModelFile(mdModelFile);
+        MdModelInfo mdModelInfo = new MdModelInfo(mdModelFile.getMdid(),mdModelFile.getFileid());
+        mdModelInfoService.updateMdModelInfo(mdModelInfo);
+        return 1;
     }
 
     /**
@@ -93,4 +107,18 @@ public class MdModelFileServiceImpl implements IMdModelFileService
     {
         return mdModelFileMapper.deleteMdModelFileByFileid(fileid);
     }
+
+    @Override
+    public int insertMdModelFile(MdModelFile accountMdModelFile, MultipartFile accountFile) {
+        String filePath = RuoYiConfig.getUploadPath();
+        // 上传并返回新文件名称
+        try {
+            String fileName = FileUploadUtils.upload(filePath, accountFile);
+            System.out.println(fileName);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        return 0;
+    }
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/MdModelInfoServiceImpl.java

@@ -3,11 +3,14 @@ package com.ruoyi.interfaces.service.impl;
 import java.util.List;
 
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.interfaces.domain.MdModelFile;
 import com.ruoyi.interfaces.domain.MdModelInfo;
 import com.ruoyi.interfaces.mapper.MdModelInfoMapper;
+import com.ruoyi.interfaces.service.IMdModelFileService;
 import com.ruoyi.interfaces.service.IMdModelInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 模型信息Service业务层处理
@@ -21,6 +24,10 @@ public class MdModelInfoServiceImpl implements IMdModelInfoService
     @Autowired
     private MdModelInfoMapper mdModelInfoMapper;
 
+    @Autowired
+    private IMdModelFileService mdModelFileService;
+
+
     /**
      * 查询模型信息
      * 
@@ -52,10 +59,11 @@ public class MdModelInfoServiceImpl implements IMdModelInfoService
      * @return 结果
      */
     @Override
-    public int insertMdModelInfo(MdModelInfo mdModelInfo)
+    public String insertMdModelInfo(MdModelInfo mdModelInfo)
     {
         mdModelInfo.setMdid(IdUtils.fastUUID());
-        return mdModelInfoMapper.insertMdModelInfo(mdModelInfo);
+        mdModelInfoMapper.insertMdModelInfo(mdModelInfo);
+        return mdModelInfo.getMdid();
     }
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java

@@ -35,6 +35,8 @@ public class MimeTypeUtils
             "rar", "zip", "gz", "bz2",
             // 视频格式
             "mp4", "avi", "rmvb",
+            //模型格式
+            "jar","ph","sh","exe","zip","bat",
             // pdf
             "pdf" };