Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java

@@ -292,7 +292,9 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
 
     @Override
     public Object getApplyPriceCount() {
-        Long sum = abilityApplicationDao.getFundStatementSum(new HashMap<>());
+        Map<String, Object> map = new HashMap<>();
+        map.put("applyResult", "通过");
+        Long sum = abilityApplicationDao.getFundStatementSum(map);
         BigDecimal result = new BigDecimal(sum).divide(new BigDecimal(10000));
         result = result.setScale(1, BigDecimal.ROUND_HALF_UP);
         return result ;

renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java

@@ -223,4 +223,6 @@ public interface ResourceDao extends BaseDao<ResourceEntity> {
     List<Map> getAppListByDept(@Param("deptId") Long deptId, @Param("key") String key);
 
     Integer updateByDelProcinst(@Param("resourceId") Long resourceId);
+
+    Integer selectYzyCount();
 }

renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java

@@ -713,7 +713,9 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
             }
             break;
             case TSINGTAO: {
+
                 //青岛市局数据资源
+                CompletableFuture sjzy = CompletableFuture.runAsync(() -> {
                     TsingtaoDataResourceService tsingtaoDataResourceService = new TsingtaoDataResourceService();
                     GetDataResourceListDto getDataResourceListDto = new GetDataResourceListDto().setPageNum(1).setPageSize(5);
                     HashMap dataResource = (HashMap) tsingtaoDataResourceService.getDataResource(getDataResourceListDto);
@@ -723,14 +725,25 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                             put("type", "数据资源");
                         }
                     });
+                }, executor);
+
+                //基础设施
+                CompletableFuture jcss = CompletableFuture.runAsync(() -> {
+                    HashMap<String, Object> map = (HashMap<String, Object>) this.selectInfrastructureList();
+                    final Long[] total = {0L};
+                    map.forEach((k,v) -> {
+                       total[0] = total[0] + (Integer) v;
+                    });
                     re.add(new HashMap<String, Object>() {
                         {
-                        QueryWrapper<CameraChannel> queryWrapper = new QueryWrapper<>();
+                            put("count", total[0]);
-                        queryWrapper.eq("check_status", 1).ne("gps_x", "").ne("gps_y", "").isNotNull("gps_x").isNotNull("gps_y");
-                        put("count", cameraChannelMapper.selectCount(queryWrapper) + "");
                             put("type", "基础设施");
                         }
                     });
+                }, executor);
+
+                CompletableFuture all = CompletableFuture.allOf(sjzy, jcss);
+                all.join();
 
             }
             break;
@@ -1939,16 +1952,19 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     @Override
     public Object selectInfrastructureList() {
         HashMap<String, Object> resultMap = new HashMap<>();
-        resultMap.put("云资源", 0);
+        //云资源
+        CompletableFuture<Void> yzy = CompletableFuture.runAsync(() -> {
+            resultMap.put("云资源", resourceDao.selectYzyCount());
+        }, executor);
+
         //视频资源
         CompletableFuture<Void> jcss = CompletableFuture.runAsync(() -> {
-            Map map = (Map) selectTotal();
+
-            List<Map<String, Object>> list = (List<Map<String, Object>>) map.get("total");
+            QueryWrapper<CameraChannel> queryWrapper = new QueryWrapper<>();
-            list.forEach(index -> {
+            queryWrapper.eq("check_status", 1).ne("gps_x", "").ne("gps_y", "").isNotNull("gps_x").isNotNull("gps_y");
-                if ("基础设施".equals(index.get("type").toString())) {
+            resultMap.put("视频资源", cameraChannelMapper.selectCount(queryWrapper));
-                    resultMap.put("视频资源", Integer.parseInt(index.get("count").toString()));
+
-                }
+
-            });
         }, executor);
 
         //新增会客厅和视频会议统计

renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java

@@ -197,7 +197,6 @@ public class SysUserController {
 
     }
 
-
     @GetMapping("/getApproverUnconfiguredDepartment")
     @ApiOperation("查询未配置部门审核人部门列表")
     @LogOperation("查询未配置部门审核人部门列表")

renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml

@@ -724,7 +724,7 @@
                             t_ability_application taa
                         WHERE
                             taa.del_flag = 0
-                          AND taa.approve_status IN ( '通过', '审核中' )
+                          AND taa.approve_status = '通过'
                         GROUP BY
                             resource_id
                     ) taa ON taa.resource_id = tdr.id
