zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改文件位置

Browse Source
This commit is contained in:
wuchunlei
2025-06-11 15:09:17 +08:00
parent 7aca5e4f7b
commit dbf585f114
14 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/book/controller/MedicaldesController.java
View File

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.R;
import com.peanut.modules.book.entity.SysDictDataEntity;
import com.peanut.modules.sys.entity.SysDictDataEntity;
import com.peanut.modules.book.service.*;
import com.peanut.modules.common.entity.*;
import com.peanut.modules.sys.service.SysDictDataService;

2
src/main/java/com/peanut/modules/book/controller/MedicinalMaterialsController.java
View File

@@ -6,7 +6,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.R;
import com.peanut.modules.common.entity.MedicinalDrug;
import com.peanut.modules.common.entity.MedicinalMaterials;
import com.peanut.modules.book.entity.SysDictDataEntity;
import com.peanut.modules.sys.entity.SysDictDataEntity;
import com.peanut.modules.book.service.MedicinalDrugService;
import com.peanut.modules.book.service.MedicinalMaterialsService;
import com.peanut.modules.sys.service.SysDictDataService;

2
src/main/java/com/peanut/modules/book/service/impl/BookServiceImpl.java
View File

@@ -15,7 +15,7 @@ import com.peanut.common.utils.FileDownloadUtil;
import com.peanut.common.utils.PageUtils;
import com.peanut.common.utils.Query;
import com.peanut.modules.common.dao.BookDao;
import com.peanut.modules.book.entity.SysDictDataEntity;
import com.peanut.modules.sys.entity.SysDictDataEntity;
import com.peanut.modules.book.service.BookChapterContentService;
import com.peanut.modules.book.service.BookChapterService;
import com.peanut.modules.book.service.BookService;

17
src/main/java/com/peanut/modules/common/controller/MedicaldesController.java
View File

