模型、服务、审核发布

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

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.ExecutorName;
+import com.ruoyi.common.utils.Arith;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.interfaces.domain.vo.FlowDispatchBatchVo;
 import com.ruoyi.interfaces.domain.vo.JobTaskVo;
@@ -53,7 +54,7 @@ public class MdFlowDispatchController extends BaseController {
         flowDispatchVo.setUpdateBy(getUsername());
         flowDispatchVo.setJobName(flowDispatchVo.getFlowJobName());
         Long update = mdFlowDispatchService.update(flowDispatchVo);
-        if (update.equals(0L))return error("更新失败");
+        if (update.equals(0L)) return error("更新失败");
         return success();
     }
 
@@ -62,16 +63,16 @@ public class MdFlowDispatchController extends BaseController {
         MdFlowDispatchVo info = mdFlowDispatchService.getInfo(id);
         if (StringUtils.isNull(info)) return error("任务不存在");
         if ("1".equals(info.getJobStatus())) return error("请先关闭任务");
-
-        Long delete = mdFlowDispatchService.delete(id);
         Set<Long> ids = new HashSet<>();
         ids.add(info.getId());
         SnailJobOpenApi.deleteJob(ids).execute();
+        Long delete = mdFlowDispatchService.delete(id);
         return success(delete);
     }
 
     /**
      * 计算任务执行批次
+     *
      * @param par
      * @return
      */
