调整格式

src/main/java/com/yihu/quota/controller/QuotaReportStatisticsController.java

@@ -1,10 +1,11 @@
package com.yihu.quota.controller;
package com.yihu.quota.controller.special;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.ehr.model.dict.MapDict;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.quota.controller.BaseController;
import com.yihu.quota.model.TjQuota;
import com.yihu.quota.service.quota.QuotaService;
import com.yihu.quota.util.BasesicUtil;

src/main/java/com/yihu/quota/controller/SolrStatisticsEndPoint.java

@@ -1,4 +1,4 @@
package com.yihu.quota.controller;
package com.yihu.quota.controller.special;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;

src/main/java/com/yihu/quota/etl/save/ExtractDataWithRunnable.java

@@ -1,7 +1,7 @@
package com.yihu.quota.etl.save;
import com.yihu.quota.etl.Contant;
import com.yihu.quota.job.EsQuotaJob;
import com.yihu.quota.service.job.EsQuotaJob;
import com.yihu.quota.model.TjQuotaLog;
import com.yihu.quota.util.SpringUtil;
import com.yihu.quota.vo.QuotaVo;

src/main/java/com/yihu/quota/service/dict/DictService.java

@@ -1,17 +0,0 @@
package com.yihu.quota.service.dict;
import com.yihu.quota.dao.dict.SystemDictDao;
import com.yihu.quota.dao.dict.SystemDictListDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * Created by chenweida on 2017/6/1.
 */
@Service
public class DictService {
    @Autowired
    private SystemDictDao systemDictDao;
    @Autowired
    private SystemDictListDao systemDictListDao;
}

src/main/java/com/yihu/quota/service/dimension/TjDimensionMainService.java

@@ -9,7 +9,8 @@ import org.springframework.stereotype.Service;
import java.util.List;
/**
 * Created by chenweida on 2017/6/1.
 * @author chenweida
 * @date 2017/6/1
 */
@Service
public class TjDimensionMainService {

src/main/java/com/yihu/quota/service/dimension/TjDimensionSlaveService.java

@@ -9,7 +9,8 @@ import org.springframework.stereotype.Service;
import java.util.List;
/**
 * Created by chenweida on 2017/6/1.
 * @author chenweida
 * @date 2017/6/1
 */
@Service
public class TjDimensionSlaveService {

src/main/java/com/yihu/quota/job/EsQuotaJob.java

@@ -1,4 +1,4 @@
package com.yihu.quota.job;
package com.yihu.quota.service.job;
import com.yihu.ehr.elasticsearch.ElasticSearchPool;
import com.yihu.quota.dao.TjQuotaLogDao;
@@ -38,11 +38,13 @@ import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2017/6/6.
 * @author chenweida
 * @date 2017/6/6
 * DisallowConcurrentExecution 防止到了执行时间点前一任务还在执行中，但是这时有空闲的线程，那么马上又会执行，这样一来就会存在同一job被并行执行
 */
@Component
@Scope("prototype")
@DisallowConcurrentExecution//防止到了执行时间点前一任务还在执行中，但是这时有空闲的线程，那么马上又会执行，这样一来就会存在同一job被并行执行
@DisallowConcurrentExecution
public class EsQuotaJob implements Job {
    @Autowired
    ElasticsearchUtil elasticsearchUtil;

src/main/java/com/yihu/quota/job/EsQuotaPercentJob.java

@@ -1,4 +1,4 @@
package com.yihu.quota.job;
package com.yihu.quota.service.job;
import com.yihu.quota.dao.TjQuotaLogDao;
import com.yihu.quota.etl.Contant;

src/main/java/com/yihu/quota/service/job/JobService.java

@@ -1,7 +1,6 @@
package com.yihu.quota.service.job;
import com.yihu.quota.dao.TjQuotaDao;
import com.yihu.quota.etl.extract.es.EsResultExtract;
import com.yihu.quota.model.TjQuota;
import com.yihu.quota.util.QuartzHelper;
import com.yihu.quota.vo.QuotaVo;
@@ -24,8 +23,6 @@ public class JobService {
    private QuartzHelper quartzHelper;
    @Autowired
    private TjQuotaDao quotaDao;
    @Autowired
    private EsResultExtract esResultExtract;
    /**
     * 启动指标任务