education token 1.05

src/main/java/org/rcisoft/business/bcarousel/controller/BCarouselController.java

@@ -12,7 +12,6 @@ import org.rcisoft.core.constant.MessageConstant;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.Result;
-import org.rcisoft.core.result.ResultCode;
 import org.rcisoft.core.result.ResultServiceEnums;
 import org.rcisoft.core.util.UploadUtil;
 import org.rcisoft.core.util.UserUtil;
@@ -29,8 +28,9 @@ import java.util.Map;
 @RestController
 @RequestMapping("/BCarousel")
 public class BCarouselController extends PaginationController<BCarousel> {
+
     @Autowired
-    private BCarouselService bCarouselService;
+    private BCarouselService bCarouselServiceImpl;
 
     @Autowired
     private Global global;
@@ -45,16 +45,10 @@ public class BCarouselController extends PaginationController<BCarousel> {
             @ApiImplicitParam(name = "linkUrl", value = "链接", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "imageType", value = "图片类型", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "imageId", value = "图片id", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "createBy", value = "创建者", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "createDate", value = "创建日期", required = false, dataType = "datetime"),
-            @ApiImplicitParam(name = "updateBy", value = "更新者", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "updateDate", value = "更新日期", required = false, dataType = "datetime"),
-            @ApiImplicitParam(name = "delFlag", value = "删除标记（0：正常；1：删除；2：审核）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "flag", value = "启用标记（0：停用；1：启用）", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @RequestMapping("/add")
     public Result add(BCarousel bCarousel) {
-        PersistModel data = bCarouselService.persist(bCarousel);
+        PersistModel data = bCarouselServiceImpl.persist(bCarousel);
         return Result.builder(data,MessageConstant.MESSAGE_ALERT_SUCCESS,bCarousel);
     }
 
@@ -62,7 +56,7 @@ public class BCarouselController extends PaginationController<BCarousel> {
     @ApiImplicitParam(name = "id", value = "businessId", required = true, dataType = "varchar")
     @RequestMapping("/remove")
     public Result remove(String id) {
-        PersistModel data = bCarouselService.removeBCarousel(id,getToken());
+        PersistModel data = bCarouselServiceImpl.removeBCarousel(id,getToken());
         return Result.builder(data,MessageConstant.MESSAGE_ALERT_SUCCESS,id);
     }
 
@@ -70,7 +64,7 @@ public class BCarouselController extends PaginationController<BCarousel> {
     @ApiImplicitParam(name = "id", value = "businessId", required = true, dataType = "varchar")
     @RequestMapping("/one")
     public Result queryOne(String businessId) {
-        return Result.builder(new PersistModel(1),MessageConstant.MESSAGE_ALERT_SUCCESS,bCarouselService.selectOne(businessId));
+        return Result.builder(new PersistModel(1),MessageConstant.MESSAGE_ALERT_SUCCESS,bCarouselServiceImpl.selectOne(businessId));
     }
 
 
@@ -84,16 +78,12 @@ public class BCarouselController extends PaginationController<BCarousel> {
             @ApiImplicitParam(name = "linkUrl", value = "链接", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "imageType", value = "图片类型", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "imageId", value = "图片id", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "createBy", value = "创建者", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "createDate", value = "创建日期", required = false, dataType = "datetime"),
-            @ApiImplicitParam(name = "updateBy", value = "更新者", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "updateDate", value = "更新日期", required = false, dataType = "datetime"),
             @ApiImplicitParam(name = "delFlag", value = "删除标记（0：正常；1：删除；2：审核）", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "flag", value = "启用标记（0：停用；1：启用）", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @RequestMapping("/queryBCarouselsByPaginationWithoutAuth")
     public GridModel queryBCarouselsByPagination(BCarousel param) {
-        bCarouselService.queryBCarouselsByPagination(getPaginationUtility(),param);
+        bCarouselServiceImpl.queryBCarouselsByPagination(getPaginationUtility(),param);
         GridModel gridModel = getGridModelResponse();
         return gridModel;
     }
@@ -108,17 +98,11 @@ public class BCarouselController extends PaginationController<BCarousel> {
             @ApiImplicitParam(name = "linkUrl", value = "链接", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "imageType", value = "图片类型", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "imageId", value = "图片id", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "createBy", value = "创建者", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "createDate", value = "创建日期", required = false, dataType = "datetime"),
-            @ApiImplicitParam(name = "updateBy", value = "更新者", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "updateDate", value = "更新日期", required = false, dataType = "datetime"),
-            @ApiImplicitParam(name = "delFlag", value = "删除标记（0：正常；1：删除；2：审核）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "flag", value = "启用标记（0：停用；1：启用）", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @RequestMapping("/queryBCarousels")
     public Result queryBCarousels(BCarousel param) {
         param.setCreateBy(UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID));
-        return Result.builder(new PersistModel(1),MessageConstant.MESSAGE_ALERT_SUCCESS,bCarouselService.queryBCarousels(param));
+        return Result.builder(new PersistModel(1),MessageConstant.MESSAGE_ALERT_SUCCESS,bCarouselServiceImpl.queryBCarousels(param));
 
     }
 

src/main/java/org/rcisoft/core/util/UserUtil.java

@@ -39,6 +39,8 @@ public class UserUtil {
         entity.setCreateBy(UserUtil.getUserInfoProp(token,UserUtil.USER_ID));
         entity.setCreateDate(new Date());
         entity.setBusinessId(IdGen.uuid());
+        entity.setNotDeleted();
+        entity.setStart();
     }
 
     /**

src/main/java/org/rcisoft/sys/role/controller/RoleController.java

@@ -12,7 +12,6 @@ import org.rcisoft.core.validate.ValidatedResult;
 import org.rcisoft.sys.role.entity.Role;
 import org.rcisoft.sys.role.service.RoleService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -181,9 +180,6 @@ public class RoleController extends PaginationController<Role> {
     @ResponseBody
     public Result deptPermission(@RequestParam("roleId") String roleId, @RequestParam("role_depts") String role_depts){
         PersistModel persistModel = roleServiceImpl.doAuthorizationDept(roleId,role_depts,getToken());
-        if(persistModel.isSuccessBySinglePersist())
-            return Result.builder(new PersistModel(1),MessageConstant.MESSAGE_ALERT_SUCCESS,roleId);
-        else
-            return Result.builder(new PersistModel(2),MessageConstant.MESSAGE_ALERT_ERROR,roleId);
+        return Result.builder(persistModel,MessageConstant.MESSAGE_ALERT_SUCCESS,roleId);
     }
 }

src/main/java/org/rcisoft/sys/role/entity/Role.java

@@ -28,8 +28,7 @@ import java.util.List;
 public class Role extends IdEntity<Role> {
 
 
-    private static final long serialVersionUID = 1L;
-
+    private static final long serialVersionUID = -437438239495993636L;
     /*角色名称*/
     private String name;
     /**

src/main/java/org/rcisoft/sys/role/service/RoleService.java

@@ -67,6 +67,13 @@ public interface RoleService {
      * @return
      */
     public List<DeptRole> queryUserRolesByPagination(PageUtil<Role> paginationUtility, String userId, Role role);
-    
+
+    /**
+     *
+     * @param paginationUtility
+     * @param DeptId
+     * @param role
+     * @return
+     */
     public List<Role> queryDeptRolesByPagination(PageUtil<Role> paginationUtility, String DeptId, Role role);
 }

src/main/java/org/rcisoft/sys/role/service/impl/RoleServiceImpl.java

@@ -34,8 +34,6 @@ public class RoleServiceImpl  implements RoleService {
     private RoleRepository roleRepository;
 
 
-
-
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
     public PersistModel persistRole(Role role, String token) {