diff --git a/src/com/engine/organization/biz/SchemeBiz.java b/src/com/engine/organization/biz/SchemeBiz.java deleted file mode 100644 index 6316c28d..00000000 --- a/src/com/engine/organization/biz/SchemeBiz.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.engine.organization.biz; - -import com.engine.organization.entity.scheme.param.SchemeSearchParam; -import com.engine.organization.entity.scheme.po.SchemePO; -import com.engine.organization.mapper.scheme.SchemeMapper; -import com.engine.organization.util.page.PageInfo; -import com.engine.organization.util.page.PageUtil; -import org.apache.ibatis.session.SqlSession; -import weaver.conn.mybatis.MyBatisFactory; - -import java.util.List; - -public class SchemeBiz { - - -} diff --git a/src/com/engine/organization/cmd/scheme/SchemeListCmd.java b/src/com/engine/organization/cmd/scheme/SchemeListCmd.java deleted file mode 100644 index 0acfd9ce..00000000 --- a/src/com/engine/organization/cmd/scheme/SchemeListCmd.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.engine.organization.cmd.scheme; - -import com.alibaba.fastjson.JSON; -import com.cloudstore.eccom.result.WeaResultMsg; -import com.engine.common.biz.AbstractCommonCommand; -import com.engine.common.entity.BizLogContext; -import com.engine.core.interceptor.CommandContext; -import com.engine.organization.component.OrganizationWeaTable; -import com.engine.organization.entity.scheme.vo.SchemeTableVO; -import com.engine.organization.util.db.DBType; -import org.apache.commons.lang3.StringUtils; -import weaver.conn.RecordSet; -import weaver.hrm.User; - -import java.util.Map; - -/** - *查询职等职级列表 - */ -public class SchemeListCmd extends AbstractCommonCommand> { - - public SchemeListCmd(Map params, User user) { - this.user = user; - this.params = params; - } - @Override - public BizLogContext getLogContext() { - return null; - } - - @Override - public Map execute(CommandContext commandContext) { - OrganizationWeaTable table = new OrganizationWeaTable<>(user,SchemeTableVO.class); - - String sqlWhere = buildSqlWhere(params); - table.setSqlwhere(sqlWhere); - - WeaResultMsg result = new WeaResultMsg(false); - result.putAll(table.makeDataResult()); - result.success(); - return result.getResultMap(); - } - - /** - * 查询条件 - * @param params - * @return - */ - private String buildSqlWhere(Map params) { - DBType dbType = DBType.get(new RecordSet().getDBType()); - String sqlWhere = " where delete_type ='0' "; - String name = (String) params.get("name"); - if (StringUtils.isNotBlank(name)) { - sqlWhere += " AND scheme_name " + dbType.like(name); - } - String no = (String) params.get("no"); - if (StringUtils.isNotBlank(name)) { - sqlWhere += " AND scheme_no " + dbType.like(no); - } - return sqlWhere; - } -} diff --git a/src/com/engine/organization/cmd/scheme/SchemeSaveCmd.java b/src/com/engine/organization/cmd/scheme/SchemeSaveCmd.java deleted file mode 100644 index 362159e5..00000000 --- a/src/com/engine/organization/cmd/scheme/SchemeSaveCmd.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.engine.organization.cmd.scheme; - -import com.engine.common.biz.AbstractCommonCommand; -import com.engine.common.entity.BizLogContext; -import com.engine.core.interceptor.CommandContext; -import com.engine.organization.entity.scheme.po.SchemePO; -import com.engine.organization.exception.OrganizationRunTimeException; -import com.engine.organization.mapper.scheme.SchemeMapper; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.ibatis.session.SqlSession; -import weaver.conn.mybatis.MyBatisFactory; -import weaver.general.Util; -import weaver.hrm.User; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class SchemeSaveCmd extends AbstractCommonCommand> { - - public SchemeSaveCmd(Map params, User user) { - this.user = user; - this.params = params; - } - - @Override - public BizLogContext getLogContext() { - return null; - } - - @Override - public Map execute(CommandContext commandContext) { - Map apidatas = new HashMap(16); - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - SchemeMapper mapper = sqlSession.getMapper(SchemeMapper.class); - - List list = mapper.listByNo(Util.null2String(this.params.get("scheme_no"))); - if (CollectionUtils.isNotEmpty(list)) { - throw new OrganizationRunTimeException("编号不允许重复"); - } - - SchemePO schemePO = SchemePO.convertToPO(params, (long) user.getUID()); - mapper.insertIgnoreNull(schemePO); - - sqlSession.commit(); - } finally { - sqlSession.close(); - } - return apidatas; - } - - -} diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.java b/src/com/engine/organization/mapper/scheme/SchemeMapper.java index a031bc98..207d3333 100644 --- a/src/com/engine/organization/mapper/scheme/SchemeMapper.java +++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.java @@ -1,9 +1,7 @@ package com.engine.organization.mapper.scheme; -import com.engine.organization.entity.scheme.param.SchemeSearchParam; import com.engine.organization.entity.scheme.po.SchemePO; -import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; diff --git a/src/com/engine/organization/service/SchemeService.java b/src/com/engine/organization/service/SchemeService.java index 7b4daeaa..53f7f34b 100644 --- a/src/com/engine/organization/service/SchemeService.java +++ b/src/com/engine/organization/service/SchemeService.java @@ -1,11 +1,5 @@ package com.engine.organization.service; -import com.engine.organization.entity.scheme.param.SchemeSearchParam; -import com.engine.organization.entity.scheme.po.SchemePO; -import com.engine.organization.util.page.PageInfo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; import java.util.Map; /** diff --git a/src/com/engine/organization/service/impl/SchemeServiceImpl.java b/src/com/engine/organization/service/impl/SchemeServiceImpl.java index 6b0cb3d4..0bc72bc0 100644 --- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java +++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java @@ -1,14 +1,23 @@ package com.engine.organization.service.impl; +import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; -import com.engine.organization.biz.SchemeBiz; -import com.engine.organization.cmd.scheme.SchemeListCmd; -import com.engine.organization.entity.scheme.param.SchemeSearchParam; +import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.scheme.po.SchemePO; +import com.engine.organization.entity.scheme.vo.SchemeTableVO; +import com.engine.organization.exception.OrganizationRunTimeException; +import com.engine.organization.mapper.scheme.SchemeMapper; import com.engine.organization.service.SchemeService; -import com.engine.organization.util.page.PageInfo; +import com.engine.organization.util.db.DBType; import com.weaverboot.frame.ioc.anno.classAnno.WeaIocService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.session.SqlSession; +import weaver.conn.RecordSet; +import weaver.conn.mybatis.MyBatisFactory; +import weaver.general.Util; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -24,12 +33,58 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map save(Map params) { - return commandExecutor.execute(new SchemeListCmd(params, user)); + Map apidatas = new HashMap(16); + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + SchemeMapper mapper = sqlSession.getMapper(SchemeMapper.class); + + List list = mapper.listByNo(Util.null2String(params.get("scheme_no"))); + if (CollectionUtils.isNotEmpty(list)) { + throw new OrganizationRunTimeException("编号不允许重复"); + } + + SchemePO schemePO = SchemePO.convertToPO(params, (long) user.getUID()); + mapper.insertIgnoreNull(schemePO); + + sqlSession.commit(); + } finally { + sqlSession.close(); + } + return apidatas; } + @Override public Map listPage(Map params) { - return commandExecutor.execute(new SchemeListCmd(params,user)); + OrganizationWeaTable table = new OrganizationWeaTable<>(user,SchemeTableVO.class); + + String sqlWhere = buildSqlWhere(params); + table.setSqlwhere(sqlWhere); + + WeaResultMsg result = new WeaResultMsg(false); + String tableString = table.getTableString(); + result.putAll(table.makeDataResult()); + result.success(); + return result.getResultMap(); + } + + /** + * 查询条件 + * @param params + * @return + */ + private String buildSqlWhere(Map params) { + DBType dbType = DBType.get(new RecordSet().getDBType()); + String sqlWhere = " where delete_type ='0' "; + String name = (String) params.get("name"); + if (StringUtils.isNotBlank(name)) { + sqlWhere += " AND scheme_name " + dbType.like(name); + } + String no = (String) params.get("no"); + if (StringUtils.isNotBlank(name)) { + sqlWhere += " AND scheme_no " + dbType.like(no); + } + return sqlWhere; } } diff --git a/src/com/engine/organization/web/SchemeController.java b/src/com/engine/organization/web/SchemeController.java index 9d32238a..636585fb 100644 --- a/src/com/engine/organization/web/SchemeController.java +++ b/src/com/engine/organization/web/SchemeController.java @@ -1,17 +1,9 @@ package com.engine.organization.web; -import com.alibaba.fastjson.JSON; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.organization.entity.scheme.dto.SchemeListDTO; -import com.engine.organization.entity.scheme.param.SchemeSearchParam; -import com.engine.organization.service.SchemeService; -import com.engine.organization.service.impl.SchemeServiceImpl; -import com.engine.organization.util.ResponseResult; -import com.engine.organization.util.page.PageInfo; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.SchemeWrapper; -import io.swagger.v3.oas.annotations.parameters.RequestBody; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; @@ -24,10 +16,6 @@ import java.util.Map; public class SchemeController { - private SchemeService getSchemeService(User user) { - return ServiceUtil.getService(SchemeServiceImpl.class, user); - } - public SchemeWrapper getSchemeWrapper(User user) { return ServiceUtil.getService(SchemeWrapper.class, user); } @@ -43,11 +31,11 @@ public class SchemeController { @GET @Path("/getTable") @Produces(MediaType.APPLICATION_JSON) - public String getTable(@Context HttpServletRequest request, @Context HttpServletResponse response, + public ReturnResult getTable(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam("searchCondition") String searchCondition) { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ResponseResult.run(getSchemeService(user)::listPage, map); + return ReturnResult.successed(getSchemeWrapper(user).listPage(map)); } /** @@ -59,10 +47,10 @@ public class SchemeController { @POST @Path("/save") @Produces(MediaType.APPLICATION_JSON) - public String saveFrom(@Context HttpServletRequest request, @Context HttpServletResponse response) { + public ReturnResult saveFrom(@Context HttpServletRequest request, @Context HttpServletResponse response) { User user = HrmUserVarify.getUser(request, response); - return ResponseResult.run(getSchemeService(user)::save, ParamUtil.request2Map(request)); - + Map save = getSchemeWrapper(user).save(ParamUtil.request2Map(request)); + return ReturnResult.successed(save); } } diff --git a/src/com/engine/organization/wrapper/SchemeWrapper.java b/src/com/engine/organization/wrapper/SchemeWrapper.java index c4f9f4f0..9e009768 100644 --- a/src/com/engine/organization/wrapper/SchemeWrapper.java +++ b/src/com/engine/organization/wrapper/SchemeWrapper.java @@ -2,17 +2,11 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.organization.entity.scheme.bo.SchemeBO; -import com.engine.organization.entity.scheme.dto.SchemeListDTO; -import com.engine.organization.entity.scheme.param.SchemeSearchParam; -import com.engine.organization.entity.scheme.po.SchemePO; import com.engine.organization.service.SchemeService; import com.engine.organization.service.impl.SchemeServiceImpl; -import com.engine.organization.util.page.PageInfo; -import com.engine.organization.util.response.ReturnResult; import weaver.hrm.User; -import java.util.List; +import java.util.Map; /** * @Author weaver_cl @@ -26,5 +20,10 @@ public class SchemeWrapper extends Service { return ServiceUtil.getService(SchemeServiceImpl.class,user); } - + public Map listPage(Map params) { + return getSchemeService(user).listPage(params); + } + public Map save(Map params) { + return getSchemeService(user).save(params); + } }