修改数据查询

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TbAreaServiceImpl.java

@@ -58,6 +58,7 @@ public class TbAreaServiceImpl  implements TbAreaService {
                if (StringHelper.isNotEmpty(result)) {
                    return Result.fail(result);
                }
+
                dto.setAreaId(IdUtils.getuid());
                int num=mapper.insertData(dto);
                if (num==SystemGlobal.SUCCESS_NUM){
@@ -243,12 +244,32 @@ public class TbAreaServiceImpl  implements TbAreaService {
         return  mapper.getSwList(dto);
     }
 
+
+    public  static  long max_size=1024*1024*40;
+
+    public static String allowedExtensions ="glb";
+
     @Override
     public Result<String> addSwFile(MultipartFile[] files, AreaVo dto) {
         try{
             if(files==null || files.length<1){
                 return Result.fail("三维文件未上传");
             }
+            long allSIz=0;
+            for (int i = 0; i <files.length ; i++) {
+                MultipartFile file=files[i];
+                String fileName=file.getOriginalFilename();
+                long size= file.getSize();
+                allSIz+=size;
+                String fileExtension = fileName.substring(fileName.lastIndexOf(".") + 1);
+                if(!allowedExtensions.equals(fileExtension)){
+                    return Result.fail("文件类型不正确,文件格式应该是glb类型");
+                }
+            }
+            if (allSIz>max_size){
+                return Result.fail("文件过大,不允许超过30M");
+            }
+
             String result=checkData(dto);
             if(StringHelper.isNotEmpty(result)){
                 return Result.fail(result);

securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TaskCheckMapper.xml

@@ -16,7 +16,8 @@
         select su.login_name loginName,su.user_id userId,user_name userName,count(cmc.class_id)  checkNum
 				from sys_user su
 				left join  sys_role sr on su.role_id=sr.role_id and sr.del_flag=0
-				left join t_class_metting_check  cmc on cmc.user_id=su.user_id and cmc.create_day=CURRENT_DATE()
+				left join t_class_metting_check  cmc on cmc.user_id=su.user_id
+<!--        and cmc.create_day=CURRENT_DATE()-->
 				where sr.role_code='duty'  and su.del_flag=0
 				<if test="keyWord!=null and keyWord!='' ">
                  AND   (
@@ -32,7 +33,8 @@
             FROM    t_class_metting cm
             left join  t_class_metting_check tcm  on cm.class_id=tcm.class_id
             left join sys_build so on so.org_id=cm.org
-             where  cm.del_flag=0  and cm.work_day=CURRENT_DATE()
+             where  cm.del_flag=0
+<!--        and cm.work_day=CURRENT_DATE()-->
             <if test='type=="3"'>
                 <if test='userId!=null and userId!="" '>
                     and   tcm.user_id=#{userId}