优化站点同步事项

base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncMatterTaskImpl.java

@@ -80,13 +80,13 @@ public class SyncMatterTaskImpl implements ITaskExcuteService {
             stopWatch.start("开始同步事项方法");
             matterExtService.doMatterBySiteId(siteEntity,null);
             stopWatch.stop();
-            log.info("同步事项完成,耗时：{}ms", stopWatch.getLastTaskTimeMillis());
+            log.info("同步事项完成,耗时：{}s", stopWatch.getLastTaskTimeMillis()/1000);
 
             log.info("开始添加站点事项==》{}",siteEntity.getSiteName());
             stopWatch.start("开始添加站点事项");
             siteMatterService.doSyncSiteMatter(siteEntity, null);
             stopWatch.stop();
-            log.info("开始添加站点事项,耗时：{}ms", stopWatch.getLastTaskTimeMillis());
+            log.info("开始添加站点事项,耗时：{} s", stopWatch.getLastTaskTimeMillis()/1000);
            // syncMatter(siteEntity);
         }
         // syncDevice();

base-manager/src/main/java/com/mortals/xhx/module/matter/dao/ibatis/MatterDaoImpl.java

@@ -13,6 +13,7 @@ import java.util.ArrayList;
 import java.util.Date;
 
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import org.springframework.util.ObjectUtils;
 
 import java.util.List;
 
@@ -56,6 +57,9 @@ public class MatterDaoImpl extends BaseCRUDDaoMybatis<MatterEntity, Long> implem
 
         ParamDto param = new ParamDto();
         param.getCondition().put("areaCode", matterQuery.getAreaCode());
+        if(!ObjectUtils.isEmpty(matterQuery.getSource())){
+            param.getCondition().put("areaCode", matterQuery.getSource());
+        }
         return this.getSqlSession().selectList(this.getSqlId("getMatterListByAreaCode"), param);
     }