Merge branch 'develop_3' into 'develop_master'

feat: 标准库 详情 文件类 修改

See merge request !23

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java

@@ -187,5 +187,7 @@ public class SarStandardsInfo extends BaseEntity {
     @TableField(exist = false)
     private String putTime2;
 
+    @TableField(exist = false)
+    private String standSystemName;
 }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -32,6 +32,7 @@ import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
 import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService;
 import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao;
 import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu;
+import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService;
 import com.adc.da.slrs.sarStandPutTime.dao.SarStandPutTimeDao;
 import com.adc.da.slrs.sarStandPutTime.entity.SarStandPutTime;
 import com.adc.da.slrs.sarStandVal.dao.SarStandValDao;
@@ -47,6 +48,8 @@ import com.adc.da.sys.common.SelectionResult;
 import com.adc.da.sys.constant.ValueStateEnum;
 import com.adc.da.sys.dao.DicTypeEODao;
 import com.adc.da.sys.entity.DicTypeEO;
+import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
+import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService;
 import com.adc.da.util.LoginUserUtil;
 import com.adc.da.util.UUIDUtils;
 import com.adc.da.utils.util.*;
@@ -96,6 +99,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Autowired
     private ITsResourceService sarMenuEOService;
 
+    @Autowired
+    private ISarMenuStandardService sarMenuStandardService;
+
     @Autowired
     private SarSarAccessInfoDao sarSarAccessInfoEODao;
 
@@ -114,6 +120,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Autowired
     private ISarSarAccessService sarSarAccessEOService;
 
+    @Autowired
+    private ISarStandMenuService sarStandMenuService;
+
     @Autowired
     private ISarLawsInfoService sarLawsInfoEOService;
 
@@ -1796,6 +1805,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         // 查询纳入清单的国家地区
         if (sarStandardsInfoEO != null) {
+            if(sarStandardsInfoEO.getStandSystem() != null){
+                SarMenuStandard menu = sarMenuStandardService.selectMenuById(sarStandardsInfoEO.getStandSystem());
+                if(menu != null){
+                    sarStandardsInfoEO.setStandSystemName(menu.getMenuName() == null ? "" : menu.getMenuName());
+                }
+            }
             String accessCountry = sarSarAccessEOService.getCountryByRes(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND");
             sarStandardsInfoEO.setAccessCountry(accessCountry);
         }

adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java

@@ -136,7 +136,8 @@ public class AttFileEOController {
             String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request);
             response.setHeader("Content-Disposition", "attachment; filename=\""+ fileOldName  +"\"");
             response.setContentType("application/octet-stream");
-            is = iFileStore.loadFile(attFileEO.getFilePath()+attFileEO.getFileName());
+            File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName());
+            is = new FileInputStream(file);
             os = response.getOutputStream();
             IOUtils.copy(is, os);
             os.flush();
@@ -232,7 +233,8 @@ public class AttFileEOController {
             String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request);
             response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\"");
             response.setContentType("application/octet-stream");
-            is = iFileStore.loadFile(attFileEO.getFilePath()+attFileEO.getFileName());
+            File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName());
+            is = new FileInputStream(file);
             os = response.getOutputStream();
             IOUtils.copy(is, os);
             os.flush();
@@ -280,7 +282,8 @@ public class AttFileEOController {
 //            WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent);
             response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\"");
             response.setContentType("application/octet-stream");
-            is = iFileStore.loadFile(attFileEO.getFilePath()+"waterPath/"+attFileEO.getOldFileName());
+            File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName());
+            is = new FileInputStream(file);
             os = response.getOutputStream();
             IOUtils.copy(is, os);
             os.flush();
@@ -356,7 +359,8 @@ public class AttFileEOController {
             String fileOldName = fileNameEncoding(fileName,request);
             response.setHeader("Content-Disposition", "attachment; filename=" + fileOldName);
             response.setContentType("application/octet-stream");
-            is = iFileStore.loadFile("/modal/"+fileName);
+            File file = new File(filePath+"/modal/"+fileName);
+            is = new FileInputStream(file);
             os = response.getOutputStream();
             IOUtils.copy(is, os);
             os.flush();

adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/ISarMenuStandardService.java

@@ -48,4 +48,7 @@ public interface ISarMenuStandardService extends IService<SarMenuStandard> {
      * @return List<Menu>
      */
     List<SarMenuStandard> getMenuByIds(List<String> menuIds);
+
+    SarMenuStandard selectMenuById(String id);
+
 }

adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java

@@ -29,6 +29,11 @@ public class SarMenuStandardServiceImpl extends ServiceImpl<SarMenuStandardDao,
     @Autowired
     private SarMenuStandardDao dao;
 
+    @Override
+    public SarMenuStandard selectMenuById(String id){
+        return dao.selectById(id);
+    }
+
     /**
      * 查询所有菜单
      */