场景包分配bug

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/IndexMapper.java

@@ -25,7 +25,10 @@ public interface IndexMapper {
     @Insert("insert into simulation_mpt_last_target_score(id,\n" +
             "                                             p_id,\n" +
             "                                             target,\n" +
+            "                                             error_scene_num,\n" +
+            "                                             not_scored_scene_num,\n" +
             "                                             not_standard_scene_num,\n" +
+            "                                             standard_scene_num,\n" +
             "                                             score,\n" +
             "                                             score_explain,\n" +
             "                                             create_time,\n" +
@@ -36,7 +39,10 @@ public interface IndexMapper {
             "values (#{leaf.id},\n" +
             "        #{leaf.pId},\n" +
             "        #{leaf.target},\n" +
+            "        #{leaf.errorSceneNum},\n" +
+            "        #{leaf.notScoredSceneNum},\n" +
             "        #{leaf.notStandardSceneNum},\n" +
+            "        #{leaf.standardSceneNum},\n" +
             "        #{leaf.score},\n" +
             "        #{leaf.scoreExplain},\n" +
             "        #{leaf.createTime},\n" +

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

@@ -29,7 +29,7 @@ public class ScoringRulesController {
     //查询列表
     @PostMapping("/queryScoringRulesList")
     @ResponseBody
-    public ResponseBodyVO<List<ScoringRulesVO>> queryScoringRulesList(@RequestBody ScoringRulesParam parms) {
+    public ResponseBodyVO<PageInfo<ScoringRulesVO>> queryScoringRulesList(@RequestBody ScoringRulesParam parms) {
         PageUtil.setPageInfo(parms);
         List<ScoringRulesPO> list = scoringRulesService.queryScoringRulesList(parms);
         PageInfo<ScoringRulesPO> scoringRulesPOPageInfo = new PageInfo<>(list);
@@ -40,21 +40,21 @@ public class ScoringRulesController {
             BeanUtils.copyProperties(po, vo);
             list1.add(vo);
         }
-        PageInfo pageInfo = new PageInfo(list1);
+        PageInfo<ScoringRulesVO> pageInfo = new PageInfo<>(list1);
         pageInfo.setTotal(scoringRulesPOPageInfo.getTotal());
 
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, pageInfo);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, pageInfo);
     }
 
     //查询详情
     @PostMapping("/queryScoringRules")
     @ResponseBody
-    public ResponseBodyVO<List<ScoringRulesPO>> queryScoringRules(@RequestBody ScoringRulesParam parms) {
+    public ResponseBodyVO<ScoringRulesPO> queryScoringRules(@RequestBody ScoringRulesParam parms) {
         if (ObjectUtil.isNull(parms.getRulesId())) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数RulesId不能为空，请检查");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数RulesId不能为空，请检查");
         }
         ScoringRulesPO po = scoringRulesService.queryScoringRules(parms);
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, po);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, po);
 
     }
 
@@ -63,18 +63,15 @@ public class ScoringRulesController {
     @ResponseBody
     public ResponseBodyVO<List<ScoringRulesPO>> queryScoringRulesCount(@RequestBody ScoringRulesParam parms) {
         if (ObjectUtil.isNull(parms.getRuleName())) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数RulesName不能为空，请检查");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数RulesName不能为空，请检查");
         }
         List<ScoringRulesPO> list = scoringRulesService.queryScoringRulesByRuleName(parms);
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, list);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, list);
     }
 
 
     /**
      * 新增打分规则
-     *
-     * @param scoringRulesPO
-     * @return
      */
     @PostMapping("/saveScoringRules")
     @ResponseBody

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

@@ -122,11 +122,11 @@ public class SystemScenePackageController {
     //人员场景包列表
     @PostMapping("/queryPackageByUserIdList")
     @ResponseBody
-    public ResponseBodyVO<String> queryPackageByUserIdList(@RequestBody SystemScenePackageParam param) {
+    public ResponseBodyVO<PageInfo<SystemScenePackageVO>> queryPackageByUserIdList(@RequestBody SystemScenePackageParam param) {
         PageUtil.setPageInfo(param);
         List<SystemScenePackageVO> list = systemScenePackageService.queryPackageByUserIdList(param);
 
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, new PageInfo<>(list));
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, new PageInfo<>(list));
     }
 
     // 查询勾选场景数量

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

@@ -4,16 +4,15 @@
 
     <insert id="saveSystemScenePackage" parameterType="api.common.pojo.po.scene.SystemScenePackagePO">
         insert into simulation.system_scene_package
