计算任务开发更新

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

@@ -61,7 +61,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: dev
+    active: test
   # 文件上传
   servlet:
     multipart:

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

@@ -16,7 +16,6 @@ import com.ruoyi.interfaces.mapper.PtServiceParamMapper;
 import com.ruoyi.interfaces.service.IMdModelInfoService;
 import com.ruoyi.interfaces.service.PtServiceService;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -115,12 +114,13 @@ public class PtServiceServiceImpl extends ServiceImpl<PtServiceMapper, PtService
     @Override
     public MdModelInfoVo modelService(MdModelInfoVo par) {
         MdModelInfoVo mdModelInfoVo = ptServiceMapper.selectModelService(par);
-        mdModelInfoVo.getServiceList().forEach(p -> {
-            p.setDevelopContacter(sm4Util.decrypt(p.getDevelopContacter()));
-            p.setMaintainContacer(sm4Util.decrypt(p.getMaintainContacer()));
-            p.setAdName(sm4Util.decrypt(p.getAdName()));
+        if (StringUtils.isNotNull(mdModelInfoVo) && StringUtils.isNotEmpty(mdModelInfoVo.getServiceList()))
+            mdModelInfoVo.getServiceList().forEach(p -> {
+                p.setDevelopContacter(sm4Util.decrypt(p.getDevelopContacter()));
+                p.setMaintainContacer(sm4Util.decrypt(p.getMaintainContacer()));
+                p.setAdName(sm4Util.decrypt(p.getAdName()));
 
-        });
+            });
         return mdModelInfoVo;
     }
 
@@ -145,6 +145,7 @@ public class PtServiceServiceImpl extends ServiceImpl<PtServiceMapper, PtService
     public HashMap<String, String> testRun(PtService ptService) throws IOException {
 
         String url = RuoYiConfig.getGatewayUrl() + ptService.getProxyPath() + ptService.getUrl();
+        System.out.println(url);
         //String url = ptService.getUrl();
         HashMap<String, String> headers = new HashMap<>();
         List<PtServiceParam> params = ptService.getParams();

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

@@ -24,6 +24,7 @@
             resultMap="SysMetaTableResult">
         <include refid="selectSysMetaTableVo"/>
         <where>
+            <if test="dsCode != null  and dsCode != ''">and ds_code = #{dsCode} </if>
             <if test="metaName != null  and metaName != ''">and META_NAME like concat('%', #{metaName}, '%')</if>
             <if test="metaType != null  and metaType != ''">and META_TYPE = #{metaType}</if>
             <if test="metaCatalog != null  and metaCatalog != ''">and META_CATALOG = #{metaCatalog}</if>

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -75,12 +75,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
--- 		select * from sys_dept where find_in_set(#{deptId}, ancestors)
+
 		select * from sys_dept where instr(','||ancestors||',' ,  ','|| #{deptId} ||',')
 	</select>
 	
 	<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
--- 		select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
 		select count(*) from sys_dept where status = 0 and del_flag = '0' and instr(','||ancestors||',' ,  ','|| #{deptId} ||',')
 	</select>
 	

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -84,6 +84,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
+
+
 	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time