diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java index 7a9ab59..f0dc009 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.IDataMoreService; +import cn.estsh.i3plus.core.apiservice.dao.IFactoryStoreDao; import cn.estsh.i3plus.pojo.platform.bean.FactoryStore; import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; @@ -26,7 +27,7 @@ public class FactoryStoreController { private Logger LOGGER = LoggerFactory.getLogger(this.getClass()); @Autowired - private IDataMoreService dataMoreService; + private IFactoryStoreDao dataMoreService; @PostMapping(value="/insert/{name}/{code}") @ApiOperation(value="service服务",notes="返回内容添加service") @@ -34,7 +35,7 @@ public class FactoryStoreController { FactoryStore fs = new FactoryStore(); fs.setStoreName(name); fs.setStoreCode(code); - dataMoreService.insertFactory(fs); +// dataMoreService.(fs); return new ResultBean(true,"工厂已保存"); } @@ -43,7 +44,7 @@ public class FactoryStoreController { @GetMapping(value="/list") @ApiOperation(value="查询服务",notes="返回列表") public ResultBean list(){ - List fsList = dataMoreService.listFactoryStoreMore(); + List fsList = null; return new ResultBean(true,"查询结果:" + fsList.size(),fsList); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java index 7a5a10a..170cc54 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.dao; +import cn.estsh.i3plus.pojo.platform.bean.FactoryStore; import org.springframework.stereotype.Repository; import java.util.List; @@ -14,7 +15,7 @@ import java.util.List; @Repository public interface IFactoryStoreDao { - List listFactoryStore(); + // List listFactoryStore(); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.java index 2b40885..f3d5a6e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.daoimpl; import cn.estsh.i3plus.core.apiservice.dao.IFactoryStoreDao; +import cn.estsh.i3plus.pojo.platform.bean.FactoryStore; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,12 +21,12 @@ public class FactoryStoreDaoImpl implements IFactoryStoreDao { @Autowired private EntityManager entityManager; - public List listFactoryStore(){ + /*public List listFactoryStore(){ List list = entityManager.createQuery("from FactoryStore").getResultList(); for(FactoryStore fs : list){ fs.setStoreCode(""); } return list; - } + }*/ } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java index edf8b84..232fb58 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.core.apiservice.schedulejob; +import cn.estsh.impp.framework.base.BaseImppScheduleJob; import cn.estsh.impp.framework.boot.core.ApplicationProperties; import cn.estsh.impp.framework.boot.quartz.job.ImppJob; +import io.swagger.annotations.ApiOperation; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -11,20 +13,22 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; /** - * @Description : + * @Description : 定时任务 * @Reference : * @Author : alwaysfrin * @CreateDate : 2018-09-30 13:25 * @Modify: **/ -public class DemoJob implements Job { +@ApiOperation("定时任务demo") +public class DemoJob extends BaseImppScheduleJob { public static final Logger LOGGER = LoggerFactory.getLogger(DemoJob.class); - @Autowired - public ApplicationProperties applicationProperties; - - public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + public DemoJob() { + super(DemoJob.class,"定时任务demo"); + } + @Override + public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { LOGGER.info("projectName:{},port:{}",applicationProperties.getApplicationName(),applicationProperties.getServerPort()); } }