Commit 965e4300 authored by liqin's avatar liqin 💬

bug fixed

parent 40c4477f
package cn.wisenergy.chnmuseum.party.common.mvc; package cn.wisenergy.chnmuseum.party.common.mvc;
import cn.wisenergy.chnmuseum.party.common.enums.RESPONSE_CODE_ENUM;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.lang3.exception.ExceptionUtils;
......
package cn.wisenergy.chnmuseum.party.common.mvc; package cn.wisenergy.chnmuseum.party.common.mvc;
import cn.wisenergy.chnmuseum.party.common.enums.RESPONSE_CODE_ENUM;
/** /**
* 自定义接口异常对象 * 自定义接口异常对象
*/ */
......
package cn.wisenergy.chnmuseum.party.common.mvc; package cn.wisenergy.chnmuseum.party.common.mvc;
import cn.wisenergy.datastation.common.core.utils.exception.RESPONSE_CODE_ENUM; import cn.wisenergy.chnmuseum.party.common.enums.RESPONSE_CODE_ENUM;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
......
package cn.wisenergy.chnmuseum.party.common.validator; package cn.wisenergy.chnmuseum.party.common.validator;
import cn.wisenergy.datastation.model.validator.constraints.EnumValue; import cn.wisenergy.chnmuseum.party.common.validator.constraints.EnumValue;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
......
package cn.wisenergy.chnmuseum.party.common.validator; package cn.wisenergy.chnmuseum.party.common.validator;
import cn.wisenergy.datastation.model.validator.constraints.IdCard; import cn.wisenergy.chnmuseum.party.common.validator.constraints.IdCard;
import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext; import javax.validation.ConstraintValidatorContext;
......
package cn.wisenergy.chnmuseum.party.common.validator; package cn.wisenergy.chnmuseum.party.common.validator;
import cn.wisenergy.datastation.model.validator.constraints.Phone; import cn.wisenergy.chnmuseum.party.common.validator.constraints.Phone;
import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext; import javax.validation.ConstraintValidatorContext;
......
package cn.wisenergy.chnmuseum.party.common.validator.constraints; package cn.wisenergy.chnmuseum.party.common.validator.constraints;
import cn.wisenergy.datastation.model.validator.EnumValueValidator; import cn.wisenergy.chnmuseum.party.common.validator.EnumValueValidator;
import javax.validation.Constraint; import javax.validation.Constraint;
import javax.validation.Payload; import javax.validation.Payload;
......
package cn.wisenergy.chnmuseum.party.common.validator.constraints; package cn.wisenergy.chnmuseum.party.common.validator.constraints;
import cn.wisenergy.datastation.model.validator.IdCardValidator; import cn.wisenergy.chnmuseum.party.common.validator.IdCardValidator;
import javax.validation.Constraint; import javax.validation.Constraint;
import javax.validation.Payload; import javax.validation.Payload;
......
package cn.wisenergy.chnmuseum.party.common.validator.constraints; package cn.wisenergy.chnmuseum.party.common.validator.constraints;
import cn.wisenergy.datastation.model.validator.PhoneValidator; import cn.wisenergy.chnmuseum.party.common.validator.PhoneValidator;
import javax.validation.Constraint; import javax.validation.Constraint;
import javax.validation.Payload; import javax.validation.Payload;
......
...@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel; ...@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Collections; import java.util.Collections;
......
...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
#if(${superControllerClassPackage}) #if(${superControllerClassPackage})
import com.wisenergy.DigDataStation.common.controller.BaseController; import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
#end #end
import ${package.Entity}.${entity}; import ${package.Entity}.${entity};
import ${package.Service}.${table.serviceName}; import ${package.Service}.${table.serviceName};
...@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.HashMap; import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -117,8 +117,11 @@ public class ${table.controllerName} { ...@@ -117,8 +117,11 @@ public class ${table.controllerName} {
@ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path"), @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path"),
@ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataType = "String") @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataType = "String")
}) })
public Map<String, Object> updateStatus(@NotNull(message = "$!{table.comment}ID不能为空") @PathVariable("id") Long id, @RequestParam("status") AuditStatusEnum status) { public Map<String, Object> updateStatus(@NotNull(message = "$!{table.comment}ID不能为空") @PathVariable("id") String id, @RequestParam("status") AuditStatusEnum status) {
boolean flag = ${table.entityPath}Service.updateAuditStatusById(id, status); UpdateWrapper<${entity}> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", id);
updateWrapper.eq("audit_status", status.name());
boolean flag = ${table.entityPath}Service.update(updateWrapper);
if (flag) { if (flag) {
return getSuccessResult(); return getSuccessResult();
} }
...@@ -133,7 +136,7 @@ public class ${table.controllerName} { ...@@ -133,7 +136,7 @@ public class ${table.controllerName} {
@ApiImplicitParams(value = { @ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String") @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
}) })
public Map<String, Object> delete${entity}(@PathVariable("id") Long id) { public Map<String, Object> delete${entity}(@PathVariable("id") String id) {
boolean result = ${table.entityPath}Service.removeById(id); boolean result = ${table.entityPath}Service.removeById(id);
if (result) { if (result) {
return getSuccessResult(); return getSuccessResult();
...@@ -206,7 +209,7 @@ public class ${table.controllerName} { ...@@ -206,7 +209,7 @@ public class ${table.controllerName} {
#if(${cfg.requiresPermissions}) #if(${cfg.requiresPermissions})
@RequiresPermissions("$!{cfg.colonTableName}:getById") @RequiresPermissions("$!{cfg.colonTableName}:getById")
#end #end
public Map<String, Object> getById(@PathVariable("id") Long id) { public Map<String, Object> getById(@PathVariable("id") String id) {
${entity} ${table.entityPath} = ${table.entityPath}Service.getById(id); ${entity} ${table.entityPath} = ${table.entityPath}Service.getById(id);
return getResult(${table.entityPath}); return getResult(${table.entityPath});
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment