Merge remote-tracking branch 'remotes/origin/dev' into test

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

@@ -0,0 +1,120 @@
+package cn.estsh.i3plus.core.api.iservice.busi;
+
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
+import cn.estsh.i3plus.pojo.platform.bean.*;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * @Description :人员业务服务接口
+ * @Reference :
+ * @Author : Adair Peng
+ * @CreateDate : 2018-12-22 16:15
+ * @Modify:
+ **/
+public interface IPersonnelService {
+
+    @ApiOperation(value = "保存账号")
+    SysUser saveSysUser(SysUser user);
+
+    @ApiOperation(value = "保存用户")
+    SysUserInfo saveSysUserInfo(SysUserInfo info);
+
+    @ApiOperation(value = "更新用户状态")
+    void updateSysUserInfoStatus(Long userInfoId,Integer status);
+
+    @ApiOperation(value = "删除账号信息")
+    void deleteSysUser(Long[] userIdList,String userName);
+
+    @ApiOperation(value = "删除用户信息")
+    void deleteSysUserInfo(Long[] infoIdList,String userName);
+
+    @ApiOperation(value = "获取账号信息")
+    SysUser getSysUserById(Long id);
+
+    @ApiOperation(value = "查询账号信息")
+    List<SysUser> findSysUserByIds(Long[] ids);
+
+    @ApiOperation(value = "查询账号信息")
+    List<SysUser> querySysUserByUserDetailModelOrIds(UserDetailModel model, List<Long> ids);
+
+    @ApiOperation(value = "获取用户信息")
+    SysUserInfo getSysUserInfoById(Long id);
+
+    @ApiOperation(value = "获取部门")
+    SysDepartment getSysDepartmentById(Long id);
+
+    @ApiOperation(value = "获取岗位")
+    SysPosition getSysPositionById(Long id);
+
+    @ApiOperation(value = "获取组织")
+    SysOrganize getSysOrganizeById(Long id);
+
+    @ApiOperation(value = "用户登录")
+    SessionUser queryUserLogin(String userName, String password, String languageCode);
+
+    @ApiOperation(value = "查询用户信息")
+    ListPager<SysUserInfo> querySysUserInfo(UserDetailModel model, Pager pager);
+
+    @ApiOperation(value = "查询用户信息")
+    List<SysUserInfo> findSysUserInfoByIds(Long[] ids);
+
+    @ApiOperation(value = "查询账号角色关系")
+    List<SysRefUserRole> findSysRefUserRoleById(Long userId);
+
+    @ApiOperation(value = "查询账号部门关系")
+    List<SysRefUserDepartment> findSysRefUserDepartmentById(Long userId);
+
+    @ApiOperation(value = "查询账号部门关系")
+    List<SysRefUserDepartment> querySysRefUserDepartmentByUserDetailModel(UserDetailModel model);
+
+    @ApiOperation(value = "查询用户部门关系")
+    List<SysRefUserInfoDepartment> findSysRefUserInfoDepartmentById(Long infoId);
+
+    @ApiOperation(value = "查询用户部门关系")
+    List<SysDepartment> findSysUserInfoDepartmentByInfoId(Long infoId);
+
+    @ApiOperation(value = "查询账号部门关系")
+    List<SysDepartment> findSysUserDepartmentByInfoId(Long infoId);
+
+    @ApiOperation(value = "查询用户部门关系")
+    List<SysOrganize> findSysUserInfoOrganize(Long infoId);
+
+    @ApiOperation(value = "查询账户组织关系")
+    List<SysOrganize> findSysUserOrganize(Long infoId);
+
+    @ApiOperation(value = "查询用户岗位关系")
+    List<SysRefUserPosition> findSysRefUserPositionById(Long infoId);
+
+    @ApiOperation(value = "封装用户信息",notes = "封装登录完成后的用户信息(角色、权限、部门、操作部门、组织、岗位)")
+    SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode);
+
+    @ApiOperation(value = "账号唯一检查")
+    void checkSysUserOnly(SysUser user);
+
+    @ApiOperation(value = "刷新组织冗余")
+    void refreshRefSysUserOrganizeRdd(Long organizeIds);
+
+    @ApiOperation(value = "刷新账号部门")
+    void refreshRefSysUserDepartment(Long userId, Long[] departmentIds);
+
+    @ApiOperation(value = "刷新账号角色")
+    void refreshRefSysUserRole(Long userId, Long[] roleIds);
+
+    @ApiOperation(value = "刷新账号部门")
+    void refreshRefSysUserDepartmentRdd(Long departmentId);
+
+    @ApiOperation(value = "刷新用户部门")
+    void refreshRefSysUserInfoDepartment(Long userInfoId, Long[] departmentIds);
+    @ApiOperation(value = "刷新用户部门")
+    void refreshRefSysUserInfoDepartmentRdd(Long departmentId);
+
+    @ApiOperation(value = "刷新用户岗位")
+    void refreshRefSysUserInfoPosition(Long userInfoId, Long[] positionIds);
+    @ApiOperation(value = "刷新用户岗位")
+    void refreshRefSysUserInfoPositionRdd(Long positionId);
+
+}

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

@@ -96,4 +96,11 @@ public interface ISysDictionaryService {
      */
     @ApiOperation(value = "根据父节点 以及当前节点CODE 获取字典信息")
     SysDictionary getSysDictionaryByParentCodeAndCode(String parentCode,String code);
+
+    /**
+     * 设置默认字典项
+     * @param id
+     */
+    @ApiOperation(value = "设置默认字典项",notes = "根据id设置默认字典项")
+    void updateSysDictionaryDefaultById(Long id);
 }

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

@@ -0,0 +1,79 @@
+package cn.estsh.i3plus.core.api.iservice.busi;
+
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.platform.bean.SysRefTaskCyclePlan;
+import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * @Description : 任务周期业务接口
+ * @Reference   :
+ * @Author      : wei.peng
+ * @Date        : 2018-10-22 16:58:43.771
+ * @Modify      :
+ **/
+public interface ISysTaskCycleService {
+
+    /**
+     * 修改任务周期信息
+     * @param sysTaskCycle
+     */
+    @ApiOperation(value = "修改任务周期",notes = "修改任务周期")
+    void updateSysTaskCycle(SysTaskCycle sysTaskCycle);
+
+    /**
+     * 根据id删除任务周期
+     * @param id
+     */
+    @ApiOperation(value = "删除任务周期",notes = "根据id删除任务周期")
+    void deleteSysTaskCycleById(Long id);
+
+    /**
+     * 新增任务周期
+     * @param sysTaskCycle
+     * @return
+     */
+    @ApiOperation(value = "新增任务周期",notes = "新增任务周期")
+    SysTaskCycle insertSysTaskCycle(SysTaskCycle sysTaskCycle);
+
+    /**
+     * 查询所有任务周期信息
+     * @return
+     */
+    @ApiOperation(value = "查询所有任务周期信息",notes = "查询所有任务周期信息")
+    List<SysTaskCycle> listSysTaskCycle();
+
+    /**
+     * 根据ID 查询任务周期
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "根据ID 查询任务周期",notes = "根据ID 查询任务周期")
+    SysTaskCycle getSysTaskCycleById(Long id);
+
+    /**
+     * 任务周期查询，分页，排序
+     * @param sysTaskCycle
+     * @param pager
+     * @return
+     */
+    @ApiOperation(value = "任务周期查询，分页，排序",notes = "任务周期查询，分页，排序")
+    ListPager querySysTaskCycleByPager(SysTaskCycle sysTaskCycle, Pager pager);
+
+    /**
+     * 任务周期批量删除
+     * @param ids
+     */
+    @ApiOperation(value = "根据id批量删除任务周期",notes = "根据id批量删除任务周期")
+    void deleteSysTaskCycleByIds(Long[] ids);
+
+    /**
+     * 查询任务周期所关联的任务计划信息
+     * @return
+     */
+    @ApiOperation(value = "根据任务周期id查询相关任务计划信息",notes = "根据任务周期id查询相关任务计划信息")
+    List<SysRefTaskCyclePlan> findRefTaskCyclePlanByCycleId(Long cycleId);
+}

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

@@ -0,0 +1,110 @@
+package cn.estsh.i3plus.core.api.iservice.busi;
+
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
+import cn.estsh.i3plus.pojo.platform.bean.SysTask;
+import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan;
+import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * @Description : 任务计划业务接口
+ * @Reference   :
+ * @Author      : yunhao
+ * @Date        : 2018-12-26 22:08
+ * @Modify      :
+ **/
+public interface ISysTaskPlanService {
+
+    /**
+     * 新增任务计划
+     * @param sysTaskPlan 任务计划
+     * @param sysTaskCycle 任务周期
+     * @param sysTask 任务
+     * @return
+     */
+    @ApiOperation(value = "新增任务计划",notes = "新增任务计划")
+    SysTaskPlan insertSysTaskPlan(SysTaskPlan sysTaskPlan, SysTaskCycle sysTaskCycle, SysTask sysTask);
+
+    /**
+     * 修改任务计划
+     * @param sysTaskPlan 任务计划
+     * @param sysTaskCycle 任务周期
+     */
+    @ApiOperation(value = "修改任务计划",notes = "修改任务计划")
+    void updateSysTaskPlan(SysTaskPlan sysTaskPlan, SysTaskCycle sysTaskCycle);
+
+    /**
+     * 修改任务状态
+     * @param id        任务ID
+     * @param status    任务状态
+     * @param user      当前会话用户
+     */
+    @ApiOperation(value = "修改任务计划状态",notes = "修改任务计划状态")
+    void updateSysTaskPlanStatus(Long id, int status, SessionUser user);
+
+    /**
+     * 根据根据id删除数据
+     * @param id
+     */
+    @ApiOperation(value = "根据根据id删除数据")
+    void deleteSysTaskPlanById(Long id);
+
+    /**
+     * 查询所有任务计划
+     * @return
+     */
+    @ApiOperation(value = "查询所有任务计划")
+    List<SysTaskPlan> listSysTaskPlan();
+
+    /**
+     * 根据id查询任务计划数据
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "根据id查询任务计划数据",notes = "根据id查询任务计划数据")
+    SysTaskPlan getSysTaskPlanById(Long id);
+
+    /**
+     * 任务计划复杂查询，分页，排序
+     * @param sysTaskPlan
+     * @param pager
+     * @return
+     */
+    @ApiOperation(value = "任务计划复杂查询，分页，排序",notes = "任务计划复杂查询，分页，排序")
+    ListPager querySysTaskPlanByPager(SysTaskPlan sysTaskPlan, Pager pager);
+
+    /**
+     * 立即执行任务计划
+     * @param sysTaskPlan
+     */
+    @ApiOperation(value = "立即执行任务计划",notes = "立即执行任务计划")
+    void executeSysTaskPlan(SysTaskPlan sysTaskPlan);
+
+    /**
+     * 根据任务计划名称与组名称查询
+     * @param name
+     * @param groupName
+     * @return
+     */
+    @ApiOperation(value = "查询任务计划",notes = "根据任务计划名称与组名称查询")
+    SysTaskPlan getSysTaskPlanByNameAndGroup(String name, String groupName);
+
+    /**
+     * 添加任务计划执行日志
+     * @param sysLogTaskTime
+     */
+    @ApiOperation(value = "添加任务计划执行日志",notes = "添加任务计划执行日志")
+    void logInsertSysLogTaskTime(SysLogTaskTime sysLogTaskTime);
+
+    /**
+     * 修改任务计划信息，不会更新quartz数据库
+     * @param sysTaskPlan
+     */
+    @ApiOperation(value = "修改任务计划信息",notes = "修改任务计划信息，不会更新quartz数据库")
+    void updateSysTaskPlan(SysTaskPlan sysTaskPlan);
+}

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

@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.core.api.iservice.busi;
+
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.platform.bean.SysTask;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+
+/**
+ * @Description : 任务管理业务接口
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2018-12-26 21:17
+ * @Modify:
+ **/
+public interface ISysTaskService {
+
+    /**
+     * 添加任务
+     * @param sysTask
+     * @return
+     */
+    @ApiOperation(value = "添加任务",notes = "添加任务")
+    SysTask insertSysTask(SysTask sysTask);
+
+    /**
+     * 修改任务
+     * @param sysTask
+     * @return
+     */
+    @ApiOperation(value = "修改任务信息",notes = "修改任务信息")
+    void updateSysTask(SysTask sysTask);
+
+    /**
+     * 查询所有任务
+     * @return
+     */
+    @ApiOperation(value = "查询所有任务",notes = "查询所有任务")
+    List<SysTask> listSysTask();
+
+    /**
+     * 根据id查询任务信息
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "根据id查询任务信息",notes = "根据id查询任务信息")
+    SysTask getSysTaskById(Long id);
+
+    /**
+     * 根据id删除任务
+     * @param id
+     */
+    @ApiOperation(value = "删除任务",notes = "根据id删除任务")
+    void deleteSysTaskById(Long id);
+
+    /**
+     * 根据id批量删除任务
+     * @param ids
+     */
+    @ApiOperation(value = "删除任务",notes = "根据id批量删除任务")
+    void deleteSysTaskByIds(Long[] ids);
+
+    /**
+     * 任务管理复杂查询，分页，排序
+     * @param sysTask
+     * @param pager
+     * @return
+     */
+    @ApiOperation(value = "任务管理复杂查询，分页，排序",notes = "任务管理复杂查询，分页，排序")
+    ListPager<SysTask> querySysTaskByPager(SysTask sysTask, Pager pager);
+}

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

@@ -1,79 +0,0 @@
-package cn.estsh.i3plus.core.api.iservice.busi;
-
-import cn.estsh.i3plus.pojo.base.bean.ListPager;
-import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.platform.bean.SysRefExpressionTrigger;
-import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression;
-import io.swagger.annotations.ApiOperation;
-
-import java.util.List;
-
-/**
- * @Description : 定时任务表达式业务接口
- * @Reference   :
- * @Author      : wei.peng
- * @Date        : 2018-10-22 16:58:43.771
- * @Modify      :
- **/
-public interface ISysTaskTimeExpressionService {
-
-    /**
-     * 修改数据
-     * @param taskTimeExpression
-     */
-    @ApiOperation(value = "修改数据")
-    void updateSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression);
-
-    /**
-     * 根据id删除数据
-     * @param id
-     */
-    @ApiOperation(value = "根据id删除数据")
-    void deleteSysTaskTimeExpressionById(Long id);
-
-    /**
-     * 新增数据
-     * @param taskTimeExpression
-     * @return
-     */
-    @ApiOperation(value = "新增数据")
-    SysTaskTimeExpression insertSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression);
-
-    /**
-     * 查询所有数据
-     * @return
-     */
-    @ApiOperation(value = "查询所有数据")
-    List<SysTaskTimeExpression> listSysTaskTimeExpression();
-
-    /**
-     * 根据ID 查询任务表达式
-     * @param id
-     * @return
-     */
-    @ApiOperation(value = "根据ID 查询任务表达式")
-    SysTaskTimeExpression getSysTaskTimeExpressionById(Long id);
-
-    /**
-     * 任务表达式查询，分页，排序
-     * @param taskTimeExpression
-     * @param pager
-     * @return
-     */
-    @ApiOperation(value = "任务表达式查询，分页，排序")
-    ListPager querySysTaskTimeExpressionByPager(SysTaskTimeExpression taskTimeExpression, Pager pager);
-
-    /**
-     * 任务表达式批量删除
-     * @param ids
-     */
-    @ApiOperation(value = "任务表达式批量删除")
-    void deleteSysTaskTimeExpressionByIds(Long[] ids);
-
-    /**
-     * 查询表达式所关联的定时任务信息
-     * @return
-     */
-    @ApiOperation(value = "根据表达式id查询表达式关联任务信息",notes = "根据表达式id查询表达式关联任务信息")
-    List<SysRefExpressionTrigger> findRefExpressionTriggerList(Long id);
-}

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

@@ -18,14 +18,14 @@ public interface ISysTaskTimeRecordingService {
      * 修改数据
      * @param taskTimeRecording
      */
-    @ApiOperation(value = "更新任务表达式信息")
+    @ApiOperation(value = "更新任务周期信息")
     void updateSysTaskTimeRecording(SysLogTaskTime taskTimeRecording);
 
     /**
      * 根据Key 删除数据
      * @param id
      */
-    @ApiOperation(value = "删除任务表达式信息",notes = "根据 ID 删除任务表达式信息")
+    @ApiOperation(value = "删除任务周期信息",notes = "根据 ID 删除任务周期信息")
     void deleteSysTaskTimeRecordingById(Long id);
 
     /**
@@ -33,14 +33,14 @@ public interface ISysTaskTimeRecordingService {
      * @param taskTimeRecording
      * @return
      */
-    @ApiOperation(value = "新增任务表达式信息")
+    @ApiOperation(value = "新增任务周期信息")
     SysLogTaskTime insertSysTaskTimeRecording(SysLogTaskTime taskTimeRecording);
 
     /**
      * 查询所有数据
      * @return
      */
-    @ApiOperation(value = "查询任务表达式信息",notes = "查询所有任务表达式信息")
+    @ApiOperation(value = "查询任务周期信息",notes = "查询所有任务周期信息")
     List<SysLogTaskTime> findSysTaskTimeRecordingAll();
 
     /**
@@ -48,6 +48,6 @@ public interface ISysTaskTimeRecordingService {
      * @param id
      * @return
      */
-    @ApiOperation(value = "查询任务表达式信息",notes = "查询 ID 任务表达式信息")
+    @ApiOperation(value = "查询任务周期信息",notes = "查询 ID 任务周期信息")
     SysLogTaskTime getSysTaskTimeRecordingById(Long id);
 }

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

@@ -1,130 +0,0 @@
-package cn.estsh.i3plus.core.api.iservice.busi;
-
-import cn.estsh.i3plus.pojo.base.bean.ListPager;
-import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
-import cn.estsh.i3plus.pojo.platform.bean.SysTaskTime;
-import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression;
-import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
-import io.swagger.annotations.ApiOperation;
-
-import java.util.List;
-
-/**
- * @Description : 定时任务业务接口
- * @Reference   :
- * @Author      : wei.peng
- * @Date        : 2018-10-22 16:58:43.968
- * @Modify      :
- **/
-public interface ISysTaskTimeService {
-
-    /**
-     *  新增定时任务
-     * @param taskTime
-     * @return
-     */
-    @ApiOperation(value = "新增定时任务")
-    SysTaskTime insertSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression);
-
-    /**
-     * 修改定时任务
-     * @param taskTime
-     */
-    @ApiOperation(value = "修改定时任务")
-    void updateSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression);
-
-    /**
-     * 修改任务状态
-     * @param id        任务ID
-     * @param status    任务状态
-     * @param user      当前会话用户
-     */
-    @ApiOperation(value = "修改任务状态")
-    void updateSysTaskTimeStatus(Long id, int status, SessionUser user);
-
-    /**
-     * 根据根据id删除数据
-     * @param id
-     */
-    @ApiOperation(value = "根据根据id删除数据")
-    void deleteSysTaskTimeById(Long id);
-
-    /**
-     * 查询所有数据
-     * @return
-     */
-    @ApiOperation(value = "查询所有数据")
-    List<SysTaskTime> listSysTaskTime();
-
-    /**
-     * 根据id 数据
-     * @param id
-     * @return
-     */
-    @ApiOperation(value = "根据id 数据")
-    SysTaskTime getSysTaskTimeById(Long id);
-
-    /**
-     * 定时任务复制查询，分页，排序
-     * @param taskTime
-     * @param pager
-     * @return
-     */
-    @ApiOperation(value = "定时任务复制查询，分页，排序")
-    ListPager querySysTaskTimeByPager(SysTaskTime taskTime, Pager pager);
-
-    /**
-     * 根据id批量删除定时任务
-     * @param ids
-     */
-    @ApiOperation(value = "根据id批量删除定时任务")
-    void deleteSysTaskTimeByIds(Long[] ids);
-
-    /**
-     * 批量修改定时任务状态
-     * @param ids
-     *
-     */
-    @ApiOperation(value = "批量修改定时任务状态")
-    void updateSysTaskTimeStatusByIds(Long[] ids, Integer status);
-
-    /**
-     * 修改最后时间
-     * @param lastDate
-     * @param name
-     * @param groupName
-     */
-    @ApiOperation(value = "修改最后时间")
-    void doSysTaskTimeLastDateByNameAndGroupName(String lastDate,String name,String groupName);
-
-    /**
-     * 立即执行
-     * @param id
-     */
-    @ApiOperation(value = "立即执行")
-    void executeSysTaskTimeById(Long id);
-
-    /**
-     * 根据定时任务名称与组名称查询
-     * @param name
-     * @param groupName
-     * @return
-     */
-    @ApiOperation(value = "查询定时任务",notes = "根据定时任务名称与组名称查询")
-    SysTaskTime getSysTaskTimeByNameAndGroup(String name,String groupName);
-
-    /**
-     * 添加定时任务执行日志
-     * @param sysLogTaskTime
-     */
-    @ApiOperation(value = "添加定时任务执行日志",notes = "添加定时任务执行日志")
-    void logInsertSysLogTaskTime(SysLogTaskTime sysLogTaskTime);
-
-    /**
-     * 修改定时任务信息，不会更新quartz数据库
-     * @param sysTaskTime
-     */
-    @ApiOperation(value = "修改定时任务信息",notes = "修改定时任务信息，不会更新quartz数据库")
-    void updateSysTaskTime(SysTaskTime sysTaskTime);
-}

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.api.iservice.busi;
 
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 import io.swagger.annotations.ApiOperation;
 
