Commit 69150bb5 authored by hubaoshan's avatar hubaoshan

bug

parent 161b7866
package org.rcisoft.bpnsypn.controller;
/*固定导入*/
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.rcisoft.bpnsypn.entity.BPnSypn;
import org.rcisoft.bpnsypn.service.BPnSypnService;
import org.rcisoft.core.anno.CyOpeLogAnno;
import org.rcisoft.core.constant.CyMessCons;
import org.rcisoft.core.controller.CyPaginationController;
import org.rcisoft.core.model.CyGridModel;
import org.rcisoft.core.model.CyPersistModel;
import org.rcisoft.core.operlog.enums.CyLogTypeEnum;
import org.rcisoft.core.result.CyResult;
import org.rcisoft.core.util.CyResultGenUtil;
import org.rcisoft.util.ExportToExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
/**
* Created by cy on 2024年5月11日 下午3:19:37.
*/
@RestController
@RequestMapping("/bpnsypn")
public class BPnSypnController extends CyPaginationController<BPnSypn> {
@Autowired
private BPnSypnService bPnSypnServiceImpl;
//@PreAuthorize("@cyPerm.hasPerm('sys:sypn:add')")
@CyOpeLogAnno(title = "system-BPnSypn管理-新增BPnSypn", businessType = CyLogTypeEnum.INSERT)
@ApiOperation(value="添加BPnSypn", notes="添加BPnSypn")
@PostMapping(value = "/add")
public CyResult add(@Valid BPnSypn bPnSypn, BindingResult bindingResult) {
CyPersistModel data = bPnSypnServiceImpl.persist(bPnSypn);
return CyResultGenUtil.builder(data,
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
bPnSypn);
}
//@PreAuthorize("@cyPerm.hasPerm('sys:sypn:delete')")
@CyOpeLogAnno(title = "system-BPnSypn管理-删除BPnSypn", businessType = CyLogTypeEnum.DELETE)
@ApiOperation(value="逻辑删除BPnSypn", notes="逻辑删除BPnSypn")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
@DeleteMapping("/deleteLogical/{businessId:\\w+}")
public CyResult deleteLogical(@PathVariable Integer businessId, BPnSypn bPnSypn) {
bPnSypn.setBusinessId(businessId);
CyPersistModel data = bPnSypnServiceImpl.removeLogical(bPnSypn);
return CyResultGenUtil.builder(data,
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
businessId);
}
//@PreAuthorize("@cyPerm.hasPerm('sys:sypn:delete')")
@CyOpeLogAnno(title = "system-BPnSypn管理-删除BPnSypn", businessType = CyLogTypeEnum.DELETE)
@ApiOperation(value="删除BPnSypn", notes="删除BPnSypn")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
@DeleteMapping("/delete/{businessId:\\w+}")
public CyResult delete(@PathVariable Integer businessId, BPnSypn bPnSypn) {
bPnSypn.setBusinessId(businessId);
CyPersistModel data = bPnSypnServiceImpl.remove(bPnSypn);
return CyResultGenUtil.builder(data,
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
businessId);
}
//@PreAuthorize("@cyPerm.hasPerm('sys:sypn:update')")
@CyOpeLogAnno(title = "system-BPnSypn管理-修改BPnSypn", businessType = CyLogTypeEnum.UPDATE)
@ApiOperation(value="修改BPnSypn", notes="修改BPnSypn")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
@PutMapping("/update/{businessId:\\w+}")
public CyResult update(@PathVariable Integer businessId, @Valid BPnSypn bPnSypn, BindingResult bindingResult) {
bPnSypn.setBusinessId(businessId);
CyPersistModel data = bPnSypnServiceImpl.merge(bPnSypn);
return CyResultGenUtil.builder(data,
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
bPnSypn);
}
//@PreAuthorize("@cyPerm.hasPerm('sys:sypn:query')")
@CyOpeLogAnno(title = "system-BPnSypn管理-查询BPnSypn", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value="查询单一BPnSypn", notes="查询单一BPnSypn")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
@GetMapping("/detail/{businessId:\\w+}")
public CyResult detail(@PathVariable Integer businessId) {
return CyResultGenUtil.builder(new CyPersistModel(1),
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
bPnSypnServiceImpl.findById(businessId));
}
//@PreAuthorize("@cyPerm.hasPerm('sys:sypn:list')")
@CyOpeLogAnno(title = "system-BPnSypn管理-查询BPnSypn", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value="查询BPnSypn集合", notes="查询BPnSypn集合")
@GetMapping(value = "/queryBPnSypns")
public CyResult queryBPnSypns(BPnSypn bPnSypn) {
return CyResultGenUtil.builder(new CyPersistModel(1),
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
bPnSypnServiceImpl.findAll(bPnSypn));
}
//@PreAuthorize("@cyPerm.hasPerm('sys:sypn:list')")
@CyOpeLogAnno(title = "system-BPnSypn管理-查询BPnSypn", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value="分页查询BPnSypn集合", notes="分页查询BPnSypn集合")
@GetMapping(value = "/queryBPnSypnByPagination")
public CyGridModel listByPagination(BPnSypn bPnSypn) {
bPnSypnServiceImpl.findAllByPagination(getPaginationUtility(), bPnSypn);
return getGridModelResponse();
}
@CyOpeLogAnno(title = "system-BPnSypn管理-查询BPnSypn", businessType = CyLogTypeEnum.EXPORT)
@ApiOperation(value = "导出BPnSypn信息", notes = "导出BPnSypn信息")
@GetMapping(value = "/export")
public void outBPnSypn(HttpServletResponse response, BPnSypn bPnSypn, @PathVariable @RequestParam(defaultValue = "0") String excelId) {
String excelName="";
switch(excelId){
case "0": excelName="BPnSypn信息.xls";break;
case "1": excelName="BPnSypn信息.xlsx";break;
case "2": excelName="BPnSypn信息.csv";break;
}
List<BPnSypn> bPnSypnList = bPnSypnServiceImpl.export(bPnSypn);
ExportToExcelUtil.exportExcel(bPnSypnList, "BPnSypn信息", "BPnSypn信息", BPnSypn.class, excelName, response);
}
}
//package org.rcisoft.bus.bpnsypn.dao;
//
//import com.baomidou.mybatisplus.core.metadata.IPage;
//import org.apache.ibatis.annotations.Param;
//import org.rcisoft.bus.bpnsypn.entity.BPnSypn;
//import org.rcisoft.core.mapper.CyBaseMapper;
//import org.rcisoft.core.model.CyPageInfo;
//
//import java.util.List;
//
///**
// * Created with cy on 2024年5月11日 下午3:19:37.
// */
//
//public interface BPnSypnRepository extends CyBaseMapper<BPnSypn> {
//
//
// List<BPnSypn> queryBPnSypns(@Param("entity") BPnSypn bpnsypn);
//
// /**
// * 分页查询 bPnSypn
// *
// */
// IPage<BPnSypn> queryBPnSypnsPaged(CyPageInfo cyPageInfo, @Param("entity") BPnSypn bpnsypn);
//
// /** 验重
// * @description:
// * @author: gaoyu
// * @param:
// * @return:
// **/
// Integer querySomePn( BPnSypn bPnSypn);
//}
package org.rcisoft.bpnsypn.dao;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.rcisoft.bpnsypn.entity.BPnSypn;
import org.rcisoft.core.mapper.CyBaseMapper;
import org.rcisoft.core.model.CyPageInfo;
import java.util.List;
/**
* Created with cy on 2024年5月11日 下午3:19:37.
*/
public interface BPnSypnRepository extends CyBaseMapper<BPnSypn> {
List<BPnSypn> queryBPnSypns(@Param("entity") BPnSypn bPnSypn);
/**
* 分页查询 bPnSypn
*
*/
IPage<BPnSypn> queryBPnSypnsPaged(CyPageInfo cyPageInfo, @Param("entity") BPnSypn bPnSypn);
/** 验重
* @description:
* @author: gaoyu
* @param:
* @return:
**/
Integer querySomePn( BPnSypn bPnSypn);
}
package org.rcisoft.bpnsypn.entity;
//import cn.afterturn.easypoi.excel.annotation.Excel;
//import com.baomidou.mybatisplus.annotation.TableName;
//import lombok.Data;
//import org.rcisoft.core.entity.CyIdIncreEntity;
//
//@Data
//@TableName("b_pn_sypn")
//public class BPnSypn extends CyIdIncreEntity<BPnSypn> {
// @Excel(name = "pn", orderNum = "0", width = 20)
// private String pn;
// @Excel(name = "sypn", orderNum = "1", width = 20)
// private String sypn;
//}
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.rcisoft.core.entity.CyIdIncreEntity;
/**
* Created with cy on 2024年5月11日 下午3:19:37.
*/
@Data
@TableName("b_pn_sypn")
public class BPnSypn extends CyIdIncreEntity<BPnSypn> {
/**
* @desc
* @column pn
* @default
*/
@Excel(name = "pn", orderNum = "0", width = 20)
private String pn;
/**
* @desc
* @column sypn
* @default
*/
@Excel(name = "sypn", orderNum = "1", width = 20)
private String sypn;
}
// private Integer businesssId;
//
//
// private String flag;
//
// private String createBy;
//
// private Date createDate;
//
// private String updateBy;
//
// private Date updateDate;
//
// private String remarks;
//
// private String delFlag;
//
// public BPnSypn() {
// }
//
// public BPnSypn(Integer businesssId, String pn, String sypn, String flag, String createBy, Date createDate, String updateBy, Date updateDate, String remarks, String delFlag) {
// this.businesssId = businesssId;
// this.pn = pn;
// this.sypn = sypn;
// this.flag = flag;
// this.createBy = createBy;
// this.createDate = createDate;
// this.updateBy = updateBy;
// this.updateDate = updateDate;
// this.remarks = remarks;
// this.delFlag = delFlag;
// }
//
// @Override
// public String toString() {
// return "BPnSypn{" +
// "businesssId=" + businesssId +
// ", pn='" + pn + '\'' +
// ", sypn='" + sypn + '\'' +
// ", flag='" + flag + '\'' +
// ", createBy='" + createBy + '\'' +
// ", createDate=" + createDate +
// ", updateBy='" + updateBy + '\'' +
// ", updateDate=" + updateDate +
// ", remarks='" + remarks + '\'' +
// ", delFlag='" + delFlag + '\'' +
// '}';
// }
//
// public Integer getBusinesssId() {
// return businesssId;
// }
//
// public void setBusinesssId(Integer businesssId) {
// this.businesssId = businesssId;
// }
//
// public String getPn() {
// return pn;
// }
//
// public void setPn(String pn) {
// this.pn = pn;
// }
//
// public String getSypn() {
// return sypn;
// }
//
// public void setSypn(String sypn) {
// this.sypn = sypn;
// }
//
// public String getFlag() {
// return flag;
// }
//
// public void setFlag(String flag) {
// this.flag = flag;
// }
//
// public String getCreateBy() {
// return createBy;
// }
//
// public void setCreateBy(String createBy) {
// this.createBy = createBy;
// }
//
// public Date getCreateDate() {
// return createDate;
// }
//
// public void setCreateDate(Date createDate) {
// this.createDate = createDate;
// }
//
// public String getUpdateBy() {
// return updateBy;
// }
//
// public void setUpdateBy(String updateBy) {
// this.updateBy = updateBy;
// }
//
// public Date getUpdateDate() {
// return updateDate;
// }
//
// public void setUpdateDate(Date updateDate) {
// this.updateDate = updateDate;
// }
//
// public String getRemarks() {
// return remarks;
// }
//
// public void setRemarks(String remarks) {
// this.remarks = remarks;
// }
//
// public String getDelFlag() {
// return delFlag;
// }
//
// public void setDelFlag(String delFlag) {
// this.delFlag = delFlag;
// }
//
// public void setDeleted() {
// }
//}
//package org.rcisoft.bus.bpnsypn.service;
//
//import com.baomidou.mybatisplus.core.metadata.IPage;
//import org.rcisoft.bus.bpnsypn.entity.BPnSypn;
//import org.rcisoft.core.model.CyPageInfo;
//import org.rcisoft.core.model.CyPersistModel;
//
//import java.util.List;
//
//public interface BPnSypnService {
// CyPersistModel persist(BPnSypn bpnsypn);//保存
//
// CyPersistModel remove(BPnSypn bpnsypn);//物理删除
//
// CyPersistModel removeLogical(BPnSypn bpnsypn);//逻辑删除
//
// CyPersistModel merge(BPnSypn bpnsypn); //修改
//
// BPnSypn findById(Integer bpnsypn);//根据id查询
//
// IPage<BPnSypn> findAllByPagination(CyPageInfo<BPnSypn> paginationUtility, BPnSypn bpnsypn);//分页查询
// List<BPnSypn>findAll(BPnSypn bpnsypn);//查询list
// List<BPnSypn>export(BPnSypn bpnsypn);//导出
//
//
//
//}
package org.rcisoft.bpnsypn.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.rcisoft.bpnsypn.entity.BPnSypn;
import org.rcisoft.core.model.CyPageInfo;
import org.rcisoft.core.model.CyPersistModel;
import java.util.List;
/**
* Created by cy on 2024年5月11日 下午3:19:37.
*/
public interface BPnSypnService {
/**
* 保存
* @param bPnSypn
* @return
*/
CyPersistModel persist(BPnSypn bPnSypn);
/**
* 删除
* @param bPnSypn
* @return
*/
CyPersistModel remove(BPnSypn bPnSypn);
/**
* 逻辑删除
* @param bPnSypn
* @return
*/
CyPersistModel removeLogical(BPnSypn bPnSypn);
/**
* 修改
* @param bPnSypn
* @return
*/
CyPersistModel merge(BPnSypn bPnSypn);
/**
* 根据id查询
* @param id
* @return
*/
BPnSypn findById(Integer id);
/**
* 分页查询
* @param bPnSypn
* @return
*/
IPage<BPnSypn> findAllByPagination(CyPageInfo<BPnSypn> paginationUtility,
BPnSypn bPnSypn);
/**
* 查询list
* @param bPnSypn
* @return
*/
List<BPnSypn> findAll(BPnSypn bPnSypn);
/**
* 导出
* @return
*/
List<BPnSypn> export(BPnSypn bPnSypn);
}
package org.rcisoft.bpnsypn.service.Impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.rcisoft.bpnsypn.dao.BPnSypnRepository;
import org.rcisoft.bpnsypn.entity.BPnSypn;
import org.rcisoft.bpnsypn.service.BPnSypnService;
import org.rcisoft.core.exception.CyServiceException;
import org.rcisoft.core.model.CyPageInfo;
import org.rcisoft.core.model.CyPersistModel;
import org.rcisoft.core.util.CyUserUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* Created by cy on 2024年5月11日 下午3:19:37.
*/
@Service
@Transactional(readOnly = true,propagation = Propagation.NOT_SUPPORTED)
@Slf4j
public class BPnSypnServiceImpl extends ServiceImpl<BPnSypnRepository, BPnSypn> implements BPnSypnService {
/**
* 保存
* @param bPnSypn
* @return
*/
@Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
@Override
public CyPersistModel persist(BPnSypn bPnSypn){
// pn验重
if (baseMapper.querySomePn(bPnSypn) > 0) {
throw new CyServiceException(501,"该pn已存在,请重新输入");
}
//增加操作
int line = baseMapper.insert(bPnSypn);
log.debug(CyUserUtil.getAuthenUsername()+"新增了ID为"+
bPnSypn.getBusinessId()+"的信息");
return new CyPersistModel(line);
}
/**
* 删除
* @param bPnSypn
* @return
*/
@Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
@Override
public CyPersistModel remove(BPnSypn bPnSypn){
int line = baseMapper.realDelete(bPnSypn);
log.debug(CyUserUtil.getAuthenUsername()+"删除了ID为"+
bPnSypn.getBusinessId()+"的信息");
return new CyPersistModel(line);
}
/**
* 逻辑删除
* @param bPnSypn
* @return
*/
@Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
@Override
public CyPersistModel removeLogical(BPnSypn bPnSypn){
bPnSypn.setDeleted();
int line = baseMapper.deleteById(bPnSypn);
log.debug(CyUserUtil.getAuthenUsername()+"逻辑删除了ID为"+
bPnSypn.getBusinessId()+"的信息");
return new CyPersistModel(line);
}
/**
* 修改
* @param bPnSypn
* @return
*/
@Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
@Override
public CyPersistModel merge(BPnSypn bPnSypn){
// pn验重
if (baseMapper.querySomePn(bPnSypn) > 0) {
throw new CyServiceException(501,"该pn已存在,请重新输入");
}
int line = baseMapper.updateById(bPnSypn);
log.debug(CyUserUtil.getAuthenUsername()+"修改了ID为"+ bPnSypn.getBusinessId()+"的信息");
return new CyPersistModel(line);
}
/**
* 根据id查询
* @param id
* @return
*/
@Override
public BPnSypn findById(Integer id){
return baseMapper.selectById(id);
}
/**
* 分页查询
* @param bPnSypn
* @return
*/
@Override
public IPage<BPnSypn> findAllByPagination(CyPageInfo<BPnSypn> paginationUtility,
BPnSypn bPnSypn){
return baseMapper.queryBPnSypnsPaged(paginationUtility,bPnSypn);
}
/**
* 查询list
* @param bPnSypn
* @return
*/
@Override
public List<BPnSypn> findAll(BPnSypn bPnSypn){
return baseMapper.queryBPnSypns(bPnSypn);
}
/**
* 导出
* @return
*/
@Override
public List<BPnSypn> export(BPnSypn bPnSypn) {
List<BPnSypn> bPnSypnList = baseMapper.queryBPnSypns(bPnSypn);
return bPnSypnList;
}
}
server:
port: 8090
port: 8083
tomcat:
max-threads: 300
servlet:
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.rcisoft.bus.bpnsypn.dao.BPnSypnRepository">
<resultMap id="BaseResultMap" type="org.rcisoft.bus.bpnsypn.entity.BPnSypn">
<id column="business_id" jdbcType="BIGINT" property="businessId"/>
<result column="pn" jdbcType="VARCHAR" property="pn"/>
<result column="sypn" jdbcType="VARCHAR" property="sypn"/>
<result column="flag" jdbcType="NCHAR" property="flag"/>
<result column="create_by" jdbcType="VARCHAR" property="createBy"/>
<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
<result column="remarks" jdbcType="VARCHAR" property="remarks"/>
<result column="del_flag" jdbcType="NCHAR" property="delFlag"/>
</resultMap>
<select id="queryBPnSypns" resultMap="BaseResultMap">
select * from b_pn_sypn
where 1=1
<if test="entity.delFlag !=null and entity.delFlag != '' ">
and del_flag = #{entity.delFlag}
</if>
<if test="entity.flag !=null and entity.flag != '' ">
and flag = #{entity.flag}
</if>
<if test="entity.pn !=null and entity.pn != '' ">
and pn like concat('%',#{entity.pn},'%')
</if>
<if test="entity.sypn !=null and entity.sypn != '' ">
and sypn like concat('%',#{entity.sypn},'%')
</if>
</select>
<select id="queryBPnSypnsPaged" resultMap="BaseResultMap">
select * from b_pn_sypn
where 1=1
and del_flag = '0'
<if test="entity.flag !=null and entity.flag != '' ">
and flag = #{entity.flag}
</if>
<if test="entity.pn !=null and entity.pn != '' ">
and pn like concat('%',#{entity.pn},'%')
</if>
<if test="entity.sypn !=null and entity.sypn != '' ">
and sypn like concat('%',#{entity.sypn},'%')
</if>
</select>
<select id="querySomePn" resultType="java.lang.Integer">
SELECT
count(*)
FROM
b_pn_sypn
where
del_flag = 0
and pn = #{pn}
<if test="businessId != null and businessId != ''">
and business_id != #{businessId}
</if>
</select>
</mapper>
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