-        (id,package_name,scene_describe,
-       create_user_id,create_time,modify_user_id,modify_time,
+        (id, package_name, scene_describe,
+         create_user_id, create_time, modify_user_id, modify_time,
          is_deleted)
-        values (#{id,jdbcType=VARCHAR},#{packageName,jdbcType=VARCHAR},#{sceneDescribe},
-       #{createUserId,jdbcType=VARCHAR},#{createTime},#{modifyUserId,jdbcType=VARCHAR},#{modifyTime},
-        #{isDeleted,jdbcType=VARCHAR})
+        values (#{id,jdbcType=VARCHAR}, #{packageName,jdbcType=VARCHAR}, #{sceneDescribe},
+                #{createUserId,jdbcType=VARCHAR}, #{createTime}, #{modifyUserId,jdbcType=VARCHAR}, #{modifyTime},
+                #{isDeleted,jdbcType=VARCHAR})
     </insert>
 
 
-
     <select id="querySystemScenePackageList" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
             resultType="api.common.pojo.vo.scene.SystemScenePackageVO">
         select
@@ -30,7 +29,7 @@
         p.*,
         COUNT(u.id) as userCount
         FROM system_scene_package p
-       left JOIN system_user_scene u on p.id = u.package_id and u.is_deleted = '0' and p.is_deleted = '0'
+        left JOIN system_user_scene u on p.id = u.package_id and u.is_deleted = '0' and p.is_deleted = '0'
         <where>
             <if test="userId != null and userId != ''">
                 and u.user_id = #{userId,jdbcType=VARCHAR}
@@ -55,43 +54,53 @@
                 </foreach>
             </if>
         </where>
-        GROUP BY t.id   order by create_time desc
+        GROUP BY t.id order by create_time desc
     </select>
 
-    <select id="queryPackageByUserIdList" parameterType="api.common.pojo.param.scene.SystemScenePackageParam" resultType="api.common.pojo.vo.scene.SystemScenePackageVO">
-        select a.*,GROUP_CONCAT(DISTINCT(p.package_name)) as package_name from (select u.id user_id,s.is_deleted  ,username userName, company,s.package_id,s.modify_time
-        from system_user  u left join system_user_scene s
-        on u.id=s.user_id where u.is_deleted = '0'  and  u.role_code ='2') a
-        left join system_scene_package p on a.package_id = p.id AND p.is_deleted = '0' and a.is_deleted='0'
-        <where>
-            1=1
-            <if test="userName != null and userName != ''">
-                and a.userName  like  CONCAT('%',#{userName,jdbcType=VARCHAR},'%')
-            </if>
-            <if test="yearMax != null and yearMax != ''">
-                and #{yearMax,jdbcType=VARCHAR} &gt; a.modify_time and #{yearMin,jdbcType=VARCHAR} &lt; a.modify_time
-            </if>
-        </where>
-        GROUP BY a.user_id
-        ORDER BY a.modify_time DESC
+    <select id="queryPackageByUserIdList" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
+            resultType="api.common.pojo.vo.scene.SystemScenePackageVO">
+        select a.username, GROUP_CONCAT(DISTINCT (p.package_name)) as package_name, max(a.modify_time) modify_time
+        from (select u.id user_id, s.is_deleted, u.username, u.company, s.package_id, s.modify_time
+        from system_user u
+        left join system_user_scene s on u.id = s.user_id
+        where u.is_deleted = '0'
+        and s.is_deleted = '0'
+        and u.role_code = '2') a
+        left join system_scene_package p on a.package_id = p.id
+        where p.is_deleted = '0'
+        <if test="userName != null and userName != ''">
+            and username like CONCAT('%',#{userName,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="yearMax != null and yearMax != ''">
+            and #{yearMax,jdbcType=VARCHAR} &gt; modify_time
+            and #{yearMin,jdbcType=VARCHAR} &lt; modify_time
+        </if>
+        GROUP BY a.username
+        ORDER BY modify_time DESC
     </select>
     <select id="querySystemScenePackageById" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
             resultType="api.common.pojo.po.scene.SystemScenePackagePO">
-        select
-        id,package_name,scene_describe,
-        create_user_id,create_time,modify_user_id,modify_time
+        select id,
+               package_name,
+               scene_describe,
+               create_user_id,
+               create_time,
+               modify_user_id,
+               modify_time
         from system_scene_package
-        where  id =#{id}
+        where id = #{id}
 
     </select>
 
-    <select id="queryPackageByUserId" parameterType="api.common.pojo.param.scene.SystemScenePackageParam" resultType="java.util.Map">
-        select a.userName,a.company,a.modify_time modifyTime,a.user_id userId,GROUP_CONCAT(DISTINCT(p.package_name)) as packageNames from (select u.id user_id,username userName, company,s.package_id,s.modify_time
-        from system_user  u left join system_user_scene s
+    <select id="queryPackageByUserId" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
+            resultType="java.util.Map">
+        select a.userName,a.company,a.modify_time modifyTime,a.user_id userId,GROUP_CONCAT(DISTINCT(p.package_name)) as
+        packageNames from (select u.id user_id,username userName, company,s.package_id,s.modify_time
+        from system_user u left join system_user_scene s
         on u.id=s.user_id and u.is_deleted = '0' and s.is_deleted = '0') a
         left join system_scene_package p on a.package_id = p.id AND p.is_deleted = '0'
         <where>
-                    1=1
+            1=1
             <if test="userName != null and userName != ''">
                 and a.userName=#{userName}
             </if>
@@ -118,54 +127,51 @@
     </update>
 
 
-
     <update id="updateSystemScenePackage" parameterType="api.common.pojo.po.scene.SystemScenePackagePO">
         update simulation.system_scene_package
-       set package_name=#{packageName},scene_describe=#{sceneDescribe},
-       modify_time=#{modifyTime}, modify_user_id=#{modifyUserId}
+        set package_name=#{packageName},
+            scene_describe=#{sceneDescribe},
+            modify_time=#{modifyTime},
+            modify_user_id=#{modifyUserId}
         where id = #{id,jdbcType=VARCHAR}
     </update>
 
     <select id="querySceneNum" parameterType="java.lang.String" resultType="java.lang.Integer">
-        SELECT SUM(num) FROM
-        (SELECT
-                COUNT(DISTINCT c.scene_name) AS num
-        FROM system_user_scene a
-        JOIN system_scene_package b ON a.package_id = b.id AND b.is_deleted = '0'
-        JOIN system_scene_package_sublist c ON b.id = c.scene_and_package AND c.is_deleted = '0'
-        JOIN scene_natural d ON d.natural_name = c.scene_name AND d.is_deleted = '0'
-        WHERE a.user_id = #{userId}
-        UNION ALL
-        SELECT
-                COUNT(DISTINCT c.scene_name) AS num
-        FROM system_user_scene a
-        JOIN system_scene_package b ON a.package_id = b.id AND b.is_deleted = '0'
-        JOIN system_scene_package_sublist c ON b.id = c.scene_and_package AND c.is_deleted = '0'
-        JOIN scene_accident d ON d.scene_name = c.scene_name AND d.is_deleted = '0'
-        WHERE a.user_id = #{userId}
-        UNION ALL
-        SELECT
-                COUNT(DISTINCT c.scene_name) AS num
-        FROM system_user_scene a
-        JOIN system_scene_package b ON a.package_id = b.id AND b.is_deleted = '0'
-        JOIN system_scene_package_sublist c ON b.id = c.scene_and_package AND c.is_deleted = '0'
-        JOIN scene_standards_regulations d ON d.scene_name = c.scene_name AND d.is_deleted = '0'
-        WHERE a.user_id = #{userId}
-        UNION ALL
-        SELECT
-                COUNT(DISTINCT c.scene_name) AS num
-        FROM system_user_scene a
-        JOIN system_scene_package b ON a.package_id = b.id AND b.is_deleted = '0'
-        JOIN system_scene_package_sublist c ON b.id = c.scene_and_package AND c.is_deleted = '0'
-        JOIN scene_general_template d ON d.scene_id = c.scene_name AND d.is_deleted = '0'
-        WHERE a.user_id = #{userId}) AS t
+        SELECT SUM(num)
+        FROM (SELECT COUNT(DISTINCT c.scene_name) AS num
+              FROM system_user_scene a
+                       JOIN system_scene_package b ON a.package_id = b.id AND b.is_deleted = '0'
+                       JOIN system_scene_package_sublist c ON b.id = c.scene_and_package AND c.is_deleted = '0'
+                       JOIN scene_natural d ON d.natural_name = c.scene_name AND d.is_deleted = '0'
+              WHERE a.user_id = #{userId}
+              UNION ALL
+              SELECT COUNT(DISTINCT c.scene_name) AS num
+              FROM system_user_scene a
+                       JOIN system_scene_package b ON a.package_id = b.id AND b.is_deleted = '0'
+                       JOIN system_scene_package_sublist c ON b.id = c.scene_and_package AND c.is_deleted = '0'
+                       JOIN scene_accident d ON d.scene_name = c.scene_name AND d.is_deleted = '0'
+              WHERE a.user_id = #{userId}
+              UNION ALL
+              SELECT COUNT(DISTINCT c.scene_name) AS num
+              FROM system_user_scene a
+                       JOIN system_scene_package b ON a.package_id = b.id AND b.is_deleted = '0'
+                       JOIN system_scene_package_sublist c ON b.id = c.scene_and_package AND c.is_deleted = '0'
+                       JOIN scene_standards_regulations d ON d.scene_name = c.scene_name AND d.is_deleted = '0'
+              WHERE a.user_id = #{userId}
+              UNION ALL
+              SELECT COUNT(DISTINCT c.scene_name) AS num
+              FROM system_user_scene a
+                       JOIN system_scene_package b ON a.package_id = b.id AND b.is_deleted = '0'
+                       JOIN system_scene_package_sublist c ON b.id = c.scene_and_package AND c.is_deleted = '0'
+                       JOIN scene_general_template d ON d.scene_id = c.scene_name AND d.is_deleted = '0'
+              WHERE a.user_id = #{userId}) AS t
     </select>
 
 
     <select id="queryScenePackageByPackageName" parameterType="api.common.pojo.po.scene.SystemScenePackageNewPO"
             resultType="java.lang.String">
         select
-            id
+        id
         from system_scene_package
         <where>
             is_deleted = '0'
@@ -182,13 +188,13 @@
     <select id="querySystemScenePackageListByTJ" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
             resultType="java.util.Map">
         SELECT
-        c.scene_type, COUNT(DISTINCT c.scene_name  ) aaa
+        c.scene_type, COUNT(DISTINCT c.scene_name ) aaa
         FROM
         system_user_scene a
         LEFT JOIN system_scene_package b ON a.package_id = b.id AND b.is_deleted = '0'
         JOIN system_scene_package_sublist c ON b.id = c.scene_and_package AND c.is_deleted = '0'
         <where>
-           a.is_deleted='0'
+            a.is_deleted='0'
             <if test="packageNames != null and packageNames.length>0">
                 and b.package_name in
                 <foreach collection="packageNames" item="item" index="index"
@@ -204,9 +210,10 @@
     <select id="querySceneNaturalListByTJ" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
             resultType="java.lang.String">
         select DISTINCT(a.scene_name) scene_name
-        FROM system_scene_package_sublist a join  scene_natural s on a.scene_name=s.natural_name join system_scene_package b on a.scene_and_package=b.id
+        FROM system_scene_package_sublist a join scene_natural s on a.scene_name=s.natural_name join
+        system_scene_package b on a.scene_and_package=b.id
         where
-            a.is_deleted='0' and s.is_deleted='0' and b.is_deleted='0' and a.scene_type='1'
+        a.is_deleted='0' and s.is_deleted='0' and b.is_deleted='0' and a.scene_type='1'
         and b.package_name in
         <foreach collection="packageNames" item="item" index="index"
                  separator="," open="(" close=")">
@@ -214,10 +221,12 @@
         </foreach>
 
     </select>
-    <select id="querySceneStandardsRegulationsListByTJ" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
+    <select id="querySceneStandardsRegulationsListByTJ"
+            parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
             resultType="java.lang.String">
         select DISTINCT(a.scene_name) scene_name
-        FROM system_scene_package_sublist a join  scene_standards_regulations s on a.scene_name=s.scene_name join system_scene_package b on a.scene_and_package=b.id
+        FROM system_scene_package_sublist a join scene_standards_regulations s on a.scene_name=s.scene_name join
+        system_scene_package b on a.scene_and_package=b.id
         where
         a.is_deleted='0' and s.is_deleted='0' and b.is_deleted='0' and a.scene_type='2'
         and b.package_name in
@@ -230,7 +239,8 @@
     <select id="querySceneAccidentListByTJ" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
             resultType="java.lang.String">
         select DISTINCT(a.scene_name) scene_name
-        FROM system_scene_package_sublist a join  scene_accident s on a.scene_name=s.scene_name join system_scene_package b on a.scene_and_package=b.id
+        FROM system_scene_package_sublist a join scene_accident s on a.scene_name=s.scene_name join system_scene_package
+        b on a.scene_and_package=b.id
         where
         a.is_deleted='0' and s.is_deleted='0' and b.is_deleted='0' and a.scene_type='3'
         and b.package_name in
@@ -243,7 +253,8 @@
     <select id="querySceneGeneralTemplateListByTJ" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
             resultType="java.lang.String">
         select DISTINCT(a.scene_name) scene_name
-        FROM system_scene_package_sublist a join  scene_general_template s on a.scene_name=s.scene_id join system_scene_package b on a.scene_and_package=b.id
+        FROM system_scene_package_sublist a join scene_general_template s on a.scene_name=s.scene_id join
+        system_scene_package b on a.scene_and_package=b.id
         where
         a.is_deleted='0' and s.is_deleted='0' and b.is_deleted='0' and a.scene_type='4'
         and b.package_name in