@@ -80,12 +81,21 @@ public class MdFlowDispatchController extends BaseController {
     public TableDataInfo getBatchDataTable(FlowDispatchBatchVo par) {
         startPage();
         List<FlowDispatchBatchVo> data = mdFlowDispatchService.selectFlowDispatchBatch(par);
+        data.forEach(item -> {
+            if (StringUtils.isNotNull(item.getExecutionAt()) && StringUtils.isNotNull(item.getCreateDt())) {
+                double sub = Arith.sub(item.getExecutionAt(), item.getCreateDt().getTime());
+                item.setExecutionAtMi(Arith.div(sub, 1000, 2)
+                );
+            }
+
+        });
         return getDataTable(data);
     }
 
 
     /**
      * 计算任务详情
+     *
      * @param par
      * @return
      */

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

@@ -96,6 +96,7 @@ public class MdModelParamsController extends BaseController {
     @Log(title = "模型参数信息", businessType = BusinessType.INSERT)
     @PostMapping("/addList")
     public AjaxResult addList(@RequestBody List<MdModelParams> mdModelParams) {
+
         if (StringUtils.isEmpty(mdModelParams)) return AjaxResult.error("数据为空");
         mdModelParamsService.deleteMdModelParamsByMdid(mdModelParams.get(0).getMdid());
         for (int i = 0; i < mdModelParams.size(); i++) {

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

@@ -233,7 +233,6 @@ public class PtServiceController extends BaseController {
         ptService.setAdName(sm4Util.encrypt(ptService.getAdName()));
 
 
-        boolean save = ptServiceService.save(ptService);
 
         MdModelInfo mdModelInfo = mdModelInfoService.selectMdModelInfoByMdid(ptService.getMdid());
 

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

@@ -46,7 +46,7 @@ public class PtServiceParamController extends BaseController {
                 .collect(Collectors.toList());
 
         if (CollectionUtils.isEmpty(ptServiceParamList)) {
-            return AjaxResult.error();
+            return AjaxResult.error("请求参数缺少必填项");
         }
 
         String srvId = ptServiceParamList.get(0).getSrvId();

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

@@ -176,7 +176,11 @@ public class PtTreeCateController extends BaseController {
             }
         }
         if (level.equals("3")) {
-            List<PtService> ptServices = ptServiceService.selectAllColumns(new PtService());
+            PtService ptService1 = new PtService();
+
+            System.out.println(ptTreeCate.getParams().get("serviceState"));
+            ptService1.setState(ptTreeCate.getParams().get("serviceState") != null ? ptTreeCate.getParams().get("serviceState").toString() : null);
+            List<PtService> ptServices = ptServiceService.selectAllColumns(ptService1);
             for (PtService ptService : ptServices) {
                 if (StringUtils.isNotNull(ptService.getSrvId()) &&
                         StringUtils.isNotNull(ptService.getMdid()) &&

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

@@ -22,6 +22,8 @@ public class FlowDispatchBatchVo extends MdFlowDispatchVo {
 
     private Long executionAt;
 
+    private Double executionAtMi;
+
     private Integer operationReason;
 
 

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

@@ -129,7 +129,8 @@ public class MdEstimateFirmlyServiceImpl implements IMdEstimateFirmlyService {
             mdEstimateFirmly.setCreateBy(estimateFirmly.getCreateBy());
             mdEstimateFirmly.setCreateTime(estimateFirmly.getCreateTime());
             mdEstimateFirmly.setFirmlyConfirm(estimateFirmly.getFirmlyConfirm());
-            mdEstimateFirmly.setFirmlyState(estimateFirmly.getFirmlyType());
+            mdEstimateFirmly.setFirmlyType(estimateFirmly.getFirmlyType());
+            mdEstimateFirmly.setFirmlyState("1");
             mdEstimateFirmlyMapper.updateMdEstimateFirmly(mdEstimateFirmly);
         }
         return "认定成功";

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

@@ -75,7 +75,7 @@
         where catalog_id = #{catalogId}
     </update>
     <update id="updateCatalogStatusNormal">
-        update md_catalog set status = '0' where catalog_id in
+        update md_catalog set status = '1' where catalog_id in
         <foreach collection="array" item="catalogId" open="(" separator="," close=")">
             #{catalogId}
         </foreach>
@@ -151,5 +151,6 @@
                 and update_time = #{updateTime}
             </if>
         </where>
+        order by sort
     </select>
 </mapper>

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

@@ -78,7 +78,7 @@
         </where>
         group by estimate_Time,mdid, create_by
         ) group by estimate_Time,mdid
-        ) n  ON n.mdid = ef.mdid
+        ) n  ON n.mdid = m.mdid
         <where>
             <if test="devkind != null ">and m.devkind = #{devkind}</if>
             <if test="mdid != null ">and m.mdid = #{mdid}</if>

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

@@ -197,11 +197,12 @@
         JOIN snail_job.sj_job job ON batch.job_id = job.id
         ) job ON f.ID = job.job_id
         <where>
+            job.id is not null
             <if test="appId != null">
                 and f.app_id = #{appId}
             </if>
             <if test="flowJobName != null and flowJobName != ''">
-                and f.FLOW_JOB_NAME  like CONCAT('%', #{flowJobName}, '%')
+                and f.FLOW_JOB_NAME like CONCAT('%', #{flowJobName}, '%')
             </if>
             <if test="taskBatchStatus != null">
                 and job.TASK_BATCH_STATUS = #{taskBatchStatus}

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

@@ -35,7 +35,7 @@
         FROM
         pt_service_log a
         LEFT JOIN md_model_info b on a.md_id = b.MDID
-        LEFT JOIN sys_user c on a.user_id = c.user_id
+        LEFT JOIN SH_PROJECT.sys_user c on a.user_id = c.user_id
         <where>
             <if test="logId != null ">and log_id = #{logId}</if>
             <if test="serId != null  and serId != ''">and ser_id = #{serId}</if>
@@ -62,7 +62,7 @@
         l.EXEC_TM,
         m.name as MD_NAME,
         s.name as SER_NAME
-        from (
+        from md_model_info m left join (
         SELECT tm as statis_Tm, MD_ID, SER_ID, STATUS_CODE, count(1) STATIS_NUM,SUM(EXEC_TM) EXEC_TM
         FROM (SELECT MD_ID, SER_ID, STATUS_CODE, to_char(tm, 'yyyy-mm-dd') tm,EXEC_TM from pt_Service_Log
         <where>
@@ -71,9 +71,9 @@
         </where>
         )
         GROUP BY tm, MD_ID, SER_ID, STATUS_CODE
-        ) l
-        left join md_model_info m on l.MD_ID = m.MDID
+        ) l on l.MD_ID = m.MDID
         left join pt_service s on l.MD_ID = s.SRV_ID
+        order by STATIS_NUM desc
     </select>
 
     <insert id="insertPtServiceLog" parameterType="com.ruoyi.interfaces.domain.PtServiceLog" useGeneratedKeys="true"

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

@@ -211,13 +211,13 @@
     <select id="selectPtServiceLogStatisYearMdList"
             resultMap="PtServiceLogStatisMap">
         select l.STATIS_TM,
-        l.MD_ID,
+        M.MDID,
         '' as SER_ID,
         '' as STATUS_CODE,
         l.STATIS_NUM,
         m.name as MD_NAME,
         '' as SER_NAME
-        from (
+        from md_model_info m left join (
         SELECT
         mmdd AS STATIS_TM ,MD_ID,sum(statis_num) statis_num
         FROM (
@@ -241,9 +241,10 @@
         </where>
         ) GROUP BY mmdd,MD_ID
         ) l
-        left join md_model_info m on l.MD_ID = m.MDID
+        on l.MD_ID = m.MDID
         <where>
             and m.name is not null
+            and devkind = 'APP'
         </where>
 
     </select>

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

@@ -315,7 +315,8 @@ PUBLISH_TIME
             </if>
             <if test="gatewayId != null and gatewayId != ''">
                 and gateway_id = #{gatewayId}
-            </if> <if test="state != null and state != ''">
+            </if>
+             <if test="state != null and state != ''">
                 and state = #{state}
             </if>
             <if test="serviceSource != null and serviceSource != ''">