From dbea7ac14ee94515c82775675de35aff679b779e Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 12 Mar 2025 11:18:37 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9Econfig=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=202=E3=80=81=E6=96=B0=E5=A2=9E=E7=A4=BA=E4=BE=8B?= =?UTF-8?q?=E6=A8=A1=E5=9D=97yourModuleName=EF=BC=8C=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9D=97=E7=9B=B4=E6=8E=A5=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E7=B2=98=E8=B4=B4=E8=BF=99=E4=B8=AA=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=B9=B6=E5=9C=A8system-start=20pom=E4=B8=AD?= =?UTF-8?q?=E5=BC=95=E5=85=A5=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9D=97=E7=9A=84?= =?UTF-8?q?biz=E6=A8=A1=E5=9D=97=E5=8D=B3=E5=8F=AF=203=E3=80=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=B8=9A=E5=8A=A1=E5=AD=97=E5=85=B8=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=88=E9=9D=9E=E5=AE=8C=E6=95=B4=E4=BB=A3=E7=A0=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/config/shiro/ShiroConfig.java | 3 +- .../nu-config-api/nu-config-local-api/pom.xml | 14 ++ .../{ => nu-config-api}/pom.xml | 11 +- nursing-unit-config/nu-config-biz/pom.xml | 36 ++++ .../controller/DictTypeController.java | 167 ++++++++++++++++++ .../nu/modules/dictType/entity/DictType.java | 70 ++++++++ .../dictType/mapper/DictTypeMapper.java | 14 ++ .../dictType/mapper/xml/DictTypeMapper.xml | 5 + .../dictType/service/IDictTypeService.java | 14 ++ .../service/impl/DictTypeServiceImpl.java | 19 ++ .../cloud/controller/DictTypeController.java | 25 --- nursing-unit-demo/pom.xml | 2 +- .../nu-system-api/nu-system-local-api/pom.xml | 2 +- nursing-unit-system/nu-system-api/pom.xml | 2 +- nursing-unit-system/nu-system-biz/pom.xml | 2 +- .../modules/aop/TenantPackUserLogAspect.java | 4 +- nursing-unit-system/nu-system-start/pom.xml | 5 +- .../java/org/jeecg/NUSystemApplication.java | 5 +- .../src/main/resources/application-dev.yml | 6 +- .../nu-yourModuleName-local-api/pom.xml | 15 ++ .../nu-yourModuleName-api/pom.xml | 27 +++ .../nu-yourModuleName-biz/pom.xml | 38 ++++ nursing-unit-yourModuleName/pom.xml | 21 +++ 23 files changed, 463 insertions(+), 44 deletions(-) create mode 100644 nursing-unit-config/nu-config-api/nu-config-local-api/pom.xml rename nursing-unit-config/{ => nu-config-api}/pom.xml (75%) create mode 100644 nursing-unit-config/nu-config-biz/pom.xml create mode 100644 nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java create mode 100644 nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java create mode 100644 nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java create mode 100644 nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml create mode 100644 nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java create mode 100644 nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java delete mode 100644 nursing-unit-config/src/main/java/org/jeecg/modules/demo/cloud/controller/DictTypeController.java create mode 100644 nursing-unit-yourModuleName/nu-yourModuleName-api/nu-yourModuleName-local-api/pom.xml create mode 100644 nursing-unit-yourModuleName/nu-yourModuleName-api/pom.xml create mode 100644 nursing-unit-yourModuleName/nu-yourModuleName-biz/pom.xml create mode 100644 nursing-unit-yourModuleName/pom.xml diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index fe38936..f9d7e3e 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -101,7 +101,6 @@ public class ShiroConfig { filterChainDefinitionMap.put("/auth/2step-code", "anon");//登录验证码 filterChainDefinitionMap.put("/sys/common/static/**", "anon");//图片预览 &下载文件不限制token filterChainDefinitionMap.put("/sys/common/pdf/**", "anon");//pdf预览 - //filterChainDefinitionMap.put("/sys/common/view/**", "anon");//图片预览不限制token //filterChainDefinitionMap.put("/sys/common/download/**", "anon");//文件下载不限制token filterChainDefinitionMap.put("/generic/**", "anon");//pdf预览需要文件 @@ -109,7 +108,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/sys/getLoginQrcode/**", "anon"); //登录二维码 filterChainDefinitionMap.put("/sys/getQrcodeToken/**", "anon"); //监听扫码 filterChainDefinitionMap.put("/sys/checkAuth", "anon"); //授权接口排除 - filterChainDefinitionMap.put("/testDictType/abc", "anon");//TODO 待删除 + filterChainDefinitionMap.put("/dictType/dictType/abc", "anon");//TODO 待删除 //update-begin--Author:scott Date:20221116 for：排除静态资源后缀 filterChainDefinitionMap.put("/", "anon"); diff --git a/nursing-unit-config/nu-config-api/nu-config-local-api/pom.xml b/nursing-unit-config/nu-config-api/nu-config-local-api/pom.xml new file mode 100644 index 0000000..dfeacb1 --- /dev/null +++ b/nursing-unit-config/nu-config-api/nu-config-local-api/pom.xml @@ -0,0 +1,14 @@ + + + + com.nursingunit.boot + nu-config-api + 2.0.0 + + 4.0.0 + + nu-config-local-api + + diff --git a/nursing-unit-config/pom.xml b/nursing-unit-config/nu-config-api/pom.xml similarity index 75% rename from nursing-unit-config/pom.xml rename to nursing-unit-config/nu-config-api/pom.xml index ac6554e..1fa3625 100644 --- a/nursing-unit-config/pom.xml +++ b/nursing-unit-config/nu-config-api/pom.xml @@ -4,19 +4,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.nursingunit.boot - nursing-unit-parent + nursing-unit-config 2.0.0 4.0.0 - nursing-unit-config + nu-config-api + pom + + + nu-config-local-api + com.nursingunit.boot nursing-unit-base-core - 2.0.0 - diff --git a/nursing-unit-config/nu-config-biz/pom.xml b/nursing-unit-config/nu-config-biz/pom.xml new file mode 100644 index 0000000..443206f --- /dev/null +++ b/nursing-unit-config/nu-config-biz/pom.xml @@ -0,0 +1,36 @@ + + + com.nursingunit.boot + nursing-unit-config + 2.0.0 + + 4.0.0 + + nu-config-biz + + + + com.nursingunit.boot + nu-config-local-api + ${nursingunit.version} + + + org.hibernate + hibernate-core + + + org.jeecgframework.boot + hibernate-re + + + + + org.jeecgframework + weixin4j + + + + + diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java new file mode 100644 index 0000000..b7eef76 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java @@ -0,0 +1,167 @@ +package com.nu.modules.dictType.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nu.modules.dictType.entity.DictType; +import com.nu.modules.dictType.service.IDictTypeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: 业务字典主表 + * @Author: jeecg-boot + * @Date: 2025-03-11 + * @Version: V1.0 + */ +@Api(tags="业务字典主表") +@RestController +@RequestMapping("/dictType/dictType") +@Slf4j +public class DictTypeController extends JeecgController { + @Autowired + private IDictTypeService dictTypeService; + + @GetMapping("/abc") + public String abc(){ + return "abc"; + } + + /** + * 分页列表查询 + * + * @param dictType + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "业务字典主表-分页列表查询") + @ApiOperation(value="业务字典主表-分页列表查询", notes="业务字典主表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(DictType dictType, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dictType, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = dictTypeService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param dictType + * @return + */ + @AutoLog(value = "业务字典主表-添加") + @ApiOperation(value="业务字典主表-添加", notes="业务字典主表-添加") + @RequiresPermissions("dictType:dict_type:add") + @PostMapping(value = "/add") + public Result add(@RequestBody DictType dictType) { + dictTypeService.save(dictType); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param dictType + * @return + */ + @AutoLog(value = "业务字典主表-编辑") + @ApiOperation(value="业务字典主表-编辑", notes="业务字典主表-编辑") + @RequiresPermissions("dictType:dict_type:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody DictType dictType) { + dictTypeService.updateById(dictType); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "业务字典主表-通过id删除") + @ApiOperation(value="业务字典主表-通过id删除", notes="业务字典主表-通过id删除") + @RequiresPermissions("dictType:dict_type:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + dictTypeService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "业务字典主表-批量删除") + @ApiOperation(value="业务字典主表-批量删除", notes="业务字典主表-批量删除") + @RequiresPermissions("dictType:dict_type:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.dictTypeService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "业务字典主表-通过id查询") + @ApiOperation(value="业务字典主表-通过id查询", notes="业务字典主表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + DictType dictType = dictTypeService.getById(id); + if(dictType==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(dictType); + } + + /** + * 导出excel + * + * @param request + * @param dictType + */ + @RequiresPermissions("dictType:dict_type:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, DictType dictType) { + return super.exportXls(request, dictType, DictType.class, "业务字典主表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("dictType:dict_type:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, DictType.class); + } + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java new file mode 100644 index 0000000..ed9c8d6 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java @@ -0,0 +1,70 @@ +package com.nu.modules.dictType.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 业务字典主表 + * @Author: jeecg-boot + * @Date: 2025-03-11 + * @Version: V1.0 + */ +@Data +@TableName("dict_type") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="dict_type对象", description="业务字典主表") +public class DictType implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**字典名称*/ + @Excel(name = "字典名称", width = 15) + @ApiModelProperty(value = "字典名称") + private String dictName; + /**字典编码*/ + @Excel(name = "字典编码", width = 15) + @ApiModelProperty(value = "字典编码") + private String dictCode; + /**描述*/ + @Excel(name = "描述", width = 15) + @ApiModelProperty(value = "描述") + private String description; + /**删除状态*/ + @Excel(name = "删除状态", width = 15) + @ApiModelProperty(value = "删除状态") + @TableLogic + private Integer delFlag; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间") + private Date updateTime; +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java new file mode 100644 index 0000000..f3224fb --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java @@ -0,0 +1,14 @@ +package com.nu.modules.dictType.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.dictType.entity.DictType; + +/** + * @Description: 业务字典主表 + * @Author: jeecg-boot + * @Date: 2025-03-11 + * @Version: V1.0 + */ +public interface DictTypeMapper extends BaseMapper { + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml new file mode 100644 index 0000000..19118df --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java new file mode 100644 index 0000000..b51e443 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java @@ -0,0 +1,14 @@ +package com.nu.modules.dictType.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.dictType.entity.DictType; + +/** + * @Description: 业务字典主表 + * @Author: jeecg-boot + * @Date: 2025-03-11 + * @Version: V1.0 + */ +public interface IDictTypeService extends IService { + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java new file mode 100644 index 0000000..e02fbac --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.dictType.service.impl; + +import com.nu.modules.dictType.entity.DictType; +import com.nu.modules.dictType.mapper.DictTypeMapper; +import com.nu.modules.dictType.service.IDictTypeService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 业务字典主表 + * @Author: jeecg-boot + * @Date: 2025-03-11 + * @Version: V1.0 + */ +@Service +public class DictTypeServiceImpl extends ServiceImpl implements IDictTypeService { + +} diff --git a/nursing-unit-config/src/main/java/org/jeecg/modules/demo/cloud/controller/DictTypeController.java b/nursing-unit-config/src/main/java/org/jeecg/modules/demo/cloud/controller/DictTypeController.java deleted file mode 100644 index 8db9773..0000000 --- a/nursing-unit-config/src/main/java/org/jeecg/modules/demo/cloud/controller/DictTypeController.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.jeecg.modules.demo.cloud.controller; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * - */ -@RestController -@RequestMapping("/testDictType") -public class DictTypeController { - - /** - * 测试 - * - * @return - */ - @GetMapping("/abc") - public void abc() { - System.out.println(12313); - } - - -} diff --git a/nursing-unit-demo/pom.xml b/nursing-unit-demo/pom.xml index 9486739..4cd97ea 100644 --- a/nursing-unit-demo/pom.xml +++ b/nursing-unit-demo/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.nursingunit.boot + com.nursingunit.boot nursing-unit-parent 2.0.0 diff --git a/nursing-unit-system/nu-system-api/nu-system-local-api/pom.xml b/nursing-unit-system/nu-system-api/nu-system-local-api/pom.xml index cb1cfe2..65909d4 100644 --- a/nursing-unit-system/nu-system-api/nu-system-local-api/pom.xml +++ b/nursing-unit-system/nu-system-api/nu-system-local-api/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - nu-system-api com.nursingunit.boot + nu-system-api 2.0.0 4.0.0 diff --git a/nursing-unit-system/nu-system-api/pom.xml b/nursing-unit-system/nu-system-api/pom.xml index e2a6286..3f684c6 100644 --- a/nursing-unit-system/nu-system-api/pom.xml +++ b/nursing-unit-system/nu-system-api/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - nursing-unit-system com.nursingunit.boot + nursing-unit-system 2.0.0 4.0.0 diff --git a/nursing-unit-system/nu-system-biz/pom.xml b/nursing-unit-system/nu-system-biz/pom.xml index 75c6423..adbae49 100644 --- a/nursing-unit-system/nu-system-biz/pom.xml +++ b/nursing-unit-system/nu-system-biz/pom.xml @@ -2,8 +2,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - nursing-unit-system com.nursingunit.boot + nursing-unit-system 2.0.0 4.0.0 diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java index 820df07..65cfda7 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java @@ -1,7 +1,5 @@ package org.jeecg.modules.aop; -import org.jeecg.modules.system.entity.SysTenantPack; -import org.jeecg.modules.system.entity.SysTenantPackUser; import org.apache.shiro.SecurityUtils; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.AfterThrowing; @@ -13,6 +11,8 @@ import org.jeecg.common.api.dto.LogDTO; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.base.service.BaseCommonService; +import org.jeecg.modules.system.entity.SysTenantPack; +import org.jeecg.modules.system.entity.SysTenantPackUser; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/nursing-unit-system/nu-system-start/pom.xml b/nursing-unit-system/nu-system-start/pom.xml index 155da34..6fec439 100644 --- a/nursing-unit-system/nu-system-start/pom.xml +++ b/nursing-unit-system/nu-system-start/pom.xml @@ -24,14 +24,13 @@ nursing-unit-demo ${nursingunit.version} - + com.nursingunit.boot - nursing-unit-config + nu-config-biz ${nursingunit.version} - org.flywaydb diff --git a/nursing-unit-system/nu-system-start/src/main/java/org/jeecg/NUSystemApplication.java b/nursing-unit-system/nu-system-start/src/main/java/org/jeecg/NUSystemApplication.java index 336a392..51b5374 100644 --- a/nursing-unit-system/nu-system-start/src/main/java/org/jeecg/NUSystemApplication.java +++ b/nursing-unit-system/nu-system-start/src/main/java/org/jeecg/NUSystemApplication.java @@ -2,6 +2,7 @@ package org.jeecg; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.util.oConvertUtils; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -19,7 +20,9 @@ import java.util.Map; * 单体启动类 */ @Slf4j -@SpringBootApplication(scanBasePackages = {"com.nu","org.jeecg"}) +@SpringBootApplication +@ComponentScan(basePackages = {"com.nu","org.jeecg"}) +@MapperScan({"com.nu.**.mapper","org.jeecg.**.mapper"}) public class NUSystemApplication extends SpringBootServletInitializer { @Override diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml index 9f08dc6..3f04021 100644 --- a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml +++ b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml @@ -181,7 +181,7 @@ spring: password: #mybatis plus 设置 mybatis-plus: - mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml + mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml,classpath*:com/nu/**/xml/*Mapper.xml global-config: # 关闭MP3.0自带的banner banner: false @@ -192,7 +192,7 @@ mybatis-plus: table-underline: true configuration: # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 - #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 返回类型为Map,显示null对应的字段 call-setters-on-nulls: true #jeecg专用配置 @@ -300,7 +300,7 @@ logging: level: org.flywaydb: debug org.jeecg.modules.system.mapper: info - + com.nu.modules.system.mapper: info #swagger knife4j: #开启增强配置 diff --git a/nursing-unit-yourModuleName/nu-yourModuleName-api/nu-yourModuleName-local-api/pom.xml b/nursing-unit-yourModuleName/nu-yourModuleName-api/nu-yourModuleName-local-api/pom.xml new file mode 100644 index 0000000..8bc8549 --- /dev/null +++ b/nursing-unit-yourModuleName/nu-yourModuleName-api/nu-yourModuleName-local-api/pom.xml @@ -0,0 +1,15 @@ + + + + com.nursingunit.boot + + nu-yourModuleName-api + 2.0.0 + + 4.0.0 + + nu-yourModuleName-local-api + + diff --git a/nursing-unit-yourModuleName/nu-yourModuleName-api/pom.xml b/nursing-unit-yourModuleName/nu-yourModuleName-api/pom.xml new file mode 100644 index 0000000..1a0a048 --- /dev/null +++ b/nursing-unit-yourModuleName/nu-yourModuleName-api/pom.xml @@ -0,0 +1,27 @@ + + + + com.nursingunit.boot + + nursing-unit-yourModuleName + 2.0.0 + + 4.0.0 + + nu-yourModuleName-api + pom + + + + nu-yourModuleName-local-api + + + + + com.nursingunit.boot + nursing-unit-base-core + + + diff --git a/nursing-unit-yourModuleName/nu-yourModuleName-biz/pom.xml b/nursing-unit-yourModuleName/nu-yourModuleName-biz/pom.xml new file mode 100644 index 0000000..3514333 --- /dev/null +++ b/nursing-unit-yourModuleName/nu-yourModuleName-biz/pom.xml @@ -0,0 +1,38 @@ + + + com.nursingunit.boot + + nursing-unit-yourModuleName + 2.0.0 + + 4.0.0 + + nu-yourModuleName-biz + + + + com.nursingunit.boot + + nu-yourModuleName-local-api + ${nursingunit.version} + + + org.hibernate + hibernate-core + + + org.jeecgframework.boot + hibernate-re + + + + + org.jeecgframework + weixin4j + + + + + diff --git a/nursing-unit-yourModuleName/pom.xml b/nursing-unit-yourModuleName/pom.xml new file mode 100644 index 0000000..a2820a3 --- /dev/null +++ b/nursing-unit-yourModuleName/pom.xml @@ -0,0 +1,21 @@ + + + + com.nursingunit.boot + nursing-unit-parent + 2.0.0 + + 4.0.0 + + nursing-unit-yourModuleName + pom + + + + nu-yourModuleName-api + nu-yourModuleName-biz + + +