Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/sooka/sponest/data/system/attach/controller/CenterdataTAttachController.java

@@ -3,7 +3,6 @@ package com.sooka.sponest.data.system.attach.controller;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.sooka.sponest.data.system.attach.domain.AppDataTAttach;
 import com.sooka.sponest.data.system.attach.domain.CenterdataTAttach;
 import com.sooka.sponest.data.system.attach.mapper.CenterdataTAttachMapper;
 import com.sooka.sponest.data.system.attach.service.ICenterdataTAttachService;
@@ -119,14 +118,13 @@ public class CenterdataTAttachController extends BaseController {
         return toAjax(centerdataTAttachService.insertCenterdataTAttach(centerdataTAttach));
     }
 
-
     @GetMapping("urlAttch/{busId}")
-    public R<List<AppDataTAttach>> urlAttch(@PathVariable String busId) {
+    public R<List<CenterdataTAttach>> urlAttch(@PathVariable String busId) {
         return R.ok(centerdataTAttachMapper.urlAttch(busId));
     }
 
     @GetMapping("urlAttchMpF/{busId}")
-    public R<List<AppDataTAttach>> urlAttchMpF(@PathVariable String busId) {
+    public R<List<CenterdataTAttach>> urlAttchMpF(@PathVariable String busId) {
         return R.ok(centerdataTAttachMapper.urlAttchMpF(busId));
     }
 }

src/main/java/com/sooka/sponest/data/system/attach/domain/AppDataTAttach.java

@@ -1,85 +0,0 @@
- package com.sooka.sponest.data.system.attach.domain;
-
- import com.ruoyi.common.core.annotation.Excel;
- import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
- import org.apache.commons.lang3.builder.ToStringBuilder;
- import org.apache.commons.lang3.builder.ToStringStyle;
-
- /**
-  * 附件对象 centerdata_t_attach
-  *
-  * @author ruoyi
-  * @date 2022-06-11
-  */
- public class AppDataTAttach extends BaseBusinessEntity
- {
-     private static final long serialVersionUID = 1L;
-
-     /** 业务ID */
-     @Excel(name = "业务ID")
-     private String busId;
-
-     /** 路径 */
-     @Excel(name = "路径")
-     private String attachPath;
-
-     private String busSource;
-
-     /** 业务类型（索引） */
-     @Excel(name = "业务类型", readConverterExp = "索=引")
-     private String busIndx;
-     private String fileName;
-
-     public String getFileName() {
-         return fileName;
-     }
-
-     public void setFileName(String fileName) {
-         this.fileName = fileName;
-     }
-
-     public void setBusId(String busId)
-     {
-         this.busId = busId;
-     }
-
-     public String getBusId()
-     {
-         return busId;
-     }
-     public void setAttachPath(String attachPath)
-     {
-         this.attachPath = attachPath;
-     }
-
-     public String getAttachPath()
-     {
-         return attachPath;
-     }
-     public void setBusIndx(String busIndx)
-     {
-         this.busIndx = busIndx;
-     }
-
-     public String getBusIndx()
-     {
-         return busIndx;
-     }
-
-     public String getBusSource() {
-         return busSource;
-     }
-
-     public void setBusSource(String busSource) {
-         this.busSource = busSource;
-     }
-
-     @Override
-     public String toString() {
-         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-             .append("busId", getBusId())
-             .append("attachPath", getAttachPath())
-             .append("busIndx", getBusIndx())
-             .toString();
-     }
- }

src/main/java/com/sooka/sponest/data/system/attach/mapper/CenterdataTAttachMapper.java

@@ -1,6 +1,5 @@
 package com.sooka.sponest.data.system.attach.mapper;
 
-import com.sooka.sponest.data.system.attach.domain.AppDataTAttach;
 import com.sooka.sponest.data.system.attach.domain.CenterdataTAttach;
 import org.apache.ibatis.annotations.Param;
 
@@ -67,9 +66,9 @@ public interface CenterdataTAttachMapper {
 
     List<CenterdataTAttach> listCenterdataTAttachByBusId(String busId);
 
-    List<AppDataTAttach> urlAttch(String busId);
+    List<CenterdataTAttach> urlAttch(String busId);
 
-    List<AppDataTAttach> urlAttchMpF(String busId);
+    List<CenterdataTAttach> urlAttchMpF(String busId);
 
     int insertEventFileLog(CenterdataTAttach res);
 

src/main/resources/mapper/system/attach/CenterdataTAttachMapper.xml

@@ -100,16 +100,14 @@
         delete from centerdata_t_attach where bus_id = #{busId}
     </delete>
 
-    <select id="urlAttch" parameterType="java.lang.String"
-            resultType="com.sooka.sponest.data.system.attach.domain.AppDataTAttach">
+    <select id="urlAttch" parameterType="java.lang.String" resultType="CenterdataTAttach">
         select attach_path attachPath,file_name fileName,bus_source busSource
         from centerdata_t_attach
         where bus_id = #{busId} and attach_path not like concat('%', 'mp4', '%')
         order by create_time,attach_sorts
     </select>
 
-    <select id="urlAttchMpF" parameterType="java.lang.String"
-            resultType="com.sooka.sponest.data.system.attach.domain.AppDataTAttach">
+    <select id="urlAttchMpF" parameterType="java.lang.String" resultType="CenterdataTAttach">
         select attach_path attachPath,file_name fileName,bus_source busSource
         from centerdata_t_attach
         where bus_id = #{busId} and attach_path like concat('%', 'mp4', '%')