Merge branch 'master' of http://39.98.38.2:13000/dumingliang/sh-model-platform

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

@@ -81,7 +81,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 1440
+  expireTime: 120
 
 # mybatis-plus
 mybatis-plus:

ruoyi-admin/src/test/java/com/ruoyi/JasyptTest.java

@@ -1,36 +1,19 @@
 package com.ruoyi;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SM4Util;
-import com.ruoyi.common.utils.json.JSONUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.interfaces.domain.MdModelInfo;
-import com.ruoyi.interfaces.domain.PtService;
-import com.ruoyi.interfaces.domain.SysMetaDatasource;
-import com.ruoyi.interfaces.service.IMdModelInfoService;
+import com.ruoyi.interfaces.mapper.MdModelInfoMapper;
 import com.ruoyi.interfaces.service.ISysMetaDatasourceService;
 import com.ruoyi.interfaces.service.PtServiceService;
-import com.ruoyi.model.dpp.dal.dataobject.etl.DppEtlTaskDO;
-import com.ruoyi.model.etl.mapper.DppEtlTaskMapper;
-import com.ruoyi.model.etl.mapper.TestDppEtlTaskMapper;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysUserService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -43,7 +26,7 @@ public class JasyptTest {
     private SM4Util sm4Util;
 
     @Autowired
-    private IMdModelInfoService mdModelInfoService;
+    private MdModelInfoMapper modelMapper;
 
     @Autowired
     private PtServiceService ptServiceService;
@@ -58,14 +41,20 @@ public class JasyptTest {
     @Test
     public void test() {
 
-        /*List<MdModelInfo> mdModelInfos = mdModelInfoService.selectMdModelInfoList(null);
+/*List<MdModelInfo> mdModelInfos = modelMapper.selectMdModelInfoList(new MdModelInfo());
         mdModelInfos.forEach(p->{
-            p.setMdContact(sm4Util.encrypt(p.getMdContact()));
-            p.setDevContact(sm4Util.encrypt(p.getDevContact()));
-            mdModelInfoService.updateMdModelInfo(p);
-        });
-*/
-/*        List<PtService> ptServices = ptServiceService.selectAllColumns(null);
+            p.setName(sm4Util.decrypt(p.getName()));
+            p.setEnname(sm4Util.decrypt(p.getEnname()));
+            p.setMdUnit(sm4Util.decrypt(p.getMdUnit()));
+            p.setMdContact(sm4Util.decrypt(p.getMdContact()));
+            p.setDevUnit(sm4Util.decrypt(p.getDevUnit()));
+            p.setDevContact(sm4Util.decrypt(p.getDevContact()));
+            modelMapper.updateMdModelInfo(p);
+        });*/
+/*
+
+
+        List<PtService> ptServices = ptServiceService.selectAllColumns(null);
         ptServices.forEach(p->{
             p.setDevelopContacter(sm4Util.encrypt(p.getDevelopContacter()));
             p.setMaintainContacer(sm4Util.encrypt(p.getMaintainContacer()));
@@ -74,23 +63,26 @@ public class JasyptTest {
             ptServiceService.put(p);
         });
 
-        */
-   /*     List<SysMetaDatasource> sysMetaDatasources = datasourceService.selectSysMetaDatasourceList(null);
+
+
+     List<SysMetaDatasource> sysMetaDatasources = datasourceService.selectSysMetaDatasourceList(null);
         sysMetaDatasources.forEach(p -> {
             p.setDsUser(sm4Util.encrypt(p.getDsUser()));
             p.setDsPass(sm4Util.encrypt(p.getDsPass()));
 
             datasourceService.updateSysMetaDatasource(p);
 
-        });*/
-/*
+        });
+
         String encrypt = sm4Util.decrypt("oMd930VR5zYn5ySU4ZJHPg==");
 
-        System.out.println(encrypt);*/
+        System.out.println(encrypt);
+
 
         List<SysMetaDatasource> sysMetaDatasources = datasourceService.selectSysMetaDatasourceList(null);
         String prettyJsonString = JSONUtils.toPrettyJsonString(sysMetaDatasources);
         System.out.println(prettyJsonString);
+*/
 
     }
-}
+}

