场景模块

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

@@ -0,0 +1,34 @@
+package api.common.pojo.param.scene;
+
+import api.common.pojo.common.PageVO;
+import lombok.*;
+
+import java.io.Serializable;
+
+/**
+ * 打分规则
+ */
+@EqualsAndHashCode()
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SceneImportTaskParam extends PageVO implements Serializable {
+
+    private String name;  //任务名称
+    private String yearMax;//结束时间
+    private String yearMin;//开始时间
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

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

@@ -77,7 +77,7 @@ public class SceneAccidentController {
         sceneImportPO.setStatus("3");
         sceneImportService.updateStatus(sceneImportPO);
         sceneImportPO= sceneAccidentService.importMiNio(sceneImportParam);
-        sceneImportService.updateStatus(sceneImportPO);
+        sceneImportService.updateInfo(sceneImportPO);
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 

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

@@ -75,7 +75,7 @@ public class SceneNaturalController {
         sceneImportPO.setStatus("3");
         sceneImportService.updateStatus(sceneImportPO);
         sceneImportPO= sceneNaturalService.importMiNio(sceneImportParam);
-        sceneImportService.updateStatus(sceneImportPO);
+        sceneImportService.updateInfo(sceneImportPO);
        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 

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

@@ -74,7 +74,7 @@ public class StandardsRegulationsController {
         sceneImportPO.setStatus("3");
         sceneImportService.updateStatus(sceneImportPO);
         sceneImportPO= standardsRegulationsService.importMiNio(sceneImportParam);
-        sceneImportService.updateStatus(sceneImportPO);
+        sceneImportService.updateInfo(sceneImportPO);
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 

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

@@ -5,7 +5,6 @@ import api.common.pojo.param.MinioParameter;
 import api.common.pojo.param.scene.SceneAccidentParam;
 import api.common.pojo.param.scene.SceneImportParam;
 import api.common.pojo.po.scene.SceneAccidentPO;
-import api.common.pojo.po.scene.SceneImportTaskPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.FileUtil;
 import api.common.util.ObjectUtil;

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

@@ -1,12 +1,10 @@
 package com.css.simulation.resource.scene.service;
 
 import api.common.pojo.common.ResponseBodyVO;
-import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.MinioParameter;
 import api.common.pojo.param.scene.SceneImportParam;
 import api.common.pojo.param.scene.SceneNaturalNewParam;
 import api.common.pojo.param.scene.SceneNaturalParam;
-import api.common.pojo.po.scene.SceneImportTaskPO;
 import api.common.pojo.po.scene.SceneNaturalPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.ObjectUtil;

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

@@ -1,12 +1,9 @@
 package com.css.simulation.resource.scene.service;
 
 import api.common.pojo.common.ResponseBodyVO;
-import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.MinioParameter;
 import api.common.pojo.param.scene.SceneImportParam;
 import api.common.pojo.param.scene.StandardsRegulationsParam;
-import api.common.pojo.po.scene.SceneAccidentPO;
-import api.common.pojo.po.scene.SceneImportTaskPO;
 import api.common.pojo.po.scene.StandardsRegulationsPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.ObjectUtil;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/SceneImportCtrl.java

@@ -2,10 +2,13 @@ package com.css.simulation.resource.system.ctrl;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
+import api.common.pojo.param.scene.SceneImportTaskParam;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.ObjectUtil;
+import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.feign.SceneService;
 import com.css.simulation.resource.system.service.SceneImportService;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Controller
 @RequestMapping("/sceneImport")
@@ -47,4 +51,14 @@ public class SceneImportCtrl {
         sceneService.startImport(po);
         return response;
     }
+
+    //查询列表
+    @RequestMapping("/querySceneImportList")
+    @ResponseBody
+    public ResponseBodyVO<List<SceneImportPO>> querySceneImportList(@RequestBody SceneImportTaskParam parms) {
+        PageUtil.setPageInfo(parms);
+        List<SceneImportPO> list = sceneImportService.querySceneImportList(parms);
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, new PageInfo<>(list));
+    }
+
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/system/mapper/SceneImportMapper.java

@@ -1,5 +1,6 @@
 package com.css.simulation.resource.system.mapper;
 
+import api.common.pojo.param.scene.SceneImportTaskParam;
 import api.common.pojo.po.system.SceneImportPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
@@ -11,6 +12,7 @@ import java.util.List;
 public interface SceneImportMapper {
 
     List<SceneImportPO> checkName(SceneImportPO po);
+    List<SceneImportPO> querySceneImportList(SceneImportTaskParam po);
 
     void insert(SceneImportPO po);
 

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/SceneImportService.java

@@ -1,6 +1,7 @@
 package com.css.simulation.resource.system.service;
 
 import api.common.pojo.constants.DictConstants;
+import api.common.pojo.param.scene.SceneImportTaskParam;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
@@ -47,10 +48,16 @@ public class SceneImportService {
         params.setModifyUserId(AuthUtil.getCurrentUserId());
         sceneImportMapper.updateStatus(params);
     }
-    public void updateSceneImportTask(SceneImportPO params) {
+    public void updateInfo(SceneImportPO params) {
         params.setModifyTime(TimeUtil.getNowForMysql());
         params.setModifyUserId(AuthUtil.getCurrentUserId());
         sceneImportMapper.updateSceneImportTask(params);
     }
 
+    public List<SceneImportPO> querySceneImportList(SceneImportTaskParam params) {
+
+        List<SceneImportPO> list = sceneImportMapper.querySceneImportList(params);
+        return list;
+    }
+
 }

simulation-resource-server/src/main/resources/mapper/system/SceneImportMapper.xml

@@ -69,4 +69,26 @@
         where id = #{id,jdbcType=VARCHAR}
     </update>
 
+
+    <select id="querySceneImportList" parameterType="api.common.pojo.param.scene.SceneImportTaskParam"
+            resultType="api.common.pojo.po.scene.SceneImportPO">
+        select
+        id,name,scene_type,status,success_num,false_num,error_message,total_time,
+        create_user_id,create_time,modify_user_id,modify_time,
+        is_deleted
+        from simulation.scene_import_task
+        <where>
+            is_deleted = '0'
+            <if test="name != null and name != ''">
+                and name = #{name,jdbcType=VARCHAR}
+            </if>
+            <if test="yearMax != null and yearMax != ''">
+                and #{yearMax,jdbcType=VARCHAR} &gt; create_time and #{yearMin,jdbcType=VARCHAR} &lt; create_time
+            </if>
+            <if test="createUserId != null and createUserId != ''">
+                and create_user_id=#{createUserId,jdbcType=VARCHAR}
+            </if>
+            order by create_time desc
+        </where>
+    </select>
 </mapper>