1.删除无用代码

master
x_z 3 years ago
parent 5964d09a69
commit d405de0092

@ -2,7 +2,6 @@ package com.glxp.udi.admin.controller.basic;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.common.res.BaseResponse;
import com.glxp.udi.admin.constant.Constant; import com.glxp.udi.admin.constant.Constant;
@ -13,7 +12,6 @@ import com.glxp.udi.admin.req.basic.BussinessLocalTypeFilterRequest;
import com.glxp.udi.admin.req.basic.BussinessTypeFilterRequest; import com.glxp.udi.admin.req.basic.BussinessTypeFilterRequest;
import com.glxp.udi.admin.req.info.DeleteRequest; import com.glxp.udi.admin.req.info.DeleteRequest;
import com.glxp.udi.admin.res.PageSimpleResponse; import com.glxp.udi.admin.res.PageSimpleResponse;
import com.glxp.udi.admin.res.basic.BussinessTypResponse;
import com.glxp.udi.admin.service.auth.AuthAdminService; import com.glxp.udi.admin.service.auth.AuthAdminService;
import com.glxp.udi.admin.service.auth.CustomerService; import com.glxp.udi.admin.service.auth.CustomerService;
import com.glxp.udi.admin.service.basic.BussinessTypeService; import com.glxp.udi.admin.service.basic.BussinessTypeService;
@ -91,21 +89,6 @@ public class BussinessTypeController {
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
@GetMapping("/udiwms/bussinessType/udimsFilter")
public BaseResponse udimsFilter(BussinessTypeFilterRequest bussinessTypeFilterRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
bussinessTypeFilterRequest.setSpUse(true);
Page<BussinessTypResponse> page = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest);
PageSimpleResponse<BussinessTypResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(page.getRecords());
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/bussinessType/delete") @PostMapping("/udiwms/bussinessType/delete")
public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {

@ -2,10 +2,8 @@ package com.glxp.udi.admin.dao.basic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.basic.BussinessTypeEntity; import com.glxp.udi.admin.entity.basic.BussinessTypeEntity;
import com.glxp.udi.admin.req.basic.BussinessTypeFilterRequest; import com.glxp.udi.admin.req.basic.BussinessTypeFilterRequest;
import com.glxp.udi.admin.res.basic.BussinessTypResponse;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -14,8 +12,6 @@ import java.util.List;
@Mapper @Mapper
public interface BussinessTypeDao extends BaseMapper<BussinessTypeEntity> { public interface BussinessTypeDao extends BaseMapper<BussinessTypeEntity> {
Page<BussinessTypResponse> filterJoinList(Page<BussinessTypResponse> page, BussinessTypeFilterRequest bussinessTypeFilterRequest);
IPage<BussinessTypeEntity> filterAllByUser(IPage<BussinessTypeEntity> page, String name, String action, String mainAction, String locInvCode, String customerId, Boolean enabled); IPage<BussinessTypeEntity> filterAllByUser(IPage<BussinessTypeEntity> page, String name, String action, String mainAction, String locInvCode, String customerId, Boolean enabled);
List<BussinessTypeEntity> filterAllByUserList(BussinessTypeFilterRequest bussinessTypeFilterRequest); List<BussinessTypeEntity> filterAllByUserList(BussinessTypeFilterRequest bussinessTypeFilterRequest);

@ -10,7 +10,6 @@ import com.glxp.udi.admin.constant.TypeConstant;
import com.glxp.udi.admin.dao.basic.BussinessTypeDao; import com.glxp.udi.admin.dao.basic.BussinessTypeDao;
import com.glxp.udi.admin.entity.basic.BussinessTypeEntity; import com.glxp.udi.admin.entity.basic.BussinessTypeEntity;
import com.glxp.udi.admin.req.basic.BussinessTypeFilterRequest; import com.glxp.udi.admin.req.basic.BussinessTypeFilterRequest;
import com.glxp.udi.admin.res.basic.BussinessTypResponse;
import com.glxp.udi.admin.service.auth.AuthAdminService; import com.glxp.udi.admin.service.auth.AuthAdminService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
@ -58,14 +57,6 @@ public class BussinessTypeService {
return wrapper; return wrapper;
} }
public Page<BussinessTypResponse> filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest) {
if (bussinessTypeFilterRequest == null) {
return new Page<>();
}
Page<BussinessTypResponse> page = new Page<>(bussinessTypeFilterRequest.getPage(), bussinessTypeFilterRequest.getLimit());
return bussinessTypeDao.filterJoinList(page, bussinessTypeFilterRequest);
}
public IPage<BussinessTypeEntity> filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest) { public IPage<BussinessTypeEntity> filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest) {
if (bussinessTypeFilterRequest == null) { if (bussinessTypeFilterRequest == null) {
return new Page<>(); return new Page<>();

@ -3,34 +3,6 @@
<mapper namespace="com.glxp.udi.admin.dao.basic.BussinessTypeDao"> <mapper namespace="com.glxp.udi.admin.dao.basic.BussinessTypeDao">
<select id="filterJoinList" parameterType="com.glxp.udi.admin.req.basic.BussinessTypeFilterRequest"
resultType="com.glxp.udi.admin.res.basic.BussinessTypResponse">
select * from basic_bussiness_type
<where>
<if test="name != ''and name != null">
AND `name` LIKE concat('%',#{name},'%')
</if>
<if test="action != ''and action != null">
AND `action` LIKE concat('%',#{action},'%')
</if>
<if test="mainAction != ''and mainAction != null">
AND mainAction LIKE concat(#{mainAction},'%')
</if>
<if test="advanceType != ''and advanceType != null">
AND advanceType =#{advanceType}
</if>
<if test="localAction != ''and localAction != null">
AND `action` =#{localAction}
</if>
<if test="secCheckEnable != ''and secCheckEnable != null">
AND secCheckEnable =#{secCheckEnable}
</if>
<if test="customerId != null and customerId != ''">
AND customerId = #{customerId}
</if>
</where>
</select>
<select id="filterAllByUser" parameterType="com.glxp.udi.admin.req.basic.BussinessTypeFilterRequest" <select id="filterAllByUser" parameterType="com.glxp.udi.admin.req.basic.BussinessTypeFilterRequest"
resultType="com.glxp.udi.admin.entity.basic.BussinessTypeEntity"> resultType="com.glxp.udi.admin.entity.basic.BussinessTypeEntity">
SELECT SELECT

Loading…
Cancel
Save