ruoyi-admin/src/test/java/com/ruoyi/MyBatisJoinTest.java

@@ -1,3 +1,4 @@
+/*
 package com.ruoyi;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -97,4 +98,4 @@ public class MyBatisJoinTest {
             e.printStackTrace();
         }
     }
-}
+}*/

ruoyi-admin/src/test/java/com/ruoyi/TinyflowTest.java

@@ -1,3 +1,4 @@
+/*
 package com.ruoyi;
 
 import com.agentsflex.core.chain.Chain;
@@ -202,7 +203,8 @@ public class TinyflowTest {
             "}";
 
     public static void main(String[] args) {
-        /*System.out.println(data1);
+        */
+/*System.out.println(data1);
         Tinyflow tinyflow = new Tinyflow(data1);
         tinyflow.getChainParser().addNodeParser("printNode",new PrintNodeParser());
         tinyflow.getChainParser().addNodeParser("serviceNode",new ServiceNodeParser());
@@ -237,7 +239,8 @@ public class TinyflowTest {
 
         Map<String, Object> result = chain.executeForResult(variables);
 
-        System.out.println("result：" + result);*/
+        System.out.println("result：" + result);*//*
+
 //        TestService testService = new TestService();
 //        System.out.println(testService.helloTest());
 
@@ -267,3 +270,4 @@ public class TinyflowTest {
         }
     }
 }
+*/

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

@@ -42,6 +42,16 @@ public class MdDataSetFileController extends BaseController {
         List<MdDataSetFile> list = mdDataSetFileService.selectMdDataSetFileList(mdDataSetFile);
         return getDataTable(list);
     }
