feat:集团物料、公司物料、物料分类CRUD和部分定制功能接口

release
gongquanlin 2 years ago
parent 3ca1431596
commit 36d2b6f7be
  1. 8
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java
  2. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/dao/CommodityMapper.java
  3. 10
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEntity.java
  4. 3
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/CommodityService.java
  5. 5
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
  6. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/impl/InterfaceServiceForKfptImpl.java
  7. 63
      order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
  8. 5
      order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/GroupCommodityCodeMapper.java
  9. 41
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/CompanyCommodityCodeController.java
  10. 18
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/CloneCompanyCommodityDTO.java
  11. 18
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/CloneCompanyCommodityDetailDTO.java
  12. 24
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/ICompanyCommodityCodeService.java
  13. 52
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/CompanyCommodityCodeServiceImpl.java
  14. 8
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java
  15. 14
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/model/dto/SdenergyTaxCodeMatchDeleteDTO.java
  16. 8
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java
  17. 1
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java
  18. 52
      order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/ValidateUtils.java
  19. 2
      order-management-consumer/src/main/resources/bootstrap-dev.yaml
  20. 1036
      order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
  21. 4
      order-management-consumer/src/main/resources/mybatis/mapper/SdenergyTaxCodeMatchDao.xml

@ -76,15 +76,17 @@ public class CommodityController {
log.info("参数 {}", map);
String xhfNsrsbh = (String) map.get("xhfNsrsbh");
String entId = (String) map.get("entId"); // 数据权限id,对应的大B下的企业id
if (StringUtils.isBlank(xhfNsrsbh)) {
log.error("{},请求税号为空!", LOGGER_MSG);
return R.error(OrderInfoContentEnum.TAXCODE_ISNULL);
}
List<String> shList = NsrsbhUtils.transShListByXhfNsrsbh(xhfNsrsbh);
List<String> entIdList = NsrsbhUtils.transShListByXhfNsrsbh(entId);
try {
PageUtils pageUtil = commodityService.queryCommodityList(map, shList);
PageUtils pageUtil = commodityService.queryCommodityList(map, shList, entIdList);
return R.ok().put("page", pageUtil);
} catch (NumberFormatException e) {
log.error("{},分页参数类型转换异常:{}", LOGGER_MSG, e.getMessage());
@ -581,11 +583,13 @@ public class CommodityController {
public void exportCommodityExcel(@RequestBody Map<String, Object> map, HttpServletResponse response) {
log.info("导出商品信息入参: {}", map);
String xhfNsrsbh = (String) map.get("xhfNsrsbh");
String entId = (String) map.get("entId"); // 数据权限id,对应的大B下的企业id
if (StringUtils.isBlank(xhfNsrsbh)) {
log.error("{},请求税号为空!", LOGGER_MSG);
}
List<String> shList = NsrsbhUtils.transShListByXhfNsrsbh(xhfNsrsbh);
PageUtils pageUtil = commodityService.queryCommodityList(map, shList);
List<String> entIdList = NsrsbhUtils.transShListByXhfNsrsbh(entId);
PageUtils pageUtil = commodityService.queryCommodityList(map, shList, entIdList);
List<CommodityCodeEntity> commodityCodeEntityList = (List<CommodityCodeEntity>) pageUtil.getList();
if (CollectionUtil.isEmpty(commodityCodeEntityList)) {
log.error("{},查询商品信息为空!", LOGGER_MSG);

@ -21,7 +21,7 @@ public interface CommodityMapper {
* @param shList
* @return
*/
List<CommodityCodeEntity> selectCommodityList(@Param("map") Map<String, Object> map, @Param("shList") List<String> shList);
List<CommodityCodeEntity> selectCommodityList(@Param("map") Map<String, Object> map, @Param("shList") List<String> shList, @Param("entId") List<String> entId);
/**
* 查询商品税编信息

@ -199,6 +199,16 @@ public class CommodityCodeEntity implements Serializable {
*/
private String wlflmc;
/**
* 数据权限id大B中的dept_id指下级公司
*/
private String entId;
/**
* 特殊物料标识 0非特殊物料1特殊物料
*/
private String tswl;
private String UUID;
private Boolean success;

@ -26,7 +26,7 @@ public interface CommodityService {
* @param xhfNsrsbh
* @return
*/
PageUtils queryCommodityList(Map<String, Object> map, List<String> xhfNsrsbh);
PageUtils queryCommodityList(Map<String, Object> map, List<String> xhfNsrsbh, List<String> entIdList);
/**
* 保存
@ -145,6 +145,7 @@ public interface CommodityService {
/**
* 导出商品信息
*
* @param commodityExcelList 需要导出的商品信息集合
* @return org.apache.poi.xssf.streaming.SXSSFWorkbook
* @throws ExcelReadException 表格导入自定义异常

@ -70,11 +70,11 @@ public class CommodityServiceImpl implements CommodityService {
* @return
*/
@Override
public PageUtils queryCommodityList(Map<String, Object> map, List<String> xhfNsrsbh) {
public PageUtils queryCommodityList(Map<String, Object> map, List<String> xhfNsrsbh, List<String> entIdList) {
int pageSize = Integer.parseInt((String) map.get(ConfigureConstant.STRING_PAGE_SIZE));
int currPage = Integer.parseInt((String) map.get(ConfigureConstant.STRING_CURR_PAGE));
PageHelper.startPage(currPage, pageSize);
List<CommodityCodeEntity> selectCommodity = commodityMapper.selectCommodityList(map, xhfNsrsbh);
List<CommodityCodeEntity> selectCommodity = commodityMapper.selectCommodityList(map, xhfNsrsbh,entIdList);
selectCommodity.forEach(commodityCodeEntity -> {
if (StringUtils.isNotBlank(commodityCodeEntity.getSl())) {
commodityCodeEntity.setSl(CommonUtils.formatSl(commodityCodeEntity.getSl()));
@ -426,6 +426,7 @@ public class CommodityServiceImpl implements CommodityService {
/**
* 成品油商品信息查询
*
* @param pageSpxxReq 成品油类型1成品油0非成品油
* @param shList
* @return

@ -179,7 +179,7 @@ public class InterfaceServiceForKfptImpl implements InterfaceServiceForKfpt {
//3.按照纳税人识别号查询
PageUtils pageUtils = commodityService.queryCommodityList(param, shList);
PageUtils pageUtils = commodityService.queryCommodityList(param, shList, null);
List<SpxxBO> spxxCommonList = new ArrayList<>();
List<CommodityCodeEntity> commodityCodeEntityList = (List<CommodityCodeEntity>) pageUtils.getList();
log.info("{}查询商品信息结果:{}", LOGGER_MSG, commodityCodeEntityList);

@ -40,6 +40,8 @@
<result column="jdc" jdbcType="VARCHAR" property="jdc"/>
<result column="wlflbm" jdbcType="VARCHAR" property="wlflbm"/>
<result column="wlflmc" jdbcType="VARCHAR" property="wlflmc"/>
<result column="ent_id" jdbcType="VARCHAR" property="entId"/>
<result column="tswl" jdbcType="VARCHAR" property="tswl"/>
</resultMap>
<sql id="Base_Column_List">
@ -48,7 +50,7 @@
tax_rate, specification_model, metering_unit, unit_price, tax_logo, hide_the_logo,
enjoy_preferential_policies, tax_class_code, tax_classification_name, preferential_policies_type,zzstsgl,
user_id, create_time, modify_time, modify_user_id, group_id,enterprise_name,data_source,
matching_state,data_state,tax_class_abbreviation,description,collect_ident,cpy,bmb_bbh,jdc,wlflbm,wlflmc
matching_state,data_state,tax_class_abbreviation,description,collect_ident,cpy,bmb_bbh,jdc,wlflbm,wlflmc,ent_id,tswl
</sql>
@ -91,7 +93,9 @@
cc.bmb_bbh,
gc.group_name,
cc.wlflbm,
cc.wlflmc
cc.wlflmc,
cc.ent_id,
cc.tswl
FROM
commodity_code cc LEFT JOIN group_commodity gc
ON gc.id = cc.group_id
@ -112,6 +116,13 @@
#{item}
</foreach>
</if>
<if test="entId != null and entId.size() > 1">
and cc.ent_id in
<foreach collection="entId" index="index" item="item"
open="(" separator="," close=")">
#{item}
</foreach>
</if>
and cc.xhf_nsrsbh != '-1'
<!-- 商品编码表ID-->
<if test="map.id != null and map.id != ''">
@ -133,6 +144,12 @@
<if test="map.sjzt != null and map.sjzt != ''">
AND cc.data_state = #{map.sjzt,jdbcType=VARCHAR}
</if>
<if test="map.entId != null and map.entId != ''">
AND cc.ent_id = #{map.entId,jdbcType=VARCHAR}
</if>
<if test="map.tswl != null and map.tswl != ''">
AND cc.tswl = #{map.tswl,jdbcType=VARCHAR}
</if>
<if test="dataType == 0">
<choose>
<!--模糊查询的标识(0表示不进行模糊查询,1表示模糊查询)-->
@ -323,6 +340,12 @@
<if test="commodityCode.wlflmc != null">
wlflmc = #{commodityCode.wlflmc,jdbcType=VARCHAR},
</if>
<if test="commodityCode.entId != null">
ent_id = #{commodityCode.entId,jdbcType=VARCHAR},
</if>
<if test="commodityCode.tswl != null">
tswl = #{commodityCode.tswl,jdbcType=VARCHAR},
</if>
</set>
<where>
<if test="commodityCode.id != null and commodityCode.id != ''">
@ -457,6 +480,12 @@
<if test="wlflmc != null">
wlflmc,
</if>
<if test="entId != null">
ent_id,
</if>
<if test="tswl != null">
tswl,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -569,6 +598,12 @@
<if test="wlflmc != null">
#{wlflmc,jdbcType=VARCHAR},
</if>
<if test="entId != null">
#{entId,jdbcType=VARCHAR},
</if>
<if test="tswl != null">
#{tswl,jdbcType=VARCHAR},
</if>
</trim>
</insert>
@ -682,6 +717,12 @@
<if test="wlflmc != null">
wlflmc,
</if>
<if test="entId != null">
entId,
</if>
<if test="tswl != null">
tswl,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -794,6 +835,12 @@
<if test="wlflmc != null">
#{wlflmc,jdbcType=VARCHAR},
</if>
<if test="entId != null">
#{entId,jdbcType=VARCHAR},
</if>
<if test="tswl != null">
#{tswl,jdbcType=VARCHAR},
</if>
</trim>
ON DUPLICATE KEY UPDATE
<trim suffixOverrides=",">
@ -901,6 +948,12 @@
<if test="wlflmc != null">
wlflmc = VALUES(wlflmc),
</if>
<if test="entId != null">
ent_id = VALUES(ent_id),
</if>
<if test="tswl != null">
tswl = VALUES(tswl),
</if>
</trim>
</insert>
@ -1138,6 +1191,12 @@
#{item}
</foreach>
</if>
<if test="map.entId != null ">
AND cc.ent_id = #{map.entId,jdbcType=VARCHAR}
</if>
<if test="map.tswl != null ">
AND cc.tswl = #{map.tswl,jdbcType=VARCHAR}
</if>
and cc.xhf_nsrsbh != '-1'
</select>

@ -1,6 +1,7 @@
package com.dxhy.order.consumer.dao;
import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity;
import com.dxhy.order.consumer.modules.commodity.domain.dto.CloneCompanyCommodityDetailDTO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -32,4 +33,8 @@ public interface GroupCommodityCodeMapper {
int insertCommodityCode(CommodityCodeEntity entity);
int deleteCommodityCodeByXhfNsrsbh(CloneCompanyCommodityDetailDTO dto);
int cloneCommodityCode(@Param("from") CloneCompanyCommodityDetailDTO from, @Param("to") CloneCompanyCommodityDetailDTO to);
}

@ -0,0 +1,41 @@
package com.dxhy.order.consumer.modules.commodity.controller;
import com.dxhy.order.consumer.modules.commodity.domain.dto.CloneCompanyCommodityDTO;
import com.dxhy.order.consumer.modules.commodity.domain.dto.QueryGroupCommodityDTO;
import com.dxhy.order.consumer.modules.commodity.domain.dto.QuoteGroupCommodityDTO;
import com.dxhy.order.consumer.modules.commodity.domain.dto.SyncGroupCommodityDTO;
import com.dxhy.order.consumer.modules.commodity.service.ICompanyCommodityCodeService;
import com.dxhy.order.consumer.modules.commodity.service.IGroupCommodityCodeService;
import com.dxhy.order.model.PageUtils;
import com.dxhy.order.model.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
* @Description 公司物料库
* @Author 巩权林
* @Date 2023/3/9 08:19
**/
@RequestMapping(value = "/companyCommodity")
@RestController
@Slf4j
public class CompanyCommodityCodeController {
private final static String LOGGER_MSG = "(集团物料库)";
@Autowired
private ICompanyCommodityCodeService cloneCompanyCommodityCode;
/**
* 克隆物料
*
* @return
*/
@PostMapping("/clone")
public R quote(@RequestBody @Validated CloneCompanyCommodityDTO dto) {
return cloneCompanyCommodityCode.cloneCompanyCommodityCode(dto);
}
}

@ -0,0 +1,18 @@
package com.dxhy.order.consumer.modules.commodity.domain.dto;
import lombok.Data;
/**
* @Description 克隆物料DTO
* @Author 巩权林
* @Date 2023/3/15 20:50
**/
@Data
public class CloneCompanyCommodityDTO {
// 克隆的目标公司税号
private CloneCompanyCommodityDetailDTO from;
// 被克隆的目标公司税号
private CloneCompanyCommodityDetailDTO to;
}

@ -0,0 +1,18 @@
package com.dxhy.order.consumer.modules.commodity.domain.dto;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Description
* @Author 巩权林
* @Date 2023/3/16 10:45
**/
@Data
public class CloneCompanyCommodityDetailDTO {
@NotBlank(message = "销方税号不能为空")
private String xhfNsrsbh; // 销方税号
@NotBlank(message = "数据权限不能为空")
private String entId; // 数据权限id
}

@ -0,0 +1,24 @@
package com.dxhy.order.consumer.modules.commodity.service;
import com.dxhy.order.consumer.modules.commodity.domain.dto.CloneCompanyCommodityDTO;
import com.dxhy.order.consumer.modules.commodity.domain.dto.QueryGroupCommodityDTO;
import com.dxhy.order.consumer.modules.commodity.domain.dto.QuoteGroupCommodityDTO;
import com.dxhy.order.consumer.modules.commodity.domain.dto.SyncGroupCommodityDTO;
import com.dxhy.order.model.PageUtils;
import com.dxhy.order.model.R;
/**
* @Description 集团物料库
* @Author 巩权林
* @Date 2023/3/9 10:06
**/
public interface ICompanyCommodityCodeService {
/**
* 克隆物料
*
* @param dto
* @return
*/
R cloneCompanyCommodityCode(CloneCompanyCommodityDTO dto);
}

@ -0,0 +1,52 @@
package com.dxhy.order.consumer.modules.commodity.service.impl;
import com.dxhy.order.baseservice.module.commodity.dao.GroupCommodityMapper;
import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper;
import com.dxhy.order.consumer.modules.commodity.domain.dto.CloneCompanyCommodityDTO;
import com.dxhy.order.consumer.modules.commodity.domain.dto.CloneCompanyCommodityDetailDTO;
import com.dxhy.order.consumer.modules.commodity.service.ICompanyCommodityCodeService;
import com.dxhy.order.consumer.utils.ValidateUtils;
import com.dxhy.order.model.R;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
/**
* @Description
* @Author 巩权林
* @Date 2023/3/15 21:08
**/
@Service
public class CompanyCommodityCodeServiceImpl implements ICompanyCommodityCodeService {
@Autowired
private GroupCommodityCodeMapper groupCommodityMapper;
/**
* 克隆物料
*
* @param dto
* @return
*/
@Override
@Transactional
public R cloneCompanyCommodityCode(CloneCompanyCommodityDTO dto) {
CloneCompanyCommodityDetailDTO to = dto.getTo();
CloneCompanyCommodityDetailDTO from = dto.getFrom();
ValidateUtils.validate(to);
ValidateUtils.validate(from);
// 删除to公司下的所有物料
groupCommodityMapper.deleteCommodityCodeByXhfNsrsbh(to);
// 复制from公司下的所有物料到to
if (groupCommodityMapper.cloneCommodityCode(from, to) <= 0) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return R.error("克隆失败,请重新操作");
}
return R.ok();
}
}

@ -9,12 +9,14 @@ import com.dxhy.order.consumer.modules.commodity.domain.dto.QueryGroupCommodityD
import com.dxhy.order.consumer.modules.taxcodematch.emum.SdenergyTaxCodeMatchEnum;
import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMatch;
import com.dxhy.order.consumer.modules.taxcodematch.model.dto.SdenergyTaxCodeMatchDTO;
import com.dxhy.order.consumer.modules.taxcodematch.model.dto.SdenergyTaxCodeMatchDeleteDTO;
import com.dxhy.order.consumer.modules.taxcodematch.service.SdenergyTaxCodeMatchService;
import com.dxhy.order.model.PageUtils;
import com.dxhy.order.model.R;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -69,11 +71,10 @@ public class SdenergyTaxCodeMatchController {
}
@PutMapping("/edit")
public R edit(@RequestBody SdenergyTaxCodeMatchDTO dto, @RequestParam("id") Long id) {
public R edit(@RequestBody SdenergyTaxCodeMatch dto) {
SdenergyTaxCodeMatch updateEntity = new SdenergyTaxCodeMatch();
try {
BeanUtils.copyProperties(updateEntity, dto);
updateEntity.setId(id);
if (sdenergyTaxCodeMatchService.update(updateEntity) > 0) {
return R.ok();
} else {
@ -89,7 +90,8 @@ public class SdenergyTaxCodeMatchController {
}
@DeleteMapping("/delete")
public R delete(@RequestParam("id") Long id) {
public R delete(@RequestBody @Validated SdenergyTaxCodeMatchDeleteDTO dto) {
Long id = dto.getId();
return sdenergyTaxCodeMatchService.deleteById(id) ? R.ok() : R.error();
}

@ -0,0 +1,14 @@
package com.dxhy.order.consumer.modules.taxcodematch.model.dto;
import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMatch;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Data
public class SdenergyTaxCodeMatchDeleteDTO {
@NotNull(message = "id不得为空")
private Long id;
}

@ -1400,7 +1400,6 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
}
//如果申请类别为空,根据申请说明补全
HzsqdscpcBO hzsqdscpc1 = hzsqdscReq.getHZSQDSCPC();
if (StringUtils.isBlank(hzsqdscpc1.getSQLB())) {
@ -2354,7 +2353,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
//3.按照纳税人识别号查询
PageUtils pageUtils = commodityService.queryCommodityList(param, shList);
PageUtils pageUtils = commodityService.queryCommodityList(param, shList, null);
List<SpxxBO> spxxCommonList = new ArrayList<>();
List<CommodityCodeEntity> commodityCodeEntityList = (List<CommodityCodeEntity>) pageUtils.getList();
log.info("{}查询商品信息结果:{}", LOGGER_MSG_V4, commodityCodeEntityList);
@ -4934,10 +4933,11 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
/**
* 构建全电订单信息bean
* @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
* @date 2022-10-20
*
* @param ddfpzxx 订单发票全数据返回协议bean
* @return java.util.List<com.dxhy.order.model.qd.OrderInfoQd>
* @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
* @date 2022-10-20
*/
private List<OrderInfoQd> buildOrderInfoQd(DdfpzxxBO ddfpzxx) {
List<OrderInfoQd> orderInfoQdList = new ArrayList<>(5);

@ -218,6 +218,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
commodityCodeEntity.setUUID(reqBO.getUUID());
commodityCodeEntity.setWlflbm(reqBO.getCATEGORYCODE());
commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME());
commodityCodeEntity.setDataSource("4");
// 维护税编和商品编码
if (codeEntityForMatch != null && StringUtils.isNotBlank(codeEntityForMatch.getSsflMc())) {

@ -0,0 +1,52 @@
package com.dxhy.order.consumer.utils;
import org.apache.commons.collections4.CollectionUtils;
import javax.validation.ConstraintViolation;
import javax.validation.Valid;
import javax.validation.Validation;
import java.util.Set;
/**
* @Description
* @Author 巩权林
* @Date 2023/3/16 11:07
**/
public class ValidateUtils {
/**
* 单纯参数校验
*
* @param validateObject
* @param <T>
* @throws RuntimeException
*/
public static <T> void validate(@Valid T validateObject) throws RuntimeException {
validate(validateObject, null);
}
/**
* validate主动校验方式
*
* @param validateObject 进行校验的对象
* @param <T> 传递的校验类型
* @param preMsg 错误信息的前部分要追加的内容
* @throws RuntimeException 服务异常
*/
public static <T> void validate(@Valid T validateObject, String preMsg) throws RuntimeException {
Set<ConstraintViolation<@Valid T>> validateSet = Validation
.buildDefaultValidatorFactory()
.getValidator()
.validate(validateObject);
if (CollectionUtils.isNotEmpty(validateSet)) {
for (ConstraintViolation<@Valid T> i : validateSet) {
String msg = i.getPropertyPath() + i.getMessage();
if (preMsg != null) {
msg = preMsg + msg;
}
throw new RuntimeException(msg);
}
}
}
}

@ -56,6 +56,8 @@ spring:
server-addr: ${spring.cloud.nacos.config.server-addr}
username: ${spring.cloud.nacos.config.username}
password: ${spring.cloud.nacos.config.password}
grpc:
enabled: false
#sentinel配置相关
sentinel:
#sentinel是否开启控制

@ -56,13 +56,13 @@
and wlflbm like concat("%",#{wlflbm},"%")
</if>
<if test="flmc != null and flmc != ''">
and flmc = like concat("%",#{flmc},"%")
and flmc like concat("%",#{flmc},"%")
</if>
<if test="ssflbm != null and ssflbm != ''">
and ssflbm = #{ssflbm}
</if>
<if test="ssflmc != null and ssflmc != ''">
and ssflmc = #{ssflmc}
and ssflmc like concat("%",#{ssflmc},"%")
</if>
</where>
</select>

Loading…
Cancel
Save