diff --git a/src/com/engine/organization/service/impl/DemoServiceImpl.java b/src/com/engine/organization/service/impl/DemoServiceImpl.java index cf860d15..910995dd 100644 --- a/src/com/engine/organization/service/impl/DemoServiceImpl.java +++ b/src/com/engine/organization/service/impl/DemoServiceImpl.java @@ -1,12 +1,22 @@ package com.engine.organization.service.impl; import com.engine.core.impl.Service; +import com.engine.organization.annotation.Log; +import com.engine.organization.entity.LoggerContext; import com.engine.organization.entity.po.Demo; +import com.engine.organization.enums.OperateTypeEnum; +import com.engine.organization.mapper.DemoMapper; import com.engine.organization.service.DemoService; import com.engine.organization.util.HrmI18nUtil; +import com.engine.organization.util.LogAspect; import com.engine.organization.util.OrganizationAssert; -import com.weaverboot.frame.ioc.anno.classAnno.WeaIocService; +import com.engine.organization.util.db.MapperProxyFactory; +//import com.weaverboot.frame.ioc.anno.classAnno.WeaIocReplaceComponent; +//import com.weaverboot.frame.ioc.anno.classAnno.WeaIocService; +//import com.weaverboot.frame.ioc.anno.methodAnno.WeaReplaceAfter; +//import com.weaverboot.frame.ioc.handler.replace.weaReplaceParam.impl.WeaAfterReplaceParam; +import java.lang.reflect.Method; import java.util.List; /** @@ -15,24 +25,42 @@ import java.util.List; * @Date 2022/4/27 * @Version V1.0 **/ -@WeaIocService +//@WeaIocService +//@WeaIocReplaceComponent("demoService") //如不标注名称,则按类的全路径注入 public class DemoServiceImpl extends Service implements DemoService { @Override - //@Log(operateType = OperateTypeEnum.ADD,operateDesc = "测试自定义日志") + @Log(operateType = OperateTypeEnum.ADD,operateDesc = "测试自定义日志") public List list(String name) { - OrganizationAssert.notNull(name,HrmI18nUtil.getI18nLabel(34721,"参数不能为空") ); - //List demos = MapperProxyFactory.getProxy(DemoMapper.class).listAll(); - // - ////操作日志记录 - //Method method = new Object(){}.getClass().getEnclosingMethod(); - //LoggerContext loggerContext = LoggerContext.builder().operatorId(user.getUID()).operatorName(user.getLastname()).build(); - //LogAspect logAspect = new LogAspect(DemoServiceImpl.class,method,loggerContext); - //logAspect.start(); + OrganizationAssert.notNull(name, HrmI18nUtil.getI18nLabel(34721, "参数不能为空")); + List demos = MapperProxyFactory.getProxy(DemoMapper.class).listAll(); - return null; + //操作日志记录 + Method method = new Object() { + }.getClass().getEnclosingMethod(); + LoggerContext loggerContext = LoggerContext.builder().operatorId(user.getUID()).operatorName(user.getLastname()).build(); + LogAspect logAspect = new LogAspect(DemoServiceImpl.class, method, loggerContext); + logAspect.start(); + + return demos; } + + + + + + //这个是接口后置方法,大概的用法跟前置方法差不多,稍有差别 + //注解名称为WeaReplaceAfter + //返回类型必须为String + //参数叫WeaAfterReplaceParam,这个类前四个参数跟前置方法的那个相同,不同的是多了一个叫data的String,这个是那个接口执行完返回的报文 + //@WeaReplaceAfter(value = "/api/bs/hrmorganization/scheme/updateForbiddenTagById",order = 1) +// public void after(WeaAfterReplaceParam weaAfterReplaceParam){ +// +// String data = weaAfterReplaceParam.getData();//这个就是接口执行完的报文 +// System.out.println(data); +// //日志记录 +// } } diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java index d2017f94..c0008ef9 100644 --- a/src/com/engine/organization/service/impl/GradeServiceImpl.java +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -159,6 +159,8 @@ public class GradeServiceImpl extends Service implements GradeService { levelBrowserBean.setReplaceDatas(levelMaps); levelBrowserItem.setBrowserConditionParam(levelBrowserBean); + levelBrowserItem.setRelatekey("schemeId"); + // 编辑状态下,编号只读 // gradeNoCondition.setViewAttr(1); } diff --git a/src/com/engine/organization/web/GradeController.java b/src/com/engine/organization/web/GradeController.java index 9a398a15..f0a7f34b 100644 --- a/src/com/engine/organization/web/GradeController.java +++ b/src/com/engine/organization/web/GradeController.java @@ -27,6 +27,8 @@ import java.util.Map; * @version: 1.0 */ public class GradeController { + + public GradeWrapper getGradeWrapper(User user) { return ServiceUtil.getService(GradeWrapper.class, user); } @@ -166,6 +168,7 @@ public class GradeController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); + //String s = Util.null2String(map.get(ParamConstant.PARAM_IP)); return ReturnResult.successed(getGradeWrapper(user).getGradeForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); diff --git a/src/com/engine/organization/wrapper/GradeWrapper.java b/src/com/engine/organization/wrapper/GradeWrapper.java index 3eaf1216..c3591cf8 100644 --- a/src/com/engine/organization/wrapper/GradeWrapper.java +++ b/src/com/engine/organization/wrapper/GradeWrapper.java @@ -1,5 +1,6 @@ package com.engine.organization.wrapper; + import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.organization.entity.scheme.param.GradeSearchParam; @@ -18,10 +19,14 @@ import java.util.Map; * @version: 1.0 */ public class GradeWrapper extends Service { + + + private GradeService getGradeService(User user) { return ServiceUtil.getService(GradeServiceImpl.class, user); } + /** * 职级列表 *