+    /**
+     * 查询文件数据集列表
+     */
+    @GetMapping("/listLog")
+    public TableDataInfo listLog(MdDataSetFile mdDataSetFile) {
+        startPage();
+        List<MdDataSetFile> list = mdDataSetFileService.selectMdDataSetFileLogList(mdDataSetFile);
+        return getDataTable(list);
+    }
+
 
     /**
      * 导出文件数据集列表
@@ -67,7 +77,10 @@ public class MdDataSetFileController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody MdDataSetFile mdDataSetFile) {
         mdDataSetFileService.deleteMdDataSetFileByDcCode(mdDataSetFile.getDcCode());
-        return toAjax(mdDataSetFileService.insertMdDataSetFile(mdDataSetFile));
+        mdDataSetFile.setCreateBy(getUsername());
+        int i = mdDataSetFileService.insertMdDataSetFile(mdDataSetFile);
+        mdDataSetFileService.insertMdDataSetFileLog(mdDataSetFile);
+        return toAjax(i);
     }
 
     /**

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

@@ -90,8 +90,6 @@ public class MdModelInfoController extends BaseController {
         if (StringUtils.isNull(mdModelInfo.getEnname())) return error("【模型英文名称】不可为空");
         mdModelInfo.setRegUser(getUsername());
 
-        mdModelInfo.setMdContact(sm4Util.encrypt(mdModelInfo.getMdContact()));
-        mdModelInfo.setDevContact(sm4Util.encrypt(mdModelInfo.getDevContact()));
 
         return AjaxResult.success(mdModelInfoService.insertMdModelInfo(mdModelInfo));
     }
@@ -105,8 +103,6 @@ public class MdModelInfoController extends BaseController {
     public AjaxResult edit(@RequestBody MdModelInfo mdModelInfo) {
         if (StringUtils.isNull(mdModelInfo.getName())) return error("【模型名称】不可为空");
         if (StringUtils.isNull(mdModelInfo.getEnname())) return error("【模型英文名称】不可为空");
-        mdModelInfo.setMdContact(sm4Util.encrypt(mdModelInfo.getMdContact()));
-        mdModelInfo.setDevContact(sm4Util.encrypt(mdModelInfo.getDevContact()));
 
         return toAjax(mdModelInfoService.updateMdModelInfo(mdModelInfo));
     }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/mapper/MdDataSetFileMapper.java

@@ -66,4 +66,8 @@ public interface MdDataSetFileMapper
     public int deleteMdDataSetFileByIds(Long[] ids);
 
     int deleteMdDataSetFileByDcCode(String dcCode);
+
+    int insertMdDataSetFileLog(MdDataSetFile mdDataSetFile);
+
+    List<MdDataSetFile> selectMdDataSetFileLogList(MdDataSetFile mdDataSetFile);
 }

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

@@ -65,4 +65,7 @@ public interface IMdDataSetFileService
 
     List<HashMap<String,Object>> queryFileData( MdDataSetFileVo mdDataSetFile) throws Exception;
 
+    int insertMdDataSetFileLog(MdDataSetFile mdDataSetFile);
+
+    List<MdDataSetFile> selectMdDataSetFileLogList(MdDataSetFile mdDataSetFile);
 }

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

@@ -106,4 +106,15 @@ public class MdDataSetFileServiceImpl implements IMdDataSetFileService {
         ExcelParser.parseExcelWithParams(file, paramList);
         return Collections.emptyList();
     }
+
+    @Override
+    public int insertMdDataSetFileLog(MdDataSetFile mdDataSetFile) {
+
+        return mdDataSetFileMapper.insertMdDataSetFileLog(mdDataSetFile);
+    }
+
+    @Override
+    public List<MdDataSetFile> selectMdDataSetFileLogList(MdDataSetFile mdDataSetFile) {
+        return mdDataSetFileMapper.selectMdDataSetFileLogList(mdDataSetFile);
+    }
 }

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

@@ -42,7 +42,11 @@ public class MdModelInfoServiceImpl implements IMdModelInfoService {
     @Override
     public MdModelInfo selectMdModelInfoByMdid(String mdid) {
         MdModelInfo mdModelInfo = mdModelInfoMapper.selectMdModelInfoByMdid(mdid);
+        mdModelInfo.setName(sm4Util.decrypt(mdModelInfo.getName()));
+        mdModelInfo.setEnname(sm4Util.decrypt(mdModelInfo.getEnname()));
+        mdModelInfo.setMdUnit(sm4Util.decrypt(mdModelInfo.getMdUnit()));
         mdModelInfo.setMdContact(sm4Util.decrypt(mdModelInfo.getMdContact()));
+        mdModelInfo.setDevUnit(sm4Util.decrypt(mdModelInfo.getDevUnit()));
         mdModelInfo.setDevContact(sm4Util.decrypt(mdModelInfo.getDevContact()));
 
         return mdModelInfo;
@@ -58,9 +62,12 @@ public class MdModelInfoServiceImpl implements IMdModelInfoService {
     public List<MdModelInfo> selectMdModelInfoList(MdModelInfo mdModelInfo) {
         List<MdModelInfo> mdModelInfos = mdModelInfoMapper.selectMdModelInfoList(mdModelInfo);
         mdModelInfos.forEach(p -> {
+            p.setName(sm4Util.decrypt(p.getName()));
+            p.setEnname(sm4Util.decrypt(p.getEnname()));
+            p.setMdUnit(sm4Util.decrypt(p.getMdUnit()));
             p.setMdContact(sm4Util.decrypt(p.getMdContact()));
+            p.setDevUnit(sm4Util.decrypt(p.getDevUnit()));
             p.setDevContact(sm4Util.decrypt(p.getDevContact()));
-
         });
         return mdModelInfos;
     }
@@ -75,6 +82,12 @@ public class MdModelInfoServiceImpl implements IMdModelInfoService {
     public String insertMdModelInfo(MdModelInfo mdModelInfo) {
         mdModelInfo.setMdid(IdUtils.fastUUID());
         mdModelInfo.setCreateby(DateUtils.getNowDate());
+        mdModelInfo.setName(sm4Util.encrypt(mdModelInfo.getName()));
+        mdModelInfo.setEnname(sm4Util.encrypt(mdModelInfo.getEnname()));
+        mdModelInfo.setMdUnit(sm4Util.encrypt(mdModelInfo.getMdUnit()));
+        mdModelInfo.setMdContact(sm4Util.encrypt(mdModelInfo.getMdContact()));
+        mdModelInfo.setDevUnit(sm4Util.encrypt(mdModelInfo.getDevUnit()));
+        mdModelInfo.setDevContact(sm4Util.encrypt(mdModelInfo.getDevContact()));
         mdModelInfoMapper.insertMdModelInfo(mdModelInfo);
         return mdModelInfo.getMdid();
     }
@@ -87,6 +100,13 @@ public class MdModelInfoServiceImpl implements IMdModelInfoService {
      */
     @Override
     public int updateMdModelInfo(MdModelInfo mdModelInfo) {
+        mdModelInfo.setName(sm4Util.encrypt(mdModelInfo.getName()));
+        mdModelInfo.setEnname(sm4Util.encrypt(mdModelInfo.getEnname()));
+        mdModelInfo.setMdUnit(sm4Util.encrypt(mdModelInfo.getMdUnit()));
+        mdModelInfo.setMdContact(sm4Util.encrypt(mdModelInfo.getMdContact()));
+        mdModelInfo.setDevUnit(sm4Util.encrypt(mdModelInfo.getDevUnit()));
+        mdModelInfo.setDevContact(sm4Util.encrypt(mdModelInfo.getDevContact()));
+
         mdModelInfo.setModifyby(DateUtils.getNowDate());
         return mdModelInfoMapper.updateMdModelInfo(mdModelInfo);
     }

