首页概览及场景库标签

api-common/src/main/java/api/common/pojo/param/scene/SceneNaturalParam.java

@@ -63,5 +63,6 @@ public class SceneNaturalParam extends PageVO implements Serializable {
     private String jsonAddress ; //
     private String videoPreview;//视频预览地址
     private String[] ids ; //回显数组
+    private String createUserId ; //创建人id
 
 }

api-common/src/main/java/api/common/pojo/po/scene/SceneAccidentPO.java

@@ -29,6 +29,7 @@ public class SceneAccidentPO implements Serializable {
     private String xodrAddress ; //
     private String jsonAddress ; //
     private String videoPreview;//视频预览地址
+    private String label;//标签
     /**
      * 记录创建时间
      */

api-common/src/main/java/api/common/pojo/po/scene/SceneNaturalPO.java

@@ -60,6 +60,8 @@ public class SceneNaturalPO  implements Serializable {
     private String xoscAddress ; //
     private String jsonAddress ; //
     private String videoPreview;//视频预览地址
+
+    private String label;//标签
     /**
      * 记录创建时间
      */

api-common/src/main/java/api/common/pojo/po/scene/StandardsRegulationsPO.java

@@ -26,6 +26,7 @@ public class StandardsRegulationsPO implements Serializable {
     private String xodrAddress ; //
     private String jsonAddress ; //
     private String videoPreview;//视频预览地址
+    private String label;//标签
     /**
      * 记录创建时间
      */

api-common/src/main/java/api/common/pojo/vo/scene/SceneAccidentVO.java

@@ -24,5 +24,6 @@ public class SceneAccidentVO extends PageVO implements Serializable {
     private String conflictType ; //冲突类型
     private String videoAddress ; //视频地址
     private String videoPreview;//视频预览地址
+    private String label;//标签
 
 }

api-common/src/main/java/api/common/pojo/vo/scene/SceneNaturalVO.java

@@ -61,5 +61,7 @@ public class SceneNaturalVO extends PageVO implements Serializable {
     private String jsonAddress ; //
     private String videoPreview;//视频预览地址
 
+    private String label;//标签
+
 
 }

api-common/src/main/java/api/common/pojo/vo/scene/StandardsRegulationsVO.java

@@ -22,5 +22,5 @@ public class StandardsRegulationsVO extends PageVO implements Serializable {
     private String share ; //是否分析  1为分享
     private String videoAddress ; //视频地址
     private String videoPreview;//视频预览地址
-
+    private String label;//标签
 }

api-common/src/main/java/api/common/util/TimeUtil.java

@@ -1,9 +1,9 @@
 package api.common.util;
 
 import java.sql.Timestamp;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
+import java.util.*;
 
 public class TimeUtil {
 
@@ -29,4 +29,28 @@ public class TimeUtil {
         return Integer.valueOf(sdf.format(date));
 
     }
+    //获取时间类型格式转化
+    public static String getToStringDate(Date date, int index){
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFmtArr[index]);
+        if(date == null){
+            date = new Date();
+        }
+        return sdf.format(date);
+
+    }
+
+    //获取过去某天的起始日期
+    public static Map<String,Object> getPastTime(Integer num) {
+        Calendar c = Calendar.getInstance();
+        c.setTime(new Date());
+        c.add(Calendar.DATE, -num);
+        Date d = c.getTime();
+        String  startDate=getToStringDate(d,2) + " 00:00:00";
+        String  endDate=getToStringDate(d,2) + " 23:59:59";
+        Map<String,Object> map = new HashMap();
+        map.put("startDate", startDate);
+        map.put("endDate", endDate);
+        map.put("toDate", getToStringDate(d,2));
+        return map;
+    }
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/algorithm/ctrl/AlgorithmCtrl.java

@@ -111,15 +111,5 @@ public class AlgorithmCtrl {
         return service.testConnection(param);
     }
 
-    /**
-     * 首页文件数量
-     * @param
-     * @return
-     */
-    @RequestMapping("selectDetailsBySy")
-    @ResponseBody
-    public ResponseBodyVO selectDetailsBySy(){
-        return service.selectDetailsBySy();
-    }
 
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/algorithm/serviceImpl/AlgorithmServiceImpl.java

@@ -17,6 +17,8 @@ import com.css.simulation.resource.system.service.DictService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -29,8 +31,8 @@ public class AlgorithmServiceImpl implements AlgorithmService {
 
     @Autowired
     DictService dictService;
-    
-    @Autowired
+
+    @Resource
     FileDownService fileDownService;
     
     @Override
@@ -234,6 +236,7 @@ public class AlgorithmServiceImpl implements AlgorithmService {
         AlgorithmParameter param=new AlgorithmParameter();
         param.setUploadMode("1");
         param.setShare("0");
+        param.setCreateUserId(AuthUtil.getCurrentUserId());
         int fileNum= algorithmMapper.selectDetailsBySy(param);
         param.setUploadMode("2");
         int pathNum= algorithmMapper.selectDetailsBySy(param);

simulation-resource-server/src/main/java/com/css/simulation/resource/project/impl/SimulationProjectServiceImpl.java

@@ -12,6 +12,7 @@ import api.common.pojo.param.system.DictParam;
 import api.common.pojo.po.project.*;
 import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.vo.project.*;
+import api.common.pojo.vo.scene.RunProjectVO;
 import api.common.util.JsonUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.TimeUtil;
@@ -32,6 +33,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.io.*;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -45,7 +47,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     @Autowired
     private SimulationProjectMapper simulationProjectMapper;
 
-    @Autowired
+    @Resource
     private KafkaService kafkaService;
 
     @Autowired
@@ -111,7 +113,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         }
         if(!isEmpty(param.getCreateEndDate())){
             String createEndDate = param.getCreateEndDate();
-            Date endDate = getDate(createEndDate + " 11:59:59",1);
+            Date endDate = getDate(createEndDate + " 23:59:59",1);
             if(endDate == null){
                 return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE);
             }
@@ -129,7 +131,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         }
         if(!isEmpty(param.getFinishDateEnd())){
             String finishDateEnd = param.getFinishDateEnd();
-            Date enddate = getDate(finishDateEnd + " 11:59:59",1);
+            Date enddate = getDate(finishDateEnd + " 23:59:59",1);
             if(enddate == null){
                 return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE);
             }
@@ -1475,7 +1477,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 /*
     *//**
      * 查询所有指标和得分
-     * @param scenePackageId
+     * @param
      *//*
     private void selectScenePackageSubListAndSetScore(String pId, String scenePackageId, List<List<String>> resultArr, List<ScenePackageSubListVO>  single){
 
@@ -1783,6 +1785,57 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             cloums.add(map);
         }
     }
-
-
+    //运行项目统计-折线图
+    @Override
+    public ResponseBodyVO selectRunProjectBySy() {
+        List<RunProjectVO> list=new ArrayList();
+        for(Integer i=6;i>-1;i--) {
+            RunProjectVO vo=new RunProjectVO();
+            Map<String,Object> params = TimeUtil.getPastTime(i);
+            params.put("createUserId", AuthUtil.getCurrentUserId());
+            Integer num = simulationProjectMapper.selectRunProjectBySy(params);
+            vo.setToDate(params.get("toDate").toString());
+            vo.setNum(num);
+            list.add(vo);
+        }
+         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS,list);
+    }
+    //运行任务统计-折线图
+    @Override
+    public ResponseBodyVO selectRunTaskBySy() {
+        List<RunProjectVO> list=new ArrayList();
+        for(Integer i=6;i>-1;i--) {
+            RunProjectVO vo=new RunProjectVO();
+            Map<String,Object> params = TimeUtil.getPastTime(i);
+            params.put("createUserId", AuthUtil.getCurrentUserId());
+            Integer num = simulationProjectMapper.selectRunTaskBySy(params);
+            vo.setToDate(params.get("toDate").toString());
+            vo.setNum(num);
+            list.add(vo);
+        }
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS,list);
+    }
+    //任务运行状态统计-饼图
+    @Override
+    public ResponseBodyVO selectRunTaskByState() {
+            Map<String,Object> params =new HashMap<>();
+            params.put("createUserId", AuthUtil.getCurrentUserId());
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, simulationProjectMapper.selectRunTaskByState(params));
+    }
+    //项目运行状态统计-饼图
+    @Override
+    public ResponseBodyVO selectRunProjectByState() {
+        Map<String,Object> params =new HashMap<>();
+        params.put("createUserId", AuthUtil.getCurrentUserId());
+        //10：未执行，20：执行中，30：执行完成，40：已中止
+        List list=simulationProjectMapper.selectRunProjectByState(params);
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, list);
+    }
+    //评测等级分布-饼图
+    @Override
+    public ResponseBodyVO selectEvaluationLevel() {
+        Map<String,Object> params =new HashMap<>();
+        params.put("createUserId", AuthUtil.getCurrentUserId());
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, simulationProjectMapper.selectEvaluationLevel(params));
+    }
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/project/mapper/SimulationProjectMapper.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 @Repository
@@ -101,4 +102,11 @@ public interface SimulationProjectMapper {
 
     List<SublistScoreVo> selectSubScore(String id);
 
+    Integer selectRunProjectBySy(Map map);
+    Integer selectRunTaskBySy(Map map);
+
+    List<Map> selectRunTaskByState(Map map);
+    List<Map> selectRunProjectByState(Map map);
+    List<Map> selectEvaluationLevel(Map map);
+
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/project/service/SimulationProjectService.java

@@ -3,6 +3,8 @@ package com.css.simulation.resource.project.service;
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 
+import java.util.Map;
+
 
 public interface SimulationProjectService {
 
@@ -32,4 +34,9 @@ public interface SimulationProjectService {
 
     ResponseBodyVO selectProjectTaskList(SimulationManualProjectParam param);
 
+    ResponseBodyVO selectRunProjectBySy();
+    ResponseBodyVO selectRunTaskBySy();
+    ResponseBodyVO selectRunTaskByState();
+    ResponseBodyVO selectRunProjectByState();
+    ResponseBodyVO selectEvaluationLevel();
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/SceneAccidentController.java

@@ -4,14 +4,12 @@ import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.scene.SceneAccidentParam;
 import api.common.pojo.po.scene.SceneAccidentPO;
 import api.common.pojo.vo.scene.SceneAccidentVO;
+import api.common.util.ObjectUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.feign.FileDownService;
 import com.css.simulation.resource.scene.service.SceneAccidentService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -28,9 +26,9 @@ public class SceneAccidentController {
     //查询列表
     @PostMapping("/querySceneAccidentList")
     @ResponseBody
-    public ResponseBodyVO<List<SceneAccidentVO>> querySceneAccidentList(@RequestBody SceneAccidentParam parms) {
-        PageUtil.setPageInfo(parms);
-        List<SceneAccidentPO> list = sceneAccidentService.querySceneAccidentList(parms);
+    public ResponseBodyVO<List<SceneAccidentVO>> querySceneAccidentList(@RequestBody SceneAccidentParam params) {
+        PageUtil.setPageInfo(params);
+        List<SceneAccidentPO> list = sceneAccidentService.querySceneAccidentList(params);
         PageInfo<SceneAccidentPO> objectPageInfo = new PageInfo<>(list);
         List<SceneAccidentVO> list1 = new ArrayList<>();
         for (SceneAccidentPO po : list) {
@@ -47,16 +45,19 @@ public class SceneAccidentController {
     //新增交通事故
     @PostMapping("/saveSceneAccident")
     @ResponseBody
-    public ResponseBodyVO<String> saveSceneAccident(@RequestBody SceneAccidentParam parms) {
-        return sceneAccidentService.importJtSg(parms);
+    public ResponseBodyVO<String> saveSceneAccident(@RequestBody SceneAccidentParam params) {
+        return sceneAccidentService.importJtSg(params);
 
     }
 
     //删除交通事故
     @PostMapping("/deleteSceneAccident")
     @ResponseBody
-    public ResponseBodyVO<String> deleteSceneAccident(@RequestBody SceneAccidentPO parms) {
-        sceneAccidentService.deleteSceneAccidentList(parms);
+    public ResponseBodyVO<String> deleteSceneAccident(@RequestBody SceneAccidentPO params) {
+        if (ObjectUtil.isNull(params.getAccidentId())) {
+            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数场景Id不能为空，请检查");
+        }
+        sceneAccidentService.deleteSceneAccidentList(params);
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/SceneNaturalController.java

@@ -5,6 +5,7 @@ import api.common.pojo.param.scene.SceneNaturalNewParam;
 import api.common.pojo.param.scene.SceneNaturalParam;
 import api.common.pojo.po.scene.SceneNaturalPO;
 import api.common.pojo.vo.scene.SceneNaturalVO;
+import api.common.util.ObjectUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.scene.service.SceneNaturalService;
 import com.github.pagehelper.PageInfo;
@@ -26,9 +27,9 @@ public class SceneNaturalController {
     //查询列表
     @PostMapping("/querySceneNaturalList")
     @ResponseBody
-    public ResponseBodyVO<List<SceneNaturalVO>> querySceneNaturalList(@RequestBody SceneNaturalNewParam parms) {
-        PageUtil.setPageInfo(parms);
-        List<SceneNaturalPO> list = sceneNaturalService.querySceneNaturalList(parms);
+    public ResponseBodyVO<List<SceneNaturalVO>> querySceneNaturalList(@RequestBody SceneNaturalNewParam params) {
+        PageUtil.setPageInfo(params);
+        List<SceneNaturalPO> list = sceneNaturalService.querySceneNaturalList(params);
         PageInfo<SceneNaturalPO> objectPageInfo = new PageInfo<>(list);
         List<SceneNaturalVO> list1 = new ArrayList<>();
         for (SceneNaturalPO po : list) {
@@ -45,26 +46,21 @@ public class SceneNaturalController {
     //新增自然场景
     @PostMapping("/saveSceneNatural")
     @ResponseBody
-    public ResponseBodyVO<String> saveSceneNatural(@RequestBody SceneNaturalParam parms) {
+    public ResponseBodyVO<String> saveSceneNatural(@RequestBody SceneNaturalParam params) {
 
-        return sceneNaturalService.importZrjsSceneCicv(parms);
+        return sceneNaturalService.importZrjsSceneCicv(params);
     }
 
     //删除
     @PostMapping("/deleteSceneNatural")
     @ResponseBody
-    public ResponseBodyVO<String> deleteSceneNatural(@RequestBody SceneNaturalPO parms) {
-        sceneNaturalService.deleteSceneNatural(parms);
+    public ResponseBodyVO<String> deleteSceneNatural(@RequestBody SceneNaturalPO params) {
+        if (ObjectUtil.isNull(params.getNaturalId())) {
+            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数场景Id不能为空，请检查");
+        }
+        sceneNaturalService.deleteSceneNatural(params);
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 
-    //首页查询场景数量
-    @PostMapping("/querySceneNumBySy")
-    @ResponseBody
-    public ResponseBodyVO<Integer> querySceneNumBySy() {
-        Integer a=sceneNaturalService.querySceneNumBySy();
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS,a);
-    }
-
 
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/ScenePackageController.java

@@ -79,7 +79,6 @@ public class ScenePackageController {
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, list);
     }
 
-
     //测试包分享
     @PostMapping("/instShareList")
     @ResponseBody
@@ -87,7 +86,6 @@ public class ScenePackageController {
         if (ObjectUtil.isNull(parms.getPackageId())) {
             return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数PackageId不能为空，请检查");
         }
-
         return scenePackageService.instShareList(parms);
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/StandardsRegulationsController.java

@@ -1,26 +1,16 @@
 package com.css.simulation.resource.scene.ctrl;
 
 import api.common.pojo.common.ResponseBodyVO;
-import api.common.pojo.param.MinioParameter;
 import api.common.pojo.param.scene.StandardsRegulationsParam;
 import api.common.pojo.po.scene.StandardsRegulationsPO;
 import api.common.pojo.vo.scene.StandardsRegulationsVO;
-import api.common.util.FileUtil;
+import api.common.util.ObjectUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.feign.FileDownService;
 import com.css.simulation.resource.scene.service.StandardsRegulationsService;
 import com.github.pagehelper.PageInfo;
-import feign.Response;
 import org.springframework.beans.BeanUtils;
-import org.springframework.http.MediaType;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -35,9 +25,9 @@ public class StandardsRegulationsController {
     //查询列表
     @PostMapping("/queryStandardsRegulationsList")
     @ResponseBody
-    public ResponseBodyVO<List<StandardsRegulationsVO>> queryStandardsRegulationsList(@RequestBody StandardsRegulationsParam parms) {
-        PageUtil.setPageInfo(parms);
-        List<StandardsRegulationsPO> list = standardsRegulationsService.querySceneNaturalList(parms);
+    public ResponseBodyVO<List<StandardsRegulationsVO>> queryStandardsRegulationsList(@RequestBody StandardsRegulationsParam params) {
+        PageUtil.setPageInfo(params);
+        List<StandardsRegulationsPO> list = standardsRegulationsService.queryStandardsRegulationsList(params);
         PageInfo<StandardsRegulationsPO> objectPageInfo = new PageInfo<>(list);
         List<StandardsRegulationsVO> list1 = new ArrayList<>();
         for (StandardsRegulationsPO po : list) {
@@ -54,17 +44,20 @@ public class StandardsRegulationsController {
     //新增标准法规
     @PostMapping("/saveStandardsRegulations")
     @ResponseBody
-    public ResponseBodyVO<String> saveStandardsRegulations(@RequestBody StandardsRegulationsParam parms) {
+    public ResponseBodyVO<String> saveStandardsRegulations(@RequestBody StandardsRegulationsParam params) {
 
-        return standardsRegulationsService.importBzFg(parms);
+        return standardsRegulationsService.importBzFg(params);
 
     }
 
     //删除
     @PostMapping("/deleteStandardsRegulations")
     @ResponseBody
-    public ResponseBodyVO<String> deleteStandardsRegulations(@RequestBody StandardsRegulationsPO parms) {
-        standardsRegulationsService.deleteStandardsRegulations(parms);
+    public ResponseBodyVO<String> deleteStandardsRegulations(@RequestBody StandardsRegulationsPO params) {
+        if (ObjectUtil.isNull(params.getRegulationsId())) {
+            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数场景Id不能为空，请检查");
+        }
+        standardsRegulationsService.deleteStandardsRegulations(params);
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/SceneNaturalService.java

@@ -248,7 +248,7 @@ public class SceneNaturalService {
     }
     public Integer querySceneNumBySy() {
         SceneNaturalParam params=new SceneNaturalParam();
-
+        params.setCreateUserId(AuthUtil.getCurrentUserId());
        return sceneNaturalMapper.querySceneNumBySy(params);
     }
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/StandardsRegulationsService.java

@@ -83,7 +83,7 @@ public class StandardsRegulationsService {
     }
 
     //查看列表
-    public List<StandardsRegulationsPO> querySceneNaturalList(StandardsRegulationsParam params) {
+    public List<StandardsRegulationsPO> queryStandardsRegulationsList(StandardsRegulationsParam params) {
         List<StandardsRegulationsPO> list = standardsRegulationsMapper.queryStandardsRegulationsList(params);
         return list;
     }

simulation-resource-server/src/main/resources/mapper/project/SimulationProjectMapper.xml

@@ -554,5 +554,66 @@
 				order by seq
     </select>
 
+    <!--查询某天运行项目数量-->
+    <select id="selectRunProjectBySy" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(id) from simulation_manual_project
+        where
+        is_deleted = '0'
+        <if test="createUserId != null and createUserId != ''">
+            and create_user_id=#{createUserId,jdbcType=VARCHAR}
+        </if>
+        <if test="startDate != null">
+            and start_time &gt;= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and start_time &lt;= #{endDate}
+        </if>
+    </select>
+
+    <!--查询某天运行任务数量-->
+    <select id="selectRunTaskBySy" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(id) from simulation_manual_project_task
+        where
+        is_deleted = '0'
+        <if test="createUserId != null and createUserId != ''">
+            and create_user_id=#{createUserId,jdbcType=VARCHAR}
+        </if>
+        <if test="startDate != null">
+            and run_start_time &gt;= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and run_start_time &lt;= #{endDate}
+        </if>
+    </select>
 
+    <!--运行任务状态-->
+    <select id="selectRunTaskByState" parameterType="java.util.Map" resultType="java.util.Map">
+        select count(run_state) num,run_state runState from simulation_manual_project_task
+        where
+        is_deleted = '0'
+        <if test="createUserId != null and createUserId != ''">
+            and create_user_id=#{createUserId,jdbcType=VARCHAR}
+        </if>
+        group by run_state
+    </select>
+    <!--运行项目状态-->
+    <select id="selectRunProjectByState" parameterType="java.util.Map" resultType="java.util.Map">
+        select count(now_run_state) num,now_run_state nowRunState from simulation_manual_project
+        where
+        is_deleted = '0'
+        <if test="createUserId != null and createUserId != ''">
+            and create_user_id=#{createUserId,jdbcType=VARCHAR}
+        </if>
+        group by now_run_state
+    </select>
+    <!--评测等级分布-->
+    <select id="selectEvaluationLevel" parameterType="java.util.Map" resultType="java.util.Map">
+        select count(evaluation_level) num,evaluation_level evaluationLevel from simulation_manual_project
+        where
+        is_deleted = '0' and evaluation_level is not null
+        <if test="createUserId != null and createUserId != ''">
+            and create_user_id=#{createUserId,jdbcType=VARCHAR}
+        </if>
+        group by evaluation_level
+    </select>
 </mapper>

simulation-resource-server/src/main/resources/mapper/scene/StandardsRegulationsMapper.xml

@@ -38,6 +38,13 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="ids != null and ids.length != 0">
+                and regulation_type in
+                <foreach collection="regulationType" item="item" index="index"
+                         separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
             <if test="standardType != null and standardType != ''">
                 and standard_type like CONCAT('%',#{standardType,jdbcType=VARCHAR},'%')
             </if>