Merge remote-tracking branch 'origin/master'

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<FactoryStore> fsList = dataMoreService.listFactoryStoreMore();
+        List<FactoryStore> fsList = null;
 
         return new ResultBean(true,"查询结果:" + fsList.size(),fsList);
     }

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<FactoryStore> listFactoryStore();
+   // List<FactoryStore> listFactoryStore();
 
 
 }

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<FactoryStore> listFactoryStore(){
+    /*public List<FactoryStore> listFactoryStore(){
         List<FactoryStore> list = entityManager.createQuery("from FactoryStore").getResultList();
 
         for(FactoryStore fs : list){
             fs.setStoreCode("");
         }
         return list;
-    }
+    }*/
 }

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());
     }
 }