@@ -121,7 +122,7 @@ public interface ISysUserInfoService {
     List<SysRefUserDepartment> findRefUserDepartmentByUserId(Long userId);
 
     @ApiOperation(value = "关系查询-用户部门",notes = "根据部门或者组织集合查询用户部门关系")
-    List<SysRefUserDepartment> querySysRefUserDepartment(SysUserInfo userInfo);
+    List<SysRefUserDepartment> querySysRefUserDepartment(UserDetailModel model);
 
     /**
      * 查询用户岗位关系
@@ -137,9 +138,12 @@ public interface ISysUserInfoService {
      * @param idList 用户ID 集合
      * @return
      */
-    @ApiOperation(value = "查询用户信息-",notes = "根据组织、部门、名称+工号组合查询条件查询用户信息")
+    @ApiOperation(value = "查询用户信息",notes = "根据组织、部门、名称+工号组合查询条件查询用户信息")
     List<SysUserInfo> querySysUserInfoList(SysUserInfo info, List<Long> idList);
 
+    @ApiOperation(value = "查询用户信息",notes = "根据组织、部门、名称+工号组合查询条件查询用户信息")
+    List<SysUserInfo> querySysUserInfoList(UserDetailModel model, List<Long> idList);
+
     /**
      * 用户唯一校验  用户工号
      * @param no

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

@@ -117,6 +117,9 @@ public interface ISysUserService {
     @ApiOperation(value = "查询所有",notes = "查询所有账号信息")
     List<SysUser> list();
 
+    @ApiOperation(value = "查询用户ID 集合",notes = "根据角色Id 查询用户ID集合")
+    List<Long> findSysUserIdListByRoleId(Long roleId);
+
     /**
      * 复杂查询
      * @param user

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

@@ -18,6 +18,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.Map;
 
 @RestController
@@ -125,4 +129,39 @@ public class DemoCloudController {
         LOGGER.info("【impp-core-more-obj接受多对象模型】objBean:{},pager:{}" ,roleBean.getObj(),roleBean.getPager());
         return ResultBean.success("返回：" + roleBean).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
     }
+
+    @Autowired
+    public HttpServletRequest request;
+
+    @PostMapping(value="/test-post-request-body")
+    @ApiOperation(value="测试request-body")
+    public ResultBean testPostFeignRequestBody(@RequestParam("test") String test,@RequestBody BaseModelBean<SysRole> roleBean) {
+        LOGGER.info("PostMapping【param】{}" ,test);
+
+        Map<String, String> map = new HashMap<String, String>();
+        Enumeration headerNames = request.getHeaderNames();
+        while (headerNames.hasMoreElements()) {
+            String key = (String) headerNames.nextElement();
+            String value = request.getHeader(key);
+            System.out.println("key:"+key + "  ,value: " + value);
+        }
+
+        LOGGER.info("【测试request-body-post】objBean:{},pager:{}" ,roleBean.getObj(),roleBean.getPager());
+        return ResultBean.success("返回：" + roleBean).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+    }
+
+    @GetMapping(value="/test-get-request-body")
+    @ApiOperation(value="测试request-body")
+    public ResultBean testGetFeignRequestBody(@RequestBody BaseModelBean<SysRole> roleBean) {
+        Map<String, String> map = new HashMap<String, String>();
+        Enumeration headerNames = request.getHeaderNames();
+        while (headerNames.hasMoreElements()) {
+            String key = (String) headerNames.nextElement();
+            String value = request.getHeader(key);
+            System.out.println("key:"+key + "  ,value: " + value);
+        }
+
+        LOGGER.info("【测试request-body-get】objBean:{},pager:{}" ,roleBean.getObj(),roleBean.getPager());
+        return ResultBean.success("返回：" + roleBean).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+    }
 }

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

@@ -2,8 +2,11 @@ package cn.estsh.i3plus.core.apiservice.controller;
 
 import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueueConfig;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.i3plus.pojo.mes.MachineFactory;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -233,4 +236,40 @@ public class DemoRedisMqController extends CoreBaseController{
 
         return new ResultBean(true,"操作成功 ： " + locale.getLanguage() + "  " + locale.getCountry());
     }
+
+    @Resource(name="redisSession")
+    private ImppRedis redisSession;
+
+    @GetMapping(value="/set-redis")
+    @ApiOperation(value="setredis")
+    public ResultBean setRedis(String key,String value) {
+        //redisSession.putObject(key,value);
+        //redisCore.putObject(key,value);
+
+
+        ResultBean rs = new ResultBean(true,"yes");
+        rs.setPager(new Pager(100));
+        redisSession.putObject("rs",rs);
+        redisCore.putObject("rs",rs);
+
+        return new ResultBean(true,"操作成功 ： " + key + " : " + value);
+    }
+
+    @GetMapping(value="/get-redis")
+    @ApiOperation(value="getredis")
+    public ResultBean getRedis(String key) {
+        Object  d1 = redisSession.getObject(key);
+        System.out.println("redisSession-d1==" + d1);
+        Object d2 = redisCore.getObject(key);
+
+        if(d1 != null) {
+            SessionUser sessionUser = AuthUtil.getSessionUser();
+            System.out.println(sessionUser.toString());
+        }
+
+        System.out.println("redisCore-d2==" + d2);
+        System.out.println(d1 == null?"null":d1.toString());
+        System.out.println(d2 == null?"null":d2.toString());
+        return new ResultBean(true,"操作成功 ： " + d1 + " : " + d2);
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java

@@ -1,10 +1,7 @@
 package cn.estsh.i3plus.core.apiservice.controller.base;
 
 import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService;
-import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService;
-import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleLanguageService;
-import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
-import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
+import cn.estsh.i3plus.core.api.iservice.busi.*;
 import cn.estsh.i3plus.core.apiservice.controller.DemoAuthController;
 import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.SysLocaleLanguageService;
 import cn.estsh.i3plus.platform.common.tool.ServletRequestTool;
@@ -58,6 +55,9 @@ public class WhiteController extends CoreBaseController {
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private IPersonnelService personnelService;
+
     @GetMapping(value = "/sys-locale-language/list")
     @ApiOperation(value = "查询全部系统语言",notes = "查询全部系统语言")
     public ResultBean listSysLocaleLanguage(){

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

@@ -0,0 +1,450 @@
+package cn.estsh.i3plus.core.apiservice.controller.busi;
+
+import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
+import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.platform.common.tool.EncryptTool;
+import cn.estsh.i3plus.platform.common.tool.StringTool;
+import cn.estsh.i3plus.platform.common.tool.TimeTool;
+import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
+import cn.estsh.i3plus.pojo.platform.bean.*;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
+import cn.estsh.impp.framework.boot.exception.ImppBusiException;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
+import cn.estsh.impp.framework.boot.util.ResultBean;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Adair Peng
+ * @CreateDate : 2018-12-24 14:02
+ * @Modify:
+ **/
+@RestController
+@Api(description = "系统用户管理服务")
+@RequestMapping(PlatformConstWords.BASE_URL +"/personnel")
+public class PersonnelController  extends CoreBaseController {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(PersonnelController.class);
+
+    @Autowired
+    private IPersonnelService personnelService;
+
+    @Autowired
+    private ISysFileService fileService;
+
+
+    @PostMapping(value="/user-detail/insert")
+    @ApiOperation(value="添加用户信息",notes="返回内容添加用户信息")
+    public ResultBean insertUserDetailModel(UserDetailModel model) {
+        try {
+            SysUser user = model.getSysUser();
+            SysUserInfo info = model.getSysUserInfo();
+
+            checkUserDetailModel(model, false);
+            personnelService.checkSysUserOnly(user);
+
+            initUserDetail(info,user);
+
+            SysDepartment infoDepartment = personnelService.getSysDepartmentById(Long.parseLong(model.getInfoDepartmentId()));
+            if(infoDepartment == null){
+                ValidatorBean.checkNotNull(infoDepartment,"用户主部门不存在");
+            }
+            SysOrganize infoOrganize = personnelService.getSysOrganizeById(infoDepartment.getOrganizeId());
+            SysPosition position = personnelService.getSysPositionById(Long.parseLong(model.getInfoPositionId()));
+            if(infoDepartment == null){
+                ValidatorBean.checkNotNull(position,"用户主岗位存在");
+            }
+
+            SysDepartment userDepartment = personnelService.getSysDepartmentById(Long.parseLong(model.getUserDepartmentId()));
+            if(userDepartment == null){
+                ValidatorBean.checkNotNull(userDepartment,"账号主部门不存在");
+            }
+            SysOrganize userOrganize = personnelService.getSysOrganizeById(userDepartment.getOrganizeId());
+
+            info.setDepartmentId(infoDepartment.getId());
+            info.setDepartmentNameRdd(infoDepartment.getName());
+            info.setOrganizeId(infoOrganize.getId());
+            info.setOrganizeNameRdd(infoOrganize.getName());
+            info.setOrganizeCode(infoOrganize.getOrganizeCode());
+            info.setPositionId(position.getId());
+            info.setPositionNameRdd(position.getName());
+            personnelService.saveSysUserInfo(info);
+
+            user.setDepartmentId(userDepartment.getId());
+            user.setDepartmentNameRdd(userDepartment.getName());
+            user.setOrganizeId(userOrganize.getId());
+            user.setOrganizeNameRdd(userOrganize.getName());
+            user.setOrganizeCode(userOrganize.getOrganizeCode());
+            user.setUserInfoId(info.getId());
+            refreshSysUserPassword(user);
+            personnelService.saveSysUser(user);
+
+            info.setUserId(user.getId());
+            personnelService.saveSysUserInfo(info);
+
+            // 关系 刷新
+            refreshRef(user, info, model);
+
+            return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
+        }
+    }
+
+    @PutMapping(value="/user-detail/update")
+    @ApiOperation(value="添加用户信息",notes="返回内容添加用户信息")
+    public ResultBean updateUserDetailModel(UserDetailModel model) {
+        try {
+            SysUser user = model.getSysUser();
+            SysUserInfo info = model.getSysUserInfo();
+
+            checkUserDetailModel(model, true);
+            personnelService.checkSysUserOnly(user);
+
+            initUserDetail(info,user);
+
+            SysDepartment infoDepartment = personnelService.getSysDepartmentById(Long.parseLong(model.getInfoDepartmentId()));
+            if(infoDepartment == null){
+                ValidatorBean.checkNotNull(infoDepartment,"用户主部门不存在");
+            }
+            SysOrganize infoOrganize = personnelService.getSysOrganizeById(infoDepartment.getOrganizeId());
+            SysPosition position = personnelService.getSysPositionById(Long.parseLong(model.getInfoPositionId()));
+            if(infoDepartment == null){
+                ValidatorBean.checkNotNull(position,"用户主岗位存在");
+            }
+
+            SysDepartment userDepartment = personnelService.getSysDepartmentById(Long.parseLong(model.getUserDepartmentId()));
+            if(userDepartment == null){
+                ValidatorBean.checkNotNull(userDepartment,"账号主部门不存在");
+            }
+            SysOrganize userOrganize = personnelService.getSysOrganizeById(userDepartment.getOrganizeId());
+
+            info.setDepartmentId(infoDepartment.getId());
+            info.setDepartmentNameRdd(infoDepartment.getName());
+            info.setOrganizeId(infoOrganize.getId());
+            info.setOrganizeNameRdd(infoOrganize.getName());
+            info.setOrganizeCode(infoOrganize.getOrganizeCode());
+            info.setPositionId(position.getId());
+            info.setPositionNameRdd(position.getName());
+
+            user.setDepartmentId(userDepartment.getId());
+            user.setDepartmentNameRdd(userDepartment.getName());
+            user.setOrganizeId(userOrganize.getId());
+            user.setOrganizeNameRdd(userOrganize.getName());
+
+            // 关系 刷新
+            refreshRef(user, info, model);
+            // 更新 密码
+            refreshSysUserPassword(user);
+
+            personnelService.saveSysUser(user);
+            personnelService.saveSysUserInfo(info);
+
+            return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
+        }
+    }
+
+    @GetMapping(value = "/user-info/get-detail/{id}")
+    @ApiOperation(value = "获取用户信息", notes = "查询根据ID查询用户相关所有信息")
+    public ResultBean getUserInfoById(@PathVariable("id") String id){
+        try {
+            // 数据校验
+            ValidatorBean.checkNotNull(id, "角色id 不能为空");
+            Map<String,Object> resultMap = new HashMap<>();
+
+
+            SysUserInfo info = personnelService.getSysUserInfoById(Long.parseLong(id));
+            SysUser user = personnelService.getSysUserById(info.getUserId());
+
+            List<SysRefUserInfoDepartment> refUserInfoDepartmentList = personnelService.findSysRefUserInfoDepartmentById(info.getId());
+            List<SysRefUserPosition> refUserPositionList = personnelService.findSysRefUserPositionById(info.getId());
+            List<SysRefUserDepartment> refUserDepartmentList = personnelService.findSysRefUserDepartmentById(user.getId());
+            List<SysRefUserRole> refUserRoleList = personnelService.findSysRefUserRoleById(user.getId());
+            SysFile image = info.getUserImageId() != null ? fileService.getSysFileById(info.getUserImageId()) : null;
+
+            resultMap.put("user",user);
+            resultMap.put("refUserInfoDepartmentList",refUserInfoDepartmentList);
+            resultMap.put("refUserPositionList",refUserPositionList);
+            resultMap.put("refUserDepartmentList",refUserDepartmentList);
+            resultMap.put("refUserRoleList",refUserRoleList);
+            resultMap.put("image",image);
+
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(resultMap);
+        } catch (ImppBusiException busExcep) {
+            LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
+
+    @DeleteMapping(value="/user-info/delete/{id}")
+    @ApiOperation(value="删除用户信息",notes="根据用户信息id删除信息")
+    public ResultBean deleteSysUserInfo(@PathVariable("id") String id){
+        try {
+            //条件验证
+            ValidatorBean.checkNotNull(id,"id为空");
+
+            SysUserInfo info = personnelService.getSysUserInfoById(Long.parseLong(id));
+            if(info != null){
+                personnelService.deleteSysUserInfo(new Long[]{info.getId()},getSessionUser().getUserName());
+                personnelService.deleteSysUser(new Long[]{info.getUserId()},getSessionUser().getUserName());
+
+                return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+            }else{
+                return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
+            }
+        } catch (ImppBusiException busExcep) {
+            LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
+        }
+    }
+
+    @DeleteMapping(value = "/user-info/batch-delete")
+    @ApiOperation(value = "根据id批量删除", notes = "根据id批量删除")
+    public ResultBean deleteSysUserInfoByIds(String[] ids){
+        try{
+            ids = ConvertBean.modelSafeArrayNumber(ids,true);
+            if(ids.length == 0){
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                        .setErrorDetail("请选择需要删除的用户信息。")
+                        .build();
+            }
+
+            List<SysUserInfo> list = personnelService.findSysUserInfoByIds(StringTool.getArrayLong(ids));
+
+            if(list != null && list.size() > 0){
+                Long[] infoIds = new Long[list.size()];
+                Long[] userIds = new Long[list.size()];
+
+                for (int i = 0; i < list.size(); i++) {
+                    infoIds[i] = list.get(i).getId();
+                    userIds[i] = list.get(i).getUserId();
+                }
+
+                personnelService.deleteSysUserInfo(infoIds,getSessionUser().getUserName());
+                personnelService.deleteSysUser(userIds,getSessionUser().getUserName());
+
+                return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+            }else{
+                return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
+            }
+        }catch(ImppBusiException busExcep){
+            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
+
+    @DeleteMapping(value="/user/delete/{id}")
+    @ApiOperation(value="删除账号信息",notes="根据账号信息id删除信息")
+    public ResultBean deleteSysUser(@PathVariable("id") String id){
+        try {
+            //条件验证
+            ValidatorBean.checkNotNull(id,"id为空");
+
+            SysUser user = personnelService.getSysUserById(Long.parseLong(id));
+            if(user != null){
+                personnelService.deleteSysUserInfo(new Long[]{user.getUserInfoId()},getSessionUser().getUserName());
+                personnelService.deleteSysUser(new Long[]{user.getId()},getSessionUser().getUserName());
+
+                return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+            }else{
+                return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
+            }
+        } catch (ImppBusiException busExcep) {
+            LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
+        }
+    }
+
+    @DeleteMapping(value = "/user/batch-delete")
+    @ApiOperation(value = "根据id批量删除", notes = "根据id批量删除")
+    public ResultBean deleteSysUserByIds(String[] ids){
+        try{
+            ids = ConvertBean.modelSafeArrayNumber(ids,true);
+            if(ids.length == 0){
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                        .setErrorDetail("请选择需要删除的用户信息。")
+                        .build();
+            }
+
+            List<SysUser> list = personnelService.findSysUserByIds(StringTool.getArrayLong(ids));
+
+            if(list != null && list.size() > 0){
+                Long[] infoIds = new Long[list.size()];
+                Long[] userIds = new Long[list.size()];
+
+                for (int i = 0; i < list.size(); i++) {
+                    infoIds[i] = list.get(i).getUserInfoId();
+                    userIds[i] = list.get(i).getId();
+                }
+
+                personnelService.deleteSysUserInfo(infoIds,getSessionUser().getUserName());
+                personnelService.deleteSysUser(userIds,getSessionUser().getUserName());
+
+                return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+            }else{
+                return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
+            }
+        }catch(ImppBusiException busExcep){
+            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
+
+
+    @GetMapping(value = "/query-ref-department")
+    @ApiOperation(value = "查询角色的所有角色权限关系", notes = "查询角色的所有角色权限关系")
+    public ResultBean queryRefDepartment(UserDetailModel model) {
+        try {
+            model.setUserDepartmentIdList(new ArrayList<String>(Arrays.asList(new String[]{"1072037153732694016"})));
+
+            List<Long> idList = new ArrayList<>();
+
+            List<SysRefUserDepartment> refs = personnelService.querySysRefUserDepartmentByUserDetailModel(model);
+            if(refs != null && refs.size() > 0){
+                for (SysRefUserDepartment ref : refs) {
+                    idList.add(ref.getUserId());
+                }
+            }
+
+            List<SysUser> result = personnelService.querySysUserByUserDetailModelOrIds(model, idList);
+
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(result);
+        } catch (ImppBusiException busExcep) {
+            LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
+
+    /**
+     * 数据必填校验
+     * @param model
+     * @param isCheckId
+     * @throws Exception
+     */
+    private void checkUserDetailModel(UserDetailModel model,boolean isCheckId)throws Exception{
+        if(isCheckId){
+            ValidatorBean.beginValid(model)
+                    .notNull("userInfoId", model.getUserInfoId())
+                    .notNull("userId", model.getUserId());
+        }else {
+            ValidatorBean.beginValid(model).notNull("userLoginPassword", model.getUserLoginPassword());
+        }
+
+        ValidatorBean.beginValid(model)
+                .notNull("infoName", model.getInfoName())
+                .notNull("infoEmpNo", model.getInfoEmpNo())
+                .notNull("infoPositionId", model.getInfoPositionId())
+                .notNull("infoDepartmentId", model.getInfoDepartmentId())
+                .notNull("userLoginName", model.getUserLoginName())
+                .notNull("userEmail", model.getUserEmail())
+                .notNull("userPhone", model.getUserPhone());
+    }
+
+    /**
+     * 用户信息初始化
+     * @param info
+     * @param user
+     * @throws Exception
+     */
+    private void initUserDetail(SysUserInfo info ,SysUser user)throws Exception{
+        if(StringUtils.isBlank(info.getUserJoinDate())){
+            info.setUserJoinDate(TimeTool.getToday());
+        }
+
+        info.setUserInfoStatus(CommonEnumUtil.USER_INFO_STATUS.INCUMBENT.getValue());
+        info.setUserLoginNum(0);
+        info.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue());
+        ConvertBean.modelInitialize(info, AuthUtil.getSessionUser());
+
+        user.setUserType(CommonEnumUtil.USER_TYPE.USER.getValue());
+        user.setUserStatus(CommonEnumUtil.USER_STATUS.ENABLE.getValue());
+        user.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue());
+        user.setUserLoginNum(0);
+        ConvertBean.modelInitialize(user, AuthUtil.getSessionUser());
+    }
+
+    /**
+     * 关系刷新
+     * @param user
+     * @param info
+     * @param model
+     */
+    private void refreshRef(SysUser user,SysUserInfo info,UserDetailModel model){
+        // 刷新账号 部门关系
+        personnelService.refreshRefSysUserDepartment(user.getId(), StringTool.getArrayLong(model.getUserDepartmentIdList()));
+        // 刷新账号 角色关系
+        personnelService.refreshRefSysUserRole(user.getId(),StringTool.getArrayLong(model.getUserRoleIdList()));
+
+        // 刷新用户 部门关系
+        personnelService.refreshRefSysUserInfoDepartment(info.getId(),StringTool.getArrayLong(model.getInfoDepartmentIdList()));
+        // 刷新用户 岗位关系
+        personnelService.refreshRefSysUserInfoPosition(info.getId(),StringTool.getArrayLong(model.getInfoPositionIdList()));
+    }
+
+    /**
+     * 更新用户密码
+     * @param user
+     */
+    private void refreshSysUserPassword(SysUser user)throws Exception{
+        if(user != null){
+            if(user.getId() != null){ // 更新密码
+                if(!StringUtils.isAnyBlank(user.getUserLoginPassword())){   // 使用新密码
+                    user.setUserLoginPassword(EncryptTool.hexMD5(user.getUserLoginPassword()));
+                }else{  //使用旧密码
+                    SysUser sysUser = personnelService.getSysUserById(user.getId());
+                    user.setUserLoginPassword(sysUser.getUserLoginPassword());
+                }
+            }else { // 创建密码
+                user.setUserLoginPassword(EncryptTool.hexMD5(user.getUserLoginPassword()));
+            }
+        }
+    }
+}

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

@@ -81,7 +81,7 @@ public class SysDashboardController extends CoreBaseController {
         try {
             // 保持时间,key统一
             Date nowDate = new Date();
-            String redisKey = PlatformConstWords.REDIS_DASHBOARD_AVG_RESP_TIME + "_" + nowDate.getTime();
+            String redisKey = PlatformConstWords.REDIS_DASHBOARD_LOG_INFO + "_" + nowDate.getTime();
 
             Map<Object, Object> dashboardData = redisCore.getHashMap(redisKey);
             if (dashboardData == null || dashboardData.size() == 0) {
@@ -116,7 +116,7 @@ public class SysDashboardController extends CoreBaseController {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
                 dashboardData = sysDashboardService.querySysLogSystemAvgExecuteTime(
-                        sdf.format(TimeTool.timeCalc(nowDate, Calendar.MINUTE, -5)),sdf.format(nowDate));
+                        sdf.format(TimeTool.timeCalc(nowDate, Calendar.MINUTE, -3)),sdf.format(nowDate));
 
                 redisCore.putHashMap(redisKey, dashboardData, 180);
             }
@@ -155,6 +155,7 @@ public class SysDashboardController extends CoreBaseController {
     }
 
     @GetMapping(value = "/get-server-pressure")
+    @ApiOperation(value = "获取服务压力情况", notes = "获取服务压力情况")
     public ResultBean getServerPressure() {
         try {
             // 保持时间,key统一

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -24,7 +25,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : 字典管理服务
@@ -56,7 +59,7 @@ public class SysDictionaryController extends CoreBaseController{
                     .notNull("dictionaryValue",sysDictionary.getDictionaryValue());
 
             //新增初始化
-            ConvertBean.modelInitialize(sysDictionary,user);
+            sysDictionary.setIsDefault(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
 
             sysDictionaryService.insertSysDictionary(sysDictionary);
             return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@@ -178,6 +181,31 @@ public class SysDictionaryController extends CoreBaseController{
         }
     }
 
+    @GetMapping(value = "/find/user-info")
+    @ApiOperation(value = "查询跟用户相关所有字典")
+    public ResultBean findSysDictionaryUserInfo() {
+        try {
+            Map<String,Object> resultMap = new HashMap<>();
+            resultMap.put("1",sysDictionaryService.findSysDictionaryByParentCode(CommonConstWords.DICTIONARY_SEX));
+            resultMap.put("2",sysDictionaryService.findSysDictionaryByParentCode(CommonConstWords.DICTIONARY_FILE_TYPE));
+            resultMap.put("3",sysDictionaryService.findSysDictionaryByParentCode(CommonConstWords.DICTIONARY_MARRIAGE));
+            resultMap.put("4",sysDictionaryService.findSysDictionaryByParentCode(CommonConstWords.DICTIONARY_EDUCATION));
+            resultMap.put("5",sysDictionaryService.findSysDictionaryByParentCode(CommonConstWords.DICTIONARY_NATIONALITY));
+            resultMap.put("6",sysDictionaryService.findSysDictionaryByParentCode(CommonConstWords.DICTIONARY_CERTIFICATE_TYPE));
+            resultMap.put("7",sysDictionaryService.findSysDictionaryByParentCode(CommonConstWords.DICTIONARY_GRADE));
+            resultMap.put("8",sysDictionaryService.findSysDictionaryByParentCode(CommonConstWords.DICTIONARY_POLITICAL_STATUS));
+            resultMap.put("9",sysDictionaryService.findSysDictionaryByParentCode(CommonConstWords.DICTIONARY_EMPLOYEE_TYPE));
+
+            return ResultBean.success("查询成功").setResultMap(resultMap).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
+
     @GetMapping("/query")
     @ApiOperation(value = "字典复杂查询，分页，排序",notes = "字典复杂查询，分页，排序")
     public ResultBean querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) {
@@ -231,4 +259,20 @@ public class SysDictionaryController extends CoreBaseController{
             return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
+
+    @PutMapping("/default/{id}")
+    @ApiOperation(value = "设置默认字典值",notes = "根据id设置默认字典值")
+    public ResultBean updateSysDictionaryDefaultById(@PathVariable("id") String idStr){
+        try {
+            //条件验证
+            ValidatorBean.checkNotNull(idStr,"id不能为空");
+
+            sysDictionaryService.updateSysDictionaryDefaultById(Long.parseLong(idStr));
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

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

@@ -275,8 +275,9 @@ public class SysFileController extends CoreBaseController{
                     }
                 }
             }
-
+            // 增加文件下载次数
             sysFile.setDownloadNum(sysFile.getDownloadNum() + 1);
+            sysFileService.updateSysFile(sysFile);
             return ResultBean.success("下载").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/SysMessageController.java

@@ -59,7 +59,7 @@ public class SysMessageController extends CoreBaseController {
                     .notNull("messageReceiversId",sysMessage.getMessageReceiversId());
 
             // 设置发件人名称
-            sysMessage.setMessageSenderId(getSessionUser().getUserId());
+            sysMessage.setMessageSenderId(getSessionUser().getUser().getId());
             sysMessage.setMessageSenderNameRdd(getSessionUser().getUserName());
             sysMessage.setMessageSendTime(sdf.format(new Date()));
             sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue());
@@ -182,7 +182,7 @@ public class SysMessageController extends CoreBaseController {
         try {
             // 设置消息类型为站内信
             sysRefUserMessage.setMessageTypeRdd(ImppEnumUtil.MESSAGE_TYPE.LETTER.getValue());
-            sysRefUserMessage.setReceiverId(getSessionUser().getUserId());
+            sysRefUserMessage.setReceiverId(getSessionUser().getUser().getId());
 
             ListPager userMessageList = sysMessageService.querySysRefUserMessageByPager(sysRefUserMessage,pager);
             return  ResultBean.success("查询成功").setListPager(userMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@@ -198,6 +198,7 @@ public class SysMessageController extends CoreBaseController {
     public ResultBean querySysRefUserMessageByPager(SysMessage sysMessage,Pager pager){
         try {
             // 发件人为当前用户
+            sysMessage.setMessageType(ImppEnumUtil.MESSAGE_TYPE.LETTER.getValue());
             sysMessage.setMessageSenderId(getSessionUser().getUser().getId());
 
             ListPager sysMessageListPager = sysMessageService.querySysMessageByPager(sysMessage,pager);
@@ -213,7 +214,7 @@ public class SysMessageController extends CoreBaseController {
     @ApiOperation(value = "查看用户未读站内信")
     public ResultBean findUnreadUserMessage(){
         try {
-            List userMessageList = sysMessageService.findSysRefUserMessageByUserIdAndStatus(getSessionUser().getUserInfo().getId(),
+            List userMessageList = sysMessageService.findSysRefUserMessageByUserIdAndStatus(getSessionUser().getUser().getId(),
                         ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue());
             return  ResultBean.success("查询成功").setResultList(userMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
@@ -304,7 +305,7 @@ public class SysMessageController extends CoreBaseController {
 
             // 设置发件人名称
             sysMessage.setMessageType(ImppEnumUtil.MESSAGE_TYPE.LETTER.getValue());
-            sysMessage.setMessageSenderId(getSessionUser().getUserId());
+            sysMessage.setMessageSenderId(getSessionUser().getUser().getId());
             sysMessage.setMessageSenderNameRdd(getSessionUser().getUserName());
             sysMessage.setMessageSendTime(sdf.format(new Date()));
             sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue());

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

@@ -0,0 +1,150 @@
+package cn.estsh.i3plus.core.apiservice.controller.busi;
+
+import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService;
+import cn.estsh.i3plus.platform.common.tool.StringTool;
+import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.platform.bean.SysTask;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
+import cn.estsh.impp.framework.boot.exception.ImppBusiException;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
+import cn.estsh.impp.framework.boot.util.ResultBean;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Description : 任务管理服务
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2018-12-27 15:13
+ * @Modify:
+ **/
+@RestController
+@Api(description = "任务管理服务")
+@RequestMapping(PlatformConstWords.BASE_URL + "/task")
+public class SysTaskController extends CoreBaseController {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskController.class);
+
+    @Autowired
+    private ISysTaskService sysTaskService;
+
+    @PostMapping(value = "/insert")
+    @ApiOperation(value = "添加任务", notes = "添加任务")
+    public ResultBean insertSysTask(SysTask sysTask) {
+        try {
+            // 数据校验
+            ValidatorBean.beginValid(sysTask)
+                    .notNull("name", sysTask.getName())
+                    .notNull("taskPackage", sysTask.getTaskPackage())
+                    .notNull("taskClass", sysTask.getTaskClass());
+
+            sysTaskService.insertSysTask(sysTask);
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysTask);
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @PutMapping(value = "/update")
+    @ApiOperation(value = "修改任务", notes = "修改任务")
+    public ResultBean updateSysTask(SysTask sysTask) {
+        try {
+            // 数据校验
+            ValidatorBean.beginValid(sysTask)
+                    .notNull("name", sysTask.getName())
+                    .notNull("taskPackage", sysTask.getTaskPackage())
+                    .notNull("taskClass", sysTask.getTaskClass());
+
+            sysTaskService.updateSysTask(sysTask);
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @DeleteMapping(value = "/delete/{id}")
+    @ApiOperation(value = "删除任务", notes = "删除任务")
+    public ResultBean deleteSysTaskById(@PathVariable("id") String idStr) {
+        try {
+            // 数据校验
+            ValidatorBean.checkNotNull(idStr, "id不能为空");
+            if (sysTaskService.getSysTaskById(Long.parseLong(idStr)) == null) {
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
+                        .setErrorDetail("任务不存在")
+                        .setErrorSolution("请重新选择")
+                        .build();
+            }
+
+            sysTaskService.deleteSysTaskById(Long.parseLong(idStr));
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "查询所有任务", notes = "查询所有任务")
+    public ResultBean listSysTask() {
+        try {
+            List sysTaskList = sysTaskService.listSysTask();
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysTaskList);
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @GetMapping(value = "/query")
+    @ApiOperation(value = "任务复杂查询", notes = "任务复杂查询,分页，排序")
+    public ResultBean querySysTaskByPager(SysTask sysTask, Pager pager) {
+        try {
+            ListPager<SysTask> sysTaskList = sysTaskService.querySysTaskByPager(sysTask, pager);
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(sysTaskList);
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @DeleteMapping(value = "/batch-delete")
+    @ApiOperation(value = "根据id批量删除任务", notes = "根据id批量删除任务")
+    public ResultBean deleteSysTaskByIds(String[] idsStr) {
+        try {
+            if (idsStr == null || idsStr.length == 0) {
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                        .setErrorDetail("请选择需要删除的资源。")
+                        .build();
+            }
+            sysTaskService.deleteSysTaskByIds(StringTool.getArrayLong(idsStr));
+            return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+}

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

@@ -1,16 +1,16 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
-import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeExpressionService;
-import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskCycleService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.SysRefExpressionTrigger;
-import cn.estsh.i3plus.pojo.platform.bean.SysTaskTime;
-import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression;
+import cn.estsh.i3plus.pojo.platform.bean.SysRefTaskCyclePlan;
+import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle;
+import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -27,36 +27,36 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
- * @Description : 系统时间表达式 服务
+ * @Description : 任务周期管理服务
  * @Reference   :
- * @Author      : wei.peng
- * @Date        : 2018-10-22 16:58:43.838
+ * @Author      : yunhao
+ * @Date        : 2018-12-27 15:54
  * @Modify      :
  **/
 @RestController
-@Api(description = "系统时间表达式")
-@RequestMapping(PlatformConstWords.BASE_URL +"/task-time-expression")
-public class SysTaskTimeExpressionController extends CoreBaseController{
+@Api(description = "任务周期")
+@RequestMapping(PlatformConstWords.BASE_URL +"/task-cycle")
+public class SysTaskCycleController extends CoreBaseController{
 
-    public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskTimeExpressionController.class);
+    public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskCycleController.class);
 
     @Autowired
-    private ISysTaskTimeExpressionService taskTimeExpressionService;
+    private ISysTaskCycleService sysTaskCycleService;
 
     @Autowired
-    private ISysTaskTimeService sysTaskTimeService;
+    private ISysTaskPlanService sysTaskPlanService;
 
     @PostMapping(value = "/insert")
-    @ApiOperation(value = "新增系统时间表达式", notes = "系统时间表达式")
-    public ResultBean insertSysTaskTimeExpression(SysTaskTimeExpression timeExpression) {
+    @ApiOperation(value = "新增任务周期", notes = "任务周期")
+    public ResultBean insertSysTaskCycle(SysTaskCycle sysTaskCycle) {
         try {
             // 数据校验
-            ValidatorBean.beginValid(timeExpression)
-                    .notNull("name", timeExpression.getName())
-                    .notNull("expressionContent", timeExpression.getExpressionContent())
-                    .notNull("expressionStartDatetime",timeExpression.getExpressionStartDatetime());
+            ValidatorBean.beginValid(sysTaskCycle)
+                    .notNull("name", sysTaskCycle.getName())
+                    .notNull("taskCycleExps", sysTaskCycle.getTaskCycleExps())
+                    .notNull("taskCycleStartDatetime",sysTaskCycle.getTaskCycleStartDatetime());
 
-            taskTimeExpressionService.insertSysTaskTimeExpression(timeExpression);
+            sysTaskCycleService.insertSysTaskCycle(sysTaskCycle);
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -66,28 +66,28 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
     }
 
     @PutMapping(value = "/update")
-    @ApiOperation(value = "修改系统时间表达式", notes = "系统时间表达式")
-    public ResultBean updateSysTaskTimeExpression(SysTaskTimeExpression timeExpression) {
+    @ApiOperation(value = "修改任务周期", notes = "修改任务周期")
+    public ResultBean updateSysTaskCycle(SysTaskCycle sysTaskCycle) {
         try {
             // 数据校验
-            ValidatorBean.beginValid(timeExpression)
-                    .notNull("id", timeExpression.getId())
-                    .notNull("name", timeExpression.getName())
-                    .notNull("timeExpression", timeExpression.getExpressionContent());
-
-            taskTimeExpressionService.updateSysTaskTimeExpression(timeExpression);
-
-            // 查询关联定时任务信息，并进行修改
-            List<SysRefExpressionTrigger> refTrigger = taskTimeExpressionService.findRefExpressionTriggerList(timeExpression.getId());
-            SysTaskTime sysTaskTime;
-            for (SysRefExpressionTrigger item: refTrigger) {
-                sysTaskTime = sysTaskTimeService.getSysTaskTimeByNameAndGroup(item.getTriggerName(),item.getTriggerGroupName());
-                sysTaskTime.setTimeExpressionNameRdd(timeExpression.getName());
-                sysTaskTime.setTimeExpressionContentRdd(timeExpression.getExpressionContent());
-                sysTaskTime.setTaskStartDateTimeRdd(timeExpression.getExpressionStartDatetime());
-                sysTaskTime.setTaskEndDateTimeRdd(timeExpression.getExpressionEndDatetime());
-
-                sysTaskTimeService.updateSysTaskTime(sysTaskTime,timeExpression);
+            ValidatorBean.beginValid(sysTaskCycle)
+                    .notNull("id", sysTaskCycle.getId())
+                    .notNull("name", sysTaskCycle.getName())
+                    .notNull("taskCycleExps", sysTaskCycle.getTaskCycleExps());
+
+            sysTaskCycleService.updateSysTaskCycle(sysTaskCycle);
+
+            // 查询关联任务计划信息，并进行修改
+            List<SysRefTaskCyclePlan> taskCyclePlans = sysTaskCycleService.findRefTaskCyclePlanByCycleId(sysTaskCycle.getId());
+            SysTaskPlan sysTaskPlan;
+            for (SysRefTaskCyclePlan item: taskCyclePlans) {
+                sysTaskPlan = sysTaskPlanService.getSysTaskPlanByNameAndGroup(item.getTaskPlanName(),item.getTaskPlanGroupName());
+                sysTaskPlan.setTaskCycleNameRdd(sysTaskCycle.getName());
+                sysTaskPlan.setTaskCycleExpsRdd(sysTaskCycle.getTaskCycleExps());
+                sysTaskPlan.setTaskCycleStartDateTimeRdd(sysTaskCycle.getTaskCycleStartDatetime());
+                sysTaskPlan.setTaskCycleEndDateTimeRdd(sysTaskCycle.getTaskCycleEndDatetime());
+
+                sysTaskPlanService.updateSysTaskPlan(sysTaskPlan,sysTaskCycle);
             }
 
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@@ -99,21 +99,21 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
     }
 
     @DeleteMapping(value = "/delete/{id}")
-    @ApiOperation(value = "删除系统时间表达式", notes = "删除系统时间表达式")
-    public ResultBean deleteSysTaskTimeExpression(@PathVariable("id") String idStr) {
+    @ApiOperation(value = "删除任务周期", notes = "删除任务周期")
+    public ResultBean deleteSysTaskCycle(@PathVariable("id") String idStr) {
         try {
             // 数据校验
             ValidatorBean.checkNotNull(idStr, "时间表达式id 不能为空");
-            if(taskTimeExpressionService.getSysTaskTimeExpressionById(Long.parseLong(idStr)) == null){
+            if(sysTaskCycleService.getSysTaskCycleById(Long.parseLong(idStr)) == null){
                 throw ImppExceptionBuilder.newInstance()
                         .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
                         .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
-                        .setErrorDetail("时间表达式不存在")
+                        .setErrorDetail("任务周期不存在")
                         .setErrorSolution("请重新选择")
                         .build();
             }
 
-            taskTimeExpressionService.deleteSysTaskTimeExpressionById(Long.parseLong(idStr));
+            sysTaskCycleService.deleteSysTaskCycleById(Long.parseLong(idStr));
             return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -123,10 +123,10 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
     }
 
     @GetMapping(value = "/list")
-    @ApiOperation(value = "查询时间表达式所有", notes = "查询所有系统时间表达式")
-    public ResultBean findSysTaskTimeExpressionAll() {
+    @ApiOperation(value = "查询所有任务周期信息", notes = "查询所有任务周期信息")
+    public ResultBean findSysTaskCycle() {
         try {
-            List<SysTaskTimeExpression> list = taskTimeExpressionService.listSysTaskTimeExpression();
+            List<SysTaskCycle> list = sysTaskCycleService.listSysTaskCycle();
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list);
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -136,15 +136,19 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
     }
 
     @GetMapping(value = "/get/{id}")
-    @ApiOperation(value = "查询系统时间表达式", notes = "查询根据ID查询系统时间表达式")
-    public ResultBean getSysTaskTimeExpressionById(@PathVariable("id") String id) {
+    @ApiOperation(value = "查询任务周期", notes = "查询根据ID查询任务周期")
+    public ResultBean getSysTaskCycleById(@PathVariable("id") String id) {
         try {
             // 数据校验
             ValidatorBean.checkNotNull(id, "定时任务id 不能为空");
 
-            SysTaskTimeExpression taskTimeExpression = taskTimeExpressionService.getSysTaskTimeExpressionById(Long.parseLong(id));
-
-            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(taskTimeExpression);
+            SysTaskCycle sysTaskCycle = sysTaskCycleService.getSysTaskCycleById(Long.parseLong(id));
+            if (sysTaskCycle != null) {
+                return ResultBean.success("查询成功")
+                        .setResultObject(sysTaskCycle).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+            }else {
+                return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
+            }
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
         }catch(Exception e){
@@ -152,12 +156,12 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
         }
     }
 
-    @GetMapping("query")
-    @ApiOperation(value = "时间表达式查询，分页，排序",notes = "时间表达式查询，分页，排序")
-    public ResultBean querySysTaskTimeExpressionByPager(SysTaskTimeExpression taskTimeExpression, Pager pager){
+    @GetMapping("/query")
+    @ApiOperation(value = "任务周期查询，分页，排序",notes = "任务周期查询，分页，排序")
+    public ResultBean querySysTaskCycleByPager(SysTaskCycle taskTimeExpression, Pager pager){
         try {
-            ListPager taskTimeExpressionListPager = taskTimeExpressionService.querySysTaskTimeExpressionByPager(taskTimeExpression,pager);
-            return  ResultBean.success("查询成功").setListPager(taskTimeExpressionListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+            ListPager listPager = sysTaskCycleService.querySysTaskCycleByPager(taskTimeExpression,pager);
+            return  ResultBean.success("查询成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
         }catch(Exception e){
@@ -166,7 +170,7 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
     }
 
     @DeleteMapping("/batch-delete")
-    @ApiOperation(value = "根据id批量删除时间表达式",notes = "根据id批量删除时间表达式")
+    @ApiOperation(value = "根据id批量删除任务周期",notes = "根据id批量删除任务周期")
     public ResultBean deleteSysTaskTimeExpressionByIds(String[] idsStr){
         try{
             if(idsStr.length == 0){
@@ -177,7 +181,7 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
                         .build();
             }
 
-            taskTimeExpressionService.deleteSysTaskTimeExpressionByIds(StringTool.getArrayLong(idsStr));
+            sysTaskCycleService.deleteSysTaskCycleByIds(StringTool.getArrayLong(idsStr));
             return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);

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

@@ -0,0 +1,223 @@
+package cn.estsh.i3plus.core.apiservice.controller.busi;
+
+import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskCycleService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService;
+import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.platform.bean.SysTask;
+import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle;
+import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
+import cn.estsh.impp.framework.boot.exception.ImppBusiException;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ResultBean;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Description : 任务计划管理服务
+ * @Reference   :
+ * @Author      : yunhao
+ * @Date        : 2018-12-27 10:45
+ * @Modify      :
+ **/
+@RestController
+@Api(description = "任务计划管理服务")
+@RequestMapping(PlatformConstWords.BASE_URL +"/task-plan")
+public class SysTaskPlanController extends CoreBaseController{
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskPlanController.class);
+
+    @Autowired
+    private ISysTaskPlanService sysTaskPlanService;
+
+    @Autowired
+    private ISysTaskCycleService sysTaskCycleService;
+
+    @Autowired
+    private ISysTaskService sysTaskService;
+
+    @PostMapping(value = "/insert")
+    @ApiOperation(value = "新增任务计划", notes = "任务计划")
+    public ResultBean insertSysTaskTime(SysTaskPlan sysTaskPlan, Boolean isExecute) {
+        try {
+            // 数据校验
+            ValidatorBean.beginValid(sysTaskPlan)
+                    .notNull("name", sysTaskPlan.getName())
+                    .notNull("groupName",sysTaskPlan.getGroupName())
+                    .notNull("taskCycleId",sysTaskPlan.getTaskCycleId())
+                    .notNull("taskId",sysTaskPlan.getTaskId())
+                    .notNull("taskMethodType", sysTaskPlan.getTaskMethodType());
+
+            SysTaskCycle sysTaskCycle = sysTaskCycleService.getSysTaskCycleById(sysTaskPlan.getTaskCycleId());
+            ValidatorBean.checkNotNull(sysTaskCycle,"任务周期不存在");
+
+            SysTask sysTask = sysTaskService.getSysTaskById(sysTaskPlan.getTaskId());
+            ValidatorBean.checkNotNull(sysTask,"任务不存在");
+
+            // 设置冗余信息
+            sysTaskPlan.setTaskPlanExecNum(0);
+            sysTaskPlan.setTaskNameRdd(sysTask.getName());
+            sysTaskPlan.setTaskCycleNameRdd(sysTaskCycle.getName());
+            sysTaskPlan.setTaskCycleExpsRdd(sysTaskCycle.getTaskCycleExps());
+            sysTaskPlan.setTaskCycleStartDateTimeRdd(sysTaskCycle.getTaskCycleStartDatetime());
+            sysTaskPlan.setTaskCycleEndDateTimeRdd(sysTaskCycle.getTaskCycleEndDatetime());
+            sysTaskPlan.setTaskPlanStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
+
+            sysTaskPlan  = sysTaskPlanService.insertSysTaskPlan(sysTaskPlan,sysTaskCycle,sysTask);
+            // 立即执行
+            if(isExecute != null && isExecute){
+                sysTaskPlanService.executeSysTaskPlan(sysTaskPlan);
+            }
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysTaskPlan);
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @PutMapping(value = "/update")
+    @ApiOperation(value = "修改任务计划", notes = "任务计划")
+    public ResultBean updateSysTaskTime(SysTaskPlan sysTaskPlan, Boolean isExecute) {
+        try {
+            // 数据校验
+            ValidatorBean.beginValid(sysTaskPlan)
+                    .notNull("name", sysTaskPlan.getName())
+                    .notNull("groupName",sysTaskPlan.getGroupName())
+                    .notNull("taskCycleId",sysTaskPlan.getTaskCycleId())
+                    .notNull("taskId",sysTaskPlan.getTaskId())
+                    .notNull("taskMethodType", sysTaskPlan.getTaskMethodType());
+
+            SysTaskCycle sysTaskCycle = sysTaskCycleService.getSysTaskCycleById(sysTaskPlan.getTaskCycleId());
+            ValidatorBean.checkNotNull(sysTaskCycle,"任务周期不存在");
+
+            SysTask sysTask = sysTaskService.getSysTaskById(sysTaskPlan.getTaskId());
+            ValidatorBean.checkNotNull(sysTask,"任务不存在");
+
+            sysTaskPlan.setTaskNameRdd(sysTask.getName());
+            sysTaskPlan.setTaskCycleNameRdd(sysTaskCycle.getName());
+            sysTaskPlan.setTaskCycleExpsRdd(sysTaskCycle.getTaskCycleExps());
+            sysTaskPlan.setTaskCycleStartDateTimeRdd(sysTaskCycle.getTaskCycleStartDatetime());
+            sysTaskPlan.setTaskCycleEndDateTimeRdd(sysTaskCycle.getTaskCycleEndDatetime());
+
+            sysTaskPlanService.updateSysTaskPlan(sysTaskPlan,sysTaskCycle);
+            if(isExecute != null && isExecute){
+                sysTaskPlanService.executeSysTaskPlan(sysTaskPlan);
+            }
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysTaskPlan);
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @DeleteMapping(value = "/delete/{id}")
+    @ApiOperation(value = "删除任务计划", notes = "删除任务计划")
+    public ResultBean deleteSysTaskTime(@PathVariable("id") String id) {
+        try {
+            // 数据校验
+            ValidatorBean.checkNotNull(id, "任务计划id 不能为空");
+
+            sysTaskPlanService.deleteSysTaskPlanById(Long.parseLong(id));
+            return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "查询SysTaskTime", notes = "查询所有任务计划")
+    public ResultBean findSysTaskTimeAll() {
+        try {
+            List<SysTaskPlan> list = sysTaskPlanService.listSysTaskPlan();
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list);
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @GetMapping(value = "/get/{id}")
+    @ApiOperation(value = "查询任务计划", notes = "查询根据ID查询任务计划")
+    public ResultBean getBySysTaskTimeId(@PathVariable("id") String id) {
+        try {
+            // 数据校验
+            ValidatorBean.checkNotNull(id, "任务计划id 不能为空");
+
+            SysTaskPlan taskTime = sysTaskPlanService.getSysTaskPlanById(Long.parseLong(id));
+            if (taskTime != null) {
+                return ResultBean.success("查询成功").setResultObject(taskTime).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+            }else {
+                return ResultBean.fail("任务计划不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
+            }
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @PutMapping(value = "/status/{id}/{status}")
+    @ApiOperation(value = "修改任务计划状态", notes = "根据ID修改任务计划状态")
+    public ResultBean updateQuartzStatus(@PathVariable("id") String idStr,@PathVariable("status") Integer status) {
+        try {
+            // 数据校验
+            ValidatorBean.checkNotNull(idStr, "id 不能为空");
+            ValidatorBean.checkNotZero(status, "状态不能为空");
+
+            sysTaskPlanService.updateSysTaskPlanStatus(Long.parseLong(idStr),status,AuthUtil.getSessionUser());
+            return new ResultBean(true);
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @GetMapping("/query")
+    @ApiOperation(value = "任务计划复杂查询，分页，排序",notes = "任务计划复杂查询，分页，排序")
+    public ResultBean querySysTaskTimeByPager(SysTaskPlan taskTime, Pager pager){
+        try {
+            ListPager taskTimeListPager = sysTaskPlanService.querySysTaskPlanByPager(taskTime,pager);
+            return  ResultBean.success("查询成功").setListPager(taskTimeListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @GetMapping(value = "/execute/{id}")
+    @ApiOperation(value = "立即执行", notes = "立即执行")
+    public ResultBean executeBySysTaskTimeId(@PathVariable("id") String id) {
+        try {
+            // 数据校验
+            ValidatorBean.checkNotNull(id, "任务计划id 不能为空");
+            SysTaskPlan sysTaskPlan = sysTaskPlanService.getSysTaskPlanById(Long.parseLong(id));
+
+            sysTaskPlanService.executeSysTaskPlan(sysTaskPlan);
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+}

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

@@ -1,260 +0,0 @@
-package cn.estsh.i3plus.core.apiservice.controller.busi;
-
-import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeExpressionService;
-import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeService;
-import cn.estsh.i3plus.platform.common.tool.StringTool;
-import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
-import cn.estsh.i3plus.pojo.base.bean.ListPager;
-import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.SysTaskTime;
-import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression;
-import cn.estsh.impp.framework.base.controller.CoreBaseController;
-import cn.estsh.impp.framework.boot.auth.AuthUtil;
-import cn.estsh.impp.framework.boot.exception.ImppBusiException;
-import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
-import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
-import cn.estsh.impp.framework.boot.util.ResultBean;
-import cn.estsh.impp.framework.boot.util.ValidatorBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * @Description : 定时任务服务
- * @Reference   :
- * @Author      : wei.peng
- * @Date        : 2018-10-22 16:58:43.982
- * @Modify      :
- **/
-@RestController
-@Api(description = "定时任务服务")
-@RequestMapping(PlatformConstWords.BASE_URL +"/task-time")
-public class SysTaskTimeController extends CoreBaseController{
-
-    public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskTimeController.class);
-
-    @Autowired
-    private ISysTaskTimeService taskTimeService;
-
-    @Autowired
-    private ISysTaskTimeExpressionService taskTimeExpressionService;
-
-    @PostMapping(value = "/insert")
-    @ApiOperation(value = "新增定时任务", notes = "定时任务")
-    public ResultBean insertSysTaskTime(SysTaskTime taskTime,Boolean isExecute) {
-        try {
-            // 数据校验
-            ValidatorBean.beginValid(taskTime)
-                    .notNull("name", taskTime.getName())
-                    .notNull("groupName",taskTime.getGroupName())
-                    .notNull("timeExpressionId",taskTime.getTimeExpressionId())
-                    .notNull("taskMethodType", taskTime.getTaskMethodType())
-                    .notNull("taskPackage",taskTime.getTaskPackage())
-                    .notNull("taskClass",taskTime.getTaskClass());
-
-            SysTaskTimeExpression taskTimeExpression = taskTimeExpressionService
-                    .getSysTaskTimeExpressionById(taskTime.getTimeExpressionId());
-            ValidatorBean.checkNotNull(taskTimeExpression,"定时执行策略不存在");
-
-            taskTime.setTimeExpressionNameRdd(taskTimeExpression.getName());
-            taskTime.setTimeExpressionContentRdd(taskTimeExpression.getExpressionContent());
-            taskTime.setTaskStartDateTimeRdd(taskTimeExpression.getExpressionStartDatetime());
-            taskTime.setTaskEndDateTimeRdd(taskTimeExpression.getExpressionEndDatetime());
-            taskTime.setTaskStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
-
-            taskTime  = taskTimeService.insertSysTaskTime(taskTime,taskTimeExpression);
-            // 立即执行
-            if(isExecute != null && isExecute){
-                taskTimeService.executeSysTaskTimeById(taskTime.getId());
-            }
-            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(taskTime);
-        }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep);
-        }catch(Exception e){
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
-
-    @PutMapping(value = "/update")
-    @ApiOperation(value = "修改定时任务", notes = "定时任务")
-    public ResultBean updateSysTaskTime(SysTaskTime taskTime,Boolean isExecute) {
-        try {
-            // 数据校验
-            ValidatorBean.beginValid(taskTime)
-                    .notNull("id", taskTime.getId())
-                    .notNull("name", taskTime.getName())
-                    .notNull("groupName",taskTime.getGroupName())
-                    .notNull("timeExpressionId",taskTime.getTimeExpressionId())
-                    .notNull("taskMethodType", taskTime.getTaskMethodType())
-                    .notNull("taskPackage",taskTime.getTaskPackage())
-                    .notNull("taskClass",taskTime.getTaskClass());
-
-            SysTaskTimeExpression taskTimeExpression = taskTimeExpressionService
-                    .getSysTaskTimeExpressionById(taskTime.getTimeExpressionId());
-            ValidatorBean.checkNotNull(taskTimeExpression,"定时执行策略不存在");
-
-            taskTime.setTimeExpressionNameRdd(taskTimeExpression.getName());
-            taskTime.setTimeExpressionContentRdd(taskTimeExpression.getExpressionContent());
-            taskTime.setTaskStartDateTimeRdd(taskTimeExpression.getExpressionStartDatetime());
-            taskTime.setTaskEndDateTimeRdd(taskTimeExpression.getExpressionEndDatetime());
-            taskTime.setTaskStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
-
-            taskTimeService.updateSysTaskTime(taskTime,taskTimeExpression);
-            if(isExecute != null && isExecute){
-                taskTimeService.executeSysTaskTimeById(taskTime.getId());
-            }
-            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(taskTime);
-        }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep);
-        }catch(Exception e){
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
-
-    @DeleteMapping(value = "/delete/{id}")
-    @ApiOperation(value = "删除定时任务", notes = "删除定时任务")
-    public ResultBean deleteSysTaskTime(@PathVariable("id") String id) {
-        try {
-            // 数据校验
-            ValidatorBean.checkNotNull(id, "定时任务id 不能为空");
-
-            taskTimeService.deleteSysTaskTimeById(Long.parseLong(id));
-            return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-        }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep);
-        }catch(Exception e){
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
-
-    @GetMapping(value = "/list")
-    @ApiOperation(value = "查询SysTaskTime", notes = "查询所有定时任务")
-    public ResultBean findSysTaskTimeAll() {
-        try {
-            List<SysTaskTime> list = taskTimeService.listSysTaskTime();
-            return ResultBean.success("操作成功")
-                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
-                    .setResultList(list);
-        }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep);
-        }catch(Exception e){
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
-
-    @GetMapping(value = "/get/{id}")
-    @ApiOperation(value = "查询定时任务", notes = "查询根据ID查询定时任务")
-    public ResultBean getBySysTaskTimeId(@PathVariable("id") String id) {
-        try {
-            // 数据校验
-            ValidatorBean.checkNotNull(id, "定时任务id 不能为空");
-
-            SysTaskTime taskTime = taskTimeService.getSysTaskTimeById(Long.parseLong(id));
-
-            return ResultBean.success("操作成功")
-                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
-                    .setResultObject(taskTime);
-        }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep);
-        }catch(Exception e){
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
-
-    @PutMapping(value = "/status/{id}/{status}")
-    @ApiOperation(value = "修改定时任务状态", notes = "根据ID修改定时任务状态")
-    public ResultBean updateQuartzStatus(@PathVariable("id") String idStr,@PathVariable("status") Integer status) {
-        try {
-            // 数据校验
-            ValidatorBean.checkNotNull(idStr, "id 不能为空");
-            ValidatorBean.checkNotZero(status, "状态不能为空");
-
-            taskTimeService.updateSysTaskTimeStatus(Long.parseLong(idStr),status,AuthUtil.getSessionUser());
-            return new ResultBean(true);
-        }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep);
-        }catch(Exception e){
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
-
-    @GetMapping("/query")
-    @ApiOperation(value = "定时任务复杂查询，分页，排序",notes = "定时任务复杂查询，分页，排序")
-    public ResultBean querySysTaskTimeByPager(SysTaskTime taskTime, Pager pager){
-        try {
-            ListPager taskTimeListPager = taskTimeService.querySysTaskTimeByPager(taskTime,pager);
-            return  ResultBean.success("查询成功").setListPager(taskTimeListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-        }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep);
-        }catch(Exception e){
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
-
-    @DeleteMapping("/batch-delete")
-    @ApiOperation(value = "根据id批量删除定时任务",notes = "根据id批量删除定时任务")
-    public ResultBean deleteSysTaskTimeByIds(String[] ids){
-        try{
-            if(ids.length == 0){
-                throw ImppExceptionBuilder.newInstance()
-                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                        .setErrorDetail("请选择需要删除的资源。")
-                        .build();
-            }
-
-            taskTimeService.deleteSysTaskTimeByIds(StringTool.getArrayLong(ids));
-            return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-        }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep);
-        }catch(Exception e){
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
-
-    @PutMapping(value = "/batch-status")
-    @ApiOperation(value = "批量修改系统任务状态",notes = "批量修改系统任务状态")
-    public ResultBean updateSysTaskTimeStatusByIds(String[] ids,Integer status){
-        try {
-            // 数据校验
-            if(ids.length == 0){
-                throw ImppExceptionBuilder.newInstance()
-                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                        .setErrorDetail("请选择需要删除的资源。")
-                        .build();
-            }
-            ValidatorBean.checkNotZero(status,"状态不能为空");
-
-            taskTimeService.updateSysTaskTimeStatusByIds(StringTool.getArrayLong(ids),status);
-            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-        }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep);
-        }catch(Exception e){
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
-
-    @GetMapping(value = "/execute/{id}")
-    @ApiOperation(value = "立即执行", notes = "立即执行")
-    public ResultBean executeBySysTaskTimeId(@PathVariable("id") String id) {
-        try {
-            // 数据校验
-            ValidatorBean.checkNotNull(id, "定时任务id 不能为空");
-
-            taskTimeService.executeSysTaskTimeById(Long.parseLong(id));
-            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-        }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep);
-        }catch(Exception e){
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
-}

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
+import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
@@ -57,6 +58,9 @@ public class SysUserController extends CoreBaseController{
     @Autowired
     private ISysMessageService sysMessageService;
 
+    @Autowired
+    private IPersonnelService personnelService;
+
     @PostMapping(value = "/insert")
     @ApiOperation(value = "新增用户", notes = "新增系统用户")
     public ResultBean insertSysUser(SysUser sysUser,String[] roleIds) {
@@ -78,7 +82,7 @@ public class SysUserController extends CoreBaseController{
             }
 
             // 用户唯一校验
-            sysUserService.checkSysUserOnly(sysUser);
+            personnelService.checkSysUserOnly(sysUser);
 
             SysUserInfo userInfo = sysUserInfoService.getSysUserInfoById(sysUser.getUserInfoId());
             if(userInfo == null){
@@ -92,8 +96,8 @@ public class SysUserController extends CoreBaseController{
             //新增初始化
             sysUser.setUserName(userInfo.getName());
             sysUser.setUserStatus(CommonEnumUtil.USER_STATUS.ENABLE.getValue());
-            sysUser.setDepartmentId(userInfo.getDepartmentId());
-            sysUser.setDepartmentNameRdd(userInfo.getDepartmentNameRdd());
+//            sysUser.setDepartmentId(userInfo.getDepartmentId());
+//            sysUser.setDepartmentNameRdd(userInfo.getDepartmentNameRdd());
             sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
             sysUser.setUserType(CommonEnumUtil.USER_TYPE.USER.getValue());
             sysUser.setUserLoginNum(0);
@@ -102,7 +106,7 @@ public class SysUserController extends CoreBaseController{
             SysUser user = sysUserService.insertSysUser(sysUser);
 
             // 更新用户关系
-            sysUserService.refreshSysRefUserRole(user,StringTool.getArrayLong(roleIds),getSessionUser().getUserName());
+            personnelService.refreshRefSysUserRole(user.getId(),StringTool.getArrayLong(roleIds));
 
             return ResultBean.success("操作成功")
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
@@ -136,7 +140,7 @@ public class SysUserController extends CoreBaseController{
             }
 
             // 用户唯一校验
-            sysUserService.checkSysUserOnly(sysUser);
+            personnelService.checkSysUserOnly(sysUser);
 
             // 用户信息封装
             SysUserInfo userInfo = sysUserService.getSysUserInfoById(sysUser.getUserInfoId());
@@ -157,15 +161,13 @@ public class SysUserController extends CoreBaseController{
 
             user.setUserInfoId(userInfo.getId());
             user.setUserName(userInfo.getName());
-            user.setDepartmentId(userInfo.getDepartmentId());
-            user.setDepartmentNameRdd(userInfo.getDepartmentNameRdd());
             user.setUserLoginName(sysUser.getUserLoginName());
             user.setUserEmail(sysUser.getUserEmail());
             user.setUserPhone(sysUser.getUserPhone());
             ConvertBean.modelUpdate(sysUser,AuthUtil.getSessionUser());
 
             // 更新用户关系
-            sysUserService.refreshSysRefUserRole(user, StringTool.getArrayLong(roleIds),getSessionUser().getUserName());
+            personnelService.refreshRefSysUserRole(user.getId(),StringTool.getArrayLong(roleIds));
             sysUserService.updateSysUser(user);
 
             return ResultBean.success("操作成功")
@@ -267,7 +269,11 @@ public class SysUserController extends CoreBaseController{
             if(null == user) {
                 user = new SysUser();
             }
-            user.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue());
+
+            if(user.getRoleId() != null){
+                List<Long> ids = sysUserService.findSysUserIdListByRoleId(Long.parseLong(user.getRoleId()));
+                user.setRoleIdList(ids);
+            }
 
             ListPager<SysUser> listPager = sysUserService.querySysUserByPager(user, pager);
 

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

@@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
@@ -69,13 +70,13 @@ public class SysUserInfoController extends CoreBaseController{
 
             SysUserInfo info = sysUserInfoService.insertSysUserInfo(userInfo);
 
-            sysUserInfoService.refreshRefUserDepartment(info.getId(),
-                    StringTool.getArrayLong(userInfo.getDepartmentIdList()),
-                    user.getUserName());
-
-            sysUserInfoService.refreshRefUserPosition(info.getId(),
-                    StringTool.getArrayLong(userInfo.getPositionIdList()),
-                    user.getUserName());
+//            sysUserInfoService.refreshRefUserDepartment(info.getId(),
+//                    StringTool.getArrayLong(userInfo.getDepartmentIdList()),
+//                    user.getUserName());
+//
+//            sysUserInfoService.refreshRefUserPosition(info.getId(),
+//                    StringTool.getArrayLong(userInfo.getPositionIdList()),
+//                    user.getUserName());
 
             sysUserInfoService.refreshRefUserOrganize(info.getId(), userInfo.getDepartment().getOrganizeId(),user.getUserName());
 
@@ -104,13 +105,13 @@ public class SysUserInfoController extends CoreBaseController{
 
             sysUserInfoService.updateSysUserInfo(userInfo);
 
-            sysUserInfoService.refreshRefUserDepartment(userInfo.getId(),
-                    StringTool.getArrayLong(userInfo.getDepartmentIdList()),
-                    user.getUserName());
-
-            sysUserInfoService.refreshRefUserPosition(userInfo.getId(),
-                    StringTool.getArrayLong(userInfo.getPositionIdList()),
-                    user.getUserName());
+//            sysUserInfoService.refreshRefUserDepartment(userInfo.getId(),
+//                    StringTool.getArrayLong(userInfo.getDepartmentIdList()),
+//                    user.getUserName());
+//
+//            sysUserInfoService.refreshRefUserPosition(userInfo.getId(),
+//                    StringTool.getArrayLong(userInfo.getPositionIdList()),
+//                    user.getUserName());
 
             sysUserInfoService.refreshRefUserOrganize(userInfo.getId(), userInfo.getDepartment().getOrganizeId(),user.getUserName());
 
@@ -242,18 +243,18 @@ public class SysUserInfoController extends CoreBaseController{
 
     @GetMapping(value = "/query-ref-department")
     @ApiOperation(value = "查询角色的所有角色权限关系", notes = "查询角色的所有角色权限关系")
-    public ResultBean queryRefDepartment(SysUserInfo userInfo) {
+    public ResultBean queryRefDepartment(UserDetailModel model) {
         try {
             List<Long> idList = new ArrayList<>();
 
-            List<SysRefUserDepartment> refs = sysUserInfoService.querySysRefUserDepartment(userInfo);
+            List<SysRefUserDepartment> refs = sysUserInfoService.querySysRefUserDepartment(model);
             if(refs != null && refs.size() > 0){
                 for (SysRefUserDepartment ref : refs) {
                     idList.add(ref.getUserId());
                 }
             }
 
-            List<SysUserInfo> result = sysUserInfoService.querySysUserInfoList(userInfo, idList);
+            List<SysUserInfo> result = sysUserInfoService.querySysUserInfoList(model, idList);
 
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(result);
         } catch (ImppBusiException busExcep) {
@@ -296,7 +297,7 @@ public class SysUserInfoController extends CoreBaseController{
                     .notNull("name",userInfo.getName())
                     .notNull("userEmpNo",userInfo.getUserEmpNo())
                     .checkNotZero("departmentId",userInfo.getDepartmentId())
-                    .checkNotZero("departmentIdList",userInfo.getDepartmentIdList())
+//                    .checkNotZero("departmentIdList",userInfo.getDepartmentIdList())
                     .checkNotZero("positionId",userInfo.getPositionId());
             if(isId){
                 ValidatorBean.beginValid(userInfo)

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/SysLogSystemDaoImpl.java

@@ -14,10 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description :
@@ -59,7 +56,7 @@ public class SysLogSystemDaoImpl implements ISysLogSystemDao {
                 .aggregate(aggregateList);
         MongoCursor<Document> cursor = findIter.iterator();
 
-        Map resultData = new HashMap();
+        Map resultData = new LinkedHashMap();
         Document item_doc;
         while (cursor.hasNext()) {
             item_doc = cursor.next();
@@ -90,7 +87,7 @@ public class SysLogSystemDaoImpl implements ISysLogSystemDao {
                 .aggregate(aggregateList);
         MongoCursor<Document> cursor = findIter.iterator();
 
-        Map resultData = new HashMap();
+        Map resultData = new LinkedHashMap();
         Document item_doc;
         while (cursor.hasNext()) {
             item_doc = cursor.next();

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java

@@ -69,7 +69,7 @@ public class MessageLetterQueueReceiver {
                 refUserMessage.setMessageTitleRdd(msg.getMessageTitle());
                 refUserMessage.setMessageTypeRdd(msg.getMessageType());
                 refUserMessage.setMessageSenderNameRdd(msg.getMessageSenderNameRdd());
-                refUserMessage.setReceiverId(sysUser.getUserInfoId());
+                refUserMessage.setReceiverId(sysUser.getId());
                 refUserMessage.setReceiverNameRdd(sysUser.getUserName());
                 refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue());
                 refUserMessage.setReceiverTime(TimeTool.getNowTime(true));

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java

@@ -59,7 +59,8 @@ public class MessageMailQueueReceiver {
                 mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.valueOfDescription(msg.getMessageContentType()));
                 mailUtil.setBody(msg.getMessageContent());
                 mailUtil.setTo(sysConfigService.getSysConfigByCode(PlatformConstWords.CONTACT_MAIL).getConfigValue());
-                mailUtil.send();
+                //信息已处理
+//                mailUtil.send();
             }else {
 
                 // 收件人信息
@@ -90,7 +91,7 @@ public class MessageMailQueueReceiver {
                     mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.valueOfDescription(msg.getMessageContentType()));
                     mailUtil.setBody(msg.getMessageContent());
                     mailUtil.setTo(sysUser.getUserEmail());
-                    mailUtil.send();
+//                    mailUtil.send();
                 }
 
                 msg.setMessageSenderNameRdd(StringUtils.join(receiverName, ","));

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java

@@ -1,8 +1,8 @@
 package cn.estsh.i3plus.core.apiservice.mq;
 
-import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
-import cn.estsh.i3plus.pojo.platform.bean.SysTaskTime;
+import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan;
 import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
 import com.rabbitmq.client.Channel;
 import org.slf4j.Logger;
@@ -27,7 +27,7 @@ public class ScheduleQueueReceiver {
     private static final Logger LOGGER = LoggerFactory.getLogger(ScheduleQueueReceiver.class);
 
     @Autowired
-    private ISysTaskTimeService sysTaskTimeService;
+    private ISysTaskPlanService sysTaskPlanService;
 
     /**
      * 定时任务通道处理
@@ -40,16 +40,18 @@ public class ScheduleQueueReceiver {
         try {
             LOGGER.info("【MQ-IMPP_SCHEDULE_QUEUE】数据接收成功：{}",logTaskTime);
             // 跟新最后执行时间 及 任务状态
-            SysTaskTime task = sysTaskTimeService.getSysTaskTimeByNameAndGroup(logTaskTime.getName(),logTaskTime.getGroupName());
-            task.setLastRunDateTime(logTaskTime.getCreateDatetime());
-            task.setTaskStatus(logTaskTime.getTaskStatus());
-            sysTaskTimeService.updateSysTaskTime(task);
+            SysTaskPlan taskPlan = sysTaskPlanService.getSysTaskPlanByNameAndGroup(logTaskTime.getName(),logTaskTime.getGroupName());
+            taskPlan.setLastRunDateTime(logTaskTime.getCreateDatetime());
+            taskPlan.setTaskPlanExecNum(taskPlan.getTaskPlanExecNum() + 1);
+            taskPlan.setTaskPlanStatus(logTaskTime.getTaskStatus());
+            //更新任务状态以及最后执行时间
+            sysTaskPlanService.updateSysTaskPlan(taskPlan);
 
             // 添加定时任务日志
-            logTaskTime.setTimeTaskId(task.getId());
-            logTaskTime.setTimeExpressionNameRdd(task.getTimeExpressionNameRdd());
-            logTaskTime.setTimeExpressionContentRdd(task.getTimeExpressionContentRdd());
-            sysTaskTimeService.logInsertSysLogTaskTime(logTaskTime);
+            logTaskTime.setTaskPlanId(taskPlan.getId());
+            logTaskTime.setTaskCycleNameRdd(taskPlan.getTaskCycleNameRdd());
+            logTaskTime.setTaskCycleExpsRdd(taskPlan.getTaskCycleExpsRdd());
+            sysTaskPlanService.logInsertSysLogTaskTime(logTaskTime);
 
             //信息已处理
             channel.basicAck(message.getMessageProperties().getDeliveryTag(),false);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java

@@ -1,23 +1,18 @@
 package cn.estsh.i3plus.core.apiservice.schedulejob;
 
-import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
-import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeService;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob;
 import cn.estsh.impp.framework.boot.init.ApplicationProperties;
-import com.netflix.discovery.converters.Auto;
 import io.swagger.annotations.ApiOperation;
 import org.quartz.JobExecutionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.text.SimpleDateFormat;
-
 /**
  * @Description :  定时任务
  * @Reference :

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

@@ -0,0 +1,635 @@
+package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
+
+import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
+import cn.estsh.i3plus.core.apiservice.util.HqlModelPack;
+import cn.estsh.i3plus.platform.common.tool.TimeTool;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.shirotoken.UserToken;
+import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
+import cn.estsh.i3plus.pojo.platform.bean.*;
+import cn.estsh.i3plus.pojo.platform.repository.*;
+import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Adair Peng
+ * @CreateDate : 2018-12-24 13:10
+ * @Modify:
+ **/
+@Service
+public class PersonnelServiceService implements IPersonnelService {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigService.class);
+
+    @Autowired
+    private SysUserRepository userRDao;
+
+    @Autowired
+    private SysUserInfoRepository userInfoRDao;
+
+    @Autowired
+    private SysRoleRepository roleRDao;
+
+    @Autowired
+    private SysRefUserDepartmentRepository refUserDepartmentRDao;
+
+    @Autowired
+    private SysRefUserInfoDepartmentRepository refUserInfoDepartmentRDao;
+
+    @Autowired
+    private SysRefUserPositionRepository refUserPositionRDao;
+
+    @Autowired
+    private SysRefUserRoleRepository refUserRoleRDao;
+
+    @Autowired
+    private SysOrganizeRepository organizeRDao;
+
+    @Autowired
+    private SysDepartmentRepository departmentRDao;
+
+    @Autowired
+    private SysPositionRepository positionRDao;
+
+
+    @Override
+    public SysUser saveSysUser(SysUser user) {
+        LOGGER.debug("平台账号 SysUser user:{}", user);
+        return userRDao.save(user);
+    }
+
+    @Override
+    public SysUserInfo saveSysUserInfo(SysUserInfo info) {
+        LOGGER.debug("平台用户 SysUserInfo info:{}", info);
+        return userInfoRDao.save(info);
+    }
+
+    @Override
+    public void updateSysUserInfoStatus(Long userInfoId, Integer status) {
+
+    }
+
+    @Override
+    @ApiOperation(value = "删除账号信息")
+    public void deleteSysUser(Long[] userIdList,String userName) {
+        LOGGER.debug("平台账号 SysUser userIdList:{}", userIdList);
+        // 删除账号信息
+        userRDao.updateValidStatusByPropertyIn("id", userIdList,CommonEnumUtil.IS_VAILD.INVAILD.getValue(), userName);
+
+        // 删除账号关系
+        refUserDepartmentRDao.deleteByPropertyIn("userId",userIdList);
+        refUserRoleRDao.deleteByPropertyIn("userId", userIdList);
+    }
+
+    @Override
+    @ApiOperation(value = "删除用户信息")
+    public void deleteSysUserInfo(Long[] infoIdList,String userName) {
+        LOGGER.debug("平台用户 SysUserInfo infoIdList:{}", infoIdList);
+        // 删除用户信息
+        userInfoRDao.updateValidStatusByPropertyIn("id", infoIdList,CommonEnumUtil.IS_VAILD.INVAILD.getValue(), userName);
+
+        // 删除用户关系
+        refUserInfoDepartmentRDao.deleteByPropertyIn("userId",infoIdList);
+        refUserPositionRDao.deleteByPropertyIn("userId",infoIdList);
+    }
+
+    @Override
+    public SysUser getSysUserById(Long id) {
+        return userRDao.getById(id);
+    }
+
+    @Override
+    public List<SysUser> findSysUserByIds(Long[] ids) {
+        LOGGER.debug("平台用户 SysUserInfo ids:{}", ids);
+
+        String infoWhere = CoreHqlPack.packHqlIds("id", ids);
+        return userRDao.findByHqlWhere(infoWhere);
+    }
+
+    @Override
+    public List<SysUser> querySysUserByUserDetailModelOrIds(UserDetailModel model, List<Long> ids) {
+        LOGGER.debug("平台用户 SysUser model:{} ids:{}", model, ids);
+        String modeWhere = HqlModelPack.packHqlSysUserByModelOrIds(model, ids);
+
+        return userRDao.findByHqlWhere(modeWhere);
+    }
+
+    @Override
+    public SysUserInfo getSysUserInfoById(Long id) {
+        return userInfoRDao.getById(id);
+    }
+
+    @Override
+    public SysDepartment getSysDepartmentById(Long id) {
+        return departmentRDao.getById(id);
+    }
+
+    @Override
+    public SysPosition getSysPositionById(Long id) {
+        return positionRDao.getById(id);
+    }
+
+    @Override
+    public SysOrganize getSysOrganizeById(Long id) {
+        return organizeRDao.getById(id);
+    }
+
+    @Override
+    public SessionUser queryUserLogin(String userName, String password, String languageCode) {
+        LOGGER.debug("平台用户 SYS_USER loginName:{} \t password:{} \t languageCode:{}", userName, password, languageCode);
+        UserToken token = new UserToken(userName,password,languageCode);
+        SessionUser sessionUser = AuthUtil.login(token);
+        AuthUtil.setSessionUser(sessionUser);
+        return sessionUser;
+    }
+
+    @Override
+    public ListPager<SysUserInfo> querySysUserInfo(UserDetailModel model, Pager pager) {
+        return null;
+    }
+
+    @Override
+    public List<SysUserInfo> findSysUserInfoByIds(Long[] ids) {
+        LOGGER.debug("平台用户 SysUserInfo ids:{}", ids);
+
+        String infoWhere = CoreHqlPack.packHqlIds("id", ids);
+        return userInfoRDao.findByHqlWhere(infoWhere);
+    }
+
+    @Override
+    public List<SysRefUserRole> findSysRefUserRoleById(Long userId) {
+        LOGGER.debug("平台账号角色 SysRefUserRole userId:{}", userId);
+        return refUserRoleRDao.findByProperty("userId",userId);
+    }
+
+    @Override
+    public List<SysRefUserDepartment> findSysRefUserDepartmentById(Long userId) {
+        LOGGER.debug("平台账号部门 SysRefUserDepartment userId:{}", userId);
+        return refUserDepartmentRDao.findByProperty("userId",userId);
+    }
+
+    @Override
+    public List<SysRefUserDepartment> querySysRefUserDepartmentByUserDetailModel(UserDetailModel model) {
+        if(model != null){
+            StringBuffer userIdWhere = new StringBuffer();
+
+            if(model.getUserDepartmentIdList() != null){
+                HqlPack.getInPack(StringUtils.join(model.getInfoDepartmentIdList(),","),"departmentId", userIdWhere);
+            }
+            if(model.getUserOrganizeIdList() != null){
+                HqlPack.getInPack( StringUtils.join(model.getUserOrganizeIdList(),","),"organizeId",userIdWhere);
+            }
+
+            return refUserDepartmentRDao.findByHqlWhere(userIdWhere.toString());
+        }else {
+            return null;
+        }
+    }
+
+    @Override
+    public List<SysRefUserInfoDepartment> findSysRefUserInfoDepartmentById(Long infoId) {
+        LOGGER.debug("平台用户部门关系 SysRefUserInfoDepartment infoId:{}", infoId);
+        return refUserInfoDepartmentRDao.findByProperty("userId",infoId);
+    }
+
+    @Override
+    @ApiOperation(value = "查询用户部门关系")
+    public List<SysDepartment> findSysUserInfoDepartmentByInfoId(Long infoId) {
+        LOGGER.debug("平台用户部门 SysDepartment infoId:{}", infoId);
+        List<SysDepartment> result = new ArrayList<>();
+
+        List<SysRefUserInfoDepartment> refs = findSysRefUserInfoDepartmentById(infoId);
+        if(refs != null && refs.size() > 0){
+            Long[] ids = new Long[refs.size()];
+            for (int i = 0; i < refs.size(); i++) {
+                ids[i] = refs.get(i).getDepartmentId();
+            }
+            String idWhere = CoreHqlPack.packHqlIds("id", ids);
+            return departmentRDao.findByHqlWhere(idWhere);
+        }
+        return result;
+    }
+
+    @Override
+    @ApiOperation(value = "查询账号部门关系")
+    public List<SysDepartment> findSysUserDepartmentByInfoId(Long infoId) {
+        LOGGER.debug("平台用户部门 SysDepartment infoId:{}", infoId);
+        List<SysDepartment> result = new ArrayList<>();
+
+        List<SysRefUserDepartment> refs = findSysRefUserDepartmentById(infoId);
+        if(refs != null && refs.size() > 0){
+            Long[] ids = new Long[refs.size()];
+            for (int i = 0; i < refs.size(); i++) {
+                ids[i] = refs.get(i).getDepartmentId();
+            }
+            String idWhere = CoreHqlPack.packHqlIds("id", ids);
+            return departmentRDao.findByHqlWhere(idWhere);
+        }
+        return result;
+    }
+
+    @Override
+    public List<SysOrganize> findSysUserInfoOrganize(Long infoId) {
+        LOGGER.debug("平台用户部门 SysDepartment infoId:{}", infoId);
+        List<SysOrganize> result = new ArrayList<>();
+
+        List<SysRefUserInfoDepartment> refs = findSysRefUserInfoDepartmentById(infoId);
+        if(refs != null && refs.size() > 0){
+            Long[] ids = new Long[refs.size()];
+            for (int i = 0; i < refs.size(); i++) {
+                ids[i] = refs.get(i).getOrganizeId();
+            }
+            String idWhere = CoreHqlPack.packHqlIds("id", ids);
+            return organizeRDao.findByHqlWhere(idWhere);
+        }
+        return result;
+    }
+
+    @Override
+    public List<SysOrganize> findSysUserOrganize(Long infoId) {
+        LOGGER.debug("平台用户部门 SysDepartment infoId:{}", infoId);
+        List<SysOrganize> result = new ArrayList<>();
+
+        List<SysRefUserDepartment> refs = findSysRefUserDepartmentById(infoId);
+        if(refs != null && refs.size() > 0){
+            Long[] ids = new Long[refs.size()];
+            for (int i = 0; i < refs.size(); i++) {
+                ids[i] = refs.get(i).getOrganizeId();
+            }
+            String idWhere = CoreHqlPack.packHqlIds("id", ids);
+            return organizeRDao.findByHqlWhere(idWhere);
+        }
+        return result;
+    }
+
+    @Override
+    public List<SysRefUserPosition> findSysRefUserPositionById(Long infoId) {
+        LOGGER.debug("平台用户岗位 SysRefUserPosition infoId:{}", infoId);
+        return refUserPositionRDao.findByProperty("userId",infoId);
+    }
+
+    @Override
+    public SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode) {
+        return null;
+    }
+
+    @Override
+    public void checkSysUserOnly(SysUser user) {
+        if(user != null){
+            // 登录名唯一教研
+            if(!checkSysUserLoginName(user.getUserLoginName(), user.getId() == null ? 0 : user.getId())){
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+                        .setErrorDetail("用户名已存在")
+                        .setErrorSolution("请重新输入用户名")
+                        .build();
+            }
+
+            // 邮箱唯一教研
+            if(!checkSysUserEmail(user.getUserEmail(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+                        .setErrorDetail("邮箱已存在")
+                        .setErrorSolution("请重新输入邮箱")
+                        .build();
+            }
+
+            // 手机号唯一教研
+            if(!checkSysUserPhone(user.getUserPhone(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+                        .setErrorDetail("手机号已存在")
+                        .setErrorSolution("请重新输入手机号")
+                        .build();
+            }
+
+            // 工号唯一教研
+            if(!checkSysUserEmpNo(user.getUserEmpNo(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+                        .setErrorDetail("工号号已存在")
+                        .setErrorSolution("请重新输入工号")
+                        .build();
+            }
+        }
+    }
+
+    /************************************ 用户唯一检查 ****************************************/
+
+    /**
+     * 登录名 唯一检查
+     * @param userLoginName
+     * @param userId
+     * @return
+     */
+    private boolean checkSysUserLoginName(String userLoginName, long userId) {
+        int count = 0;
+        if(userId > 0){
+            StringBuffer sw = new StringBuffer();
+            HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",sw);
+            HqlPack.getStringEqualPack(userLoginName,"userLoginName",sw);
+            HqlPack.getNumNOEqualPack(userId,"id",sw);
+            count = userRDao.findByHqlWhereCount(sw.toString());
+
+        }else{
+            count = userRDao.findByPropertyCount(
+                    new String[]{"userLoginName","isValid"},
+                    new Object[]{userLoginName,CommonEnumUtil.IS_VAILD.VAILD.getValue()});
+        }
+        return count <= 0 ;
+    }
+
+    /**
+     * 用户邮箱唯一检查
+     * @param email
+     * @param infoId
+     * @return
+     */
+    private boolean checkSysUserEmail(String email, long infoId) {
+        int count;
+        if(infoId > 0){
+            StringBuffer sw = new StringBuffer();
+            HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",sw);
+            HqlPack.getStringEqualPack(email,"userEmail",sw);
+            HqlPack.getNumNOEqualPack(infoId,"userInfoId",sw);
+            count = userRDao.findByHqlWhereCount(sw.toString());
+
+        }else{
+            count = userRDao.findByPropertyCount(
+                    new String[]{"userEmail","isValid"},
+                    new Object[]{email,CommonEnumUtil.IS_VAILD.VAILD.getValue()});
+        }
+        return count <= 0 ;
+    }
+
+    /**
+     * 手机号码 唯一校验
+     * @param phone
+     * @param infoId
+     * @return
+     */
+    private boolean checkSysUserPhone(String phone, long infoId) {
+        int count;
+        if(infoId > 0){
+            StringBuffer sw = new StringBuffer();
+            HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",sw);
+            HqlPack.getStringEqualPack(phone,"userPhone",sw);
+            HqlPack.getNumNOEqualPack(infoId,"userInfoId",sw);
+            count = userRDao.findByHqlWhereCount(sw.toString());
+
+        }else{
+            count = userRDao.findByPropertyCount(
+                    new String[]{"userPhone","isValid"},
+                    new Object[]{phone,CommonEnumUtil.IS_VAILD.VAILD.getValue()});
+        }
+        return count <= 0 ;
+    }
+
+    /**
+     * 工号唯一检查
+     * @param empNo
+     * @param infoId
+     * @return
+     */
+    private boolean checkSysUserEmpNo(String empNo, long infoId) {
+        int count;
+        if(infoId > 0){
+            StringBuffer sw = new StringBuffer();
+            HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",sw);
+            HqlPack.getStringEqualPack(empNo,"userEmpNo",sw);
+            HqlPack.getNumNOEqualPack(infoId,"userInfoId",sw);
+            count = userRDao.findByHqlWhereCount(sw.toString());
+
+        }else{
+            count = userRDao.findByPropertyCount(
+                    new String[]{"userEmpNo","isValid"},
+                    new Object[]{empNo,CommonEnumUtil.IS_VAILD.VAILD.getValue()});
+        }
+        return count <= 0 ;
+    }
+
+    @Override
+    public void refreshRefSysUserOrganizeRdd(Long organizeIds) {
+
+    }
+
+    @Override
+    public void refreshRefSysUserDepartment(Long userId, Long[] departmentIds) {
+        LOGGER.info("账号部门信息 SysUser userInfoId:{} departmentIds:{}",userId,departmentIds);
+
+        SysUser user = userRDao.getById(userId);
+        if(user != null ){
+            // 删除用户部门关系
+            refUserDepartmentRDao.deleteByProperty("userId",user.getId());
+
+            if(departmentIds.length > 0){
+                // 查询部门信息
+                StringBuffer where = new StringBuffer();
+                HqlPack.getInPack(StringUtils.join(departmentIds,","),"id",where);
+                List<SysDepartment> departmentList = departmentRDao.findByHqlWhere(where.toString());
+
+                if(departmentList != null && departmentList.size() >0){
+                    List<SysRefUserDepartment> list = new ArrayList<>();
+                    List<String> nameList = new ArrayList<>();
+                    SysRefUserDepartment ref = null;
+                    for (SysDepartment department : departmentList) {
+                        ref = new SysRefUserDepartment();
+                        ref.setOrganizeId(department.getOrganizeId());
+                        ref.setOrganizeNameRdd(department.getOrganizeNameRdd());
+                        ref.setDepartmentId(department.getId());
+                        ref.setDepartmentNameRdd(department.getName());
+                        ref.setUserId(user.getId());
+                        ref.setUserNameRdd(user.getUserName());
+                        list.add(ref);
+
+                        nameList.add(department.getName());
+                    }
+
+                    user.setDepartmentNamesRdd(String.join(",",nameList));
+
+                    refUserDepartmentRDao.saveAll(list);
+                    userRDao.save(user);
+
+                    LOGGER.info("账号部门信息 SysUserInfo RefUserDepartmentRDao Insert Size :{}",list.size());
+                }
+            }
+        }else {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
+                    .setErrorDetail("用户信息不存在")
+                    .setErrorSolution("请重新操作")
+                    .build();
+        }
+    }
+
+    @Override
+    public void refreshRefSysUserRole(Long userId, Long[] roleIds) {
+        LOGGER.debug("账号角色关系信息 RefSysUserRole userId:{} roleIds:{} ", userId,roleIds);
+        SysUser user = userRDao.getById(userId);
+        if(user != null){
+            // 根据IDS 查询所有的角色信息
+            String where = CoreHqlPack.packHqlIds("id", roleIds);
+            List<SysRole> list = roleRDao.findByHqlWhere(where);
+
+            // 删除角色关系信息
+            refUserRoleRDao.deleteByProperty("userId", user.getId()); // 删除用户角色关系
+
+            if(null != list && list.size() > 0){
+                // 新增用户角色关系
+                List<SysRefUserRole> refUserRoles = new ArrayList<>();
+                List<String> roleNameList = new ArrayList<>();
+                SysRefUserRole refUserRole = null;
+                for (SysRole role : list) {
+                    roleNameList.add(role.getName());
+                    // 用户角色关系创建
+                    refUserRole = new SysRefUserRole();
+                    refUserRole.setRoleId(role.getId());
+                    refUserRole.setRoleNameRdd(role.getName());
+                    refUserRole.setUserId(user.getId());
+                    refUserRole.setUserNameRdd(user.getUserName());
+                    refUserRole.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue());
+                    refUserRoles.add(refUserRole);
+                }
+                refUserRoleRDao.saveAll(refUserRoles);
+
+                // 角色名称冗余
+                user.setRoleNamesRdd(String.join(",", roleNameList));
+
+                userRDao.save(user);
+            }
+        }
+    }
+
+    @Override
+    public void refreshRefSysUserDepartmentRdd(Long departmentId) {
+
+    }
+
+    @Override
+    public void refreshRefSysUserInfoDepartment(Long userInfoId, Long[] departmentIds) {
+        LOGGER.info("用户部门关系信息 SysUser userInfoId:{} departmentIds:{}",userInfoId,departmentIds);
+
+        SysUserInfo info = userInfoRDao.getById(userInfoId);
+        if(info != null ){
+            // 删除用户部门关系
+            refUserInfoDepartmentRDao.deleteByProperty("userId",info.getId());
+
+            if(departmentIds.length > 0){
+                // 查询部门信息
+                StringBuffer where = new StringBuffer();
+                HqlPack.getInPack(StringUtils.join(departmentIds,","),"id",where);
+                List<SysDepartment> departmentList = departmentRDao.findByHqlWhere(where.toString());
+
+                if(departmentList != null && departmentList.size() >0){
+                    List<SysRefUserInfoDepartment> list = new ArrayList<>();
+                    List<String> nameList = new ArrayList<>();
+                    SysRefUserInfoDepartment ref = null;
+                    for (SysDepartment department : departmentList) {
+                        ref = new SysRefUserInfoDepartment();
+                        ref.setOrganizeId(department.getOrganizeId());
+                        ref.setOrganizeNameRdd(department.getOrganizeNameRdd());
+                        ref.setDepartmentId(department.getId());
+                        ref.setDepartmentNameRdd(department.getName());
+                        ref.setUserId(info.getId());
+                        ref.setUserNameRdd(info.getName());
+                        list.add(ref);
+
+                        nameList.add(department.getName());
+                    }
+
+                    info.setDepartmentNamesRdd(String.join(",",nameList));
+
+                    refUserInfoDepartmentRDao.saveAll(list);
+                    userInfoRDao.save(info);
+
+                    LOGGER.info("用户部门关系信息 SysUserInfo RefUserDepartmentRDao Insert Size :{}",list.size());
+                }
+            }
+        }else {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
+                    .setErrorDetail("用户信息不存在")
+                    .setErrorSolution("请重新操作")
+                    .build();
+        }
+    }
+
+    @Override
+    public void refreshRefSysUserInfoDepartmentRdd(Long departmentId) {
+
+    }
+
+    @Override
+    public void refreshRefSysUserInfoPosition(Long userInfoId, Long[] positionIds) {
+        LOGGER.info("用户岗位关系信息 RefSysUserInfoPosition userInfoId:{} positionIds:{} userName:{}",userInfoId,positionIds);
+
+        SysUserInfo userInfo = userInfoRDao.getById(userInfoId);
+        if(userInfo != null ){
+            // 删除用户岗位关系
+            refUserPositionRDao.deleteByProperty("userId",userInfo.getId());
+
+            if(positionIds.length > 0){
+                StringBuffer where = new StringBuffer();
+                HqlPack.getInPack(StringUtils.join(positionIds,","),"id",where);  // 查询部门信息
+                List<SysPosition> positionList = positionRDao.findByHqlWhere(where.toString());
+
+                if(positionList != null && positionList.size() >0){
+                    List<SysRefUserPosition> list = new ArrayList<>();
+                    List<String> nameList = new ArrayList<>();
+                    SysRefUserPosition ref = null;
+                    for (SysPosition position : positionList) {
+                        ref = new SysRefUserPosition();
+                        ref.setUserId(userInfo.getId());
+                        ref.setUserNameRdd(userInfo.getName());
+                        ref.setPositionId(position.getId());
+                        ref.setPositionNameRdd(position.getName());
+                        list.add(ref);
+
+                        nameList.add(position.getName());
+                    }
+
+                    userInfo.setPositionNamesRdd(String.join(",",nameList));
+
+                    refUserPositionRDao.saveAll(list);
+                    userInfoRDao.save(userInfo);
+
+                    LOGGER.info("用户岗位关系信息 SysUserInfo RefUserPositionRDao Insert Size :{}",list.size());
+                }
+            }
+        }else {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
+                    .setErrorDetail("用户信息不存在")
+                    .setErrorSolution("请重新操作")
+                    .build();
+        }
+    }
+
+    @Override
+    public void refreshRefSysUserInfoPositionRdd(Long positionId) {
+
+    }
+}

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

@@ -40,13 +40,14 @@ public class SysDictionaryService implements ISysDictionaryService {
     @ApiOperation(value = "添加字典")
     public void insertSysDictionary(SysDictionary sysDictionary) {
         long repeatCodeCount = sysDictionaryRDao.findByPropertyCount("dictionaryCode",sysDictionary.getDictionaryCode());
-        long repeatValueCount = sysDictionaryRDao.findByPropertyCount("dictionaryValue",sysDictionary.getDictionaryValue());
+        long repeatValueCount = sysDictionaryRDao.findByPropertyCount(new String[]{"parentId","dictionaryValue"},
+                new Object[]{sysDictionary.getParentId(),sysDictionary.getDictionaryValue()});
         if (repeatCodeCount > 0 || repeatValueCount > 0){
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                    .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
-                    .setErrorDetail("字典代码已存在")
-                    .setErrorSolution("请重新输入字典代码")
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+                    .setErrorDetail("字典代码或字典值已存在")
+                    .setErrorSolution("请重新输入字典代码或字典值")
                     .build();
         }
 
@@ -176,4 +177,15 @@ public class SysDictionaryService implements ISysDictionaryService {
         }
         return null;
     }
+
+    @Override
+    @ApiOperation(value = "设置默认字典项",notes = "根据id设置默认字典项")
+    public void updateSysDictionaryDefaultById(Long id) {
+        SysDictionary sysDictionary = sysDictionaryRDao.getById(id);
+        sysDictionaryRDao.updateByProperties("parentId",sysDictionary.getParentId(),
+                "isDefault",CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
+
+        sysDictionaryRDao.updateByProperties("id",id,
+                "isDefault",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+    }
 }

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

@@ -0,0 +1,109 @@
+package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
+
+import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskCycleService;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.common.PagerHelper;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.platform.bean.SysRefTaskCyclePlan;
+import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle;
+import cn.estsh.i3plus.pojo.platform.repository.SysRefTaskCyclePlanRepository;
+import cn.estsh.i3plus.pojo.platform.repository.SysTaskCycleRepository;
+import cn.estsh.i3plus.pojo.platform.repository.SysTaskPlanRepository;
+import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description : 定时任务周期 业务逻辑实现
+ * @Reference :
+ * @Author : wei.peng
+ * @Date : 2018-10-24 20:40
+ * @Modify :
+ **/
+@Service
+public class SysTaskCycleService implements ISysTaskCycleService {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskCycleService.class);
+
+    @Autowired
+    private SysTaskCycleRepository sysTaskCycleRDao;
+
+    @Autowired
+    private SysTaskPlanRepository sysTaskPlanRDao;
+
+    @Autowired
+    private SysRefTaskCyclePlanRepository sysRefTaskCyclePlanRDao;
+
+    @Override
+    @ApiOperation(value = "修改任务周期",notes = "修改任务周期")
+    public void updateSysTaskCycle(SysTaskCycle sysTaskCycle) {
+        sysTaskCycleRDao.update(sysTaskCycle);
+    }
+
+    @Override
+    @ApiOperation(value = "删除任务周期",notes = "根据id删除任务周期")
+    public void deleteSysTaskCycleById(Long id) {
+        int refExpressionTriggerList = sysRefTaskCyclePlanRDao.findByPropertyCount("taskCycleId",id);
+        if(refExpressionTriggerList != 0){
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("存在关联任务计划，无法删除")
+                    .setErrorSolution("请重新选择")
+                    .build();
+        }
+
+        sysTaskCycleRDao.deleteById(id);
+    }
+
+    @Override
+    @ApiOperation(value = "新增任务周期",notes = "新增任务周期")
+    public SysTaskCycle insertSysTaskCycle(SysTaskCycle sysTaskCycle) {
+        return sysTaskCycleRDao.insert(sysTaskCycle);
+    }
+
+    @Override
+    @ApiOperation(value = "查询所有任务周期信息",notes = "查询所有任务周期信息")
+    public List<SysTaskCycle> listSysTaskCycle() {
+        return sysTaskCycleRDao.list();
+    }
+
+    @Override
+    @ApiOperation(value = "根据ID 查询任务周期",notes = "根据ID 查询任务周期")
+    public SysTaskCycle getSysTaskCycleById(Long id) {
+        return sysTaskCycleRDao.getById(id);
+    }
+
+    @Override
+    @ApiOperation(value = "任务周期查询，分页，排序",notes = "任务周期查询，分页，排序")
+    public ListPager querySysTaskCycleByPager(SysTaskCycle sysTaskCycle, Pager pager) {
+        if(sysTaskCycle == null) {
+            pager = PagerHelper.getPager(pager, sysTaskCycleRDao.listCount());
+            return new ListPager(sysTaskCycleRDao.listPager(pager),pager);
+        }else {
+            String hqlPack = CoreHqlPack.packHqlSysTaskCycle(sysTaskCycle);
+            pager = PagerHelper.getPager(pager, sysTaskCycleRDao.findByHqlWhereCount(hqlPack));
+            return new ListPager(sysTaskCycleRDao.findByHqlWherePage(hqlPack + sysTaskCycle.orderBy(),pager),pager);
+        }
+    }
+
+    @Override
+    @ApiOperation(value = "根据id批量删除任务周期",notes = "根据id批量删除任务周期")
+    public void deleteSysTaskCycleByIds(Long[] ids) {
+        sysTaskCycleRDao.deleteByIds(ids);
+    }
+
+    @Override
+    @ApiOperation(value = "根据任务周期id查询相关任务计划信息",notes = "根据任务周期id查询相关任务计划信息")
+    public List<SysRefTaskCyclePlan> findRefTaskCyclePlanByCycleId(Long cycleId) {
+        return sysRefTaskCyclePlanRDao.findByProperty("taskCycleId",cycleId);
+    }
+}

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

@@ -1,25 +1,20 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
-import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
-import cn.estsh.i3plus.pojo.platform.bean.SysRefExpressionTrigger;
-import cn.estsh.i3plus.pojo.platform.bean.SysTaskTime;
-import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression;
+import cn.estsh.i3plus.pojo.platform.bean.*;
 import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
 import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogTaskTimeRepository;
-import cn.estsh.i3plus.pojo.platform.repository.SysRefExpressionTriggerRepository;
-import cn.estsh.i3plus.pojo.platform.repository.SysTaskTimeRepository;
+import cn.estsh.i3plus.pojo.platform.repository.SysRefTaskCyclePlanRepository;
+import cn.estsh.i3plus.pojo.platform.repository.SysTaskPlanRepository;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.quartz.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,15 +34,15 @@ import java.util.List;
  * @Modify      :
  **/
 @Service
-public class SysTaskTimeService implements ISysTaskTimeService{
+public class SysTaskPlanService implements ISysTaskPlanService {
 
-    public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskTimeService.class);
+    public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskPlanService.class);
 
     @Autowired
-    private SysTaskTimeRepository taskTimeRDao;
+    private SysTaskPlanRepository sysTaskPlanRDao;
 
     @Autowired
-    private SysRefExpressionTriggerRepository refExpressionTriggerRDao;
+    private SysRefTaskCyclePlanRepository sysRefTaskCyclePlanRDao;
 
     @Autowired
     private SysLogTaskTimeRepository sysLogTaskTimeRDao;
@@ -56,23 +51,92 @@ public class SysTaskTimeService implements ISysTaskTimeService{
     private Scheduler scheduler;
 
     @Override
-    @ApiOperation(value = "修改定时任务")
-    public void updateSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression) {
+    @ApiOperation(value = "新增任务计划",notes = "新增任务计划")
+    public SysTaskPlan insertSysTaskPlan(SysTaskPlan sysTaskPlan, SysTaskCycle sysTaskCycle,SysTask sysTask) {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            // 唯一校验
+            JobKey jobKey = JobKey.jobKey(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
+            TriggerKey triggerKey = TriggerKey.triggerKey(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
+            if (sysTaskPlanRDao.isExitByProperty(new String[]{"name","groupName"},new String[]{sysTaskPlan.getName(),sysTaskPlan.getGroupName()})
+                    || scheduler.checkExists(jobKey) || scheduler.checkExists(triggerKey)){
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+                        .setErrorDetail("定时任务已存在")
+                        .setErrorSolution("请重新输入任务名称和组名称")
+                        .build();
+            }
+
+            SysRefTaskCyclePlan refTaskCyclePlan = new SysRefTaskCyclePlan();
+            refTaskCyclePlan.setTaskCycleId(sysTaskCycle.getId());
+            refTaskCyclePlan.setTaskPlanName(sysTaskPlan.getName());
+            refTaskCyclePlan.setTaskPlanGroupName(sysTaskPlan.getGroupName());
+
+            sysTaskPlan = sysTaskPlanRDao.insert(sysTaskPlan);
+            // 添加表达式与触发器关系表
+            sysRefTaskCyclePlanRDao.insert(refTaskCyclePlan);
+
+            // 添加定时任务与触发器到quartz表中
+            CronScheduleBuilder schedBuilder = CronScheduleBuilder
+                    .cronSchedule(sysTaskCycle.getTaskCycleExps())
+                    .withMisfireHandlingInstructionDoNothing();
+            TriggerBuilder<CronTrigger> trigger = TriggerBuilder.newTrigger()
+                    .withIdentity(triggerKey)
+                    .withDescription(sysTaskCycle.getTaskCycleDescription())
+                    .withSchedule(schedBuilder)
+                    .startAt(sdf.parse(sysTaskCycle.getTaskCycleStartDatetime()));
+            if(sysTaskCycle.getTaskCycleEndDatetime() != null && sysTaskCycle.getTaskCycleEndDatetime().length() != 0){
+                trigger = trigger.endAt(sdf.parse(sysTaskCycle.getTaskCycleEndDatetime()));
+            }
+
+            Class<? extends Job> clazz = (Class<? extends Job>) Class.forName(sysTask.getTaskPackage() + "." + sysTask.getTaskClass());
+            JobDetail jobDetail = JobBuilder.newJob(clazz).withIdentity(jobKey).withDescription(sysTaskPlan.getTaskPlanDescription()).build();
+
+            scheduler.scheduleJob(jobDetail, trigger.build());
+        } catch (SchedulerException e) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.TASK_EXCEPTION.getCode())
+                    .build();
+        } catch (ParseException e) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_FORMAT.getCode())
+                    .setErrorDetail("表达式起止时间错误")
+                    .setErrorSolution("请更改表达式起止时间")
+                    .build();
+        } catch (ClassNotFoundException e) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("定时任务包名及类名不正确")
+                    .setErrorSolution("请重新输入定时任务包名及类名")
+                    .build();
+        }
+        return sysTaskPlan;
+    }
+
+    @Override
+    @ApiOperation(value = "修改任务计划",notes = "修改任务计划")
+    public void updateSysTaskPlan(SysTaskPlan sysTaskPlan, SysTaskCycle sysTaskCycle) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-        SysTaskTime oldSysTaskTime = taskTimeRDao.getById(taskTime.getId());
+        SysTaskPlan oldSysTaskPlan = sysTaskPlanRDao.getById(sysTaskPlan.getId());
 
         // 更新关系表
-        refExpressionTriggerRDao.updateByProperties(new String[]{"triggerName","triggerGroupName"},
-                new String[]{oldSysTaskTime.getName(),taskTime.getGroupName()},
-                "expressionId",oldSysTaskTime.getTimeExpressionId()
+        sysRefTaskCyclePlanRDao.updateByProperties(new String[]{"taskPlanName","taskPlanGroupName"},
+                new String[]{oldSysTaskPlan.getName(),oldSysTaskPlan.getGroupName()},
+                "taskCycleId", oldSysTaskPlan.getTaskCycleId()
         );
 
-        taskTimeRDao.update(taskTime);
+        sysTaskPlan.setTaskPlanExecNum(oldSysTaskPlan.getTaskPlanExecNum());
+        sysTaskPlan.setLastRunDateTime(oldSysTaskPlan.getLastRunDateTime());
+        sysTaskPlan.setTaskPlanStatus(oldSysTaskPlan.getTaskPlanStatus());
+        sysTaskPlanRDao.update(sysTaskPlan);
 
         try {
-            TriggerKey triggerKey = TriggerKey.triggerKey(taskTime.getName(),taskTime.getGroupName());
-            System.out.println(scheduler.getTrigger(triggerKey));
+            TriggerKey triggerKey = TriggerKey.triggerKey(oldSysTaskPlan.getName(),oldSysTaskPlan.getGroupName());
 
             if (!scheduler.checkExists(triggerKey)) {
                 throw ImppExceptionBuilder.newInstance()
@@ -85,20 +149,20 @@ public class SysTaskTimeService implements ISysTaskTimeService{
 
             // 添加定时任务与触发器到quartz表中
             CronScheduleBuilder schedBuilder = CronScheduleBuilder
-                    .cronSchedule(taskTimeExpression.getExpressionContent())
+                    .cronSchedule(sysTaskCycle.getTaskCycleExps())
                     .withMisfireHandlingInstructionDoNothing();
             TriggerBuilder<CronTrigger> trigger = TriggerBuilder.newTrigger()
                     .withIdentity(triggerKey)
-                    .withDescription(taskTimeExpression.getExpressionDescription())
+                    .withDescription(sysTaskCycle.getTaskCycleDescription())
                     .withSchedule(schedBuilder)
-                    .startAt(sdf.parse(taskTimeExpression.getExpressionStartDatetime()));
-            if(taskTimeExpression.getExpressionEndDatetime() != null && !"".equals(taskTimeExpression.getExpressionEndDatetime())){
-                trigger = trigger.endAt(sdf.parse(taskTimeExpression.getExpressionEndDatetime()));
+                    .startAt(sdf.parse(sysTaskCycle.getTaskCycleStartDatetime()));
+            if(sysTaskCycle.getTaskCycleEndDatetime() != null && !"".equals(sysTaskCycle.getTaskCycleEndDatetime())){
+                trigger = trigger.endAt(sdf.parse(sysTaskCycle.getTaskCycleEndDatetime()));
             }
 
-            JobKey jobKey = new JobKey(taskTime.getName(), taskTime.getGroupName());
+            JobKey jobKey = new JobKey(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
             JobDetail jobDetail = scheduler.getJobDetail(jobKey);
-            jobDetail.getJobBuilder().withDescription(taskTime.getTaskDescription());
+            jobDetail.getJobBuilder().withDescription(sysTaskPlan.getTaskPlanDescription());
 
             HashSet<Trigger> triggerSet = new HashSet<>();
             triggerSet.add(trigger.build());
@@ -112,17 +176,23 @@ public class SysTaskTimeService implements ISysTaskTimeService{
     }
 
     @Override
-    @ApiOperation(value = "修改任务状态")
-    public void updateSysTaskTimeStatus(Long id, int status, SessionUser user) {
+    @ApiOperation(value = "修改任务计划状态",notes = "修改任务计划状态")
+    public void updateSysTaskPlanStatus(Long id, int status, SessionUser user) {
         LOGGER.info("定时任务 SYS_MENU  id:{} status:{} user:{}", id,status,user);
-        SysTaskTime taskTime = taskTimeRDao.getById(id);
-        taskTime.setTaskStatus(status);
-        taskTime.setModifyUser(user.getUserName());
-        taskTimeRDao.update(taskTime);
+        SysTaskPlan sysTaskPlan = sysTaskPlanRDao.getById(id);
+        sysTaskPlan.setTaskPlanStatus(status);
+        sysTaskPlan.setModifyUser(user.getUserName());
+        sysTaskPlanRDao.update(sysTaskPlan);
 
         try {
-            TriggerKey triggerKey = TriggerKey.triggerKey(taskTime.getName(), taskTime.getGroupName());
+            TriggerKey triggerKey = TriggerKey.triggerKey(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
             if (!scheduler.checkExists(triggerKey)) {
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
+                        .setErrorDetail("定时任务不存在")
+                        .setErrorSolution("请重新选择")
+                        .build();
             }
 
             if (status == CommonEnumUtil.DATA_STATUS.ENABLE.getValue()){
@@ -138,16 +208,18 @@ public class SysTaskTimeService implements ISysTaskTimeService{
 
     @Override
     @ApiOperation(value = "根据根据id删除数据")
-    public void deleteSysTaskTimeById(Long id) {
+    public void deleteSysTaskPlanById(Long id) {
         try {
-            SysTaskTime taskTime = taskTimeRDao.getById(id);
-            ValidatorBean.checkNotNull(taskTime,"定时任务不存在");
+            SysTaskPlan sysTaskPlan = sysTaskPlanRDao.getById(id);
+            ValidatorBean.checkNotNull(sysTaskPlan,"定时任务不存在");
+
+            sysTaskPlanRDao.deleteById(id);
 
-            taskTimeRDao.deleteById(id);
             // 删除关系表数据
-            refExpressionTriggerRDao.deleteByProperty("expressionId",taskTime.getTimeExpressionId());
+            sysRefTaskCyclePlanRDao.deleteByProperties(new String[]{"taskPlanName","taskPlanGroupName"},
+                    new Object[]{sysTaskPlan.getName(),sysTaskPlan.getGroupName()});
 
-            TriggerKey triggerKey = TriggerKey.triggerKey(taskTime.getName(),taskTime.getGroupName());
+            TriggerKey triggerKey = TriggerKey.triggerKey(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
             if(scheduler.checkExists(triggerKey)){
                 scheduler.pauseTrigger(triggerKey);
                 scheduler.unscheduleJob(triggerKey);
@@ -168,130 +240,34 @@ public class SysTaskTimeService implements ISysTaskTimeService{
     }
 
     @Override
-    @ApiOperation(value = "新增定时任务")
-    public SysTaskTime insertSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression) {
-        try {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            // 唯一校验
-            JobKey jobKey = JobKey.jobKey(taskTime.getName(),taskTime.getGroupName());
-            TriggerKey triggerKey = TriggerKey.triggerKey(taskTime.getName(),taskTime.getGroupName());
-            if (taskTimeRDao.isExitByProperty(new String[]{"name","groupName"},new String[]{taskTime.getName(),taskTime.getGroupName()})
-                    || scheduler.checkExists(jobKey) || scheduler.checkExists(triggerKey)){
-                throw ImppExceptionBuilder.newInstance()
-                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
-                        .setErrorDetail("定时任务已存在")
-                        .setErrorSolution("请重新输入任务名称和组名称")
-                        .build();
-            }
-
-            SysRefExpressionTrigger refExpressionTrigger = new SysRefExpressionTrigger();
-            refExpressionTrigger.setExpressionId(taskTimeExpression.getId());
-            refExpressionTrigger.setTriggerName(taskTime.getName());
-            refExpressionTrigger.setTriggerGroupName(taskTime.getGroupName());
-
-            taskTime = taskTimeRDao.insert(taskTime);
-            // 添加表达式与触发器关系表
-            refExpressionTriggerRDao.insert(refExpressionTrigger);
-
-            // 添加定时任务与触发器到quartz表中
-            CronScheduleBuilder schedBuilder = CronScheduleBuilder
-                    .cronSchedule(taskTimeExpression.getExpressionContent())
-                    .withMisfireHandlingInstructionDoNothing();
-            TriggerBuilder<CronTrigger> trigger = TriggerBuilder.newTrigger()
-                    .withIdentity(triggerKey)
-                    .withDescription(taskTimeExpression.getExpressionDescription())
-                    .withSchedule(schedBuilder)
-                    .startAt(sdf.parse(taskTimeExpression.getExpressionStartDatetime()));
-            if(taskTimeExpression.getExpressionEndDatetime() != null && taskTimeExpression.getExpressionEndDatetime().length() != 0){
-                trigger = trigger.endAt(sdf.parse(taskTimeExpression.getExpressionEndDatetime()));
-            }
-
-            Class<? extends Job> clazz = (Class<? extends Job>) Class.forName(taskTime.getTaskPackage() + "." + taskTime.getTaskClass());
-            JobDetail jobDetail = JobBuilder.newJob(clazz).withIdentity(jobKey).withDescription(taskTime.getTaskDescription()).build();
-
-            scheduler.scheduleJob(jobDetail, trigger.build());
-        } catch (SchedulerException e) {
-            throw ImppExceptionBuilder.newInstance()
-                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                    .setErrorCode(ImppExceptionEnum.TASK_EXCEPTION.getCode())
-                    .build();
-        } catch (ParseException e) {
-            throw ImppExceptionBuilder.newInstance()
-                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_FORMAT.getCode())
-                    .setErrorDetail("表达式起止时间错误")
-                    .setErrorSolution("请更改表达式起止时间")
-                    .build();
-        } catch (ClassNotFoundException e) {
-            throw ImppExceptionBuilder.newInstance()
-                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("定时任务包名及类名不正确")
-                    .setErrorSolution("请重新输入定时任务包名及类名")
-                    .build();
-        }
-        return taskTime;
-    }
-
-    @Override
-    @ApiOperation(value = "查询所有数据")
-    public List<SysTaskTime> listSysTaskTime() {
-        LOGGER.info("定时任务 TASK_TIME find All");
-        return taskTimeRDao.findAll();
+    @ApiOperation(value = "查询所有任务计划")
+    public List<SysTaskPlan> listSysTaskPlan() {
+        return sysTaskPlanRDao.list();
     }
 
     @Override
-    @ApiOperation(value = "根据id 数据")
-    public SysTaskTime getSysTaskTimeById(Long id) {
-        LOGGER.info("定时任务 TASK_TIME find id:{}", id);
-        return taskTimeRDao.getOne(id);
+    @ApiOperation(value = "根据id查询任务计划数据",notes = "根据id查询任务计划数据")
+    public SysTaskPlan getSysTaskPlanById(Long id) {
+        return sysTaskPlanRDao.getById(id);
     }
 
     @Override
-    @ApiOperation(value = "定时任务复制查询，分页，排序")
-    public ListPager querySysTaskTimeByPager(SysTaskTime taskTime, Pager pager) {
-        LOGGER.info("定时任务 TASK_TIME SysTaskTime:{}，Pager:{}",taskTime,pager);
-        if(taskTime == null) {
-            pager = PagerHelper.getPager(pager, taskTimeRDao.listCount());
-            return new ListPager(taskTimeRDao.listPager(pager),pager);
+    @ApiOperation(value = "任务计划复杂查询，分页，排序",notes = "任务计划复杂查询，分页，排序")
+    public ListPager querySysTaskPlanByPager(SysTaskPlan sysTaskPlan, Pager pager) {
+        if(sysTaskPlan == null) {
+            pager = PagerHelper.getPager(pager, sysTaskPlanRDao.listCount());
+            return new ListPager(sysTaskPlanRDao.listPager(pager),pager);
         }else {
-            String hqlPack = CoreHqlPack.packHqlSysTaskTime(taskTime);
-            pager = PagerHelper.getPager(pager, taskTimeRDao.findByHqlWhereCount(hqlPack));
-            return new ListPager(taskTimeRDao.findByHqlWherePage(hqlPack + taskTime.orderBy(),pager),pager);
+            String hqlPack = CoreHqlPack.packHqlSysTaskPlan(sysTaskPlan);
+            pager = PagerHelper.getPager(pager, sysTaskPlanRDao.findByHqlWhereCount(hqlPack));
+            return new ListPager(sysTaskPlanRDao.findByHqlWherePage(hqlPack + sysTaskPlan.orderBy(),pager),pager);
         }
     }
 
     @Override
-    @ApiOperation(value = "根据id批量删除定时任务")
-    public void deleteSysTaskTimeByIds(Long[] ids) {
-        LOGGER.info("定时任务 TASK_TIME ids:{}", ids.toString());
-        taskTimeRDao.deleteByIds(ids);
-    }
-
-    @Override
-    @ApiOperation(value = "批量修改定时任务状态")
-    public void updateSysTaskTimeStatusByIds(Long[] ids, Integer status) {
-        LOGGER.info("定时任务 TASK_TIME ids：{}，status：{}",ids,status);
-        StringBuffer where = new StringBuffer();
-        HqlPack.getInPack(StringUtils.join( ids,","), "id", where);
-
-        taskTimeRDao.updateByHqlWhere(where.toString(), "taskStatus", status);
-    }
-
-    @Override
-    @ApiOperation(value = "修改最后时间")
-    public void doSysTaskTimeLastDateByNameAndGroupName(String lastDate, String name, String groupName) {
-        taskTimeRDao.updateByProperties(
-                new String[]{"name","groupName"},new String[]{name,groupName},
-                "lastRunDateTime",lastDate);
-    }
-
-    @Override
-    @ApiOperation(value = "立即执行")
-    public void executeSysTaskTimeById(Long id) {
-        SysTaskTime taskTime = taskTimeRDao.getById(id);
-        JobKey jobKey = JobKey.jobKey(taskTime.getName(),taskTime.getGroupName());
+    @ApiOperation(value = "立即执行任务计划",notes = "立即执行任务计划")
+    public void executeSysTaskPlan(SysTaskPlan sysTaskPlan) {
+        JobKey jobKey = JobKey.jobKey(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
         try {
             if (scheduler.checkExists(jobKey)) {
                 scheduler.triggerJob(jobKey);
@@ -299,8 +275,8 @@ public class SysTaskTimeService implements ISysTaskTimeService{
                 throw ImppExceptionBuilder.newInstance()
                         .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
                         .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
-                        .setErrorDetail("定时任务不存在")
-                        .setErrorSolution("请重新输入任务名称和组名称")
+                        .setErrorDetail("任务计划不存在")
+                        .setErrorSolution("请重新选择任务计划")
                         .build();
             }
         } catch (SchedulerException e) {
@@ -312,11 +288,10 @@ public class SysTaskTimeService implements ISysTaskTimeService{
     }
 
     @Override
-    @ApiOperation(value = "查询定时任务",notes = "根据定时任务名称与组名称查询")
-    public SysTaskTime getSysTaskTimeByNameAndGroup(String name, String groupName) {
-        List<SysTaskTime> taskList = taskTimeRDao.findByProperty(new String[]{"name","groupName"},new Object[]{name,groupName});
-        if (taskList != null && taskList.size() != 0){
-            return taskList.get(0);
+    public SysTaskPlan getSysTaskPlanByNameAndGroup(String name, String groupName) {
+        List<SysTaskPlan> sysTaskPlanList = sysTaskPlanRDao.findByProperty(new String[]{"name","groupName"},new Object[]{name,groupName});
+        if (sysTaskPlanList != null && sysTaskPlanList.size() != 0){
+            return sysTaskPlanList.get(0);
         }
         return null;
     }
@@ -329,7 +304,7 @@ public class SysTaskTimeService implements ISysTaskTimeService{
 
     @Override
     @ApiOperation(value = "修改定时任务信息",notes = "修改定时任务信息，不会更新quartz数据库")
-    public void updateSysTaskTime(SysTaskTime sysTaskTime) {
-        taskTimeRDao.update(sysTaskTime);
+    public void updateSysTaskPlan(SysTaskPlan sysTaskPlan) {
+        sysTaskPlanRDao.update(sysTaskPlan);
     }
 }

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

@@ -0,0 +1,100 @@
+package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
+
+import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.common.PagerHelper;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.platform.bean.SysTask;
+import cn.estsh.i3plus.pojo.platform.repository.SysTaskPlanRepository;
+import cn.estsh.i3plus.pojo.platform.repository.SysTaskRepository;
+import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description : 任务管理业务接口实现
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2018-12-26 21:42
+ * @Modify:
+ **/
+@Service
+public class SysTaskService implements ISysTaskService {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskService.class);
+
+    @Autowired
+    private SysTaskRepository sysTaskRDao;
+
+    @Autowired
+    private SysTaskPlanRepository sysTaskPlanRDao;
+
+    @Override
+    @ApiOperation(value = "添加任务",notes = "添加任务")
+    public SysTask insertSysTask(SysTask sysTask) {
+        return sysTaskRDao.insert(sysTask);
+    }
+
+    @Override
+    @ApiOperation(value = "修改任务信息",notes = "修改任务信息")
+    public void updateSysTask(SysTask sysTask) {
+        sysTaskRDao.update(sysTask);
+        // 修改冗余信息
+        sysTaskPlanRDao.updateByProperties("taskId",sysTask.getId(),
+                "taskNameRdd",sysTask.getName());
+    }
+
+    @Override
+    @ApiOperation(value = "查询所有任务",notes = "查询所有任务")
+    public List<SysTask> listSysTask() {
+        return sysTaskRDao.list();
+    }
+
+    @Override
+    @ApiOperation(value = "根据id查询任务信息",notes = "根据id查询任务信息")
+    public SysTask getSysTaskById(Long id) {
+        return sysTaskRDao.getById(id);
+    }
+
+    @Override
+    @ApiOperation(value = "删除任务",notes = "根据id删除任务")
+    public void deleteSysTaskById(Long id) {
+        if(sysTaskPlanRDao.isExitByProperty("taskId",id)){
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("存在关联任务计划，无法删除")
+                    .setErrorSolution("请重新选择")
+                    .build();
+        }
+
+        sysTaskRDao.deleteById(id);
+    }
+
+    @Override
+    @ApiOperation(value = "删除任务",notes = "根据id批量删除任务")
+    public void deleteSysTaskByIds(Long[] ids) {
+        sysTaskRDao.deleteByIds(ids);
+    }
+
+    @Override
+    @ApiOperation(value = "任务管理复杂查询，分页，排序",notes = "任务管理复杂查询，分页，排序")
+    public ListPager<SysTask> querySysTaskByPager(SysTask sysTask, Pager pager) {
+        if(sysTask == null) {
+            pager = PagerHelper.getPager(pager, sysTaskRDao.listCount());
+            return new ListPager(sysTaskRDao.listPager(pager),pager);
+        }else {
+            String hqlPack = CoreHqlPack.packHqlSysTask(sysTask);
+            pager = PagerHelper.getPager(pager, sysTaskRDao.findByHqlWhereCount(hqlPack));
+            return new ListPager(sysTaskRDao.findByHqlWherePage(hqlPack + sysTask.orderBy(),pager),pager);
+        }
+    }
+}

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

@@ -1,126 +0,0 @@
-package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-
-import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeExpressionService;
-import cn.estsh.i3plus.pojo.base.bean.ListPager;
-import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.base.common.PagerHelper;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.SysRefExpressionTrigger;
-import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression;
-import cn.estsh.i3plus.pojo.platform.repository.SysRefExpressionTriggerRepository;
-import cn.estsh.i3plus.pojo.platform.repository.SysTaskTimeExpressionRepository;
-import cn.estsh.i3plus.pojo.platform.repository.SysTaskTimeRepository;
-import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
-import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
-import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
-import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @Description : 定时任务时间表达式 业务逻辑实现
- * @Reference :
- * @Author : wei.peng
- * @Date : 2018-10-24 20:40
- * @Modify :
- **/
-@Service
-public class SysTaskTimeExpressionService implements ISysTaskTimeExpressionService {
-
-    public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskTimeExpressionService.class);
-
-    @Autowired
-    private SysTaskTimeExpressionRepository taskTimeExpressionRDao;
-
-    @Autowired
-    private SysTaskTimeRepository taskTimeRDao;
-
-    @Autowired
-    private SysRefExpressionTriggerRepository sysRefExpressionTriggerRDao;
-
-    @Override
-    @ApiOperation(value = "修改数据")
-    public void updateSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression) {
-        LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", taskTimeExpression);
-        taskTimeExpressionRDao.update(taskTimeExpression);
-    }
-
-    @Override
-    @ApiOperation(value = "根据id删除数据")
-    public void deleteSysTaskTimeExpressionById(Long id) {
-        LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", id);
-        List refExpressionTriggerList = sysRefExpressionTriggerRDao.findByProperty("expressionId",id);
-        if(refExpressionTriggerList == null || refExpressionTriggerList.size() == 0){
-            throw ImppExceptionBuilder.newInstance()
-                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("存在关联定时任务，无法删除")
-                    .setErrorSolution("请重新选择")
-                    .build();
-        }
-
-        taskTimeExpressionRDao.deleteById(id);
-    }
-
-    @Override
-    @ApiOperation(value = "新增数据")
-    public SysTaskTimeExpression insertSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression) {
-        LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", taskTimeExpression);
-        return taskTimeExpressionRDao.insert(taskTimeExpression);
-    }
-
-    @Override
-    @ApiOperation(value = "查询所有数据")
-    public List<SysTaskTimeExpression> listSysTaskTimeExpression() {
-        LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION list");
-        return taskTimeExpressionRDao.list();
-    }
-
-    @Override
-    @ApiOperation(value = "根据ID 查询任务表达式")
-    public SysTaskTimeExpression getSysTaskTimeExpressionById(Long id) {
-        LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}" ,id);
-        return taskTimeExpressionRDao.getById(id);
-    }
-
-    @Override
-    @ApiOperation(value = "任务表达式查询，分页，排序")
-    public ListPager querySysTaskTimeExpressionByPager(SysTaskTimeExpression taskTimeExpression, Pager pager) {
-        LOGGER.info("文件表达式 TASK_TIME_EXPRESSION taskTimeExpression:{}，Pager:{}",taskTimeExpression,pager);
-        if(taskTimeExpression == null) {
-            pager = PagerHelper.getPager(pager, taskTimeExpressionRDao.listCount());
-            return new ListPager(taskTimeExpressionRDao.listPager(pager),pager);
-        }else {
-            String hqlPack = CoreHqlPack.packHqlSysTaskTimeExpression(taskTimeExpression);
-            pager = PagerHelper.getPager(pager, taskTimeExpressionRDao.findByHqlWhereCount(hqlPack));
-            return new ListPager(taskTimeExpressionRDao.findByHqlWherePage(hqlPack + taskTimeExpression.orderBy(),pager),pager);
-        }
-    }
-
-    @Override
-    @ApiOperation(value = "任务表达式批量删除")
-    public void deleteSysTaskTimeExpressionByIds(Long[] ids) {
-        LOGGER.info("文件表达式 SYS_MENU ids:{}", ids);
-        long count = taskTimeRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("timeExpressionId",ids));
-        if(count >= 1){
-            throw ImppExceptionBuilder.newInstance()
-                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("存在关联定时任务无法删除！")
-                    .setErrorSolution("请重新操作")
-                    .build();
-        }else {
-            taskTimeExpressionRDao.deleteByIds(ids);
-        }
-    }
-
-    @Override
-    @ApiOperation(value = "根据表达式id查询表达式关联任务信息",notes = "根据表达式id查询表达式关联任务信息")
-    public List<SysRefExpressionTrigger> findRefExpressionTriggerList(Long id) {
-        return sysRefExpressionTriggerRDao.findByProperty("expressionId",id);
-    }
-}

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

@@ -27,35 +27,35 @@ public class SysTaskTimeRecordingService implements ISysTaskTimeRecordingService
     private SysTaskTimeRecordingRepository taskTimeRecordingRDao;
 
     @Override
-    @ApiOperation(value = "更新任务表达式信息")
+    @ApiOperation(value = "更新任务周期信息")
     public void updateSysTaskTimeRecording(SysLogTaskTime taskTimeRecording) {
         LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING :{}", taskTimeRecording);
         taskTimeRecordingRDao.update(taskTimeRecording);
     }
 
     @Override
-    @ApiOperation(value = "删除任务表达式信息",notes = "根据 ID 删除任务表达式信息")
+    @ApiOperation(value = "删除任务周期信息",notes = "根据 ID 删除任务周期信息")
     public void deleteSysTaskTimeRecordingById(Long id) {
         LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING Key:{}", id);
         taskTimeRecordingRDao.deleteById(id);
     }
 
     @Override
-    @ApiOperation(value = "新增任务表达式信息")
+    @ApiOperation(value = "新增任务周期信息")
     public SysLogTaskTime insertSysTaskTimeRecording(SysLogTaskTime taskTimeRecording) {
         LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING :{}", taskTimeRecording);
         return taskTimeRecordingRDao.insert(taskTimeRecording);
     }
 
     @Override
-    @ApiOperation(value = "查询任务表达式信息",notes = "查询所有任务表达式信息")
+    @ApiOperation(value = "查询任务周期信息",notes = "查询所有任务周期信息")
     public List<SysLogTaskTime> findSysTaskTimeRecordingAll() {
         LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING find All");
         return taskTimeRecordingRDao.findAll();
     }
 
     @Override
-    @ApiOperation(value = "查询任务表达式信息",notes = "查询 ID 任务表达式信息")
+    @ApiOperation(value = "查询任务周期信息",notes = "查询 ID 任务周期信息")
     public SysLogTaskTime getSysTaskTimeRecordingById(Long id) {
         LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING find id:{}", id);
         return taskTimeRecordingRDao.getOne(id);

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

@@ -66,7 +66,9 @@ public class SysToolTypeService implements ISysToolTypeService {
     public void updateSysToolType(SysToolType toolType) {
         LOGGER.info("硬件类型 TOOL_TYPE toolType:{}",toolType);
         toolTypeRDao.update(toolType);
-        // TODO 修改硬件对象中冗余的硬件类型名称
+
+        // 修改硬件中的类型名称冗余
+        toolRDao.updateByProperties("toolTypeId",toolType.getId(),"toolTypeNameRdd",toolType.getName());
     }
 
     @Override

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

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 import cn.estsh.i3plus.pojo.platform.repository.*;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
@@ -216,7 +217,7 @@ public class SysUserInfoService implements ISysUserInfoService {
             int count = sysUserRepository.findByPropertyCount(
                     new String[]{"userInfoId","isValid"},
                     new Object[]{userInfo.getId(),CommonEnumUtil.IS_VAILD.VAILD.getValue()});
-            userInfo.setUserNum(count);
+//            userInfo.setUserNum(count);
             sysUserInfoRDao.save(userInfo);
 
         }
@@ -270,15 +271,15 @@ public class SysUserInfoService implements ISysUserInfoService {
 
     @Override
     @ApiOperation(value = "关系查询-用户部门",notes = "根据部门或者组织集合查询用户部门关系")
-    public List<SysRefUserDepartment> querySysRefUserDepartment(SysUserInfo userInfo) {
-        if(userInfo != null){
+    public List<SysRefUserDepartment> querySysRefUserDepartment(UserDetailModel model) {
+        if(model != null){
             StringBuffer userIdWhere = new StringBuffer();
 
-            if(userInfo.getDepartmentIdList() != null){
-                HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(),","),"departmentId", userIdWhere);
+            if(model.getUserDepartmentIdList() != null){
+                HqlPack.getInPack(StringUtils.join(model.getInfoDepartmentIdList(),","),"departmentId", userIdWhere);
             }
-            if(userInfo.getOrganizeIdList() != null){
-                HqlPack.getInPack( StringUtils.join(userInfo.getOrganizeIdList(),","),"organizeId",userIdWhere);
+            if(model.getUserOrganizeIdList() != null){
+                HqlPack.getInPack( StringUtils.join(model.getUserOrganizeIdList(),","),"organizeId",userIdWhere);
             }
 
             return refUserDepartmentRDao.findByHqlWhere(userIdWhere.toString());
@@ -319,6 +320,11 @@ public class SysUserInfoService implements ISysUserInfoService {
     }
 
     @Override
+    public List<SysUserInfo> querySysUserInfoList(UserDetailModel model, List<Long> idList) {
+        return null;
+    }
+
+    @Override
     @ApiOperation(value = "用户唯一校验  用户工号",notes = "用户唯一校验  用户工号")
     public boolean checkUserInfoByUserEmpNo(String no, long id) {
         int count;

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

@@ -1,12 +1,12 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService;
+import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
 import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.EncryptTool;
-import cn.estsh.i3plus.platform.common.tool.SerializeTool;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -22,7 +22,6 @@ import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.CredentialsException;
 import org.apache.shiro.authc.UnknownAccountException;
@@ -31,7 +30,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 /**
@@ -91,6 +89,9 @@ public class SysUserService implements ISysUserService {
     @Autowired
     private ICoreTreeService coreTreeService;
 
+    @Autowired
+    private IPersonnelService personnelService;
+
     @Override
     @ApiOperation(value = "用户登录", notes = "用户登录功能实现")
     public SessionUser queryUserLogin(String loginName, String password, String languageCode) throws AuthenticationException {
@@ -157,7 +158,7 @@ public class SysUserService implements ISysUserService {
             }else {
                 throw ImppExceptionBuilder.newInstance()
                         .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                        .setErrorCode(ImppExceptionEnum.LOGIN_EXCEPTION_USER_LOCKING.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
                         .setErrorDetail("旧密码错误")
                         .setErrorSolution("请重新输入")
                         .build();
@@ -251,8 +252,7 @@ public class SysUserService implements ISysUserService {
             refUserRoleRDao.saveAll(refUserRoles);
 
             // 角色名称冗余
-            sysUser.setRoleNameRdd(String.join(",", roleNameList));
-            sysUser.setRoleId(list.get(0).getId());
+//            sysUser.setRoleNameRdd(String.join(",", roleNameList));
 
             sysUserRDao.save(sysUser);
         }
@@ -299,6 +299,23 @@ public class SysUserService implements ISysUserService {
     }
 
     @Override
+    @ApiOperation(value = "查询用户ID 集合",notes = "根据角色Id 查询用户ID集合")
+    public List<Long> findSysUserIdListByRoleId(Long roleId) {
+        List<Long> result = new ArrayList<>();
+        if(roleId != null){
+            List<SysRefUserRole> list = refUserRoleRDao.findByProperty(
+                    new String[]{"roleId","isValid"},
+                    new Object[]{roleId,CommonEnumUtil.IS_VAILD.VAILD.getValue()});
+            if(list != null && list.size() > 0){
+                for (SysRefUserRole ref : list) {
+                    result.add(ref.getUserId());
+                }
+            }
+        }
+        return result;
+    }
+
+    @Override
     @ApiOperation(value = "账号分页查询", notes = "组合查询")
     public ListPager<SysUser> querySysUserByPager(SysUser user, Pager pager) {
         LOGGER.debug("系统用户 SysUser find user :{} page :{}", user, pager);
@@ -459,15 +476,18 @@ public class SysUserService implements ISysUserService {
             throw new UnknownAccountException("用户信息不存在");
         }
 
-        packSysUserRole(sessionUser,user);      //封装用户角色信息
-        packSysUserMenu(sessionUser,user);      //封装用户功能信息
+        packSysUserRole(user);      //封装用户角色信息
+        packSysUserMenu(user);      //封装用户功能信息
 //        packSysUserMenuTree(sessionUser, user); //封装用户功能Tree信息
+        packSysUserDepartment(user);    //封装用户部门信息
+        packSysUserOrganize(user);                  //封装用户组织信息
 
-        packSysUserDepartment(sessionUser,userInfo);    //封装用户部门信息
-        packSysUserPosition(sessionUser,userInfo);      //封装用户岗位信息
-        packSysUserOrganize(userInfo);                  //封装用户组织信息
 
-        userInfo.setUser(user);
+        packSysUserInfoDepartment(userInfo);    //封装用户部门信息
+        packSysUserInfoPosition(userInfo);      //封装用户岗位信息
+        packSysUserInfoOrganize(userInfo);                  //封装用户组织信息
+
+//        userInfo.setUser(user);
         sessionUser.setUserName(userInfo.getName());
         sessionUser.setUserCode(userInfo.getUserEmpNo());
         sessionUser.setUserId(userInfo.getId());
@@ -486,7 +506,7 @@ public class SysUserService implements ISysUserService {
      * @param user
      * @return
      */
-    public void packSysUserRole(SessionUser sessionUser, SysUser user){
+    public void packSysUserRole(SysUser user){
         List<SysRole> roleList = null;
         try {
             LOGGER.debug("平台用户 SYS_USER user id :{}", user.getUserInfoId());
@@ -498,7 +518,6 @@ public class SysUserService implements ISysUserService {
         }
 
         user.setRoleList(roleList);
-        sessionUser.setUser(user);
     }
 
     /**
@@ -507,7 +526,7 @@ public class SysUserService implements ISysUserService {
      * @param user
      * @return
      */
-    public void packSysUserMenu(SessionUser sessionUser, SysUser user){
+    public void packSysUserMenu(SysUser user){
         List<SysMenu> list = null;
         try {
             LOGGER.debug("平台用户 SYS_USER user id :{}", user.getUserInfoId());
@@ -519,7 +538,6 @@ public class SysUserService implements ISysUserService {
         }
 
         user.setMenuList(list);
-        sessionUser.setUser(user);
     }
 
 //    /**
@@ -551,15 +569,17 @@ public class SysUserService implements ISysUserService {
 
     /**
      * 封装用户 部门信息封装
-     * @param sessionUser
      * @param userInfo
      * @return
      */
-    public void packSysUserDepartment(SessionUser sessionUser, SysUserInfo userInfo){
+    public void packSysUserInfoDepartment(SysUserInfo userInfo){
         try {
             LOGGER.debug("平台用户 SYS_USER user id :{}", userInfo.getId());
-            userInfo.setDepartmentList(userPermissionDao.findDepartmentByUser(userInfo));
+
+             personnelService.findSysRefUserInfoDepartmentById(userInfo.id);
+
             userInfo.setDepartment(sysDepartmentRDao.getById(userInfo.getDepartmentId()));
+            userInfo.setDepartmentList(personnelService.findSysUserInfoDepartmentByInfoId(userInfo.getId()));
         }catch (Exception e){
             LOGGER.error(" SysUser Peck Department information Error userId : {} Exception Message : {} " ,userInfo.getId(),e.getMessage());
             e.printStackTrace();
@@ -567,12 +587,28 @@ public class SysUserService implements ISysUserService {
     }
 
     /**
+     * 封装用户 部门信息封装
+     * @param user
+     * @return
+     */
+    public void packSysUserDepartment(SysUser user){
+        try {
+            LOGGER.debug("平台用户 SYS_USER user id :{}", user.getId());
+
+            user.setDepartment(sysDepartmentRDao.getById(user.getDepartmentId()));
+            user.setDepartmentList(personnelService.findSysUserDepartmentByInfoId(user.id));
+        }catch (Exception e){
+            LOGGER.error(" SysUser Peck Department information Error userId : {} Exception Message : {} " ,user.getId(),e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    /**
      *  封装用户 岗位信息封装
-     * @param sessionUser
      * @param userInfo
      * @return
      */
-    public void packSysUserPosition(SessionUser sessionUser, SysUserInfo userInfo){
+    public void packSysUserInfoPosition(SysUserInfo userInfo){
         try {
             LOGGER.debug("平台用户 SYS_USER user id :{}", userInfo.getId());
             userInfo.setPositionList(userPermissionDao.findPositionByUser(userInfo));
@@ -587,29 +623,32 @@ public class SysUserService implements ISysUserService {
      * @param userInfo
      * @return
      */
-    public void packSysUserOrganize(SysUserInfo userInfo){
+    public void packSysUserInfoOrganize(SysUserInfo userInfo){
         try {
             LOGGER.debug("平台用户 SYS_USER user id :{}", userInfo.getId());
             userInfo.setOrganize(organizeRDao.getById(userInfo.getOrganizeId()));
-
-            List<SysDepartment> departmentList = userInfo.getDepartmentList();
-            if(departmentList != null && departmentList.size() > 0){
-                Long[] ids = new Long[departmentList.size()];
-                for (int i = 0; i < departmentList.size(); i++) {
-                    ids[i] = departmentList.get(i).getOrganizeId();
-                }
-
-                String strWhere = CoreHqlPack.packHqlSysOrganize(ids, ImppEnumUtil.ORGANIZE_YTPE.TYPE_FACTORY.getValue());
-                List<SysOrganize> organizeList = organizeRDao.findByHqlWhere(strWhere);
-
-                userInfo.setOrganizeList(organizeList);
-            }
+            userInfo.setOrganizeList(personnelService.findSysUserInfoOrganize(userInfo.getId()));;
         }catch (Exception e){
             LOGGER.error(" SysUser Peck Organize information Error userId : {} Exception Message : {} " ,userInfo.getId(),e.getMessage());
         }
     }
 
     /**
+     *  封装用户 组织信息封装
+     * @param user
+     * @return
+     */
+    public void packSysUserOrganize(SysUser user){
+        try {
+            LOGGER.debug("平台用户 SYS_USER user id :{}", user.getId());
+            user.setOrganize(organizeRDao.getById(user.getOrganizeId()));
+            user.setOrganizeList(personnelService.findSysUserOrganize(user.getId()));;
+        }catch (Exception e){
+            LOGGER.error(" SysUser Peck Organize information Error userId : {} Exception Message : {} " ,user.getId(),e.getMessage());
+        }
+    }
+
+    /**
      * 获取集合中的Root Id
      * @param menus
      * @return

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/HqlModelPack.java

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.core.apiservice.util;
+
+import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Adair Peng
+ * @CreateDate : 2018-12-26 19:22
+ * @Modify:
+ **/
+public class HqlModelPack {
+
+
+
+    /**
+     * 用户信息 复杂查询拼接
+     * @param model
+     * @return
+     */
+    public static String packHqlSysUserByModelOrIds(UserDetailModel model, List<Long> idList){
+        StringBuffer result = new StringBuffer();
+
+        // And
+        HqlPack.getNumEqualPack(model.getUserStatus(),"userStatus",result);
+        if(idList != null && idList.size() > 0){
+            HqlPack.getInPack(StringUtils.join(idList, ","), "id", result);
+        }
+
+        // Like
+        HqlPack.getStringLikerPack(model.getInfoName(),"userName",result);
+        HqlPack.getStringLikerPack(model.getInfoEmpNo(),"userEmpNo",result);
+
+        return  result.toString();
+    }
+
+}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/mq/TestMQ.java

@@ -1,50 +0,0 @@
-package cn.estsh.i3plus.core.apiservice.mq;
-
-import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase;
-import cn.estsh.i3plus.core.apiservice.util.MailUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
-import org.junit.Test;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @Description :
- * @Reference :
- * @Author : yunhao
- * @CreateDate : 2018-11-15 13:22
- * @Modify:
- **/
-public class TestMQ extends TestBase {
-
-    /**
-     * rabbitMQ队列
-     */
-    @Autowired
-    private RabbitTemplate rabbitTemplate;
-
-    @Autowired
-    private MailUtil mailUtil;
-
-    @Test
-    public void sendMail() throws InterruptedException {
-
-        SysMessage sysMessage = new SysMessage();
-        sysMessage.setMessageTitle("test-系统通知");
-        sysMessage.setMessageSenderNameRdd("system");
-        sysMessage.setMessageSenderId(-1L);
-        sysMessage.setMessageType(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue());
-        sysMessage.setMessageSendTime("2018-11-01 16:58:00");
-
-        for (int i = 0; i < 50; i++) {
-            sysMessage = new SysMessage();
-            sysMessage.setId(null);
-            sysMessage.setMessageTitle( i + "mail测试");
-            sysMessage.setMessageSenderNameRdd(i+"");
-            rabbitTemplate.convertAndSend("WYH_MESSAGE_QUEUE", new SysMessage());
-            System.out.println("第" + i + "次");
-        }
-
-    }
-
-}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ArraySort.java

@@ -1,34 +0,0 @@
-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<num.length;i++){
-            new Thread(new ArraySort(num[i])).start();
-        }
-    }
-
-    @Override
-    public void run() {
-        try {
-            Thread.sleep(Integer.parseInt(num));
-            System.out.println(num);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentService.java

@@ -1,118 +0,0 @@
-//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-//
-//import cn.estsh.i3plus.core.api.iservice.busi.IDepartmentService;
-//import cn.estsh.i3plus.pojo.base.bean.ListPager;
-//import cn.estsh.i3plus.pojo.base.common.Pager;
-//import cn.estsh.i3plus.pojo.platform.bean.Department;
-//import cn.estsh.i3plus.pojo.platform.bean.Organize;
-//import com.alibaba.fastjson.JSON;
-//import org.junit.Test;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.test.annotation.Rollback;
-//
-//import javax.transaction.Transactional;
-//import java.util.List;
-//
-///**
-// * @Description : 岗位信息测试
-// * @Reference :
-// * @Author : wei.peng
-// * @Date : 2018-10-29 19:02
-// * @Modify :
-// **/
-//public class TestDepartmentService extends TestBase {
-//
-//    @Autowired
-//    private IDepartmentService departmentService;
-//
-//    /**
-//     * 新增数据
-//     */
-//    @Test
-//    @Transactional
-//    public void  testInsertDepartment(){
-//        for(int i = 0 ; i < 50 ; i++ ){
-//            Department obj = new Department();
-//            obj.setName("Junit Test " + i);
-//            obj.setDepartmentCode("DEV_JUNIT " + i);
-//            obj.setParentId(1057165194242953216L);
-//            obj.setOrganizeId(1057163974900060160L);
-//            obj = departmentService.insertDepartment(obj);
-//            System.out.println(JSON.toJSONString(obj));
-//        }
-//    }
-//
-//    /**
-//     * 根据Key 数据
-//     * @return
-//     */
-//    @Test
-//    @Transactional
-//    public void testGetDepartmentById(){
-//        Department obj = departmentService.getDepartmentById("1057163974900060160");
-//        System.out.println(JSON.toJSONString(obj));
-//    }
-//
-//    /**
-//     * 查询所有数据
-//     *
-//     * @return
-//     */
-//    @Test
-//    @Transactional
-//    public void testListDepartment(){
-//        List list = departmentService.listDepartment();
-//        System.out.println(JSON.toJSONString(list));
-//    }
-//
-//    /**
-//     * 根据岗位信息进行查找
-//     * @return
-//     */
-//    @Test
-//    @Transactional
-//    public void testFindDepartmentByPager(){
-//        Organize obj = new Organize();
-//
-//        Pager pager = new Pager();
-//        pager.setPageSize(10);
-//        pager.setCurrentPage(1);
-//
-//        ListPager list = departmentService.queryDepartment(null, pager);
-//
-//        System.out.println(JSON.toJSONString(list));
-//    }
-//
-//    /**
-//     * 修改数据
-//     */
-//    @Test
-//    @Transactional
-//    public void testUpdateDepartment(){
-//        Department obj = departmentService.getDepartmentById("1057108586410414080");
-//        obj.setName("Junit update Name ");
-//        departmentService.updateDepartment(obj);
-//        System.out.println(JSON.toJSONString(obj));
-//    }
-//
-//    /**
-//     * 根据Key 删除数据
-//     */
-//    @Test
-//    @Transactional
-//    public void testDeleteDepartmentById(){
-////        departmentService.deleteOrganizeById("");
-//    }
-//
-//    /**
-//     * 根据id批量删除岗位
-//     * @return
-//     */
-//    @Test
-//    @Transactional
-//    public void deleteDepartmentByIds(){
-////        departmentService.deleteOrganizeByIds(new String[]{"1057108585445724160","1057108585760296960"});
-//    }
-//
-//
-//}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelOrderNoRule.java

@@ -1,96 +0,0 @@
-package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-
-import cn.estsh.i3plus.pojo.platform.bean.*;
-import cn.estsh.i3plus.pojo.platform.repository.*;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description :
- * @Reference :
- * @Author : yunhao
- * @CreateDate : 2018-11-22 11:01
- * @Modify:
- **/
-public class TestExcelOrderNoRule extends TestBase  {
-
-    public static final Logger LOGGER = LoggerFactory.getLogger(TestExcelOrderNoRule.class);
-
-    // 文件路径
-    public static final String PATH_NAME = "init/oder-no-rule.xlsx";
-    // 权限Sheet 名称
-    public static final String SHEET_ORDER_NO_RULE = "order-no-rule";
-
-    @Autowired
-    private SysOrderNoRuleRepository sysOrderNoRuleRDao;
-
-    @Test
-    public void testInit() throws Exception {
-        XSSFWorkbook workbook = getWorkbook(PATH_NAME);
-        if(workbook != null){
-            XSSFSheet sheetOrderNoRule = workbook.getSheet(SHEET_ORDER_NO_RULE);
-
-            List<SysOrderNoRule> ysOrderNoRuleList = getSysOrderNoRule(sheetOrderNoRule);
-
-            LOGGER.info("System Init SysOrderNoRule Size:{}",ysOrderNoRuleList.size());
-
-            sysOrderNoRuleRDao.saveAll(ysOrderNoRuleList);
-        }
-    }
-
-    public List<SysOrderNoRule> getSysOrderNoRule(XSSFSheet sheet){
-        List<SysOrderNoRule> result = new ArrayList<>();
-        if(sheet != null){
-            if(sheet.getLastRowNum() >= 1){
-                SysOrderNoRule obj = null;
-                for (int i = 1; i <= sheet.getLastRowNum(); i++) {
-                    try {
-                        Row row = sheet.getRow(i);//获取索引为i的行，以0开始
-                        if(row.getCell(0).toString().trim().length() > 0){
-                            obj = new SysOrderNoRule();
-                            obj.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
-                            obj.setName(row.getCell(1).getStringCellValue());
-                            obj.setOrderNoRuleCode(row.getCell(2).getStringCellValue());
-                            obj.setOrderNoRule(row.getCell(3).getStringCellValue());
-                            obj.setSerialNoSeed(Long.parseLong(row.getCell(4).getStringCellValue()));
-                            obj.setSerialNoIncrement(Long.parseLong(row.getCell(5).getStringCellValue()));
-                            obj.setSerialNoLength(Long.parseLong(row.getCell(6).getStringCellValue()));
-                            obj.setIsCycle(Integer.parseInt(row.getCell(7).getStringCellValue()));
-                            obj.setOrderNoRuleDescription(row.getCell(8).getStringCellValue());
-                            obj.setOrderNoRuleStatus(1);
-                            obj.setSerialNo(-1L);
-                            obj.setIsValid(1);
-
-                            result.add(obj);
-                        }
-                    }catch (Exception e){
-                        LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    public XSSFWorkbook getWorkbook(String pathName){
-        try {
-            InputStream in = TestExcelPermission.class.getClassLoader().getResourceAsStream(pathName);
-            XSSFWorkbook workbook = new XSSFWorkbook(in);
-            return workbook;
-        }catch (Exception e){
-            LOGGER.error(" System Init Sys Data Excel Error file path {} error message :{}",pathName,e.getMessage());
-            e.getMessage();
-            return null;
-        }
-    }
-
-}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java

@@ -1,260 +0,0 @@
-package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-
-import cn.estsh.i3plus.platform.common.tool.EncryptTool;
-import cn.estsh.i3plus.pojo.platform.bean.*;
-import cn.estsh.i3plus.pojo.platform.repository.*;
-import com.alibaba.fastjson.JSON;
-import io.swagger.models.auth.In;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.jdom2.Document;
-import org.jdom2.JDOMException;
-import org.jdom2.input.SAXBuilder;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 系统数据初始化
- */
-public class TestExcelPermission extends TestBase {
-//public class TestExcelPermission {
-
-    public static final Logger LOGGER = LoggerFactory.getLogger(TestExcelPermission.class);
-
-    // 文件路径
-    public static final String PATH_NAME = "init/permission.xlsx";
-    // 权限Sheet 名称
-    public static final String SHEET_NAME_MENU = "menu";
-    public static final String SHEET_NAME_ROLE = "role";
-    public static final String SHEET_NAME_USER_INFO = "user-info";
-    public static final String SHEET_NAME_USER = "user";
-
-    @Autowired
-    private SysUserRepository sysUserRdao;
-
-    @Autowired
-    private SysUserInfoRepository userInfoRDao;
-
-    @Autowired
-    private SysMenuRepository menuRdao;
-
-    @Autowired
-    private SysRoleRepository roleRDao;
-
-    @Autowired
-    private SysRefRoleMenuRepository refRoleMenuRDao;
-
-    @Test
-    public void testInit() throws Exception {
-        XSSFWorkbook workbook = getWorkbook(PATH_NAME);
-        if(workbook != null){
-            XSSFSheet sheetMenu = workbook.getSheet(SHEET_NAME_MENU);
-            XSSFSheet sheetRole = workbook.getSheet(SHEET_NAME_ROLE);
-            XSSFSheet sheetUserInfo = workbook.getSheet(SHEET_NAME_USER_INFO);
-            XSSFSheet sheetUser = workbook.getSheet(SHEET_NAME_USER);
-
-            List<SysMenu> menus = getSysMenu(sheetMenu);
-            List<SysRole> roles = getSysRole(sheetRole);
-            List<SysUserInfo> userInfos = getSysUserInfo(sheetUserInfo);
-            List<SysUser> users = getSysUser(sheetUser);
-
-            List<SysRefRoleMenu> refRoleMenu = getRefRoleMenu(menus, roles);
-
-            LOGGER.info("System Init SysMenu Size:{}",menus.size());
-            LOGGER.info("System Init SysRole Size:{}",roles.size());
-            LOGGER.info("System Init SysUserInfo Size:{}",userInfos.size());
-            LOGGER.info("System Init SysUser Size:{}",users.size());
-            LOGGER.info("System Init SysRefRoleMenu Size:{}",refRoleMenu.size());
-
-            sysUserRdao.saveAll(users);
-            userInfoRDao.saveAll(userInfos);
-            menuRdao.saveAll(menus);
-            roleRDao.saveAll(roles);
-            refRoleMenuRDao.saveAll(refRoleMenu);
-        }
-    }
-
-    public List<SysRefUserRole> getRefUserRole(List<SysUser> users,List<SysRole> roles){
-        List<SysRefUserRole> result = new ArrayList<>();
-        if(users != null && roles != null){
-            SysRefUserRole ref = null;
-            for (SysUser user : users) {
-                for (SysRole role : roles) {
-                    ref = new SysRefUserRole();
-                    ref.setRoleId(role.getId());
-                    ref.setRoleNameRdd(role.getName());
-                    ref.setUserId(user.getId());
-                    ref.setUserNameRdd(user.getUserName());
-                    result.add(ref);
-                }
-            }
-        }
-        return result;
-    }
-
-    public List<SysRefRoleMenu> getRefRoleMenu(List<SysMenu> menus,List<SysRole> roles){
-        List<SysRefRoleMenu> result = new ArrayList<>();
-        if(menus != null && roles != null){
-            SysRefRoleMenu ref = null;
-            for (SysMenu menu : menus) {
-                for (SysRole role : roles) {
-                    ref = new SysRefRoleMenu();
-                    ref.setRoleId(role.getId());
-                    ref.setRoleNameRdd(role.getName());
-                    ref.setMenuId(menu.getId());
-                    ref.setMenuNameRdd(menu.getName());
-                    ref.setMenuTypeRdd(menu.getMenuType());
-                    result.add(ref);
-                }
-            }
-        }
-        return result;
-    }
-
-    public List<SysUser> getSysUser(XSSFSheet sheet){
-        List<SysUser> result = new ArrayList<>();
-        if(sheet != null){
-            if(sheet.getLastRowNum() >= 1){
-                SysUser obj = null;
-                for (int i = 1; i <= sheet.getLastRowNum(); i++) {
-                    try {
-                        Row row = sheet.getRow(i);//获取索引为i的行，以0开始
-                        if(row.getCell(0).toString().trim().length() > 0){
-                            obj = new SysUser();
-                            String md5 = EncryptTool.hexMD5(row.getCell(2).toString());
-                            obj.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
-                            obj.setUserLoginName(row.getCell(1).getStringCellValue());
-                            obj.setUserLoginPassword(md5);
-                            obj.setUserEmail(row.getCell(3).getStringCellValue());
-                            obj.setUserPhone(row.getCell(4).getStringCellValue());
-                            obj.setUserInfoId(Long.parseLong(row.getCell(5).getStringCellValue()));
-                            obj.setUserName(row.getCell(6).getStringCellValue());
-                            obj.setIsValid(1);
-                            obj.setUserStatus(1);
-                            obj.setUserType(1);
-                            obj.setUserLoginNum(0);
-
-                            result.add(obj);
-                        }
-                    }catch (Exception e){
-                        LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    public List<SysUserInfo> getSysUserInfo(XSSFSheet sheet){
-        List<SysUserInfo> result = new ArrayList<>();
-        if(sheet != null){
-            if(sheet.getLastRowNum() >= 1){
-                SysUserInfo obj = null;
-                for (int i = 1; i <= sheet.getLastRowNum(); i++) {
-                    try {
-                        Row row = sheet.getRow(i);//获取索引为i的行，以0开始
-                        if(row.getCell(0).toString().trim().length() > 0){
-                            obj = new SysUserInfo();
-                            obj.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
-                            obj.setName(row.getCell(1).getStringCellValue());
-                            obj.setUserEmpNo(row.getCell(2).getStringCellValue());
-                            obj.setUserLoginNum(0);
-                            obj.setIsValid(1);
-                            obj.setUserInfoStatus(1);
-
-                            result.add(obj);
-                        }
-                    }catch (Exception e){
-                        LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    public List<SysRole> getSysRole(XSSFSheet sheet){
-        List<SysRole> result = new ArrayList<>();
-        if(sheet != null){
-            if(sheet.getLastRowNum() >= 1){
-                SysRole role = null;
-                for (int i = 1; i <= sheet.getLastRowNum(); i++) {
-                    try {
-                        Row row = sheet.getRow(i);//获取索引为i的行，以0开始
-                        if(row.getCell(0).toString().trim().length() > 0){
-                            role = new SysRole();
-                            role.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
-                            role.setName(row.getCell(1).getStringCellValue());
-                            role.setRoleDescription(row.getCell(2).getStringCellValue());
-                            role.setRoleStatus(1);
-                            role.setIsValid(1);
-
-                            result.add(role);
-                        }
-                    }catch (Exception e){
-                        LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    public List<SysMenu> getSysMenu(XSSFSheet sheet){
-        List<SysMenu> result = new ArrayList<>();
-        if(sheet != null){
-            if(sheet.getLastRowNum() >= 1){
-                SysMenu menu = null;
-                for (int i = 1; i <= sheet.getLastRowNum(); i++) {
-                    try {
-                        Row row = sheet.getRow(i);//获取索引为i的行，以0开始
-                        if(row.getCell(0).toString().trim().length() > 0){
-                            menu = new SysMenu();
-                            menu.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
-                            menu.setMenuType(Integer.parseInt(row.getCell(1).getStringCellValue()));
-                            menu.setMenuCode(row.getCell(2).getStringCellValue());
-                            menu.setName(row.getCell(3).getStringCellValue());
-                            menu.setParentId(Long.parseLong(row.getCell(4).getStringCellValue()));
-                            menu.setParentNameRdd(row.getCell(5).getStringCellValue());
-                            menu.setMenuDescription(row.getCell(6).getStringCellValue());
-                            menu.setMenuStatus(Integer.parseInt(row.getCell(7).getStringCellValue()));
-                            menu.setCreateUser("System Init");
-                            menu.setMenuUrl(row.getCell(9).getStringCellValue());
-                            menu.setMenuCss(row.getCell(10).getStringCellValue());
-                            menu.setMenuIcon(row.getCell(11).getStringCellValue());
-
-                            result.add(menu);
-                        }
-                    }catch (Exception e){
-                        LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    public XSSFWorkbook getWorkbook(String pathName){
-        try {
-            InputStream in = TestExcelPermission.class.getClassLoader().getResourceAsStream(pathName);
-            XSSFWorkbook workbook = new XSSFWorkbook(in);
-            return workbook;
-        }catch (Exception e){
-            LOGGER.error(" System Init Sys Data Excel Error file path {} error message :{}",pathName,e.getMessage());
-            e.getMessage();
-            return null;
-        }
-    }
-
-}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelSysConfig.java

@@ -1,207 +0,0 @@
-package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-
-import cn.estsh.i3plus.pojo.platform.bean.*;
-import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository;
-import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository;
-import cn.estsh.i3plus.pojo.platform.repository.SysLocaleLanguageRepository;
-import cn.estsh.i3plus.pojo.platform.repository.SysLocaleResourceRepository;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description :
- * @Reference :
- * @Author : yunhao
- * @CreateDate : 2018-11-22 11:01
- * @Modify:
- **/
-public class TestExcelSysConfig extends TestBase  {
-
-    public static final Logger LOGGER = LoggerFactory.getLogger(TestExcelPermission.class);
-
-    // 文件路径
-    public static final String PATH_NAME = "init/sys-config.xlsx";
-    // 权限Sheet 名称
-    public static final String SHEET_SYS_CONFIG = "sys-config";
-    public static final String SHEET_DICTIONARY = "dictionary";
-    public static final String SHEET_LANGUAGE = "language";
-    public static final String SHEET_RESOURCE = "resource";
-
-    @Autowired
-    private SysConfigRepository sysConfigRDao;
-    @Autowired
-    private SysDictionaryRepository sysDictionaryRDao;
-    @Autowired
-    private SysLocaleLanguageRepository sysLocaleLanguageRDao;
-    @Autowired
-    private SysLocaleResourceRepository sysLocaleResourceRDao;
-
-    @Test
-    public void testInit() throws Exception {
-        XSSFWorkbook workbook = getWorkbook(PATH_NAME);
-        if(workbook != null){
-            XSSFSheet sheetSysConfig = workbook.getSheet(SHEET_SYS_CONFIG);
-            XSSFSheet sheetDictionary = workbook.getSheet(SHEET_DICTIONARY);
-            XSSFSheet sheetLanguage = workbook.getSheet(SHEET_LANGUAGE);
-            XSSFSheet sheetResource = workbook.getSheet(SHEET_RESOURCE);
-
-            List<SysConfig> sysConfigList = getSysConfig(sheetSysConfig);
-            List<SysDictionary> sysDictionaryList = getSysDictionary(sheetDictionary);
-            List<SysLocaleLanguage> sysLocaleLanguageList = getSysLocaleLanguage(sheetLanguage);
-            List<SysLocaleResource> sysLocaleResourceList= getSysLocaleResource(sheetResource);
-
-            LOGGER.info("System Init SysConfig Size:{}",sysConfigList.size());
-            LOGGER.info("System Init SysDictionary Size:{}",sysDictionaryList.size());
-            LOGGER.info("System Init SysLocaleLanguage Size:{}",sysLocaleLanguageList.size());
-            LOGGER.info("System Init SysLocaleResource Size:{}",sysLocaleResourceList.size());
-
-            sysConfigRDao.saveAll(sysConfigList);
-            sysDictionaryRDao.saveAll(sysDictionaryList);
-            sysLocaleLanguageRDao.saveAll(sysLocaleLanguageList);
-            sysLocaleResourceRDao.saveAll(sysLocaleResourceList);
-        }
-    }
-
-    public List<SysConfig> getSysConfig(XSSFSheet sheet){
-        List<SysConfig> result = new ArrayList<>();
-        if(sheet != null){
-            if(sheet.getLastRowNum() >= 1){
-                SysConfig obj = null;
-                for (int i = 1; i <= sheet.getLastRowNum(); i++) {
-                    try {
-                        Row row = sheet.getRow(i);//获取索引为i的行，以0开始
-                        if(row.getCell(0).toString().trim().length() > 0){
-                            obj = new SysConfig();
-                            obj.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
-                            obj.setName(row.getCell(1).getStringCellValue());
-                            obj.setConfigType(Integer.valueOf(row.getCell(2).getStringCellValue()));
-                            obj.setConfigCode(row.getCell(3).getStringCellValue());
-                            obj.setConfigValue(row.getCell(4).getStringCellValue());
-                            obj.setConfigDescription(row.getCell(5).getStringCellValue());
-                            obj.setIsValid(1);
-
-                            result.add(obj);
-                        }
-                    }catch (Exception e){
-                        LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    public List<SysDictionary> getSysDictionary(XSSFSheet sheet){
-        List<SysDictionary> result = new ArrayList<>();
-        if(sheet != null){
-            if(sheet.getLastRowNum() >= 1){
-                SysDictionary obj = null;
-                for (int i = 1; i <= sheet.getLastRowNum(); i++) {
-                    try {
-                        Row row = sheet.getRow(i);//获取索引为i的行，以0开始
-                        if(row.getCell(0).toString().trim().length() > 0){
-                            obj = new SysDictionary();
-                            obj.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
-                            obj.setName(row.getCell(1).getStringCellValue());
-                            obj.setDictionaryCode(row.getCell(2).getStringCellValue());
-                            obj.setParentId(Long.valueOf(row.getCell(3).getStringCellValue()));
-                            obj.setParentNameRdd(row.getCell(4).getStringCellValue());
-                            obj.setParentCodeRdd(row.getCell(5).getStringCellValue());
-                            obj.setDictionaryValue(row.getCell(6).getStringCellValue());
-                            obj.setDictionarySort(Integer.valueOf(row.getCell(7).getStringCellValue()));
-                            obj.setDictionaryDescription(row.getCell(8).getStringCellValue());
-                            obj.setIsValid(1);
-
-                            result.add(obj);
-                        }
-                    }catch (Exception e){
-                        LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    public List<SysLocaleLanguage> getSysLocaleLanguage(XSSFSheet sheet){
-        List<SysLocaleLanguage> result = new ArrayList<>();
-        if(sheet != null){
-            if(sheet.getLastRowNum() >= 1){
-                SysLocaleLanguage obj = null;
-                for (int i = 1; i <= sheet.getLastRowNum(); i++) {
-                    try {
-                        Row row = sheet.getRow(i);//获取索引为i的行，以0开始
-                        if(row.getCell(0).toString().trim().length() > 0){
-                            obj = new SysLocaleLanguage();
-                            obj.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
-                            obj.setLanguageName(row.getCell(1).getStringCellValue());
-                            obj.setLanguageCode(row.getCell(2).getStringCellValue());
-                            obj.setLanguageSort(Integer.valueOf(row.getCell(3).getStringCellValue()));
-                            obj.setIsDefault(Integer.valueOf(row.getCell(4).getStringCellValue()));
-                            obj.setLanguageStatus(Integer.valueOf(row.getCell(5).getStringCellValue()));
-                            obj.setIsValid(1);
-
-                            result.add(obj);
-                        }
-                    }catch (Exception e){
-                        LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    public List<SysLocaleResource> getSysLocaleResource(XSSFSheet sheet){
-        List<SysLocaleResource> result = new ArrayList<>();
-        if(sheet != null){
-            if(sheet.getLastRowNum() >= 1){
-                SysLocaleResource obj = null;
-                for (int i = 1; i <= sheet.getLastRowNum(); i++) {
-                    try {
-                        Row row = sheet.getRow(i);//获取索引为i的行，以0开始
-                        if(row.getCell(0).toString().trim().length() > 0){
-                            obj = new SysLocaleResource();
-                            obj.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
-                            obj.setResourceType(Integer.valueOf(row.getCell(1).getStringCellValue()));
-                            obj.setLanguageCode(row.getCell(2).getStringCellValue());
-                            obj.setLanguageNameRdd(row.getCell(3).getStringCellValue());
-                            obj.setResourceKey(row.getCell(4).getStringCellValue());
-                            obj.setResourceValue(row.getCell(5).getStringCellValue());
-                            obj.setIsSystem(Integer.valueOf(row.getCell(6).getStringCellValue()));
-                            obj.setIsValid(1);
-
-                            result.add(obj);
-                        }
-                    }catch (Exception e){
-                        LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-
-    public XSSFWorkbook getWorkbook(String pathName){
-        try {
-            InputStream in = TestExcelPermission.class.getClassLoader().getResourceAsStream(pathName);
-            XSSFWorkbook workbook = new XSSFWorkbook(in);
-            return workbook;
-        }catch (Exception e){
-            LOGGER.error(" System Init Sys Data Excel Error file path {} error message :{}",pathName,e.getMessage());
-            e.getMessage();
-            return null;
-        }
-    }
-
-}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMathOper.java

@@ -1,59 +0,0 @@
-package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-
-import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
-import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @Description :
- * @Reference :
- * @Author : yunhao
- * @CreateDate : 2018-12-20 17:02
- * @Modify:
- **/
-public class TestMathOper extends TestBase  {
-
-    @Test
-    public void test(){
-        System.out.println("Hello World !~");
-    }
-
-    @Autowired
-    private SysConfigRepository sysConfigRDao;
-
-    String propertyName = "configType";
-    String groupByName = "configType";
-    String[] param = new String[]{"configType"};
-    Object[] paramValue = new Object[]{1};
-
-
-    @Test
-    public void testMax(){
-        SysConfig sysConfig = new SysConfig();
-        // max
-        System.out.println(sysConfigRDao.findMaxByProperties(propertyName,groupByName,param,paramValue));
-        System.out.println(sysConfigRDao.findMaxByProperty(propertyName,groupByName,param[0],paramValue[0]));
-    }
-
-    @Test
-    public void testMin(){
-        // min
-        System.out.println(sysConfigRDao.findMinByProperties(propertyName,groupByName,param,paramValue));
-        System.out.println(sysConfigRDao.findMinByProperty(propertyName,groupByName,param[0],paramValue[0]));
-    }
-
-    @Test
-    public void testSum(){
-        //sum
-        System.out.println(sysConfigRDao.findSumByProperties(propertyName,groupByName,param,paramValue));
-        System.out.println(sysConfigRDao.findSumByProperty(propertyName,groupByName,param[0],paramValue[0]));
-    }
-    @Test
-    public void testAvg(){
-        //avg
-        System.out.println(sysConfigRDao.findAvgByProperties(propertyName,groupByName,param,paramValue));
-        System.out.println(sysConfigRDao.findAvgByProperty(propertyName,groupByName,param[0],paramValue[0]));
-    }
-
-}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMessageService.java

@@ -1,110 +0,0 @@
-//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-//
-//import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
-//import cn.estsh.i3plus.pojo.base.bean.ListPager;
-//import cn.estsh.i3plus.pojo.base.common.Pager;
-//import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
-//import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
-//import com.alibaba.fastjson.JSON;
-//import org.junit.Test;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.test.annotation.Rollback;
-//
-//import javax.transaction.Transactional;
-//import java.util.List;
-//
-///**
-// * @Description : 测试 消息服务接口
-// * @Reference :
-// * @Author : yunhao
-// * @Date : 2018-10-31 15:30
-// * @Modify :
-// **/
-//public class TestMessageService extends TestBase {
-//
-//    public static final Logger LOGGER = LoggerFactory.getLogger(TestMessageService.class);
-//    @Autowired
-//    private ISysMessageService sysMessageService;
-//
-//    /**
-//     * 测试 查询所有消息
-//     */
-//    @Test
-//    @Transactional
-//    public void testListSysMessage() {
-//        List list = sysMessageService.listSysMessage();
-//        System.out.println(JSON.toJSONString(list));
-//    }
-//
-//    /**
-//     * 测试 根据id查询消息
-//     */
-//    @Test
-//    @Transactional
-//    public void testGetSysMessageById() {
-//        SysMessage sysMessage = sysMessageService.getSysMessageById(1L);
-//        System.out.println(JSON.toJSONString(sysMessage));
-//    }
-//
-//    /**
-//     * 测试 添加消息
-//     */
-//    @Test
-//    @Transactional
-//    @Rollback(false)
-//    public void testInsertSysMessage() {
-//        SysMessage sysMessage = new SysMessage();
-//        sysMessage.setMessageTitle("test-系统通知");
-//        sysMessage.setMessageSenderNameRdd("system");
-//        sysMessage.setMessageSenderId(-1L);
-//        sysMessage.setMessageType(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue());
-//        sysMessage.setMessageSendTime("2018-11-01 16:58:00");
-//
-//        for (int i = 0; i < 50; i++) {
-//            sysMessage.setId(null);
-//            sysMessage.setMessageTitle("test-系统通知" + i);
-//            sysMessageService.insertSysMessage(sysMessage);
-//        }
-//        System.out.println(JSON.toJSONString(sysMessage));
-//    }
-//
-//    /**
-//     * 测试 修改消息
-//     */
-//    @Test
-//    @Transactional
-//    public void testUpdateSysMessage(){
-//        SysMessage sysMessage = sysMessageService.getSysMessageById(1L);
-//        sysMessage.setMessageTitle("测试修改");
-//
-//        sysMessageService.updateSysMessage(sysMessage);
-//    }
-//
-//    /**
-//     * 测试 根据id删除消息
-//     */
-//    @Test
-//    @Transactional
-//    public void testDeleteSysMessageById(){
-//        sysMessageService.deleteSysMessageById(1L);
-//    }
-//
-//    /**
-//     * 测试 复杂查询
-//     */
-//    @Test
-//    @Transactional
-//    public void testQuerySysMessageByPager(){
-//        SysMessage sysMessage = new SysMessage();
-//
-//        Pager pager = new Pager();
-//        pager.setPageSize(10);
-//        pager.setCurrentPage(5);
-//
-//        ListPager list = sysMessageService.querySysMessageByPager(sysMessage,pager);
-//        System.out.println(list);
-//    }
-//
-//}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeService.java

@@ -1,118 +0,0 @@
-//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-//
-//import cn.estsh.i3plus.core.api.iservice.busi.IOrganizeService;
-//import cn.estsh.i3plus.pojo.base.bean.ListPager;
-//import cn.estsh.i3plus.pojo.base.common.Pager;
-//import cn.estsh.i3plus.pojo.platform.bean.Organize;
-//import cn.estsh.i3plus.pojo.platform.bean.Organize;
-//import com.alibaba.fastjson.JSON;
-//import org.junit.Test;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.test.annotation.Rollback;
-//
-//import javax.transaction.Transactional;
-//import java.util.List;
-//
-///**
-// * @Description : 岗位信息测试
-// * @Reference :
-// * @Author : wei.peng
-// * @Date : 2018-10-29 19:02
-// * @Modify :
-// **/
-//public class TestOrganizeService extends TestBase {
-//
-//    @Autowired
-//    private IOrganizeService organizeService;
-//
-//    /**
-//     * 新增数据
-//     */
-//    @Test
-//    @Transactional
-//    @Rollback(false)
-//    public void  testInsertOrganize(){
-//        for(int i = 0 ; i < 50 ; i++ ){
-//            Organize obj = new Organize();
-//            obj.setName("Junit Test " + i);
-//            obj.setOrganizeCode("DEV_JUNIT " + i);
-//            obj.setParentId(-1L);
-//            obj = organizeService.insertOrganize(obj);
-//            System.out.println(JSON.toJSONString(obj));
-//        }
-//    }
-//
-//    /**
-//     * 根据Key 数据
-//     * @return
-//     */
-//    @Test
-//    @Transactional
-//    public void testGetOrganizeById(){
-//        Organize obj = organizeService.getOrganizeById("1057163974900060160");
-//        System.out.println(JSON.toJSONString(obj));
-//    }
-//
-//    /**
-//     * 查询所有数据
-//     *
-//     * @return
-//     */
-//    @Test
-//    @Transactional
-//    public void testListOrganize(){
-//        List list = organizeService.listOrganize();
-//        System.out.println(JSON.toJSONString(list));
-//    }
-//
-//    /**
-//     * 根据岗位信息进行查找
-//     * @return
-//     */
-//    @Test
-//    @Transactional
-//    public void testFindOrganizeByPager(){
-//        Organize obj = new Organize();
-//
-//        Pager pager = new Pager();
-//        pager.setPageSize(10);
-//        pager.setCurrentPage(1);
-//
-//        ListPager list = organizeService.queryOrganize(null, pager);
-//
-//        System.out.println(JSON.toJSONString(list));
-//    }
-//
-//    /**
-//     * 修改数据
-//     */
-//    @Test
-//    @Transactional
-//    public void testUpdateOrganize(){
-//        Organize obj = organizeService.getOrganizeById("1057108586410414080");
-//        obj.setName("Junit update Name ");
-//        organizeService.updateOrganize(obj);
-//        System.out.println(JSON.toJSONString(obj));
-//    }
-//
-//    /**
-//     * 根据Key 删除数据
-//     */
-//    @Test
-//    @Transactional
-//    public void testDeleteOrganizeById(){
-////        organizeService.deleteOrganizeById("");
-//    }
-//
-//    /**
-//     * 根据id批量删除岗位
-//     * @return
-//     */
-//    @Test
-//    @Transactional
-//    public void deleteOrganizeByIds(){
-////        organizeService.deleteOrganizeByIds(new String[]{"1057108585445724160","1057108585760296960"});
-//    }
-//
-//
-//}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionService.java

@@ -1,117 +0,0 @@
-//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-//
-//import cn.estsh.i3plus.core.api.iservice.busi.IPositionService;
-//import cn.estsh.i3plus.pojo.base.bean.ListPager;
-//import cn.estsh.i3plus.pojo.base.common.Pager;
-//import cn.estsh.i3plus.pojo.platform.bean.Position;
-//import com.alibaba.fastjson.JSON;
-//import org.junit.Test;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.core.annotation.Order;
-//import org.springframework.test.annotation.Rollback;
-//
-//import javax.transaction.Transactional;
-//import java.util.List;
-//
-///**
-// * @Description : 岗位信息测试
-// * @Reference :
-// * @Author : wei.peng
-// * @Date : 2018-10-29 19:02
-// * @Modify :
-// **/
-//public class TestPositionService extends TestBase {
-//
-//    @Autowired
-//    private IPositionService positionService;
-//
-//    /**
-//     * 新增数据
-//     */
-//    @Test
-//    @Transactional
-//    @Rollback(false)
-//    public void  testInsertPosition(){
-//        for(int i = 0 ; i < 50 ; i++ ){
-//            Position position = new Position();
-//            position.setName("Junit Test " + i);
-//            position.setPositionCode("DEV_JUNIT " + i);
-//            position = positionService.insertPosition(position);
-//            System.out.println(JSON.toJSONString(position));
-//        }
-//    }
-//
-//    /**
-//     * 根据Key 数据
-//     * @return
-//     */
-//    @Test
-//    @Transactional
-//    public void testGetPositionById(){
-//        Position pos = positionService.getPositionById("1057108589715525632");
-//        System.out.println(JSON.toJSONString(pos));
-//    }
-//
-//    /**
-//     * 查询所有数据
-//     *
-//     * @return
-//     */
-//    @Test
-//    @Transactional
-//    public void testListPosition(){
-//        List list = positionService.listPosition();
-//        System.out.println(JSON.toJSONString(list));
-//    }
-//
-//    /**
-//     * 根据岗位信息进行查找
-//     * @return
-//     */
-//    @Test
-//    @Transactional
-//    public void testFindPositionByPager(){
-//        Position position = new Position();
-//
-//        Pager pager = new Pager();
-//        pager.setPageSize(10);
-//        pager.setCurrentPage(1);
-//
-//        ListPager list = positionService.findPositionByPager(null, pager);
-//
-//        System.out.println(JSON.toJSONString(list));
-//    }
-//
-//    /**
-//     * 修改数据
-//     */
-//    @Test
-//    @Transactional
-//    public void testUpdatePosition(){
-//        Position position = positionService.getPositionById("1057108586410414080");
-//        position.setName("Junit update Name ");
-//        positionService.updatePosition(position);
-//        System.out.println(JSON.toJSONString(position));
-//    }
-//
-//    /**
-//     * 根据Key 删除数据
-//     */
-//    @Test
-//    @Transactional
-//    public void testDeletePositionById(){
-//        positionService.deletePositionById("1057108585240203264");
-//    }
-//
-//    /**
-//     * 根据id批量删除岗位
-//     * @return
-//     */
-//    @Test
-//    @Transactional
-//    public void deletePositionByIds(){
-//        positionService.deletePositionByIds(new String[]{"1057108585445724160","1057108585760296960"});
-//    }
-//
-//
-//}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigService.java

@@ -1,102 +0,0 @@
-package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-
-import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
-import cn.estsh.i3plus.pojo.base.bean.ListPager;
-import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
-import com.alibaba.fastjson.JSON;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.annotation.Rollback;
-
-import javax.transaction.Transactional;
-import java.util.List;
-
-/**
- * @Description : 系统参数服务测试
- * @Reference :
- * @Author : yunhao
- * @Date : 2018-10-30 10:49
- * @Modify :
- **/
-public class TestSysConfigService extends TestBase {
-
-    @Autowired
-    private ISysConfigService sysConfigService;
-
-    /**
-     * 测试 查询所有系统参数
-     */
-    @Test
-    @Transactional
-    public void testListSysConfig() {
-        List list = sysConfigService.ListSysConfig();
-        System.out.println(JSON.toJSONString(list));
-    }
-
-    /**
-     * 测试 根据id查询系统参数
-     */
-    @Test
-    @Transactional
-    public void testGetSysConfigById() {
-        SysConfig sysConfig = sysConfigService.getSysConfigById(1057110061127700480L);
-        System.out.println(JSON.toJSONString(sysConfig));
-    }
-
-    /**
-     * 测试 添加系统参数
-     */
-    @Test
-    @Transactional
-    @Rollback(false)
-    public void testInsertSysConfig() {
-        SysConfig sysConfig = new SysConfig();
-        sysConfig.setName("系统名称");
-        sysConfig.setConfigCode("sys_name");
-        sysConfig.setConfigType(1);
-        sysConfig.setConfigValue("IMPP");
-        sysConfig.setConfigDescription("系统名称");
-
-        sysConfigService.insertSysConfig(sysConfig);
-        System.out.println(JSON.toJSONString(sysConfig));
-
-    }
-
-    /**
-     * 测试 修改系统参数
-     */
-    @Test
-    @Transactional
-    public void testUpdateSysConfig(){
-        SysConfig sysConfig = sysConfigService.getSysConfigById(1057110613261684736L);
-        sysConfig.setConfigDescription("测试修改");
-
-        sysConfigService.updateSysConfig(sysConfig);
-    }
-
-    /**
-     * 测试 根据id删除系统参数
-     */
-    @Test
-    @Transactional
-    public void testDeleteSysConfigById(){
-        sysConfigService.deleteSysConfigById(1057111616417566720L);
-    }
-
-    /**
-     * 测试 复制查询
-     */
-    @Test
-    @Transactional
-    public void testQuerySysConfigByPager(){
-        SysConfig sysConfig = new SysConfig();
-
-        Pager pager = new Pager();
-        pager.setPageSize(10);
-        pager.setCurrentPage(1);
-
-        ListPager list = sysConfigService.querySysConfigByPager(sysConfig,pager);
-        System.out.println(list);
-    }
-}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java

@@ -1,99 +0,0 @@
-//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-//
-//import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService;
-//import cn.estsh.i3plus.pojo.base.bean.ListPager;
-//import cn.estsh.i3plus.pojo.base.common.Pager;
-//import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
-//import com.alibaba.fastjson.JSON;
-//import org.junit.Test;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.test.annotation.Rollback;
-//
-//import javax.transaction.Transactional;
-//import java.util.List;
-//
-///**
-// * @Description : 测试字典服务接口
-// * @Reference :
-// * @Author : yunhao
-// * @Date : 2018-10-30 18:52
-// * @Modify :
-// **/
-//public class TestSysDictionaryService extends TestBase {
-//    @Autowired
-//    private ISysDictionaryService sysDictionaryService;
-//
-//    /**
-//     * 测试 查询所有字典
-//     */
-//    @Test
-//    @Transactional
-//    public void testListSysDictionary() {
-//        List list = sysDictionaryService.listSysDictionary();
-//        System.out.println(JSON.toJSONString(list));
-//    }
-//
-//    /**
-//     * 测试 根据id查询字典
-//     */
-//    @Test
-//    @Transactional
-//    public void testGetSysDictionaryById() {
-//        SysDictionary sysDictionary = sysDictionaryService.getSysDictionaryById("1057110061127700480");
-//        System.out.println(JSON.toJSONString(sysDictionary));
-//    }
-//
-//    /**
-//     * 测试 添加字典
-//     */
-//    @Test
-//    @Transactional
-//    @Rollback(false)
-//    public void testInsertSysDictionary() {
-//        SysDictionary sysDictionary = new SysDictionary();
-//        sysDictionary.setName("字典测试");
-//        sysDictionary.setDictionaryCode("dic_test");
-//        sysDictionary.setDictionaryValue("DEV");
-//        sysDictionary.setDictionaryDescription("字典测试");
-//
-//        sysDictionaryService.insertSysDictionary(sysDictionary);
-//        System.out.println(JSON.toJSONString(sysDictionary));
-//    }
-//
-//    /**
-//     * 测试 修改字典
-//     */
-//    @Test
-//    @Transactional
-//    public void testUpdateSysDictionary(){
-//        SysDictionary sysDictionary = sysDictionaryService.getSysDictionaryById("1057110613261684736");
-//        sysDictionary.setName("测试修改");
-//
-//        sysDictionaryService.updateSysDictionary(sysDictionary);
-//    }
-//
-//    /**
-//     * 测试 根据id删除字典
-//     */
-//    @Test
-//    @Transactional
-//    public void testDeleteSysDictionaryById(){
-//        sysDictionaryService.deleteSysDictionaryById("1057111616417566720");
-//    }
-//
-//    /**
-//     * 测试 复杂查询
-//     */
-//    @Test
-//    @Transactional
-//    public void testQuerySysDictionaryByPager(){
-//        SysDictionary sysDictionary = new SysDictionary();
-//
-//        Pager pager = new Pager();
-//        pager.setPageSize(10);
-//        pager.setCurrentPage(5);
-//
-//        ListPager list = sysDictionaryService.querySysDictionaryByPager(sysDictionary,pager);
-//        System.out.println(list);
-//    }
-//}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysFileService.java

@@ -1,107 +0,0 @@
-//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-//
-//import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
-//import cn.estsh.i3plus.pojo.base.bean.ListPager;
-//import cn.estsh.i3plus.pojo.base.common.Pager;
-//import cn.estsh.i3plus.pojo.platform.bean.SysFile;
-//import com.alibaba.fastjson.JSON;
-//import org.junit.Test;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.test.annotation.Rollback;
-//
-//import javax.transaction.Transactional;
-//import java.util.List;
-//
-///**
-// * @Description : 测试 文件资源服务接口
-// * @Reference :
-// * @Author : yunhao
-// * @Date : 2018-10-31 15:30
-// * @Modify :
-// **/
-//public class TestSysFileService extends TestBase {
-//
-//    @Autowired
-//    public ISysFileService sysFileService;
-//
-//    /**
-//     * 测试 查询所有文件资源
-//     */
-//    @Test
-//    @Transactional
-//    public void testListSysFile() {
-//        List list = sysFileService.listSysFile();
-//        System.out.println(JSON.toJSONString(list));
-//    }
-//
-//    /**
-//     * 测试 根据id查询文件资源
-//     */
-//    @Test
-//    @Transactional
-//    public void testGetSysFileById() {
-//        SysFile sysFile = sysFileService.getSysFileById(1057110061127700480L);
-//        System.out.println(JSON.toJSONString(sysFile));
-//    }
-//
-//    /**
-//     * 测试 添加文件资源
-//     */
-//    @Test
-//    @Transactional
-//    @Rollback(false)
-//    public void testInsertSysFile() {
-//        SysFile sysFile = new SysFile();
-//        sysFile.setName("文件doc");
-//        sysFile.setFileTypeId(1058251784058966016L);
-//        sysFile.setFileTypeName("doc");
-//        sysFile.setDownloads(999);
-//        sysFile.setFileSize(1024);
-//        sysFile.setCreateUser("中国移动");
-//        sysFile.setCreateDatetime("2018-01-01 00:00:00");
-//        for (int i = 0; i < 50; i++) {
-//            sysFile.setId(null);
-//            sysFile.setName("文件"+ i +".doc");
-//            sysFile.setCreateDatetime("2018-01-01 " + (i % 10) + "0:00:00");
-//            sysFileService.insertSysFile(sysFile);
-//        }
-//        System.out.println(JSON.toJSONString(sysFile));
-//    }
-//
-//    /**
-//     * 测试 修改文件资源
-//     */
-//    @Test
-//    @Transactional
-//    public void testUpdateSysFile(){
-//        SysFile sysFile = sysFileService.getSysFileById(1057110613261684736L);
-//        sysFile.setName("测试修改");
-//
-//        sysFileService.updateSysFile(sysFile);
-//    }
-//
-//    /**
-//     * 测试 根据id删除文件资源
-//     */
-//    @Test
-//    @Transactional
-//    public void testDeleteSysFileById(){
-//        sysFileService.deleteSysFileById("1057111616417566720");
-//    }
-//
-//    /**
-//     * 测试 复杂查询
-//     */
-//    @Test
-//    @Transactional
-//    public void testQuerySysFileByPager(){
-//        SysFile sysFile = new SysFile();
-//
-//        Pager pager = new Pager();
-//        pager.setPageSize(10);
-//        pager.setCurrentPage(5);
-//
-//        ListPager list = sysFileService.querySysFileByPager(sysFile,pager);
-//        System.out.println(list);
-//    }
-//}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysMenuService.java

@@ -1,104 +0,0 @@
-//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-//
-//import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
-//import cn.estsh.i3plus.pojo.platform.bean.Organize;
-//import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
-//import com.alibaba.fastjson.JSON;
-//import org.junit.Test;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.test.annotation.Rollback;
-//
-//import javax.transaction.Transactional;
-//import java.util.List;
-//
-///**
-// * @Description :
-// * @Reference :
-// * @Author : wei.peng
-// * @Date : 2018-11-01 11:58
-// * @Modify :
-// **/
-//public class TestSysMenuService extends TestBase {
-//
-//    @Autowired
-//    private ISysMenuService sysMenuService;
-//
-//
-//
-//
-//    /**
-//     * 修改数据
-//     */
-//    @Test
-//    public void testUpdateSysMenu() {
-//
-//    }
-//
-//    /**
-//     * 修改权限状态
-//     */
-//    @Test
-//    public void testUpdateSysMenuStatus() {
-//
-//    }
-//
-//    /**
-//     * 批量修改状态
-//     */
-//    @Test
-//    public void testUpdateSysMenuStatusByIds() {
-//
-//    }
-//
-//    /**
-//     * 根据Key 删除数据
-//     */
-//    @Test
-//    public void testDeleteSysMenuById() {
-//
-//    }
-//
-//    /**
-//     * 新增数据
-//     */
-//    @Test
-//    @Transactional
-//    @Rollback(false)
-//    public void testInsertSysMenu() {
-//        for(int i = 0 ; i < 50 ; i++ ){
-//            SysMenu obj = new SysMenu();
-//            obj.setName("Junit Test " + i);
-//            obj.setMenuCode("DEV_JUNIT " + i);
-//            obj.setParentId(-1L);
-//            obj = sysMenuService.insertSysMenu(obj);
-//            System.out.println(JSON.toJSONString(obj));
-//        }
-//    }
-//
-//    /**
-//     * 查询所有数据
-//     */
-//    @Test
-//    public void testFindSysMenuAll() {
-//        List<SysMenu> list = sysMenuService.findSysMenuAll();
-//        System.out.println(JSON.toJSONString(list));
-//    }
-//
-//    /**
-//     * 根据id 数据
-//     */
-//    @Test
-//    public void testGetSysMenuById() {
-//        SysMenu menu = sysMenuService.getSysMenuById("1057844135052054528");
-//        System.out.println(JSON.toJSONString(menu));
-//    }
-//
-//    /**
-//     * 复杂查询
-//     */
-//    @Test
-//    public void testQuerySysMenu() {
-//
-//    }
-//
-//}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeExpressionService.java

@@ -1,104 +0,0 @@
-//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-//
-//import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeExpressionService;
-//import cn.estsh.i3plus.pojo.base.bean.ListPager;
-//import cn.estsh.i3plus.pojo.base.common.Pager;
-//import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-//import cn.estsh.i3plus.pojo.platform.bean.TaskTimeExpression;
-//import com.alibaba.fastjson.JSON;
-//import org.junit.Test;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.test.annotation.Rollback;
-//
-//import javax.transaction.Transactional;
-//import java.util.List;
-//
-///**
-// * @Description : 测试 时间表达式
-// * @Reference :
-// * @Author : yunhao
-// * @Date : 2018-10-31 15:30
-// * @Modify :
-// **/
-//public class TestTaskTimeExpressionService extends TestBase {
-//
-//    @Autowired
-//    ITaskTimeExpressionService taskTimeExpressionService;
-//
-//    /**
-//     * 测试 查询所有时间表达式
-//     */
-//    @Test
-//    @Transactional
-//    public void testListTaskTimeExpression() {
-//        List list = taskTimeExpressionService.listTaskTimeExpression();
-//        System.out.println(JSON.toJSONString(list));
-//    }
-//
-//    /**
-//     * 测试 根据id查询时间表达式
-//     */
-//    @Test
-//    @Transactional
-//    public void testGetTaskTimeExpressionById() {
-//        TaskTimeExpression taskTimeExpression = taskTimeExpressionService.getTaskTimeExpressionById("1057110061127700480");
-//        System.out.println(JSON.toJSONString(taskTimeExpression));
-//    }
-//
-//    /**
-//     * 测试 添加时间表达式
-//     */
-//    @Test
-//    @Transactional
-//    @Rollback(false)
-//    public void testInsertTaskTimeExpression() {
-//        TaskTimeExpression taskTimeExpression = new TaskTimeExpression();
-//        taskTimeExpression.setName("表达式");
-//        taskTimeExpression.setExpressionContent("0000000");
-//        taskTimeExpression.setExpressionDescription("描述");
-//
-//        for (int i = 0; i < 50; i++) {
-//            taskTimeExpression.setId(null);
-//            taskTimeExpression.setName("表达式"+i);
-//            taskTimeExpressionService.insertTaskTimeExpression(taskTimeExpression);
-//        }
-//        System.out.println(JSON.toJSONString(taskTimeExpression));
-//    }
-//
-//    /**
-//     * 测试 修改时间表达式
-//     */
-//    @Test
-//    @Transactional
-//    public void testUpdateTaskTimeExpression(){
-//        TaskTimeExpression taskTimeExpression = taskTimeExpressionService.getTaskTimeExpressionById("1057110613261684736");
-//        taskTimeExpression.setName("测试修改");
-//
-//        taskTimeExpressionService.updateTaskTimeExpression(taskTimeExpression);
-//    }
-//
-//    /**
-//     * 测试 根据id删除时间表达式
-//     */
-//    @Test
-//    @Transactional
-//    public void testDeleteTaskTimeExpressionById(){
-//        taskTimeExpressionService.deleteTaskTimeExpressionById("1057111616417566720");
-//    }
-//
-//    /**
-//     * 测试 复杂查询
-//     */
-//    @Test
-//    @Transactional
-//    public void testQueryTaskTimeExpressionByPager(){
-//        TaskTimeExpression taskTimeExpression = new TaskTimeExpression();
-//
-//        Pager pager = new Pager();
-//        pager.setPageSize(10);
-//        pager.setCurrentPage(5);
-//
-//        ListPager list = taskTimeExpressionService.queryTaskTimeExpressionByPager(taskTimeExpression,pager);
-//        System.out.println(list);
-//    }
-//}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeService.java

@@ -1,109 +0,0 @@
-//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-//
-//import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeService;
-//import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeService;
-//import cn.estsh.i3plus.pojo.base.bean.ListPager;
-//import cn.estsh.i3plus.pojo.base.common.Pager;
-//import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-//import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
-//import cn.estsh.i3plus.pojo.platform.bean.TaskTime;
-//import com.alibaba.fastjson.JSON;
-//import org.junit.Test;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.test.annotation.Rollback;
-//
-//import javax.transaction.Transactional;
-//import java.util.List;
-//
-///**
-// * @Description :
-// * @Reference :
-// * @Author : yunhao
-// * @Date : 2018-11-03 00:09
-// * @Modify :
-// **/
-//public class TestTaskTimeService extends TestBase {
-//
-//    @Autowired
-//    ITaskTimeService taskTimeService;
-//
-//    /**
-//     * 测试 查询所有硬件
-//     */
-//    @Test
-//    @Transactional
-//    public void testListTaskTime() {
-//        List list = taskTimeService.listTaskTime();
-//        System.out.println(JSON.toJSONString(list));
-//    }
-//
-//    /**
-//     * 测试 根据id查询硬件
-//     */
-//    @Test
-//    @Transactional
-//    public void testGetTaskTimeById() {
-//        TaskTime taskTime = taskTimeService.getTaskTimeById("1057110061127700480");
-//        System.out.println(JSON.toJSONString(taskTime));
-//    }
-//
-//    /**
-//     * 测试 添加硬件
-//     */
-//    @Test
-//    @Transactional
-//    @Rollback(false)
-//    public void testInsertTaskTime() {
-//        TaskTime taskTime = new TaskTime();
-//        taskTime.setName("时间表达式");
-//        taskTime.setTimeExpressionId(1L);
-//        taskTime.setTaskStartDateTimeRdd("2018-01-01 00:00:00");
-//        taskTime.setTaskEndDateTimeRdd("2018-12-31 00:00:00");
-//        taskTime.setTaskTypeId(ImppEnumUtil.TASK_METHOD_TYPE.TYPE_GROUP.getValue());
-//        taskTime.setTaskStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
-//
-//        for (int i = 0; i < 50; i++) {
-//            taskTime.setId(null);
-//            taskTime.setName("时间表达式"+i);
-//            taskTimeService.insertTaskTime(taskTime,null);
-//        }
-//        System.out.println(JSON.toJSONString(taskTime));
-//    }
-//
-//    /**
-//     * 测试 修改硬件
-//     */
-//    @Test
-//    @Transactional
-//    public void testUpdateTaskTime(){
-//        TaskTime taskTime = taskTimeService.getTaskTimeById("1057110613261684736");
-//        taskTime.setName("测试修改");
-//
-//        taskTimeService.updateTaskTime(taskTime,null);
-//    }
-//
-//    /**
-//     * 测试 根据id删除硬件
-//     */
-//    @Test
-//    @Transactional
-//    public void testDeleteTaskTimeById(){
-//        taskTimeService.deleteTaskTimeById("1058406771644829696");
-//    }
-//
-//    /**
-//     * 测试 复杂查询
-//     */
-//    @Test
-//    @Transactional
-//    public void testQueryTaskTimeByPager(){
-//        TaskTime taskTime = new TaskTime();
-//
-//        Pager pager = new Pager();
-//        pager.setPageSize(10);
-//        pager.setCurrentPage(5);
-//
-//        ListPager list = taskTimeService.queryTaskTimeByPager(taskTime,pager);
-//        System.out.println(list);
-//    }
-//}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolService.java

@@ -1,109 +0,0 @@
-//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-//
-//import cn.estsh.i3plus.core.api.iservice.busi.IToolService;
-//import cn.estsh.i3plus.pojo.base.bean.ListPager;
-//import cn.estsh.i3plus.pojo.base.common.Pager;
-//import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-//import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
-//import cn.estsh.i3plus.pojo.platform.bean.Tool;
-//import com.alibaba.fastjson.JSON;
-//import org.apache.commons.lang3.EnumUtils;
-//import org.junit.Test;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.test.annotation.Rollback;
-//
-//import javax.transaction.Transactional;
-//import java.util.List;
-//
-///**
-// * @Description : 测试 硬件服务接口
-// * @Reference :
-// * @Author : yunhao
-// * @Date : 2018-10-31 15:30
-// * @Modify :
-// **/
-//public class TestToolService extends TestBase {
-//
-//    @Autowired
-//    IToolService toolService;
-//
-//    /**
-//     * 测试 查询所有硬件
-//     */
-//    @Test
-//    @Transactional
-//    public void testListTool() {
-//        List list = toolService.listTool();
-//        System.out.println(JSON.toJSONString(list));
-//    }
-//
-//    /**
-//     * 测试 根据id查询硬件
-//     */
-//    @Test
-//    @Transactional
-//    public void testGetToolById() {
-//        Tool tool = toolService.getToolById("1057110061127700480");
-//        System.out.println(JSON.toJSONString(tool));
-//    }
-//
-//    /**
-//     * 测试 添加硬件
-//     */
-//    @Test
-//    @Transactional
-//    @Rollback(false)
-//    public void testInsertTool() {
-//        Tool tool = new Tool();
-//        tool.setName("扫描枪");
-//        tool.setToolTypeId(1057261374348070912L);
-//        tool.setRedToolTypeName("扫描枪22");
-//        tool.setToolConnTypeId(1);
-//        tool.setToolDataTypeId(1);
-//        tool.setToolStatusId(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
-//
-//        for (int i = 0; i < 50; i++) {
-//            tool.setId(null);
-//            tool.setName("扫描枪"+i);
-//            toolService.insertTool(tool);
-//        }
-//        System.out.println(JSON.toJSONString(tool));
-//    }
-//
-//    /**
-//     * 测试 修改硬件
-//     */
-//    @Test
-//    @Transactional
-//    public void testUpdateTool(){
-//        Tool tool = toolService.getToolById("1057110613261684736");
-//        tool.setName("测试修改");
-//
-//        toolService.updateTool(tool);
-//    }
-//
-//    /**
-//     * 测试 根据id删除硬件
-//     */
-//    @Test
-//    @Transactional
-//    public void testDeleteToolById(){
-//        toolService.deleteToolById("1057111616417566720");
-//    }
-//
-//    /**
-//     * 测试 复杂查询
-//     */
-//    @Test
-//    @Transactional
-//    public void testQueryToolByPager(){
-//        Tool tool = new Tool();
-//
-//        Pager pager = new Pager();
-//        pager.setPageSize(10);
-//        pager.setCurrentPage(5);
-//
-//        ListPager list = toolService.queryToolByPager(tool,pager);
-//        System.out.println(list);
-//    }
-//}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolTypeService.java

@@ -1,101 +0,0 @@
-//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-//
-//import cn.estsh.i3plus.core.api.iservice.busi.IToolTypeService;
-//import cn.estsh.i3plus.core.api.iservice.busi.IToolTypeService;
-//import cn.estsh.i3plus.pojo.base.bean.ListPager;
-//import cn.estsh.i3plus.pojo.base.common.Pager;
-//import cn.estsh.i3plus.pojo.platform.bean.ToolType;
-//import com.alibaba.fastjson.JSON;
-//import org.junit.Test;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.test.annotation.Rollback;
-//
-//import javax.transaction.Transactional;
-//import java.util.List;
-//
-///**
-// * @Description : 测试 硬件类型服务接口
-// * @Reference :
-// * @Author : yunhao
-// * @Date : 2018-10-30 20:36
-// * @Modify :
-// **/
-//public class TestToolTypeService extends TestBase {
-//    @Autowired
-//    private IToolTypeService toolTypeService;
-//
-//    /**
-//     * 测试 查询所有硬件类型
-//     */
-//    @Test
-//    @Transactional
-//    public void testListToolType() {
-//        List list = toolTypeService.listToolType();
-//        System.out.println(JSON.toJSONString(list));
-//    }
-//
-//    /**
-//     * 测试 根据id查询硬件类型
-//     */
-//    @Test
-//    @Transactional
-//    public void testGetToolTypeById() {
-//        ToolType toolType = toolTypeService.getToolTypeById("1057110061127700480");
-//        System.out.println(JSON.toJSONString(toolType));
-//    }
-//
-//    /**
-//     * 测试 添加硬件类型
-//     */
-//    @Test
-//    @Transactional
-//    @Rollback(false)
-//    public void testInsertToolType() {
-//        ToolType toolType = new ToolType();
-//        toolType.setName("扫描枪");
-//
-//        for (int i = 0; i < 50; i++) {
-//            toolType.setId(null);
-//            toolType.setName("扫描枪"+i);
-//            toolTypeService.insertToolType(toolType);
-//        }
-//        System.out.println(JSON.toJSONString(toolType));
-//    }
-//
-//    /**
-//     * 测试 修改硬件类型
-//     */
-//    @Test
-//    @Transactional
-//    public void testUpdateToolType(){
-//        ToolType toolType = toolTypeService.getToolTypeById("1057110613261684736");
-//        toolType.setName("测试修改");
-//
-//        toolTypeService.updateToolType(toolType);
-//    }
-//
-//    /**
-//     * 测试 根据id删除硬件类型
-//     */
-//    @Test
-//    @Transactional
-//    public void testDeleteToolTypeById(){
-//        toolTypeService.deleteToolTypeById("1057111616417566720");
-//    }
-//
-//    /**
-//     * 测试 复杂查询
-//     */
-//    @Test
-//    @Transactional
-//    public void testQueryToolTypeByPager(){
-//        ToolType toolType = new ToolType();
-//
-//        Pager pager = new Pager();
-//        pager.setPageSize(10);
-//        pager.setCurrentPage(5);
-//
-//        ListPager list = toolTypeService.queryToolTypeByPager(toolType,pager);
-//        System.out.println(list);
-//    }
-//}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/util/TestExcelUtil.java

@@ -1,41 +0,0 @@
-package cn.estsh.i3plus.core.apiservice.util;
-
-import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase;
-import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.SysTool;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description : excel导入导出测试
- * @Reference :
- * @Author : yunhao
- * @CreateDate : 2018-11-21 19:44
- * @Modify:
- **/
-public class TestExcelUtil extends TestBase {
-
-
-    @Test
-    public void TestExportData(){
-
-    }
-
-    @Test
-    public void importData(){
-        try {
-            List sy = ExcelUtil.importData("testOut.xls", new FileInputStream("E://testOut.xls"), SysTool.class);
-            System.out.println(sy);
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/util/TestMailUtil.java

@@ -1,29 +0,0 @@
-package cn.estsh.i3plus.core.apiservice.util;
-
-import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase;
-import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @Description :
- * @Reference :
- * @Author : yunhao
- * @CreateDate : 2018-11-21 19:44
- * @Modify:
- **/
-public class TestMailUtil extends TestBase {
-
-    @Autowired
-    MailUtil mailUtil;
-
-    @Test
-    public void TestSendMail(){
-        mailUtil.setTo("yunhao.wang@estsh.com");
-        mailUtil.setSubject("中文");
-        mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getDescription());
-        mailUtil.setBody("内容");
-        mailUtil.send();
-
-    }
-}

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/util/TestOrderNoMakeUtil.java

@@ -1,33 +0,0 @@
-package cn.estsh.i3plus.core.apiservice.util;
-
-import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase;
-import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
-import org.junit.Test;
-
-/**
- * @Description :
- * @Reference :
- * @Author : yunhao
- * @CreateDate : 2018-11-21 19:45
- * @Modify:
- **/
-public class TestOrderNoMakeUtil extends TestBase {
-
-    @Test
-    public void TestMakeOrderNo() {
-        SysOrderNoRule sysOrderNoRule = new SysOrderNoRule();
-        sysOrderNoRule.setName("一号单据");
-        sysOrderNoRule.setOrderNoRule("GG-{yyyy}{MM}{dd}{serialNo}");
-        sysOrderNoRule.setSerialNoSeed(1L);
-        sysOrderNoRule.setSerialNoIncrement(1L);
-        sysOrderNoRule.setSerialNoLength(4L);
-        sysOrderNoRule.setSerialNo(9999L);
-        sysOrderNoRule.setIsCycle(1);
-
-        System.out.println(OrderNoMakeUtil.next(sysOrderNoRule));
-
-//       String d= MessageFormat.format("%0{0}d", 3);
-//        System.out.println(d);
-    }
-
-}