ruoyi-api-patform/src/main/resources/mapper/interfaces/MdDataSetFileMapper.xml

@@ -33,6 +33,24 @@
         <include refid="selectMdDataSetFileVo"/>
         where DC_CODE = #{dcCode}
     </select>
+    <select id="selectMdDataSetFileLogList" resultType="com.ruoyi.interfaces.domain.MdDataSetFile">
+        select ID,
+        DC_CODE,
+        FILE_PATH,
+        ORIGINAL_FILENAME,
+        FILE_TYPE
+        create_by,
+        create_time
+        from md_data_set_file_log
+        <where>
+            <if test="dcCode != null  and dcCode != ''">and DC_CODE = #{dcCode}</if>
+            <if test="filePath != null  and filePath != ''">and FILE_PATH = #{filePath}</if>
+            <if test="originalFilename != null  and originalFilename != ''">and ORIGINAL_FILENAME
+                like concat('%', #{originalFilename}, '%')
+            </if>
+            <if test="fileType != null  and fileType != ''">and FILE_TYPE = #{fileType}</if>
+        </where>
+    </select>
 
     <insert id="insertMdDataSetFile" parameterType="com.ruoyi.interfaces.domain.MdDataSetFile" useGeneratedKeys="true" keyProperty="id">
         insert into md_data_set_file
@@ -51,6 +69,26 @@
             <if test="pars != null">#{pars},</if>
         </trim>
     </insert>
+    <insert id="insertMdDataSetFileLog">
+        insert into md_data_set_file_log
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="dcCode != null">DC_CODE,</if>
+            <if test="filePath != null">FILE_PATH,</if>
+            <if test="originalFilename != null">ORIGINAL_FILENAME,</if>
+            <if test="fileType != null">FILE_TYPE,</if>
+            <if test="createBy != null">create_by,</if>
+            create_time,
+
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="dcCode != null">#{dcCode},</if>
+            <if test="filePath != null">#{filePath},</if>
+            <if test="originalFilename != null">#{originalFilename},</if>
+            <if test="fileType != null">#{fileType},</if>
+            <if test="createBy != null">#{createBy},</if>
+            sysdate,
+        </trim>
+    </insert>
 
     <update id="updateMdDataSetFile" parameterType="com.ruoyi.interfaces.domain.MdDataSetFile">
         update md_data_set_file

ruoyi-common/src/main/java/com/ruoyi/common/utils/SM4Util.java

@@ -86,8 +86,7 @@ public class SM4Util {
             byte[] encrypted = cipher.doFinal(data.getBytes(StandardCharsets.UTF_8));
             return Base64.getEncoder().encodeToString(encrypted);
         } catch (Exception e) {
-            return data;
-           // throw new RuntimeException("SM4加密失败", e);
+            throw new RuntimeException("SM4加密失败", e);
         }
     }
 