@@ -9,6 +9,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.R;
import com.peanut.modules.common.entity.*;
import com.peanut.modules.common.service.*;
import com.peanut.modules.sys.entity.SysDictDataEntity;
import com.peanut.modules.sys.service.SysDictDataService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -53,8 +54,8 @@ public class MedicaldesController {
*/
@RequestMapping(path = "/typeList")
public R typeList(String label) {
LambdaQueryWrapper<com.peanut.modules.book.entity.SysDictDataEntity> wrapper = new LambdaQueryWrapper();
wrapper.eq(com.peanut.modules.book.entity.SysDictDataEntity::getDictLabel,label);
LambdaQueryWrapper<SysDictDataEntity> wrapper = new LambdaQueryWrapper();
wrapper.eq(SysDictDataEntity::getDictLabel,label);
return R.ok().put("result",sysDictDataService.list(wrapper));
}
@@ -155,10 +156,10 @@ public class MedicaldesController {
}
//国际医师可能来自国外在省市里加入外国
public List<com.peanut.modules.book.entity.SysDictDataEntity> getCounts() {
LambdaQueryWrapper<com.peanut.modules.book.entity.SysDictDataEntity> wrapper = new LambdaQueryWrapper();
wrapper.eq(com.peanut.modules.book.entity.SysDictDataEntity::getDictLabel,"inheritPro");
List<com.peanut.modules.book.entity.SysDictDataEntity> dataList = sysDictDataService.list(wrapper);
public List<SysDictDataEntity> getCounts() {
LambdaQueryWrapper<SysDictDataEntity> wrapper = new LambdaQueryWrapper();
wrapper.eq(SysDictDataEntity::getDictLabel,"inheritPro");
List<SysDictDataEntity> dataList = sysDictDataService.list(wrapper);
return dataList;
}
@@ -232,10 +233,10 @@ public class MedicaldesController {
@RequestMapping(path = "/getCityByPro")
public R getCityByPro(@RequestParam("provId") Integer provId) {
List<City> prov = new ArrayList<>();
List<com.peanut.modules.book.entity.SysDictDataEntity> list = getCounts();
List<SysDictDataEntity> list = getCounts();
boolean flag = false;
if (list != null && list.size() > 0) {
for (com.peanut.modules.book.entity.SysDictDataEntity data:list) {
for (SysDictDataEntity data:list) {
if (provId==Integer.parseInt(data.getDictType())){
prov.addAll(getCityList(data.getDictValue(),Integer.parseInt(data.getDictType())));
flag = true;

9
src/main/java/com/peanut/modules/common/controller/UserContributionController.java
View File

@@ -8,6 +8,7 @@ import com.peanut.common.utils.R;
import com.peanut.common.utils.ShiroUtils;
import com.peanut.modules.common.entity.UserContribution;
import com.peanut.modules.master.service.UserContributionService;
import com.peanut.modules.sys.entity.SysDictDataEntity;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -34,13 +35,13 @@ public class UserContributionController {
Integer userId = ShiroUtils.getUId();
//各分类总分
MPJLambdaWrapper<UserContribution> wrapper = new MPJLambdaWrapper();
wrapper.leftJoin(com.peanut.modules.book.entity.SysDictDataEntity.class,
com.peanut.modules.book.entity.SysDictDataEntity::getDictType,UserContribution::getType);
wrapper.eq(com.peanut.modules.book.entity.SysDictDataEntity::getDictLabel,"userContributionLabel");
wrapper.leftJoin(SysDictDataEntity.class,
SysDictDataEntity::getDictType,UserContribution::getType);
wrapper.eq(SysDictDataEntity::getDictLabel,"userContributionLabel");
wrapper.eq("user_id",userId);
wrapper.select("type");
wrapper.select("sum(score) as score");
wrapper.select(com.peanut.modules.book.entity.SysDictDataEntity::getDictValue);
wrapper.select(SysDictDataEntity::getDictValue);
wrapper.groupBy("type");
List contributions = contributionService.listMaps(wrapper);
//统计总分

3
src/main/java/com/peanut/modules/common/entity/MedicaldesBook.java
View File

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.peanut.modules.sys.entity.SysDictDataEntity;
import lombok.Data;
import java.io.Serializable;
@@ -17,7 +18,7 @@ public class MedicaldesBook implements Serializable {
@TableField(exist = false)
private BookEntity book;
@TableField(exist = false)
private com.peanut.modules.book.entity.SysDictDataEntity sysDictData;
private SysDictDataEntity sysDictData;
@TableId
private Integer id;

7
src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
View File

@@ -14,6 +14,7 @@ import com.peanut.modules.common.entity.*;
import com.peanut.modules.common.service.ClassEntityService;
import com.peanut.modules.common.service.UserVipService;
import com.peanut.modules.sys.dao.SysUserDao;
import com.peanut.modules.sys.entity.SysDictDataEntity;
import com.peanut.modules.sys.entity.SysUserEntity;
import com.peanut.modules.sys.service.SysDictDataService;
import jodd.util.StringUtil;
@@ -356,9 +357,9 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
Boolean lock = redisTemplate.opsForValue().setIfAbsent("certificateNoLock", "getNextCertificateNo");
if(lock) {
try {
com.peanut.modules.book.entity.SysDictDataEntity sysDictDataEntity =
sysDictDataService.getOne(new LambdaQueryWrapper<com.peanut.modules.book.entity.SysDictDataEntity>()
.eq(com.peanut.modules.book.entity.SysDictDataEntity::getDictLabel,"userCertificateNo"));
SysDictDataEntity sysDictDataEntity =
sysDictDataService.getOne(new LambdaQueryWrapper<SysDictDataEntity>()
.eq(SysDictDataEntity::getDictLabel,"userCertificateNo"));
int oldNo = Integer.parseInt(sysDictDataEntity.getDictValue());
sysDictDataEntity.setDictValue(oldNo+1+"");
sysDictDataService.updateById(sysDictDataEntity);

2
src/main/java/com/peanut/modules/master/controller/UserContributionController.java
View File

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.R;
import com.peanut.modules.book.entity.SysDictDataEntity;
import com.peanut.modules.sys.entity.SysDictDataEntity;
import com.peanut.modules.common.entity.MyUserEntity;
import com.peanut.modules.common.entity.UserContribution;
import com.peanut.modules.master.service.MyUserService;

2
src/main/java/com/peanut/modules/sys/controller/SysDictDataController.java
View File

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.peanut.modules.book.entity.SysDictDataEntity;
import com.peanut.modules.sys.entity.SysDictDataEntity;
import com.peanut.common.utils.PageUtils;
import com.peanut.common.utils.R;

4
src/main/java/com/peanut/modules/sys/dao/SysDictDataDao.java
View File

@@ -1,6 +1,6 @@
package com.peanut.modules.book.dao;
package com.peanut.modules.sys.dao;
import com.peanut.modules.book.entity.SysDictDataEntity;
import com.peanut.modules.sys.entity.SysDictDataEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

2
src/main/java/com/peanut/modules/sys/entity/SysDictDataEntity.java
View File

@@ -1,4 +1,4 @@
package com.peanut.modules.book.entity;
package com.peanut.modules.sys.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

2
src/main/java/com/peanut/modules/sys/service/SysDictDataService.java
View File

@@ -2,7 +2,7 @@ package com.peanut.modules.sys.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.peanut.common.utils.PageUtils;
import com.peanut.modules.book.entity.SysDictDataEntity;
import com.peanut.modules.sys.entity.SysDictDataEntity;
import java.util.Map;

4
src/main/java/com/peanut/modules/sys/service/impl/SysDictDataServiceImpl.java
View File

@@ -10,8 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.peanut.common.utils.PageUtils;
import com.peanut.common.utils.Query;
import com.peanut.modules.book.dao.SysDictDataDao;
import com.peanut.modules.book.entity.SysDictDataEntity;
import com.peanut.modules.sys.dao.SysDictDataDao;
import com.peanut.modules.sys.entity.SysDictDataEntity;
@Slf4j
@Service("sysDictDataService")

4
src/main/resources/mapper/sys/SysDictDataDao.xml
View File

@@ -1,10 +1,10 @@
<?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="com.peanut.modules.book.dao.SysDictDataDao">
<mapper namespace="com.peanut.modules.sys.dao.SysDictDataDao">
<!-- 可根据自己的需求，是否要使用 -->
<resultMap type="com.peanut.modules.book.entity.SysDictDataEntity" id="sysDictDataMap">
<resultMap type="com.peanut.modules.sys.entity.SysDictDataEntity" id="sysDictDataMap">
<result property="id" column="id"/>
<result property="dictType" column="dict_type"/>
<result property="dictLabel" column="dict_label"/>