Skip to content

P
peizhen-java
Commit ea3b6cd9 by 邹磊浩
Options

修改代码

parent a8ab1f8e
Showing with 10 additions and 17 deletions
pz-admin/src/main/resources/application-dev.yml
...@@ -49,7 +49,7 @@ spring: ...@@ -49,7 +49,7 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
url: jdbc:mysql://db1.prd.jianghuxx.com:3317/pz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true url: jdbc:mysql://db1.prd.jianghuxx.com:3317/pz-stg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
username: root username: root
password: 4f9fa23639242790 password: 4f9fa23639242790
# 从库数据源 # 从库数据源
......
pz-merchant/src/main/java/com/pz/merchant/controller/pc/CompanyController.java
...@@ -40,7 +40,6 @@ public class CompanyController extends BaseController { ...@@ -40,7 +40,6 @@ public class CompanyController extends BaseController {
/** /**
* 查询商户列表 * 查询商户列表
*/ */
@SaCheckPermission("merchant:company:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<CompanyVo> list(CompanyBo bo, PageQuery pageQuery) { public TableDataInfo<CompanyVo> list(CompanyBo bo, PageQuery pageQuery) {
return iCompanyService.queryPageList(bo, pageQuery); return iCompanyService.queryPageList(bo, pageQuery);
...@@ -49,7 +48,6 @@ public class CompanyController extends BaseController { ...@@ -49,7 +48,6 @@ public class CompanyController extends BaseController {
/** /**
* 导出商户列表 * 导出商户列表
*/ */
@SaCheckPermission("merchant:company:export")
@Log(title = "商户", businessType = BusinessType.EXPORT) @Log(title = "商户", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(CompanyBo bo, HttpServletResponse response) { public void export(CompanyBo bo, HttpServletResponse response) {
...@@ -62,7 +60,6 @@ public class CompanyController extends BaseController { ...@@ -62,7 +60,6 @@ public class CompanyController extends BaseController {
* *
* @param id 主键 * @param id 主键
*/ */
@SaCheckPermission("merchant:company:query")
@GetMapping("/{id}") @GetMapping("/{id}")
public R<CompanyVo> getInfo(@NotNull(message = "主键不能为空") public R<CompanyVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Integer id) { @PathVariable Integer id) {
...@@ -72,7 +69,6 @@ public class CompanyController extends BaseController { ...@@ -72,7 +69,6 @@ public class CompanyController extends BaseController {
/** /**
* 新增商户 * 新增商户
*/ */
@SaCheckPermission("merchant:company:add")
@Log(title = "商户", businessType = BusinessType.INSERT) @Log(title = "商户", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
...@@ -83,7 +79,6 @@ public class CompanyController extends BaseController { ...@@ -83,7 +79,6 @@ public class CompanyController extends BaseController {
/** /**
* 修改商户 * 修改商户
*/ */
@SaCheckPermission("merchant:company:edit")
@Log(title = "商户", businessType = BusinessType.UPDATE) @Log(title = "商户", businessType = BusinessType.UPDATE)
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
...@@ -96,7 +91,6 @@ public class CompanyController extends BaseController { ...@@ -96,7 +91,6 @@ public class CompanyController extends BaseController {
* *
* @param ids 主键串 * @param ids 主键串
*/ */
@SaCheckPermission("merchant:company:remove")
@Log(title = "商户", businessType = BusinessType.DELETE) @Log(title = "商户", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
......
pz-merchant/src/main/java/com/pz/merchant/controller/pc/EmployeesController.java
...@@ -40,7 +40,6 @@ public class EmployeesController extends BaseController { ...@@ -40,7 +40,6 @@ public class EmployeesController extends BaseController {
/** /**
* 查询陪诊员列表 * 查询陪诊员列表
*/ */
@SaCheckPermission("merchant:employees:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<EmployeesVo> list(EmployeesBo bo, PageQuery pageQuery) { public TableDataInfo<EmployeesVo> list(EmployeesBo bo, PageQuery pageQuery) {
return iEmployeesService.queryPageList(bo, pageQuery); return iEmployeesService.queryPageList(bo, pageQuery);
...@@ -49,7 +48,6 @@ public class EmployeesController extends BaseController { ...@@ -49,7 +48,6 @@ public class EmployeesController extends BaseController {
/** /**
* 导出陪诊员列表 * 导出陪诊员列表
*/ */
@SaCheckPermission("merchant:employees:export")
@Log(title = "陪诊员", businessType = BusinessType.EXPORT) @Log(title = "陪诊员", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(EmployeesBo bo, HttpServletResponse response) { public void export(EmployeesBo bo, HttpServletResponse response) {
...@@ -62,7 +60,6 @@ public class EmployeesController extends BaseController { ...@@ -62,7 +60,6 @@ public class EmployeesController extends BaseController {
* *
* @param id 主键 * @param id 主键
*/ */
@SaCheckPermission("merchant:employees:query")
@GetMapping("/{id}") @GetMapping("/{id}")
public R<EmployeesVo> getInfo(@NotNull(message = "主键不能为空") public R<EmployeesVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Integer id) { @PathVariable Integer id) {
...@@ -72,7 +69,6 @@ public class EmployeesController extends BaseController { ...@@ -72,7 +69,6 @@ public class EmployeesController extends BaseController {
/** /**
* 新增陪诊员 * 新增陪诊员
*/ */
@SaCheckPermission("merchant:employees:add")
@Log(title = "陪诊员", businessType = BusinessType.INSERT) @Log(title = "陪诊员", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
...@@ -83,7 +79,6 @@ public class EmployeesController extends BaseController { ...@@ -83,7 +79,6 @@ public class EmployeesController extends BaseController {
/** /**
* 修改陪诊员 * 修改陪诊员
*/ */
@SaCheckPermission("merchant:employees:edit")
@Log(title = "陪诊员", businessType = BusinessType.UPDATE) @Log(title = "陪诊员", businessType = BusinessType.UPDATE)
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
...@@ -96,7 +91,6 @@ public class EmployeesController extends BaseController { ...@@ -96,7 +91,6 @@ public class EmployeesController extends BaseController {
* *
* @param ids 主键串 * @param ids 主键串
*/ */
@SaCheckPermission("merchant:employees:remove")
@Log(title = "陪诊员", businessType = BusinessType.DELETE) @Log(title = "陪诊员", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
......
pz-system/src/main/java/com/pz/system/service/impl/ArticleServiceImpl.java
...@@ -137,6 +137,10 @@ public class ArticleServiceImpl implements IArticleService { ...@@ -137,6 +137,10 @@ public class ArticleServiceImpl implements IArticleService {
.map(ArticleVo::getId) .map(ArticleVo::getId)
.collect(Collectors.toList()); .collect(Collectors.toList());
List<Integer> cityIds = articleVos.stream()
.map(ArticleVo::getCityId)
.collect(Collectors.toList());
// 查询城市名称 // 查询城市名称
Map<Integer, String> cityMap = new HashMap<>(); Map<Integer, String> cityMap = new HashMap<>();
// 查询点赞和收藏数 // 查询点赞和收藏数
...@@ -144,7 +148,7 @@ public class ArticleServiceImpl implements IArticleService { ...@@ -144,7 +148,7 @@ public class ArticleServiceImpl implements IArticleService {
Map<Integer, Integer> collectNumMap = new HashMap<>(); Map<Integer, Integer> collectNumMap = new HashMap<>();
if (CollectionUtils.isNotEmpty(articleIds)) { if (CollectionUtils.isNotEmpty(articleIds)) {
List<CityVo> cityVos = cityMapper.selectVoBatchIds(articleIds); List<CityVo> cityVos = cityMapper.selectVoBatchIds(cityIds);
for (CityVo cityVo : cityVos) { for (CityVo cityVo : cityVos) {
cityMap.put(cityVo.getId(), cityVo.getName()); cityMap.put(cityVo.getId(), cityVo.getName());
} }
......
pz-system/src/main/java/com/pz/system/service/impl/SysOssServiceImpl.java
...@@ -67,6 +67,8 @@ public class SysOssServiceImpl implements ISysOssService, OssService { ...@@ -67,6 +67,8 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
SysOssVo vo = SpringUtils.getAopProxy(this).getById(id); SysOssVo vo = SpringUtils.getAopProxy(this).getById(id);
if (ObjectUtil.isNotNull(vo)) { if (ObjectUtil.isNotNull(vo)) {
list.add(this.matchingUrl(vo)); list.add(this.matchingUrl(vo));
} else {
list.add(baseMapper.selectVoById(id));
} }
} }
return list; return list;
...@@ -113,7 +115,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService { ...@@ -113,7 +115,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName()); FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName());
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8"); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
OssClient storage = OssFactory.instance(sysOss.getService()); OssClient storage = OssFactory.instance(sysOss.getService());
try(InputStream inputStream = storage.getObjectContent(sysOss.getUrl())) { try (InputStream inputStream = storage.getObjectContent(sysOss.getUrl())) {
int available = inputStream.available(); int available = inputStream.available();
IoUtil.copy(inputStream, response.getOutputStream(), available); IoUtil.copy(inputStream, response.getOutputStream(), available);
response.setContentLength(available); response.setContentLength(available);
...@@ -182,7 +184,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService { ...@@ -182,7 +184,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
OssClient storage = OssFactory.instance(oss.getService()); OssClient storage = OssFactory.instance(oss.getService());
// 仅修改桶类型为 private 的URL，临时URL时长为120s // 仅修改桶类型为 private 的URL，临时URL时长为120s
if (AccessPolicyType.PRIVATE == storage.getAccessPolicy()) { if (AccessPolicyType.PRIVATE == storage.getAccessPolicy()) {
oss.setUrl(storage.getPrivateUrl(oss.getFileName(), 120)); oss.setUrl(storage.getPrivateUrl(oss.getFileName(), 200));
} }
return oss; return oss;
} }
......
pz-system/src/main/java/com/pz/system/service/impl/UserRefundServiceImpl.java
...@@ -53,7 +53,6 @@ public class UserRefundServiceImpl implements IUserRefundService { ...@@ -53,7 +53,6 @@ public class UserRefundServiceImpl implements IUserRefundService {
@Override @Override
public TableDataInfo<UserRefundVo> queryPageList(UserRefundBo bo, PageQuery pageQuery) { public TableDataInfo<UserRefundVo> queryPageList(UserRefundBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<UserRefund> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<UserRefund> lqw = buildQueryWrapper(bo);
Page<UserRefundVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<UserRefundVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
Optional.ofNullable(result.getRecords()).ifPresent(userRefundVos -> { Optional.ofNullable(result.getRecords()).ifPresent(userRefundVos -> {
userRefundVos.forEach(userRefundVo -> { userRefundVos.forEach(userRefundVo -> {
......
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