Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IDataMoreService.java

@@ -13,14 +13,4 @@ import java.util.List;
  **/
 public interface IDataMoreService {
 
-    /**
-     * 对象数据服务
-     * @param factoryStore
-     * @return
-     */
-    FactoryStore insertFactory(FactoryStore factoryStore);
-
-    List<FactoryStore> listFactoryStore();
-
-    List<FactoryStore> listFactoryStoreMore();
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java

@@ -93,12 +93,12 @@ public class OrganizeController {
 
     @DeleteMapping(value = "/delete/{id}")
     @ApiOperation(value = "删除组织", notes = "删除组织")
-    public ResultBean deleteOrganize(@PathVariable("id") String id) {
+    public ResultBean deleteOrganize(@PathVariable("id") String idStr) {
         try {
             // 数据校验
-            ValidatorBean.checkNotNull(id, "组织id 不能为空");
+            ValidatorBean.checkIsNumber(idStr.toString(), "您要删除的组织不存在");
 
-            organizeService.deleteOrganizeById(id);
+            organizeService.deleteOrganizeById(idStr);
             return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
@@ -131,7 +131,8 @@ public class OrganizeController {
     public ResultBean queryPosition(Organize organize, Pager pager){
         try{
             ListPager<Organize> listPager = organizeService.queryOrganize(organize, pager);
-            return ResultBean.success("操作成功").setListPager(listPager)
+            return ResultBean.success("操作成功")
+                    .setListPager(listPager)
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java

@@ -60,9 +60,9 @@ public class TaskTimeController {
 
             taskTime.setRedTimeName(taskTimeExpression.getName());
             taskTime.setRedTimeExpression(taskTimeExpression.getTimeExpression());
+            taskTime.setTaskStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
 
             ConvertBean.modelInitialize(taskTime, AuthUtil.getSessionUser());
-            taskTime.setTaskStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
 
             taskTime  = taskTimeService.insertTaskTime(taskTime);
             return ResultBean.success("操作成功")

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DataMoreServiceImpl.java

@@ -22,46 +22,4 @@ import java.util.List;
 @Service
 public class DataMoreServiceImpl implements IDataMoreService {
     private Logger LOGGER = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    private FactoryStoreRepository factoryStoreRepository;
-
-    @Autowired
-    private IFactoryStoreDao factoryStoreDao;
-
-    @Transactional
-    public FactoryStore insertFactory(FactoryStore factoryStore) {
-        LOGGER.info(factoryStore.toString());
-        factoryStoreRepository.executeUpdate("");
-        return null;
-    }
-
-    @Override
-    @ReadOnlyProperty
-    public List<FactoryStore> listFactoryStore() {
-        Iterable<FactoryStore> it =  null;
-
-        List<FactoryStore> fsList = new ArrayList<FactoryStore>();
-        it.forEach(factoryStore ->{
-            fsList.add(factoryStore);
-        });
-
-        return fsList;
-    }
-
-    @Override
-    @ReadOnlyProperty
-    public List<FactoryStore> listFactoryStoreMore() {
-        List<FactoryStore> fsList = factoryStoreDao.listFactoryStore();
-        for(FactoryStore fs : fsList){
-            LOGGER.info(fs.toString());
-        }
-
-        fsList = factoryStoreRepository.findAll();
-        for(FactoryStore fs : fsList){
-            LOGGER.info(fs.toString());
-        }
-
-        return fsList;
-    }
 }