修改文件位置

src/main/java/com/peanut/modules/book/controller/MedicaldesController.java

@@ -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;

src/main/java/com/peanut/modules/book/controller/MedicinalMaterialsController.java

@@ -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;

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

@@ -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;

src/main/java/com/peanut/modules/common/controller/MedicaldesController.java

@@ -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();
+        LambdaQueryWrapper<SysDictDataEntity> wrapper = new LambdaQueryWrapper();
-        wrapper.eq(com.peanut.modules.book.entity.SysDictDataEntity::getDictLabel,label);
+        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() {
+    public List<SysDictDataEntity> getCounts() {
-        LambdaQueryWrapper<com.peanut.modules.book.entity.SysDictDataEntity> wrapper = new LambdaQueryWrapper();
+        LambdaQueryWrapper<SysDictDataEntity> wrapper = new LambdaQueryWrapper();
-        wrapper.eq(com.peanut.modules.book.entity.SysDictDataEntity::getDictLabel,"inheritPro");
+        wrapper.eq(SysDictDataEntity::getDictLabel,"inheritPro");
-        List<com.peanut.modules.book.entity.SysDictDataEntity> dataList = sysDictDataService.list(wrapper);
+        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;

src/main/java/com/peanut/modules/common/controller/UserContributionController.java

@@ -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,
+        wrapper.leftJoin(SysDictDataEntity.class,
-                com.peanut.modules.book.entity.SysDictDataEntity::getDictType,UserContribution::getType);
+                SysDictDataEntity::getDictType,UserContribution::getType);
-        wrapper.eq(com.peanut.modules.book.entity.SysDictDataEntity::getDictLabel,"userContributionLabel");
+        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);
         //统计总分

src/main/java/com/peanut/modules/common/entity/MedicaldesBook.java

@@ -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;

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

@@ -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 =
+                SysDictDataEntity sysDictDataEntity =
-                        sysDictDataService.getOne(new LambdaQueryWrapper<com.peanut.modules.book.entity.SysDictDataEntity>()
+                        sysDictDataService.getOne(new LambdaQueryWrapper<SysDictDataEntity>()
-                                .eq(com.peanut.modules.book.entity.SysDictDataEntity::getDictLabel,"userCertificateNo"));
+                                .eq(SysDictDataEntity::getDictLabel,"userCertificateNo"));
                 int oldNo = Integer.parseInt(sysDictDataEntity.getDictValue());
                 sysDictDataEntity.setDictValue(oldNo+1+"");
                 sysDictDataService.updateById(sysDictDataEntity);

src/main/java/com/peanut/modules/master/controller/UserContributionController.java

@@ -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;

src/main/java/com/peanut/modules/sys/controller/SysDictDataController.java

@@ -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;
 

src/main/java/com/peanut/modules/sys/dao/SysDictDataDao.java

@@ -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;
 

src/main/java/com/peanut/modules/sys/entity/SysDictDataEntity.java

@@ -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;

src/main/java/com/peanut/modules/sys/service/SysDictDataService.java

@@ -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;
 

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

@@ -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.sys.dao.SysDictDataDao;
-import com.peanut.modules.book.entity.SysDictDataEntity;
+import com.peanut.modules.sys.entity.SysDictDataEntity;
 
 @Slf4j
 @Service("sysDictDataService")

src/main/resources/mapper/sys/SysDictDataDao.xml

@@ -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"/>