From b82a9ec102b3f74b29c52e15ca953bde14fd8e35 Mon Sep 17 00:00:00 2001
From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com>
Date: Thu, 8 Nov 2018 10:36:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/busi/FactoryStoreController.java          |  6 +++---
 .../i3plus/core/apiservice/dao/IFactoryStoreDao.java     |  2 +-
 .../core/apiservice/daoimpl/FactoryStoreDaoImpl.java     |  4 ++--
 .../i3plus/core/apiservice/schedulejob/DemoJob.java      | 16 ++++++++++------
 4 files changed, 16 insertions(+), 12 deletions(-)

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..8a4279f 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
@@ -34,7 +34,7 @@ public class FactoryStoreController {
         FactoryStore fs = new FactoryStore();
         fs.setStoreName(name);
         fs.setStoreCode(code);
-        dataMoreService.insertFactory(fs);
+        //dataMoreService.insertFactory(fs);
 
         return new ResultBean(true,"工厂已保存");
     }
@@ -43,8 +43,8 @@ public class FactoryStoreController {
     @GetMapping(value="/list")
     @ApiOperation(value="查询服务",notes="返回列表")
     public ResultBean list(){
-        List<FactoryStore> fsList = dataMoreService.listFactoryStoreMore();
+        //List<FactoryStore> fsList = dataMoreService.listFactoryStoreMore();
 
-        return new ResultBean(true,"查询结果:" + fsList.size(),fsList);
+        return new ResultBean(true);
     }
 }
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..9c4b473 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
@@ -14,7 +14,7 @@ import java.util.List;
 @Repository
 public interface IFactoryStoreDao {
 
-    List<FactoryStore> listFactoryStore();
+   // List<FactoryStore> 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..aa782ea 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
@@ -20,12 +20,12 @@ public class FactoryStoreDaoImpl implements IFactoryStoreDao {
     @Autowired
     private EntityManager entityManager;
 
-    public List<FactoryStore> listFactoryStore(){
+    /*public List<FactoryStore> listFactoryStore(){
         List<FactoryStore> 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());
     }
 }