update bean's name

erm/src/main/java/erm/appetite/controller/CrossValidateWebController.java

@@ -8,7 +8,7 @@ import io.sc.platform.mvc.controller.support.RestCrudController;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@RestController
+@RestController("erm.appetite.controller.CrossValidateWebController")
 @RequestMapping("/api/erm/appetite/crossValidate")
 public class CrossValidateWebController extends RestCrudController<CrossValidateVo, CrossValidateEntity,String, CrossValidateRepository, CrossValidateService> {
 

erm/src/main/java/erm/appetite/controller/SpreadBusinessObjectWebController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-@RestController
+@RestController("erm.appetite.controller.SpreadBusinessObjectWebController")
 @RequestMapping("/api/erm/appetite/spreadBusinessObject")
 public class SpreadBusinessObjectWebController extends RestCrudController<SpreadBusinessObjectVo, SpreadBusinessObjectEntity,String, SpreadBusinessObjectRepository, SpreadBusinessObjectService> {
     @GetMapping("findBySpreadId")

erm/src/main/java/erm/appetite/controller/SpreadCoreIndicatorWebController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-@RestController
+@RestController("erm.appetite.controller.SpreadCoreIndicatorWebController")
 @RequestMapping("/api/erm/appetite/spreadCoreIndicator")
 public class SpreadCoreIndicatorWebController extends RestCrudController<SpreadCoreIndicatorVo, SpreadCoreIndicatorEntity,String, SpreadCoreIndicatorRepository, SpreadCoreIndicatorService> {
     @GetMapping("findBySpreadId")

erm/src/main/java/erm/appetite/controller/SpreadIndustryWebController.java

@@ -1,12 +1,8 @@
 package erm.appetite.controller;
 
-import erm.appetite.api.SpreadBusinessObjectVo;
 import erm.appetite.api.SpreadIndustryVo;
-import erm.appetite.jpa.entity.SpreadBusinessObjectEntity;
 import erm.appetite.jpa.entity.SpreadIndustryEntity;
-import erm.appetite.jpa.repository.SpreadBusinessObjectRepository;
 import erm.appetite.jpa.repository.SpreadIndustryRepository;
-import erm.appetite.service.SpreadBusinessObjectService;
 import erm.appetite.service.SpreadIndustryService;
 import io.sc.platform.mvc.controller.support.RestCrudController;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-@RestController
+@RestController("erm.appetite.controller.SpreadIndustryWebController")
 @RequestMapping("/api/erm/appetite/spreadIndustry")
 public class SpreadIndustryWebController extends RestCrudController<SpreadIndustryVo, SpreadIndustryEntity,String, SpreadIndustryRepository, SpreadIndustryService> {
     @GetMapping("findBySpreadId")

erm/src/main/java/erm/appetite/controller/SpreadShareholderWebController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-@RestController
+@RestController("erm.appetite.controller.SpreadShareholderWebController")
 @RequestMapping("/api/erm/appetite/spreadShareholder")
 public class SpreadShareholderWebController extends RestCrudController<SpreadShareholderVo, SpreadShareholderEntity,String, SpreadShareholderRepository, SpreadShareholderService> {
     @GetMapping("findBySpreadId")

erm/src/main/java/erm/appetite/controller/SpreadSupervisionWebController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-@RestController
+@RestController("erm.appetite.controller.SpreadSupervisionWebController")
 @RequestMapping("/api/erm/appetite/spreadSupervision")
 public class SpreadSupervisionWebController extends RestCrudController<SpreadSupervisionVo, SpreadSupervisionEntity,String, SpreadSupervisionRepository, SpreadSupervisionService> {
     @GetMapping("findBySpreadId")

erm/src/main/java/erm/appetite/controller/SpreadWebController.java

@@ -8,7 +8,7 @@ import io.sc.platform.mvc.controller.support.RestCrudController;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@RestController
+@RestController("erm.appetite.controller.SpreadWebController")
 @RequestMapping("/api/erm/appetite/spread")
 public class SpreadWebController extends RestCrudController<SpreadVo, SpreadEntity,String, SpreadRepository, SpreadService> {
 

erm/src/main/java/erm/appetite/jpa/repository/CrossValidateRepository.java

@@ -2,7 +2,9 @@ package erm.appetite.jpa.repository;
 
 import erm.appetite.jpa.entity.CrossValidateEntity;
 import io.sc.platform.orm.repository.DaoRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository("erm.appetite.jpa.repository.CrossValidateRepository")
 public interface CrossValidateRepository extends DaoRepository<CrossValidateEntity,String> {
     public CrossValidateEntity findByCode(String code);
 }

erm/src/main/java/erm/appetite/jpa/repository/SpreadBusinessObjectRepository.java

@@ -4,9 +4,11 @@ import erm.appetite.jpa.entity.SpreadBusinessObjectEntity;
 import io.sc.platform.orm.repository.DaoRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Repository("erm.appetite.jpa.repository.SpreadBusinessObjectRepository")
 public interface SpreadBusinessObjectRepository extends DaoRepository<SpreadBusinessObjectEntity,String> {
     @Query("select e from SpreadBusinessObjectEntity e where e.spread.id=:spreadId")
     public List<SpreadBusinessObjectEntity> findBySpreadId(@Param("spreadId") String spreadId);

erm/src/main/java/erm/appetite/jpa/repository/SpreadCoreIndicatorRepository.java

@@ -4,9 +4,11 @@ import erm.appetite.jpa.entity.SpreadCoreIndicatorEntity;
 import io.sc.platform.orm.repository.DaoRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Repository("erm.appetite.jpa.repository.SpreadCoreIndicatorRepository")
 public interface SpreadCoreIndicatorRepository extends DaoRepository<SpreadCoreIndicatorEntity,String> {
     @Query("select e from SpreadCoreIndicatorEntity e where e.spread.id=:spreadId")
     public List<SpreadCoreIndicatorEntity> findBySpreadId(@Param("spreadId") String spreadId);

erm/src/main/java/erm/appetite/jpa/repository/SpreadIndustryRepository.java

@@ -4,9 +4,11 @@ import erm.appetite.jpa.entity.SpreadIndustryEntity;
 import io.sc.platform.orm.repository.DaoRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Repository("erm.appetite.jpa.repository.SpreadIndustryRepository")
 public interface SpreadIndustryRepository extends DaoRepository<SpreadIndustryEntity,String> {
     @Query("select e from SpreadIndustryEntity e where e.spread.id=:spreadId")
     public List<SpreadIndustryEntity> findBySpreadId(@Param("spreadId") String spreadId);

erm/src/main/java/erm/appetite/jpa/repository/SpreadRepository.java

@@ -2,7 +2,9 @@ package erm.appetite.jpa.repository;
 
 import erm.appetite.jpa.entity.SpreadEntity;
 import io.sc.platform.orm.repository.DaoRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository("erm.appetite.jpa.repository.SpreadRepository")
 public interface SpreadRepository extends DaoRepository<SpreadEntity,String> {
     public SpreadEntity findByCode(String code);
 }

erm/src/main/java/erm/appetite/jpa/repository/SpreadShareholderRepository.java

@@ -4,9 +4,11 @@ import erm.appetite.jpa.entity.SpreadShareholderEntity;
 import io.sc.platform.orm.repository.DaoRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Repository("erm.appetite.jpa.repository.SpreadShareholderRepository")
 public interface SpreadShareholderRepository extends DaoRepository<SpreadShareholderEntity,String> {
     @Query("select e from SpreadShareholderEntity e where e.spread.id=:spreadId")
     public List<SpreadShareholderEntity> findBySpreadId(@Param("spreadId") String spreadId);

erm/src/main/java/erm/appetite/jpa/repository/SpreadSupervisionRepository.java

@@ -4,9 +4,11 @@ import erm.appetite.jpa.entity.SpreadSupervisionEntity;
 import io.sc.platform.orm.repository.DaoRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Repository("erm.appetite.jpa.repository.SpreadSupervisionRepository")
 public interface SpreadSupervisionRepository extends DaoRepository<SpreadSupervisionEntity,String> {
     @Query("select e from SpreadSupervisionEntity e where e.spread.id=:spreadId")
     public List<SpreadSupervisionEntity> findBySpreadId(@Param("spreadId") String spreadId);

erm/src/main/java/erm/appetite/service/impl/CrossValidateServiceImpl.java

@@ -6,7 +6,7 @@ import erm.appetite.service.CrossValidateService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("erm.appetite.service.impl.CrossValidateServiceImpl")
 public class CrossValidateServiceImpl extends DaoServiceImpl<CrossValidateEntity, String, CrossValidateRepository> implements CrossValidateService {
 
 }

erm/src/main/java/erm/appetite/service/impl/SpreadBusinessObjectServiceImpl.java

@@ -13,7 +13,7 @@ import org.springframework.util.StringUtils;
 import java.util.Collections;
 import java.util.List;
 
-@Service
+@Service("erm.appetite.service.impl.SpreadBusinessObjectServiceImpl")
 public class SpreadBusinessObjectServiceImpl extends DaoServiceImpl<SpreadBusinessObjectEntity, String, SpreadBusinessObjectRepository> implements SpreadBusinessObjectService {
     @Override
     public List<SpreadBusinessObjectVo> findBySpreadId(String spreadId) throws Exception {

erm/src/main/java/erm/appetite/service/impl/SpreadCoreIndicatorServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.util.StringUtils;
 import java.util.Collections;
 import java.util.List;
 
-@Service
+@Service("erm.appetite.service.impl.SpreadCoreIndicatorServiceImpl")
 public class SpreadCoreIndicatorServiceImpl extends DaoServiceImpl<SpreadCoreIndicatorEntity, String, SpreadCoreIndicatorRepository> implements SpreadCoreIndicatorService {
     @Override
     public List<SpreadCoreIndicatorVo> findBySpreadId(String spreadId) throws Exception {

erm/src/main/java/erm/appetite/service/impl/SpreadIndustryServiceImpl.java

@@ -13,7 +13,7 @@ import org.springframework.util.StringUtils;
 import java.util.Collections;
 import java.util.List;
 
-@Service
+@Service("erm.appetite.service.impl.SpreadIndustryServiceImpl")
 public class SpreadIndustryServiceImpl extends DaoServiceImpl<SpreadIndustryEntity, String, SpreadIndustryRepository> implements SpreadIndustryService {
     @Override
     public List<SpreadIndustryVo> findBySpreadId(String spreadId) throws Exception {

erm/src/main/java/erm/appetite/service/impl/SpreadServiceImpl.java

@@ -6,7 +6,7 @@ import erm.appetite.service.SpreadService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("erm.appetite.service.impl.SpreadServiceImpl")
 public class SpreadServiceImpl extends DaoServiceImpl<SpreadEntity, String, SpreadRepository> implements SpreadService {
 
 }

erm/src/main/java/erm/appetite/service/impl/SpreadShareholderServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.util.StringUtils;
 import java.util.Collections;
 import java.util.List;
 
-@Service
+@Service("erm.appetite.service.impl.SpreadShareholderServiceImpl")
 public class SpreadShareholderServiceImpl extends DaoServiceImpl<SpreadShareholderEntity, String, SpreadShareholderRepository> implements SpreadShareholderService {
     @Override
     public List<SpreadShareholderVo> findBySpreadId(String spreadId) throws Exception {

erm/src/main/java/erm/appetite/service/impl/SpreadSupervisionServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.util.StringUtils;
 import java.util.Collections;
 import java.util.List;
 
-@Service
+@Service("erm.appetite.service.impl.SpreadSupervisionServiceImpl")
 public class SpreadSupervisionServiceImpl extends DaoServiceImpl<SpreadSupervisionEntity, String, SpreadSupervisionRepository> implements SpreadSupervisionService {
     @Override
     public List<SpreadSupervisionVo> findBySpreadId(String spreadId) throws Exception {

erm/src/main/java/erm/capitalplan/jpa/entity/repository/StrategicTargetRepository.java

@@ -1,6 +1,5 @@
 package erm.capitalplan.jpa.entity.repository;
 
-import erm.appetite.jpa.entity.CrossValidateEntity;
 import erm.capitalplan.jpa.entity.StrategicTargetEntity;
 import io.sc.platform.orm.repository.DaoRepository;
 import org.springframework.stereotype.Repository;

erm/src/main/java/erm/kpi/jpa/repository/IndicatorRepository.java

@@ -2,11 +2,11 @@ package erm.kpi.jpa.repository;
 
 import erm.kpi.jpa.entity.IndicatorEntity;
 import io.sc.platform.orm.repository.DaoRepository;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-@Service("erm.kpi.jpa.repository.IndicatorRepository" /* 避免其他同名接口冲突 */)
+@Repository("erm.kpi.jpa.repository.IndicatorRepository")
 public interface IndicatorRepository extends DaoRepository<IndicatorEntity,String> {
     public IndicatorEntity findByCode(String code);
     public List<IndicatorEntity> findByCategoryOrderByName(String category);

erm/src/main/java/erm/kpi/jpa/repository/LibRepository.java

@@ -2,11 +2,11 @@ package erm.kpi.jpa.repository;
 
 import erm.kpi.jpa.entity.LibEntity;
 import io.sc.platform.orm.repository.DaoRepository;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-@Service("erm.kpi.jpa.repository.LibRepository" /* 避免其他同名接口冲突 */)
+@Repository("erm.kpi.jpa.repository.LibRepository")
 public interface LibRepository extends DaoRepository<LibEntity,String> {
     public LibEntity findByCode(String code);
     public List<LibEntity> findAllByOrderByName();

erm/src/main/java/erm/kpi/service/impl/IndicatorServiceImpl.java

@@ -17,7 +17,7 @@ import javax.persistence.criteria.Subquery;
 import java.util.Collections;
 import java.util.List;
 
-@Service
+@Service("erm.kpi.service.impl.IndicatorServiceImpl")
 public class IndicatorServiceImpl extends DaoServiceImpl<IndicatorEntity, String, IndicatorRepository> implements IndicatorService {
     @Override
     public IndicatorEntity findByUniqueKey(IndicatorEntity entity) {

erm/src/main/java/erm/kpi/service/impl/LibServiceImpl.java

@@ -25,7 +25,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
 
-@Service
+@Service("erm.kpi.service.impl.LibServiceImpl")
 public class LibServiceImpl extends DaoServiceImpl<LibEntity, String, LibRepository> implements LibService {
     @Autowired
     private JdbcTemplate jdbcTemplate;

io.sc.engine.mv.sample/src/main/java/io/sc/engine/mv/sample/controller/SampleWebController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@RestController
+@RestController("io.sc.engine.mv.sample.controller.SampleWebController")
 @RequestMapping("/api/mv/sample")
 public class SampleWebController {
     @Autowired private TestCaseImporterService testCaseImporterService;

io.sc.engine.mv.sample/src/main/java/io/sc/engine/mv/sample/service/impl/CardGongXinImporterServiceImpl.java

@@ -25,7 +25,7 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.UUID;
 
-@Service
+@Service("io.sc.engine.mv.sample.service.impl.CardGongXinImporterServiceImpl")
 public class CardGongXinImporterServiceImpl implements CardGongXinImporterService {
     private static final String URL ="classpath:/io/sc/engine/mv/sample/信用卡_工薪模型.csv";
     private static final String MODEL_ID ="CARD_GONGXIN";

io.sc.engine.mv.sample/src/main/java/io/sc/engine/mv/sample/service/impl/CardJingyingImporterServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.UUID;
 
-@Service
+@Service("io.sc.engine.mv.sample.service.impl.CardJingyingImporterServiceImpl")
 public class CardJingyingImporterServiceImpl implements CardJingyingImporterService {
     private static final String URL ="classpath:/io/sc/engine/mv/sample/信用卡_经营模型.csv";
     private static final String MODEL_ID ="CARD_JINGYING";

io.sc.engine.mv.sample/src/main/java/io/sc/engine/mv/sample/service/impl/DaiKuanImporterServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.UUID;
 
-@Service
+@Service("io.sc.engine.mv.sample.service.impl.DaiKuanImporterServiceImpl")
 public class DaiKuanImporterServiceImpl implements DaiKuanImporterService {
     private static final String URL ="classpath:/io/sc/engine/mv/sample/贷款模型.csv";
     private static final String MODEL_ID ="DAIKUAN";

io.sc.engine.mv.sample/src/main/java/io/sc/engine/mv/sample/service/impl/TestCaseImporterServiceImpl.java

@@ -21,7 +21,7 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.UUID;
 
-@Service
+@Service("io.sc.engine.mv.sample.service.impl.TestCaseImporterServiceImpl")
 public class TestCaseImporterServiceImpl implements TestCaseImporterService {
     private static final String URL ="classpath:/io/sc/engine/mv/sample/TestCase.csv";
     private static final String MODEL_ID ="M1";

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/controller/CfgBinomialWebController.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @author wangshaoping
  *
  */
-@RestController
+@RestController("io.sc.engine.mv.configure.controller.CfgBinomialWebController")
 @RequestMapping("/api/mv/configure/binomial")
 public class CfgBinomialWebController extends RestCrudController<CfgBinomialVo,CfgBinomial, String, CfgBinomialRepository, CfgBinomialService> {
 

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/controller/CfgChiSquareWebController.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @author wangshaoping
  *
  */
-@RestController
+@RestController("io.sc.engine.mv.configure.controller.CfgChiSquareWebController")
 @RequestMapping("/api/mv/configure/chiSquare")
 public class CfgChiSquareWebController extends RestCrudController<CfgChiSquareVo, CfgChiSquare, String, CfgChiSquareRepository, CfgChiSquareService> {
     @GetMapping("significanceLevels")

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/controller/CfgCustomerDistributionWebController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author wangshaoping
  *
  */
-@RestController
+@RestController("io.sc.engine.mv.configure.controller.CfgCustomerDistributionWebController")
 @RequestMapping("/api/mv/configure/distribution")
 public class CfgCustomerDistributionWebController extends RestCrudController<CfgCustomerDistributionVo,CfgCustomerDistribution, String, CfgCustomerDistributionRepository, CfgCustomerDistributionService> {
 

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/controller/CfgCutOffPointWebController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author wangshaoping
  *
  */
-@RestController
+@RestController("io.sc.engine.mv.configure.controller.CfgCutOffPointWebController")
 @RequestMapping("/api/mv/configure/cutOffPoint")
 public class CfgCutOffPointWebController extends RestCrudController<CfgCutOffPointVo, CfgCutOffPoint, String, CfgCutOffPointRepository, CfgCutOffPointService> {
 

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/controller/CfgDataExtractorWebController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author wangshaoping
  *
  */
-@RestController
+@RestController("io.sc.engine.mv.configure.controller.CfgDataExtractorWebController")
 @RequestMapping("/api/mv/configure/dataExtractor")
 public class CfgDataExtractorWebController extends RestCrudController<CfgDataExtractorVo, CfgDataExtractor, String, CfgDataExtractorRepository, CfgDataExtractorService> {
 	@Autowired private DsRepository dsRepository;

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/controller/CfgExecutorWebController.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @author wangshaoping
  *
  */
-@RestController
+@RestController("io.sc.engine.mv.configure.controller.CfgExecutorWebController")
 @RequestMapping("/api/mv/configure/executor")
 public class CfgExecutorWebController {
 	@Autowired private ExecutorManager executorManager;

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/controller/CfgModelWebController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author wangshaoping
  *
  */
-@RestController
+@RestController("io.sc.engine.mv.configure.controller.CfgModelWebController")
 @RequestMapping("/api/mv/configure/model")
 public class CfgModelWebController extends RestCrudController<CfgModelVo, CfgModel, String, CfgModelRepository, CfgModelService> {
 	@Autowired private CfgModelService service;

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/controller/CfgScaleWebController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author wangshaoping
  *
  */
-@RestController
+@RestController("io.sc.engine.mv.configure.controller.CfgScaleWebController")
 @RequestMapping("/api/mv/configure/scale")
 public class CfgScaleWebController extends RestCrudController<CfgScaleVo, CfgScale, String, CfgScaleRepository, CfgScaleService> {
 	@RequestMapping(value="getScaleLevelByModel/{modelId}")

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/controller/CfgThresholdWebController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author wangshaoping
  *
  */
-@RestController
+@RestController("io.sc.engine.mv.configure.controller.CfgThresholdWebController")
 @RequestMapping("/api/mv/configure/threshold")
 public class CfgThresholdWebController extends RestCrudController<CfgThresholdVo, CfgThreshold, String, CfgThresholdRepository, CfgThresholdService> {
 

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/jpa/repository/CfgBinomialRepository.java

@@ -1,11 +1,13 @@
 package io.sc.engine.mv.configure.jpa.repository;
 
-import java.util.List;
-
 import io.sc.engine.mv.configure.jpa.entity.CfgBinomial;
 import io.sc.platform.orm.repository.DaoRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
+@Repository("io.sc.engine.mv.configure.jpa.repository.CfgBinomialRepository")
 public interface CfgBinomialRepository extends DaoRepository<CfgBinomial,String> {
     public CfgBinomial findBySignificanceLevel(Double significanceLevel);
 

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/jpa/repository/CfgChiSquareRepository.java

@@ -3,9 +3,11 @@ package io.sc.engine.mv.configure.jpa.repository;
 import io.sc.engine.mv.configure.jpa.entity.CfgChiSquare;
 import io.sc.platform.orm.repository.DaoRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Repository("io.sc.engine.mv.configure.jpa.repository.CfgChiSquareRepository")
 public interface CfgChiSquareRepository extends DaoRepository<CfgChiSquare,String> {
 
     public CfgChiSquare findByDofAndSignificanceLevel(int dof,double significanceLevel);

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/jpa/repository/CfgCustomerDistributionRepository.java

@@ -3,7 +3,9 @@ package io.sc.engine.mv.configure.jpa.repository;
 
 import io.sc.engine.mv.configure.jpa.entity.CfgCustomerDistribution;
 import io.sc.platform.orm.repository.DaoRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository("io.sc.engine.mv.configure.jpa.repository.CfgCustomerDistributionRepository")
 public interface CfgCustomerDistributionRepository extends DaoRepository<CfgCustomerDistribution,String> {
 
 }

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/jpa/repository/CfgCutOffPointRepository.java

@@ -3,7 +3,9 @@ package io.sc.engine.mv.configure.jpa.repository;
 
 import io.sc.engine.mv.configure.jpa.entity.CfgCutOffPoint;
 import io.sc.platform.orm.repository.DaoRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository("io.sc.engine.mv.configure.jpa.repository.CfgCutOffPointRepository")
 public interface CfgCutOffPointRepository extends DaoRepository<CfgCutOffPoint,String> {
 
     public CfgCutOffPoint findByName(String name);

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/jpa/repository/CfgDataExtractorRepository.java

@@ -4,10 +4,12 @@ import io.sc.engine.mv.configure.jpa.entity.CfgDataExtractor;
 import io.sc.platform.orm.repository.DaoRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
+@Repository("io.sc.engine.mv.configure.jpa.repository.CfgDataExtractorRepository")
 public interface CfgDataExtractorRepository extends DaoRepository<CfgDataExtractor,String> {
     public List<CfgDataExtractor> findByEnableOrderByOrder(boolean enable);
 

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/jpa/repository/CfgModelRepository.java

@@ -2,10 +2,11 @@ package io.sc.engine.mv.configure.jpa.repository;
 
 import io.sc.engine.mv.configure.jpa.entity.CfgModel;
 import io.sc.platform.orm.repository.DaoRepository;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-
+@Repository("io.sc.engine.mv.configure.jpa.repository.CfgModelRepository")
 public interface CfgModelRepository extends DaoRepository<CfgModel,String> {
 
     public CfgModel findByModelId(String modelId);

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/jpa/repository/CfgScaleRepository.java

@@ -5,7 +5,9 @@ import java.util.List;
 import io.sc.engine.mv.configure.jpa.entity.CfgScale;
 import io.sc.platform.orm.repository.DaoRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
 
+@Repository("io.sc.engine.mv.configure.jpa.repository.CfgScaleRepository")
 public interface CfgScaleRepository extends DaoRepository<CfgScale,String> {
 
     public List<CfgScale> findByModelIdOrderByOrder(String modelId);

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/jpa/repository/CfgThresholdRepository.java

@@ -2,10 +2,11 @@ package io.sc.engine.mv.configure.jpa.repository;
 
 import io.sc.engine.mv.configure.jpa.entity.CfgThreshold;
 import io.sc.platform.orm.repository.DaoRepository;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-
+@Repository("io.sc.engine.mv.configure.jpa.repository.CfgThresholdRepository")
 public interface CfgThresholdRepository extends DaoRepository<CfgThreshold,String> {
 
     public List<CfgThreshold> findByName(String name);

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/service/impl/CfgBinomialServiceImpl.java

@@ -8,7 +8,7 @@ import io.sc.engine.mv.configure.service.CfgBinomialService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("io.sc.engine.mv.configure.service.impl.CfgBinomialServiceImpl")
 public class CfgBinomialServiceImpl extends DaoServiceImpl<CfgBinomial, String, CfgBinomialRepository> implements CfgBinomialService {
 
     @Override

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/service/impl/CfgChiSquareServiceImpl.java

@@ -8,7 +8,7 @@ import io.sc.engine.mv.configure.service.CfgChiSquareService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("io.sc.engine.mv.configure.service.impl.CfgChiSquareServiceImpl")
 public class CfgChiSquareServiceImpl extends DaoServiceImpl<CfgChiSquare, String, CfgChiSquareRepository> implements CfgChiSquareService {
 
     @Override

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/service/impl/CfgCustomerDistributionServiceImpl.java

@@ -6,7 +6,7 @@ import io.sc.engine.mv.configure.service.CfgCustomerDistributionService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("io.sc.engine.mv.configure.service.impl.CfgCustomerDistributionServiceImpl")
 public class CfgCustomerDistributionServiceImpl extends DaoServiceImpl<CfgCustomerDistribution, String, CfgCustomerDistributionRepository> implements CfgCustomerDistributionService {
 
     @Override

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/service/impl/CfgCutOffPointServiceImpl.java

@@ -8,7 +8,7 @@ import io.sc.engine.mv.configure.service.CfgCutOffPointService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("io.sc.engine.mv.configure.service.impl.CfgCutOffPointServiceImpl")
 public class CfgCutOffPointServiceImpl extends DaoServiceImpl<CfgCutOffPoint, String, CfgCutOffPointRepository> implements CfgCutOffPointService {
 
     @Override

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/service/impl/CfgDataExtractorServiceImpl.java

@@ -13,7 +13,7 @@ import org.springframework.core.io.ResourceLoader;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-@Service
+@Service("io.sc.engine.mv.configure.service.impl.CfgDataExtractorServiceImpl")
 public class CfgDataExtractorServiceImpl extends DaoServiceImpl<CfgDataExtractor, String, CfgDataExtractorRepository> implements CfgDataExtractorService {
     @Autowired private DataExtractorManager dataExtractorManager;
     @Autowired private ResourceLoader resourceLoader;

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/service/impl/CfgModelServiceImpl.java

@@ -14,7 +14,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
-@Service
+@Service("io.sc.engine.mv.configure.service.impl.CfgModelServiceImpl")
 public class CfgModelServiceImpl extends DaoServiceImpl<CfgModel, String, CfgModelRepository> implements CfgModelService {
     @Autowired private JdbcTemplate jdbcTemplate;
 

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/service/impl/CfgScaleServiceImpl.java

@@ -6,7 +6,7 @@ import io.sc.engine.mv.configure.service.CfgScaleService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("io.sc.engine.mv.configure.service.impl.CfgScaleServiceImpl")
 public class CfgScaleServiceImpl extends DaoServiceImpl<CfgScale, String, CfgScaleRepository> implements CfgScaleService {
     @Override
     public String[] getDefaultSortBy() {

io.sc.engine.mv/src/main/java/io/sc/engine/mv/configure/service/impl/CfgThresholdServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 
-@Service
+@Service("io.sc.engine.mv.configure.service.impl.CfgThresholdServiceImpl")
 public class CfgThresholdServiceImpl extends DaoServiceImpl<CfgThreshold, String, CfgThresholdRepository> implements CfgThresholdService {
 
     @Override

io.sc.engine.mv/src/main/java/io/sc/engine/mv/validator/controller/ExecuteValidatorWebController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
  * @author wangshaoping
  *
  */
-@RestController
+@RestController("io.sc.engine.mv.validator.controller.ExecuteValidatorWebController")
 @RequestMapping("/api/mv")
 public class ExecuteValidatorWebController {
     @Autowired private Validator validator;

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/controller/CoeBinomialHistoryWebController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-@RestController
+@RestController("io.sc.engine.mv.viewer.controller.CoeBinomialHistoryWebController")
 @RequestMapping("/api/mv/viewer/binomial")
 public class CoeBinomialHistoryWebController extends RestCrudController<CoeBinomialHistoryVo, CoeBinomialHistory, CoeBinomialHistoryId, CoeBinomialHistoryRepository, CoeBinomialHistoryService> {
     @Autowired private CoeBinomialHistoryRepository coeBinomialHistoryRepository;

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/controller/CoeChiSquareHistoryWebController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-@RestController
+@RestController("io.sc.engine.mv.viewer.controller.CoeChiSquareHistoryWebController")
 @RequestMapping("/api/mv/viewer/chiSquare")
 public class CoeChiSquareHistoryWebController extends RestCrudController<CoeChiSquareHistoryVo, CoeChiSquareHistory, CoeChiSquareHistoryId, CoeChiSquareHistoryRepository, CoeChiSquareHistoryService> {
     @Autowired private CoeChiSquareHistoryRepository coeChiSquareHistoryRepository;

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/controller/DefaultRecordWebController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author wangshaoping
  *
  */
-@RestController
+@RestController("io.sc.engine.mv.viewer.controller.DefaultRecordWebController")
 @RequestMapping("/api/mv/viewer/defaultRecord")
 public class DefaultRecordWebController extends RestCrudController<DefaultRecordVo, DefaultRecord, DefaultRecordId, DefaultRecordRepository, DefaultRecordService> {
 

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/controller/GeneralResultHistoryWebController.java

@@ -22,7 +22,7 @@ import java.util.List;
  * @author wangshaoping
  *
  */
-@RestController
+@RestController("io.sc.engine.mv.viewer.controller.GeneralResultHistoryWebController")
 @RequestMapping("/api/mv/viewer/result")
 public class GeneralResultHistoryWebController extends RestCrudController<GeneralResultHistoryVo,GeneralResultHistory, GeneralResultHistoryId, GeneralResultHistoryRepository, GeneralResultHistoryService> {
     @Autowired private GeneralResultHistoryRepository generalResultHistoryRepository;

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/controller/GeneralSampleHistoryWebController.java

@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author wangshaoping
  *
  */
-@RestController
+@RestController("io.sc.engine.mv.viewer.controller.GeneralSampleHistoryWebController")
 @RequestMapping("/api/mv/viewer/sample")
 @SuppressWarnings("unchecked")
 public class GeneralSampleHistoryWebController extends RestCrudController<GeneralSampleHistoryVo,GeneralSampleHistory, GeneralSampleHistoryId, GeneralSampleHistoryRepository, GeneralSampleHistoryService> {

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/controller/ScCapHistoryWebController.java

@@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-@RestController
+@RestController("io.sc.engine.mv.viewer.controller.ScCapHistoryWebController")
 @RequestMapping("/api/mv/viewer/cap")
 public class ScCapHistoryWebController extends RestCrudController<ScCapHistoryVo, ScCapHistory, ScCapHistoryId, ScCapHistoryRepository, ScCapHistoryService> {
     //模型验证结果DAO

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/controller/ScKsHistoryWebController.java

@@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-@RestController
+@RestController("io.sc.engine.mv.viewer.controller.ScKsHistoryWebController")
 @RequestMapping("/api/mv/viewer/ks")
 public class ScKsHistoryWebController extends RestCrudController<ScKsHistoryVo, ScKsHistory, ScKsHistoryId, ScKsHistoryRepository, ScKsHistoryService> {
     //模型验证结果DAO

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/controller/ScRocHistoryWebController.java

@@ -33,7 +33,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Locale;
 
-@RestController
+@RestController("io.sc.engine.mv.viewer.controller.ScRocHistoryWebController")
 @RequestMapping("/api/mv/viewer/roc")
 public class ScRocHistoryWebController extends RestCrudController<ScRocHistoryVo, ScRocHistory, ScRocHistoryId, ScRocHistoryRepository, ScRocHistoryService> {
     //模型验证结果DAO

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/controller/ScoreRecordWebController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author wangshaoping
  *
  */
-@RestController
+@RestController("io.sc.engine.mv.viewer.controller.ScoreRecordWebController")
 @RequestMapping("/api/mv/viewer/scoreRecord")
 public class ScoreRecordWebController extends RestCrudController<ScoreRecordVo, ScoreRecord, ScoreRecordId, ScoreRecordRepository, ScoreRecordService> {
 

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/controller/StPsiHistoryWebController.java

@@ -35,7 +35,7 @@ import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Locale;
 
-@RestController
+@RestController("io.sc.engine.mv.viewer.controller.StPsiHistoryWebController")
 @RequestMapping("/api/mv/viewer/psi")
 public class StPsiHistoryWebController extends RestCrudController<StPsiHistoryVo, StPsiHistory, StPsiHistoryId, StPsiHistoryRepository, StPsiHistoryService> {
     @Autowired private GeneralResultHistoryRepository generalResultHistoryRepository;

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/controller/StSvdWebController.java

@@ -1,9 +1,9 @@
 package io.sc.engine.mv.viewer.controller;
 
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-@Controller
+@RestController("io.sc.engine.mv.viewer.controller.StSvdWebController")
 @RequestMapping("/api/mv/viewer/svd")
 public class StSvdWebController {
 	/*

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/jpa/repository/CoeBinomialHistoryRepository.java

@@ -4,7 +4,9 @@ package io.sc.engine.mv.viewer.jpa.repository;
 import io.sc.engine.mv.viewer.jpa.entity.CoeBinomialHistory;
 import io.sc.engine.mv.viewer.jpa.entity.id.CoeBinomialHistoryId;
 import io.sc.platform.orm.repository.DaoRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository("io.sc.engine.mv.viewer.jpa.repository.CoeBinomialHistoryRepository")
 public interface CoeBinomialHistoryRepository extends DaoRepository<CoeBinomialHistory, CoeBinomialHistoryId> {
 
 }

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/jpa/repository/CoeChiSquareHistoryRepository.java

@@ -4,7 +4,9 @@ package io.sc.engine.mv.viewer.jpa.repository;
 import io.sc.engine.mv.viewer.jpa.entity.CoeChiSquareHistory;
 import io.sc.engine.mv.viewer.jpa.entity.id.CoeChiSquareHistoryId;
 import io.sc.platform.orm.repository.DaoRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository("io.sc.engine.mv.viewer.jpa.repository.CoeChiSquareHistoryRepository")
 public interface CoeChiSquareHistoryRepository extends DaoRepository<CoeChiSquareHistory, CoeChiSquareHistoryId> {
 
 }

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/jpa/repository/DefaultRecordRepository.java

@@ -3,7 +3,9 @@ package io.sc.engine.mv.viewer.jpa.repository;
 import io.sc.engine.mv.viewer.jpa.entity.DefaultRecord;
 import io.sc.engine.mv.viewer.jpa.entity.id.DefaultRecordId;
 import io.sc.platform.orm.repository.DaoRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository("io.sc.engine.mv.viewer.jpa.repository.DefaultRecordRepository")
 public interface DefaultRecordRepository extends DaoRepository<DefaultRecord, DefaultRecordId> {
 
 }

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/jpa/repository/GeneralResultHistoryRepository.java

@@ -6,7 +6,9 @@ import io.sc.engine.mv.viewer.jpa.entity.GeneralResultHistory;
 import io.sc.engine.mv.viewer.jpa.entity.id.GeneralResultHistoryId;
 import io.sc.platform.orm.repository.DaoRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
 
+@Repository("io.sc.engine.mv.viewer.jpa.repository.GeneralResultHistoryRepository")
 public interface GeneralResultHistoryRepository extends DaoRepository<GeneralResultHistory, GeneralResultHistoryId> {
 
     /**

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/jpa/repository/GeneralSampleHistoryRepository.java

@@ -8,7 +8,9 @@ import io.sc.platform.orm.repository.DaoRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
 
+@Repository("io.sc.engine.mv.viewer.jpa.repository.GeneralSampleHistoryRepository")
 public interface GeneralSampleHistoryRepository extends DaoRepository<GeneralSampleHistory, GeneralSampleHistoryId> {
     /**
      * 分页查询某个模型某个验证日期的所有历史模型验证合格样本

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/jpa/repository/RuntimeParameterRepository.java

@@ -2,10 +2,11 @@ package io.sc.engine.mv.viewer.jpa.repository;
 
 import io.sc.engine.mv.viewer.jpa.entity.RuntimeParameter;
 import io.sc.platform.orm.repository.DaoRepository;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-
+@Repository("io.sc.engine.mv.viewer.jpa.repository.RuntimeParameterRepository")
 public interface RuntimeParameterRepository extends DaoRepository<RuntimeParameter,String> {
     public List<RuntimeParameter> findByValidateDateOrderBySno(String validateDate);
 }

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/jpa/repository/ScCapHistoryRepository.java

@@ -6,9 +6,11 @@ import io.sc.platform.orm.repository.DaoRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Repository("io.sc.engine.mv.viewer.jpa.repository.ScCapHistoryRepository")
 public interface ScCapHistoryRepository extends DaoRepository<ScCapHistory, ScCapHistoryId> {
     /**
      * 分页查询某个验证日期的所有历史区分能力CAP曲线指标

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/jpa/repository/ScKsHistoryRepository.java

@@ -8,7 +8,9 @@ import io.sc.platform.orm.repository.DaoRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
 
+@Repository("io.sc.engine.mv.viewer.jpa.repository.ScKsHistoryRepository")
 public interface ScKsHistoryRepository extends DaoRepository<ScKsHistory, ScKsHistoryId> {
     /**
      * 分页查询某个验证日期的所有历史区分能力KS曲线指标

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/jpa/repository/ScRocHistoryRepository.java

@@ -8,7 +8,9 @@ import io.sc.platform.orm.repository.DaoRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
 
+@Repository("io.sc.engine.mv.viewer.jpa.repository.ScRocHistoryRepository")
 public interface ScRocHistoryRepository extends DaoRepository<ScRocHistory, ScRocHistoryId> {
     /**
      * 分页查询某个验证日期的所有历史区分能力ROC曲线指标

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/jpa/repository/ScoreRecordRepository.java

@@ -3,7 +3,9 @@ package io.sc.engine.mv.viewer.jpa.repository;
 import io.sc.engine.mv.viewer.jpa.entity.ScoreRecord;
 import io.sc.engine.mv.viewer.jpa.entity.id.ScoreRecordId;
 import io.sc.platform.orm.repository.DaoRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository("io.sc.engine.mv.viewer.jpa.repository.ScoreRecordRepository")
 public interface ScoreRecordRepository extends DaoRepository<ScoreRecord, ScoreRecordId> {
 
 }

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/jpa/repository/StPsiHistoryRepository.java

@@ -8,7 +8,9 @@ import io.sc.platform.orm.repository.DaoRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
 
+@Repository("io.sc.engine.mv.viewer.jpa.repository.StPsiHistoryRepository")
 public interface StPsiHistoryRepository extends DaoRepository<StPsiHistory, StPsiHistoryId> {
     public Page<StPsiHistory> findAllByValidateDate(String validateDate,Pageable pageable);
 

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/service/impl/CoeBinomialHistoryServiceImpl.java

@@ -7,6 +7,6 @@ import io.sc.engine.mv.viewer.service.CoeBinomialHistoryService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("io.sc.engine.mv.viewer.service.impl.CoeBinomialHistoryServiceImpl")
 public class CoeBinomialHistoryServiceImpl extends DaoServiceImpl<CoeBinomialHistory, CoeBinomialHistoryId, CoeBinomialHistoryRepository> implements CoeBinomialHistoryService {
 }

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/service/impl/CoeChiSquareHistoryServiceImpl.java

@@ -7,6 +7,6 @@ import io.sc.engine.mv.viewer.service.CoeChiSquareHistoryService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("io.sc.engine.mv.viewer.service.impl.CoeChiSquareHistoryServiceImpl")
 public class CoeChiSquareHistoryServiceImpl extends DaoServiceImpl<CoeChiSquareHistory, CoeChiSquareHistoryId, CoeChiSquareHistoryRepository> implements CoeChiSquareHistoryService {
 }

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/service/impl/DefaultRecordServiceImpl.java

@@ -7,6 +7,6 @@ import io.sc.engine.mv.viewer.service.DefaultRecordService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("io.sc.engine.mv.viewer.service.impl.DefaultRecordServiceImpl")
 public class DefaultRecordServiceImpl extends DaoServiceImpl<DefaultRecord, DefaultRecordId, DefaultRecordRepository> implements DefaultRecordService {
 }

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/service/impl/GeneralResultHistoryServiceImpl.java

@@ -7,7 +7,7 @@ import io.sc.engine.mv.viewer.service.GeneralResultHistoryService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("io.sc.engine.mv.viewer.service.impl.GeneralResultHistoryServiceImpl")
 public class GeneralResultHistoryServiceImpl extends DaoServiceImpl<GeneralResultHistory, GeneralResultHistoryId, GeneralResultHistoryRepository> implements GeneralResultHistoryService {
     @Override
     public String[] getDefaultSortBy() {

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/service/impl/GeneralSampleHistoryServiceImpl.java

@@ -7,7 +7,7 @@ import io.sc.engine.mv.viewer.service.GeneralSampleHistoryService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("io.sc.engine.mv.viewer.service.impl.GeneralSampleHistoryServiceImpl")
 public class GeneralSampleHistoryServiceImpl extends DaoServiceImpl<GeneralSampleHistory, GeneralSampleHistoryId, GeneralSampleHistoryRepository> implements GeneralSampleHistoryService {
 
 }

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/service/impl/ScCapHistoryServiceImpl.java

@@ -7,7 +7,7 @@ import io.sc.engine.mv.viewer.service.ScCapHistoryService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("io.sc.engine.mv.viewer.service.impl.ScCapHistoryServiceImpl")
 public class ScCapHistoryServiceImpl extends DaoServiceImpl<ScCapHistory, ScCapHistoryId, ScCapHistoryRepository> implements ScCapHistoryService {
 
 }

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/service/impl/ScKsHistoryServiceImpl.java

@@ -7,7 +7,7 @@ import io.sc.engine.mv.viewer.service.ScKsHistoryService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("io.sc.engine.mv.viewer.service.impl.ScKsHistoryServiceImpl")
 public class ScKsHistoryServiceImpl extends DaoServiceImpl<ScKsHistory, ScKsHistoryId, ScKsHistoryRepository> implements ScKsHistoryService {
 
 }

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/service/impl/ScRocHistoryServiceImpl.java

@@ -7,7 +7,7 @@ import io.sc.engine.mv.viewer.service.ScRocHistoryService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("io.sc.engine.mv.viewer.service.impl.ScRocHistoryServiceImpl")
 public class ScRocHistoryServiceImpl extends DaoServiceImpl<ScRocHistory, ScRocHistoryId, ScRocHistoryRepository> implements ScRocHistoryService {
 
 }

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/service/impl/ScoreRecordServiceImpl.java

@@ -7,6 +7,6 @@ import io.sc.engine.mv.viewer.service.ScoreRecordService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("io.sc.engine.mv.viewer.service.impl.ScoreRecordServiceImpl")
 public class ScoreRecordServiceImpl extends DaoServiceImpl<ScoreRecord, ScoreRecordId, ScoreRecordRepository> implements ScoreRecordService {
 }

io.sc.engine.mv/src/main/java/io/sc/engine/mv/viewer/service/impl/StPsiHistoryServiceImpl.java

@@ -7,6 +7,6 @@ import io.sc.engine.mv.viewer.service.StPsiHistoryService;
 import io.sc.platform.orm.service.impl.DaoServiceImpl;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("io.sc.engine.mv.viewer.service.impl.StPsiHistoryServiceImpl")
 public class StPsiHistoryServiceImpl extends DaoServiceImpl<StPsiHistory, StPsiHistoryId, StPsiHistoryRepository> implements StPsiHistoryService {
 }

io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/service/impl/ExecutorFactoryServiceImpl.java

@@ -20,7 +20,7 @@ import io.sc.engine.rule.client.spring.service.ExecutorFactoryService;
 import io.sc.engine.rule.client.spring.service.LocalLoader;
 import io.sc.engine.rule.client.spring.util.EngineSpringApplicationContextUtil;
 
-@Service("reExecutorFactoryService")
+@Service("io.sc.engine.rule.client.spring.service.impl.ExecutorFactoryServiceImpl")
 public class ExecutorFactoryServiceImpl implements ExecutorFactoryService{
 	private static final Logger log =LoggerFactory.getLogger(ExecutorFactoryServiceImpl.class);
 	

io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/service/impl/LocalLoaderImpl.java

@@ -12,7 +12,7 @@ import io.sc.engine.rule.client.spring.service.LocalLoader;
 import io.sc.engine.rule.core.classes.ResourceAbstract;
 import io.sc.engine.rule.core.code.impl.support.ResourceWrapper;
 
-@Service("reLocalLoader")
+@Service("io.sc.engine.rule.client.spring.service.impl.LocalLoaderImpl")
 public class LocalLoaderImpl implements LocalLoader{
 	@Autowired private ApplicationContext applicationContext;
 	private Map<String,ResourceWrapper> cache =new ConcurrentHashMap<String,ResourceWrapper>();

io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/controller/EnumItemWebController.java

@@ -7,12 +7,13 @@ import io.sc.engine.rule.server.dictionary.vo.EnumItemVo;
 import io.sc.platform.mvc.controller.support.RestCrudController;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 枚举类型数据字典的枚举项管理器 Controller
  *
  */
-@Controller
+@RestController("io.sc.engine.rule.server.dictionary.controller.EnumItemWebController")
 @RequestMapping("/api/re/dictionary/enumItem")
 public class EnumItemWebController extends RestCrudController<EnumItemVo,EnumItemEntity,String,EnumItemRepository,EnumItemService> {
 	

io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/controller/UserDefinedJavaClassFieldWebController.java

@@ -19,10 +19,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -33,7 +30,7 @@ import java.util.Map;
 /**
  * 自定义 Java Class 类型数据字典的字段管理器 Controller
  */
-@Controller
+@RestController("io.sc.engine.rule.server.dictionary.controller.UserDefinedJavaClassFieldWebController")
 @RequestMapping("/api/re/dictionary/userDefinedJavaClassField")
 public class UserDefinedJavaClassFieldWebController extends RestCrudController<UserDefinedJavaClassFieldVo,UserDefinedJavaClassFieldEntity,String,UserDefinedJavaClassFieldRepository,UserDefinedJavaClassFieldService> {
 	@Autowired private DictionaryService dictionaryService;
@@ -56,8 +53,7 @@ public class UserDefinedJavaClassFieldWebController extends RestCrudController<U
 		return new PageImpl<>(vos,page.getPageable(),page.getTotalElements());
 	}
 
-	@RequestMapping(value="importFromCsv",method=RequestMethod.POST)
+	@PostMapping(value="importFromCsv")
-	@ResponseBody
 	public void importFromCsv(@RequestBody Map<String,String> request) throws Exception{
 		String dictionaryId =request.get("dictionaryId");
 		String csvContent =request.get("csvContent");

io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/repository/DictionaryRepository.java

@@ -1,21 +1,15 @@
 package io.sc.engine.rule.server.dictionary.repository;
 
-import java.util.List;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import io.sc.engine.rule.core.enums.DeployStatus;
-import io.sc.engine.rule.server.dictionary.entity.DictionaryEntity;
+import io.sc.engine.rule.server.dictionary.entity.*;
-import io.sc.engine.rule.server.dictionary.entity.EnumDictionaryEntity;
-import io.sc.engine.rule.server.dictionary.entity.FolderDictionaryEntity;
-import io.sc.engine.rule.server.dictionary.entity.JavaClassDictionaryEntity;
-import io.sc.engine.rule.server.dictionary.entity.ReleasableDictionaryEntity;
-import io.sc.engine.rule.server.dictionary.entity.UserDefinedJavaClassDictionaryEntity;
 import io.sc.platform.orm.repository.DaoRepository;
-import org.springframework.stereotype.Service;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
-@Service("io.sc.engine.rule.server.dictionary.repository.DictionaryRepository" /* 避免和 io.sc.platform.system.dictionary.jpa.repository.DictionaryEntity 冲突 */)
+@Repository("io.sc.engine.rule.server.dictionary.repository.DictionaryRepository")
 public interface DictionaryRepository extends DaoRepository<DictionaryEntity,String>{
 	//====================================================================================
 	// DictionaryEntity

io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/repository/EnumDictionaryRepository.java

@@ -2,7 +2,9 @@ package io.sc.engine.rule.server.dictionary.repository;
 
 import io.sc.engine.rule.server.dictionary.entity.EnumDictionaryEntity;
 import io.sc.platform.orm.repository.DaoRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository("io.sc.engine.rule.server.dictionary.repository.EnumDictionaryRepository")
 public interface EnumDictionaryRepository extends DaoRepository<EnumDictionaryEntity,String>{
 	
 }

io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/repository/EnumItemRepository.java

@@ -4,7 +4,9 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import io.sc.engine.rule.server.dictionary.entity.EnumItemEntity;
 import io.sc.platform.orm.repository.DaoRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository("io.sc.engine.rule.server.dictionary.repository.EnumItemRepository")
 public interface EnumItemRepository extends DaoRepository<EnumItemEntity,String>{
 	@Query("select max(e.order)+1 from EnumItemEntity e where e.dictionary.id=:dictionaryId")
 	public Integer getNextOrder(@Param("dictionaryId") String dictionaryId);

io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/repository/UserDefinedJavaClassFieldRepository.java

@@ -6,7 +6,9 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import io.sc.engine.rule.server.dictionary.entity.UserDefinedJavaClassFieldEntity;
 import io.sc.platform.orm.repository.DaoRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository("io.sc.engine.rule.server.dictionary.repository.UserDefinedJavaClassFieldRepository")
 public interface UserDefinedJavaClassFieldRepository extends DaoRepository<UserDefinedJavaClassFieldEntity,String>{
 	/**
 	 * 通过数据字典ID，自定义 Java Class 字段代码和名称查询 自定义Java Class 字段实体，主要用于查询是否在当前数据字典中存在相同代码和名称的自定义 Java Class 字段。

io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/service/impl/DictionaryServiceImpl.java

@@ -49,7 +49,7 @@ import org.springframework.util.StringUtils;
 
 import java.util.*;
 
-@Service("reDictionaryService")
+@Service("io.sc.engine.rule.server.dictionary.service.impl.DictionaryServiceImpl")
 public class DictionaryServiceImpl extends DaoServiceImpl<DictionaryEntity, String, DictionaryRepository> implements DictionaryService{
 	@Autowired private ApplicationContext applicationContext;
 	@Autowired private MessageSource messageSource;

io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/dictionary/service/impl/EnumItemServiceImpl.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Optional;
 
-@Service("reDictionaryOptionItemService")
+@Service("io.sc.engine.rule.server.dictionary.service.impl.EnumItemServiceImpl")
 public class EnumItemServiceImpl extends DaoServiceImpl<EnumItemEntity, String, EnumItemRepository> implements EnumItemService{
 	@Autowired private EnumDictionaryRepository enumDictionaryRepository;