diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/IDataSimpleService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/IDataSimpleService.java index 0a7cab1..3602c5c 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/IDataSimpleService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/IDataSimpleService.java @@ -17,32 +17,32 @@ public interface IDataSimpleService { void saveMachineFactory(MachineFactory machineFactory); - @Transactional + /*@Transactional void updateMachineFactoryNameById(long id, String factoryName); @Transactional void deleteMachineFactoryById(long id); - /** + *//** * 根据工厂名称查询 * @param factoryName * @return - */ + *//* @Transactional(readOnly = true) List findMachineFactoryByFactoryName(String factoryName); - /** + *//** * 根据code查询 * @param factoryCode * @return - */ + *//* @Transactional(readOnly = true) List findMachineFactoryByFactoryCode(String factoryCode); - /** + *//** * 特殊查询 * @return - */ + *//* @Transactional(readOnly = true) - List findMachineFactorySpecial(); + List findMachineFactorySpecial();*/ } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java index fd0bd2f..f24a71d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService; import cn.estsh.i3plus.platform.common.tool.EncryptTool; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.impp.framework.boot.auth.AuthUtil; @@ -30,15 +31,10 @@ import java.util.Map; **/ @RestController @Api(description="登陆授权demo") -public class DemoAuthController { +public class DemoAuthController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class); @Autowired private ISystemLoginService systemLoginService; - /** - * 缓存 - */ - @Resource(name="redisCore") - private ImppRedis imppRedis; @GetMapping(value="/login") @ApiOperation(value="登陆",notes="登陆") 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 deleted file mode 100644 index 170cc54..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.estsh.i3plus.core.apiservice.dao; - -import cn.estsh.i3plus.pojo.platform.bean.FactoryStore; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * @Description : - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-12 14:55 - * @Modify: - **/ -@Repository -public interface IFactoryStoreDao { - - // List listFactoryStore(); - - -} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IMachineFactoryDao.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IMachineFactoryDao.java index 87cd346..f3409ee 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IMachineFactoryDao.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IMachineFactoryDao.java @@ -10,17 +10,18 @@ import org.springframework.stereotype.Repository; import java.util.List; /** - * @Description : 继承了crudrepository,包含了常用hql方法 + * @Description : hql申明查询demo + * 继承了crudrepository,包含了常用hql方法 * @Reference : 如果需要执行原生sql,则添加 @Query(sql,nativeQuery=true) * @Author : alwaysfrin * @CreateDate : 2018-09-05 16:41 * @Modify: **/ -@Repository +//@Repository public interface IMachineFactoryDao extends CrudRepository { //此处findBy开头,会自动根据属性名进行查询 - List findByFactoryName(String factoryName); + /*List findByFactoryName(String factoryName); @Modifying @Query("update MachineFactory mf set mf.factoryName = :factoryName where mf.id = :id") @@ -40,5 +41,5 @@ public interface IMachineFactoryDao extends CrudRepository //自定义Hql @Query("from MachineFactory mf where mf.createDatetime like '2018-01-01%'") - List findMachineFactorySpecial(); + List findMachineFactorySpecial();*/ } 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 deleted file mode 100644 index f3d5a6e..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -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; - -import javax.persistence.EntityManager; -import java.util.List; - -/** - * @Description : 实现类留做备用demo,实际开发中并不需要 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-12 15:35 - * @Modify: - **/ -@Service -public class FactoryStoreDaoImpl implements IFactoryStoreDao { - - @Autowired - private EntityManager entityManager; - - /*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 232fb58..6581bb5 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,16 +1,11 @@ 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 cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob; +import cn.estsh.impp.framework.boot.init.ApplicationProperties; import io.swagger.annotations.ApiOperation; -import org.quartz.Job; import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; /** * @Description : 定时任务 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.java index 236b1dc..6c17061 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.java @@ -32,7 +32,7 @@ public class DataSimpleServiceImpl implements IDataSimpleService { machineFactory.setId(new SnowflakeIdMaker().nextId()); machineFactoryDao.save(machineFactory); } - +/* @Override public void updateMachineFactoryNameById(long id, String factoryName) { machineFactoryDao.updateMachineFactoryNameById(id,factoryName); @@ -59,5 +59,5 @@ public class DataSimpleServiceImpl implements IDataSimpleService { @Override public List findMachineFactorySpecial() { return machineFactoryDao.findMachineFactorySpecial(); - } + }*/ } diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ArraySort.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ArraySort.java new file mode 100644 index 0000000..5d501bb --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ArraySort.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +/** + * @Description : + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-11-09 10:00 + * @Modify: + **/ +public class ArraySort implements Runnable { + + private String num; + + public ArraySort(int num){ + this.num = num + ""; + } + + public static void main(String[] args){ + int[] num = {11,3,9,5,1,4,15}; + for(int i=0;i