@@ -107,10 +106,7 @@ public class SM4Util {
             byte[] decrypted = cipher.doFinal(encryptedBytes);
             return new String(decrypted, StandardCharsets.UTF_8);
         } catch (Exception e) {
-            System.out.println(encryptedData);
-            System.out.println(ExceptionUtil.getRootErrorMessage(e));
-            return encryptedData;
-            //throw new RuntimeException("SM4解密失败", e);
+            throw new RuntimeException("SM4解密失败", e);
         }
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -5,6 +5,8 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
+import com.ruoyi.common.utils.SM4Util;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -45,6 +47,9 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Autowired
     private SysRoleDeptMapper roleDeptMapper;
 
+
+    @Autowired
+    private SM4Util sm4Util;
     /**
      * 根据条件分页查询角色数据
      * 
@@ -55,7 +60,11 @@ public class SysRoleServiceImpl implements ISysRoleService
     @DataScope(deptAlias = "d")
     public List<SysRole> selectRoleList(SysRole role)
     {
-        return roleMapper.selectRoleList(role);
+        List<SysRole> sysRoles = roleMapper.selectRoleList(role);
+        sysRoles.forEach( p ->{
+            p.setRoleKey(sm4Util.decrypt(p.getRoleKey()));
+        });
+        return sysRoles;
     }
 
     /**
@@ -68,6 +77,9 @@ public class SysRoleServiceImpl implements ISysRoleService
     public List<SysRole> selectRolesByUserId(Long userId)
     {
         List<SysRole> userRoles = roleMapper.selectRolePermissionByUserId(userId);
+        userRoles.forEach( p ->{
+            p.setRoleKey(sm4Util.decrypt(p.getRoleKey()));
+        });
         List<SysRole> roles = selectRoleAll();
         for (SysRole role : roles)
         {
@@ -93,6 +105,9 @@ public class SysRoleServiceImpl implements ISysRoleService
     public Set<String> selectRolePermissionByUserId(Long userId)
     {
         List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
+        perms.forEach( p ->{
+            p.setRoleKey(sm4Util.decrypt(p.getRoleKey()));
+        });
         Set<String> permsSet = new HashSet<>();
         for (SysRole perm : perms)
         {
@@ -136,7 +151,9 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Override
     public SysRole selectRoleById(Long roleId)
     {
-        return roleMapper.selectRoleById(roleId);
+        SysRole sysRole = roleMapper.selectRoleById(roleId);
+        sysRole.setRoleKey(sm4Util.decrypt(sysRole.getRoleKey()));
+        return sysRole;
     }
 
     /**
@@ -150,6 +167,7 @@ public class SysRoleServiceImpl implements ISysRoleService
     {
         Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
         SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName());
+        info.setRoleKey(sm4Util.decrypt(info.getRoleKey()));
         if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
         {
             return UserConstants.NOT_UNIQUE;
@@ -168,6 +186,7 @@ public class SysRoleServiceImpl implements ISysRoleService
     {
         Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
         SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey());
+        info.setRoleKey(sm4Util.decrypt(info.getRoleKey()));
         if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
         {
             return UserConstants.NOT_UNIQUE;
@@ -234,6 +253,7 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Transactional
     public int insertRole(SysRole role)
     {
+        role.setRoleKey(sm4Util.encrypt(role.getRoleKey()));
         // 新增角色信息
         roleMapper.insertRole(role);
         return insertRoleMenu(role);
@@ -249,6 +269,7 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Transactional
     public int updateRole(SysRole role)
     {
+        role.setRoleKey(sm4Util.encrypt(role.getRoleKey()));
         // 修改角色信息
         roleMapper.updateRole(role);
         // 删除角色与菜单关联
@@ -265,6 +286,7 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Override
     public int updateRoleStatus(SysRole role)
     {
+        role.setRoleKey(sm4Util.encrypt(role.getRoleKey()));
         return roleMapper.updateRole(role);
     }
 
@@ -278,6 +300,7 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Transactional
     public int authDataScope(SysRole role)
     {
+        role.setRoleKey(sm4Util.encrypt(role.getRoleKey()));
         // 修改角色信息
         roleMapper.updateRole(role);
         // 删除角色与部门关联