@@ -748,7 +748,7 @@
                             t_meetingroom_book tmb
                                 LEFT JOIN ( SELECT id, NAME, district FROM sys_dept ) sd ON tmb.dept = sd.NAME
                         WHERE
-                            tmb.state IN ( 0, 2 )
+                            tmb.state = 0
                         GROUP BY
                             sd.id,
                             tmb.dept
@@ -787,7 +787,7 @@
                     t_ability_application taa
                 WHERE
                     taa.del_flag = 0
-                  AND taa.approve_status IN ( '通过', '审核中' )
+                  AND taa.approve_status = '通过'
                 GROUP BY
                     resource_id
             ) taa ON taa.resource_id = tdr.id
@@ -816,7 +816,7 @@
                     t_ability_application taa
                 WHERE
                     taa.del_flag = 0
-                  AND taa.approve_status IN ( '通过', '审核中' )
+                  AND taa.approve_status = '通过'
                 GROUP BY
                     resource_id
             ) taa
@@ -836,9 +836,7 @@
         FROM
             t_meetingroom_book tmb
         WHERE
-            tmb.state IN (
+            tmb.state = 0
-                0,
-                2)
     </select>
 
     <select id="getProvideDeptFundStatement" resultType="java.util.Map">
@@ -868,7 +866,7 @@
                             t_ability_application taa
                         WHERE
                             taa.del_flag = 0
-                          AND taa.approve_status IN ( '通过', '审核中' )
+                          AND taa.approve_status = '通过'
                         GROUP BY
                             resource_id
                     ) taa ON taa.resource_id = tdr.id
@@ -889,7 +887,7 @@
                         LEFT JOIN t_meetingroom_book tmb ON tmb.room_id = tm.id
                 WHERE
                     tm.del_flag = 0
-                  AND tmb.state IN ( 0, 2 )
+                  AND tmb.state = 0
             ) temp
         GROUP BY
             deptId,
@@ -924,7 +922,7 @@
                             t_ability_application taa
                         WHERE
                             taa.del_flag = 0
-                          AND taa.approve_status IN ( '通过', '审核中' )
+                          AND taa.approve_status = '通过'
                         GROUP BY
                             user_id
                     ) taa
@@ -945,7 +943,7 @@
                     t_meetingroom_book tmb
                         LEFT JOIN ( SELECT id, NAME FROM sys_dept ) sd ON tmb.dept = sd.NAME
                 WHERE
-                    tmb.state IN ( 0, 2 )
+                    tmb.state = 0
                 GROUP BY
                     sd.id,
                     tmb.dept
@@ -970,7 +968,7 @@
         LEFT JOIN sys_user su ON su.dept_id = sd.id
         LEFT JOIN (SELECT user_id, SUM(apply_price) AS "apply_price", COUNT(id) AS "applyCount" FROM t_ability_application taa WHERE
         taa.del_flag = 0
-        AND taa.approve_status IN ( '通过', '审核中' ) GROUP BY user_id  ) taa ON taa.user_id = su.id
+        AND taa.approve_status = '通过' GROUP BY user_id  ) taa ON taa.user_id = su.id
         GROUP BY
         srg.id
         ORDER BY srg.sort
@@ -1005,7 +1003,7 @@
                             t_ability_application taa
                         WHERE
                             taa.del_flag = 0
-                          AND taa.approve_status IN ( '通过', '审核中' )
+                          AND taa.approve_status = '通过'
                         GROUP BY
                             resource_id
                     ) taa ON taa.resource_id = tdr.id
@@ -1031,7 +1029,7 @@
                             t_meetingroom_book tmb
                                 LEFT JOIN ( SELECT id, NAME, district FROM sys_dept ) sd ON tmb.dept = sd.NAME
                         WHERE
-                            tmb.state IN ( 0, 2 )
+                            tmb.state = 0
                         GROUP BY
                             sd.id,
                             tmb.dept

renren-admin/src/main/resources/mapper/resource/ResourceDao.xml

@@ -2337,4 +2337,8 @@
         ORDER BY create_date DESC
     </select>
 
+    <select id="selectYzyCount" resultType="java.lang.Integer">
+        SELECT COUNT(1) FROM policy_cloud_service
+    </select>
+
 </mapper>

renren-admin/src/main/resources/mapper/sys/SysUserDao.xml

@@ -163,7 +163,7 @@
                 AND su.id = sru.user_id
                 AND sru.role_id = sr.id
                 AND sd.district = srg.id
-                AND sru.del_falg = 0
+                AND sru.del_flag = 0
                 AND sr.`name` = '区审批人'
             )
         AND srg.tree_level = 3