企业自主定时任务

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/BaseCompanyService.java

@@ -38,7 +38,7 @@ public interface BaseCompanyService extends CrudService<BaseCompany> {
      *
      * @return
      */
-    List<BaseCompany> companyIdList();
+    List<BaseCompany> companyIdList(List<String> streetTownList);
 
     /**
      * 单位管理-单位列表查询

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseCompanyServiceImpl.java

@@ -78,10 +78,11 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
     }
 
     @Override
-    public List<BaseCompany> companyIdList() {
+    public List<BaseCompany> companyIdList(List<String> streetTownList) {
         LambdaQueryWrapper<BaseCompany> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.select(BaseCompany::getCompanyId)
-                .eq(BaseCompany::getEnable, 0);
+        queryWrapper.select(BaseCompany::getCompanyId, BaseCompany::getStreetTown)
+                .eq(BaseCompany::getEnable, 0)
+                .in(CollectionUtils.isNotEmpty(streetTownList), BaseCompany::getStreetTown, streetTownList);
         List<BaseCompany> list = this.list(queryWrapper);
         return list;
     }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BscEnterpriseScreenServiceImpl.java

@@ -152,7 +152,21 @@ public class BscEnterpriseScreenServiceImpl extends AbstractCrudService<BscEnter
 
     @Override
     public void dataSynchro() {
-        List<BaseCompany> baseCompanies = baseCompanyService.companyIdList();
+        List<String> streetTownList = new ArrayList<>();
+        streetTownList.add("华漕镇");
+        streetTownList.add("新虹街道");
+        streetTownList.add("七宝镇");
+        streetTownList.add("虹桥镇");
+        streetTownList.add("古美路街道");
+        streetTownList.add("莘庄镇");
+        streetTownList.add("梅陇镇");
+        streetTownList.add("颛桥镇");
+        streetTownList.add("马桥镇");
+        streetTownList.add("江川路街道");
+        streetTownList.add("吴泾镇");
+        streetTownList.add("浦锦街道");
+        streetTownList.add("浦江镇");
+        List<BaseCompany> baseCompanies = baseCompanyService.companyIdList(streetTownList);
         if (CollectionUtils.isNotEmpty(baseCompanies)) {
             for (int i = 0; i < baseCompanies.size(); i++) {
                 Object postInspectStatistics = this.postInspectStatistics(baseCompanies.get(i).getCompanyId());
@@ -178,8 +192,8 @@ public class BscEnterpriseScreenServiceImpl extends AbstractCrudService<BscEnter
             String scoreDate = format.format(timeStamp);
             List<DemBuildScoreRecord> list1 = demBuildScoreRecordService.demBuildScoreRecordListOne(scoreDate, null);
             for (int i = 0; i < list1.size(); i++) {
-                int count = demBuildScoreRecordService.demBuildScoreRecordCount(scoreDate, null,null, null);
-                int overstepCount = demBuildScoreRecordService.demBuildScoreRecordCount(scoreDate, list1.get(i).getBuildScore(), null,null);
+                int count = demBuildScoreRecordService.demBuildScoreRecordCount(scoreDate, null, null, null);
+                int overstepCount = demBuildScoreRecordService.demBuildScoreRecordCount(scoreDate, list1.get(i).getBuildScore(), null, null);
                 double faultRatio1 = Arith.div(overstepCount, count, 2) * 100;
                 int faultRatio = new Double(faultRatio1).intValue();
                 int rank = count - overstepCount;
@@ -480,7 +494,7 @@ public class BscEnterpriseScreenServiceImpl extends AbstractCrudService<BscEnter
         int hiddenDangerCount = 70;
 
         List<DemBuildScore> list1 = demBuildScoreService.buildScoreListOne();
-        int demBuildScoreRecordsCount = demBuildScoreRecordService.demBuildScoreRecordCount(LastMonthDate, null,null, companyId);
+        int demBuildScoreRecordsCount = demBuildScoreRecordService.demBuildScoreRecordCount(LastMonthDate, null, null, companyId);
         Double deviceDamageRieo = 0.00;
         Double fireRieo = 0.00;
         Double rectificationRieo = 0.00;

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BscEnterpriseStreetTownServiceImpl.java

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.util.Arith;
 import com.usky.common.mybatis.core.AbstractCrudService;
-import com.usky.common.security.utils.SecurityUtils;
 import com.usky.fire.domain.*;
 import com.usky.fire.mapper.BscEnterpriseStreetTownMapper;
 import com.usky.fire.service.*;
@@ -128,20 +127,28 @@ public class BscEnterpriseStreetTownServiceImpl extends AbstractCrudService<BscE
     @Transactional
     @Override
     public void enterpriseStreetTownTask() {
-        LambdaQueryWrapper<BaseCompany> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.select(BaseCompany::getStreetTown)
-                .eq(BaseCompany::getEnable, 0)
-                .ne(BaseCompany::getStreetTown, "")
-                .groupBy(BaseCompany::getStreetTown);
-        List<BaseCompany> list = baseCompanyService.list(queryWrapper);
-        if (CollectionUtils.isNotEmpty(list)) {
-            for (int i = 0; i < list.size(); i++) {
-                Map<String, Object> enterpriseAutonomy = this.enterpriseStreetTownData(list.get(i).getStreetTown());
-                Object iotDevice = this.iotDevice(list.get(i).getStreetTown());
-                Object patrolInspection = this.patrolInspection(list.get(i).getStreetTown());
-                Object streetCompany = this.streetCompany(list.get(i).getStreetTown());
+        List<String> streetTownList = new ArrayList<>();
+        streetTownList.add("华漕镇");
+        streetTownList.add("新虹街道");
+        streetTownList.add("七宝镇");
+        streetTownList.add("虹桥镇");
+        streetTownList.add("古美路街道");
+        streetTownList.add("莘庄镇");
+        streetTownList.add("梅陇镇");
+        streetTownList.add("颛桥镇");
+        streetTownList.add("马桥镇");
+        streetTownList.add("江川路街道");
+        streetTownList.add("吴泾镇");
+        streetTownList.add("浦锦街道");
+        streetTownList.add("浦江镇");
+        if (CollectionUtils.isNotEmpty(streetTownList)) {
+            for (int i = 0; i < streetTownList.size(); i++) {
+                Map<String, Object> enterpriseAutonomy = this.enterpriseStreetTownData(streetTownList.get(i));
+                Object iotDevice = this.iotDevice(streetTownList.get(i));
+                Object patrolInspection = this.patrolInspection(streetTownList.get(i));
+                Object streetCompany = this.streetCompany(streetTownList.get(i));
                 BscEnterpriseStreetTown bscEnterpriseStreetTown = new BscEnterpriseStreetTown();
-                bscEnterpriseStreetTown.setStreetTown(list.get(i).getStreetTown());
+                bscEnterpriseStreetTown.setStreetTown(streetTownList.get(i));
                 bscEnterpriseStreetTown.setEnterpriseAutonomy(JSON.toJSONString(enterpriseAutonomy));
                 bscEnterpriseStreetTown.setIotDevice(JSON.toJSONString(iotDevice));
                 bscEnterpriseStreetTown.setPatrolInspection(JSON.toJSONString(patrolInspection));