diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java index f3ff51e..d4fa469 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java @@ -166,6 +166,9 @@ public class JeecgController> { for (Map.Entry entity : fileMap.entrySet()) { // 获取上传文件对象 MultipartFile file = entity.getValue(); + if(file == null){ + break; + } ImportParams params = new ImportParams(); params.setTitleRows(2); params.setHeadRows(1); diff --git a/nursing-unit-config/nu-config-biz/pom.xml b/nursing-unit-config/nu-config-biz/pom.xml index 443206f..e0a057d 100644 --- a/nursing-unit-config/nu-config-biz/pom.xml +++ b/nursing-unit-config/nu-config-biz/pom.xml @@ -31,6 +31,12 @@ weixin4j + + + com.belerweb + pinyin4j + 2.5.0 + diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java new file mode 100644 index 0000000..d8670da --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java @@ -0,0 +1,201 @@ +package com.nu.modules.ConfigMaterial.controller; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialCategory; +import com.nu.modules.ConfigMaterial.service.IConfigMaterialCategoryService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 物料类别 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +@Api(tags="物料类别") +@RestController +@RequestMapping("/ConfigMaterial/configMaterialCategory") +@Slf4j +public class ConfigMaterialCategoryController extends JeecgController { + @Autowired + private IConfigMaterialCategoryService configMaterialCategoryService; + + /** + * 分页列表查询 + * + * @param configMaterialCategory + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "物料类别-分页列表查询") + @ApiOperation(value="物料类别-分页列表查询", notes="物料类别-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ConfigMaterialCategory configMaterialCategory, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(configMaterialCategory, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = configMaterialCategoryService.page(page, queryWrapper); + return Result.OK(pageList); + } + + + @ApiOperation(value="物料类别-分页列表查询", notes="物料类别-分页列表查询") + @GetMapping(value = "/selectMaterialList") + public Result> selectMaterialList(ConfigMaterialCategory configMaterialCategory, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(configMaterialCategory, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = configMaterialCategoryService.selectMaterialList(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param configMaterialCategory + * @return + */ + @AutoLog(value = "物料类别-添加") + @ApiOperation(value="物料类别-添加", notes="物料类别-添加") + @RequiresPermissions("ConfigMaterial:config_material_category:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ConfigMaterialCategory configMaterialCategory) { + configMaterialCategoryService.save(configMaterialCategory); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param configMaterialCategory + * @return + */ + @AutoLog(value = "物料类别-编辑") + @ApiOperation(value="物料类别-编辑", notes="物料类别-编辑") + @RequiresPermissions("ConfigMaterial:config_material_category:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ConfigMaterialCategory configMaterialCategory) { + configMaterialCategoryService.updateById(configMaterialCategory); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "物料类别-通过id删除") + @ApiOperation(value="物料类别-通过id删除", notes="物料类别-通过id删除") + @RequiresPermissions("ConfigMaterial:config_material_category:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + configMaterialCategoryService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "物料类别-批量删除") + @ApiOperation(value="物料类别-批量删除", notes="物料类别-批量删除") + @RequiresPermissions("ConfigMaterial:config_material_category:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.configMaterialCategoryService.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) { + ConfigMaterialCategory configMaterialCategory = configMaterialCategoryService.getById(id); + if(configMaterialCategory==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(configMaterialCategory); + } + + /** + * 导出excel + * + * @param request + * @param configMaterialCategory + */ + @RequiresPermissions("ConfigMaterial:config_material_category:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ConfigMaterialCategory configMaterialCategory) { + return super.exportXls(request, configMaterialCategory, ConfigMaterialCategory.class, "物料类别"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("ConfigMaterial:config_material_category:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ConfigMaterialCategory.class); + } + + + @ApiOperation(value="获取物料分类树", notes="获取物料分类树") + @GetMapping(value = "/getMaterialTreeData") + public Result>> getMaterialTreeData(ConfigMaterialCategory configMaterialCategory) { + List> pageList = configMaterialCategoryService.getMaterialTreeData(configMaterialCategory); + return Result.OK(pageList); + } + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java new file mode 100644 index 0000000..1d05906 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java @@ -0,0 +1,186 @@ +package com.nu.modules.ConfigMaterial.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.configMaterialInfo.entity.ConfigMaterialInfo; +import com.nu.modules.configMaterialInfo.service.IConfigMaterialInfoService; +import com.nu.modules.utils.PinyinUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +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.jeecg.common.system.query.QueryRuleEnum; +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; +import java.util.HashMap; +import java.util.Map; + + /** + * @Description: 物料信息 + * @Author: jeecg-boot + * @Date: 2025-03-13 + * @Version: V1.0 + */ +@Api(tags="物料信息") +@RestController +@RequestMapping("/configMaterialInfo/configMaterialInfo") +@Slf4j +public class ConfigMaterialInfoController extends JeecgController { + @Autowired + private IConfigMaterialInfoService configMaterialInfoService; + + /** + * 分页列表查询 + * + * @param configMaterialInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "物料信息-分页列表查询") + @ApiOperation(value="物料信息-分页列表查询", notes="物料信息-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ConfigMaterialInfo configMaterialInfo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + // 自定义查询规则 + Map customeRuleMap = new HashMap<>(); + // 自定义多选的查询规则为：LIKE_WITH_OR +// customeRuleMap.put("categoryId", QueryRuleEnum.LIKE_WITH_OR); +// customeRuleMap.put("typeId", QueryRuleEnum.LIKE_WITH_OR); +// customeRuleMap.put("medicationId", QueryRuleEnum.LIKE_WITH_OR); +// customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR); + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(configMaterialInfo, req.getParameterMap(),customeRuleMap); + if(StringUtils.isNotBlank(configMaterialInfo.getTreeId())){ + queryWrapper.apply(" (category_id = '"+configMaterialInfo.getTreeId()+"' or type_id = '"+configMaterialInfo.getTreeId()+"' or medication_id = '"+configMaterialInfo.getTreeId()+"' )"); + } + Page page = new Page(pageNo, pageSize); + IPage pageList = configMaterialInfoService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param configMaterialInfo + * @return + */ + @AutoLog(value = "物料信息-添加") + @ApiOperation(value="物料信息-添加", notes="物料信息-添加") + @RequiresPermissions("configMaterialInfo:config_material_info:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ConfigMaterialInfo configMaterialInfo) { + + String chinese = configMaterialInfo.getMaterialName(); + String firstLetter = PinyinUtils.getFirstLetter(chinese); + configMaterialInfo.setPinyin(firstLetter); + configMaterialInfoService.save(configMaterialInfo); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param configMaterialInfo + * @return + */ + @AutoLog(value = "物料信息-编辑") + @ApiOperation(value="物料信息-编辑", notes="物料信息-编辑") + @RequiresPermissions("configMaterialInfo:config_material_info:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ConfigMaterialInfo configMaterialInfo) { + + String chinese = configMaterialInfo.getMaterialName(); + String firstLetter = PinyinUtils.getFirstLetter(chinese); + configMaterialInfo.setPinyin(firstLetter); + configMaterialInfoService.updateById(configMaterialInfo); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "物料信息-通过id删除") + @ApiOperation(value="物料信息-通过id删除", notes="物料信息-通过id删除") + @RequiresPermissions("configMaterialInfo:config_material_info:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + configMaterialInfoService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "物料信息-批量删除") + @ApiOperation(value="物料信息-批量删除", notes="物料信息-批量删除") + @RequiresPermissions("configMaterialInfo:config_material_info:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.configMaterialInfoService.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) { + ConfigMaterialInfo configMaterialInfo = configMaterialInfoService.getById(id); + if(configMaterialInfo==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(configMaterialInfo); + } + + /** + * 导出excel + * + * @param request + * @param configMaterialInfo + */ + @RequiresPermissions("configMaterialInfo:config_material_info:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ConfigMaterialInfo configMaterialInfo) { + return super.exportXls(request, configMaterialInfo, ConfigMaterialInfo.class, "物料信息"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("configMaterialInfo:config_material_info:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ConfigMaterialInfo.class); + } + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialMedicationController.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialMedicationController.java new file mode 100644 index 0000000..5d09d88 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialMedicationController.java @@ -0,0 +1,186 @@ +package com.nu.modules.ConfigMaterial.controller; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialMedication; +import com.nu.modules.ConfigMaterial.service.IConfigMaterialMedicationService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 物料用药类型 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +@Api(tags="物料用药类型") +@RestController +@RequestMapping("/ConfigMaterial/configMaterialMedication") +@Slf4j +public class ConfigMaterialMedicationController extends JeecgController { + @Autowired + private IConfigMaterialMedicationService configMaterialMedicationService; + + /** + * 分页列表查询 + * + * @param configMaterialMedication + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "物料用药类型-分页列表查询") + @ApiOperation(value="物料用药类型-分页列表查询", notes="物料用药类型-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ConfigMaterialMedication configMaterialMedication, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + // 自定义查询规则 + Map customeRuleMap = new HashMap<>(); + // 自定义多选的查询规则为：LIKE_WITH_OR + customeRuleMap.put("categoryId", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("typeId", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(configMaterialMedication, req.getParameterMap(),customeRuleMap); + Page page = new Page(pageNo, pageSize); + IPage pageList = configMaterialMedicationService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param configMaterialMedication + * @return + */ + @AutoLog(value = "物料用药类型-添加") + @ApiOperation(value="物料用药类型-添加", notes="物料用药类型-添加") + @RequiresPermissions("ConfigMaterial:config_material_medication:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ConfigMaterialMedication configMaterialMedication) { + configMaterialMedicationService.save(configMaterialMedication); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param configMaterialMedication + * @return + */ + @AutoLog(value = "物料用药类型-编辑") + @ApiOperation(value="物料用药类型-编辑", notes="物料用药类型-编辑") + @RequiresPermissions("ConfigMaterial:config_material_medication:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ConfigMaterialMedication configMaterialMedication) { + configMaterialMedicationService.updateById(configMaterialMedication); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "物料用药类型-通过id删除") + @ApiOperation(value="物料用药类型-通过id删除", notes="物料用药类型-通过id删除") + @RequiresPermissions("ConfigMaterial:config_material_medication:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + configMaterialMedicationService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "物料用药类型-批量删除") + @ApiOperation(value="物料用药类型-批量删除", notes="物料用药类型-批量删除") + @RequiresPermissions("ConfigMaterial:config_material_medication:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.configMaterialMedicationService.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) { + ConfigMaterialMedication configMaterialMedication = configMaterialMedicationService.getById(id); + if(configMaterialMedication==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(configMaterialMedication); + } + + /** + * 导出excel + * + * @param request + * @param configMaterialMedication + */ + @RequiresPermissions("ConfigMaterial:config_material_medication:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ConfigMaterialMedication configMaterialMedication) { + return super.exportXls(request, configMaterialMedication, ConfigMaterialMedication.class, "物料用药类型"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("ConfigMaterial:config_material_medication:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ConfigMaterialMedication.class); + } + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialTypeController.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialTypeController.java new file mode 100644 index 0000000..0e4a7bd --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialTypeController.java @@ -0,0 +1,184 @@ +package com.nu.modules.ConfigMaterial.controller; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialType; +import com.nu.modules.ConfigMaterial.service.IConfigMaterialTypeService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 物料类型 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +@Api(tags="物料类型") +@RestController +@RequestMapping("/ConfigMaterial/configMaterialType") +@Slf4j +public class ConfigMaterialTypeController extends JeecgController { + @Autowired + private IConfigMaterialTypeService configMaterialTypeService; + + /** + * 分页列表查询 + * + * @param configMaterialType + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "物料类型-分页列表查询") + @ApiOperation(value="物料类型-分页列表查询", notes="物料类型-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ConfigMaterialType configMaterialType, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + // 自定义查询规则 + Map customeRuleMap = new HashMap<>(); + // 自定义多选的查询规则为：LIKE_WITH_OR + customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(configMaterialType, req.getParameterMap(),customeRuleMap); + Page page = new Page(pageNo, pageSize); + IPage pageList = configMaterialTypeService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param configMaterialType + * @return + */ + @AutoLog(value = "物料类型-添加") + @ApiOperation(value="物料类型-添加", notes="物料类型-添加") + @RequiresPermissions("ConfigMaterial:config_material_type:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ConfigMaterialType configMaterialType) { + configMaterialTypeService.save(configMaterialType); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param configMaterialType + * @return + */ + @AutoLog(value = "物料类型-编辑") + @ApiOperation(value="物料类型-编辑", notes="物料类型-编辑") + @RequiresPermissions("ConfigMaterial:config_material_type:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ConfigMaterialType configMaterialType) { + configMaterialTypeService.updateById(configMaterialType); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "物料类型-通过id删除") + @ApiOperation(value="物料类型-通过id删除", notes="物料类型-通过id删除") + @RequiresPermissions("ConfigMaterial:config_material_type:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + configMaterialTypeService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "物料类型-批量删除") + @ApiOperation(value="物料类型-批量删除", notes="物料类型-批量删除") + @RequiresPermissions("ConfigMaterial:config_material_type:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.configMaterialTypeService.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) { + ConfigMaterialType configMaterialType = configMaterialTypeService.getById(id); + if(configMaterialType==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(configMaterialType); + } + + /** + * 导出excel + * + * @param request + * @param configMaterialType + */ + @RequiresPermissions("ConfigMaterial:config_material_type:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ConfigMaterialType configMaterialType) { + return super.exportXls(request, configMaterialType, ConfigMaterialType.class, "物料类型"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("ConfigMaterial:config_material_type:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ConfigMaterialType.class); + } + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java new file mode 100644 index 0000000..14762d7 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java @@ -0,0 +1,83 @@ +package com.nu.modules.ConfigMaterial.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.*; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 物料类别 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +@Data +@TableName("config_material_category") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="config_material_category对象", description="物料类别") +public class ConfigMaterialCategory implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**物料类别名称*/ + @Excel(name = "物料类别名称", width = 15) + @ApiModelProperty(value = "物料类别名称") + private java.lang.String categoryName; + /**是否启用 0启用 1未启用*/ + @Excel(name = "是否启用", width = 15, dicCode = "iz_enabled") + @Dict(dicCode = "iz_enabled") + @ApiModelProperty(value = "是否启用 0启用 1未启用") + private java.lang.String izEnabled; + /**是否删除 0未删除 1删除*/ + @Excel(name = "是否删除 0未删除 1删除", width = 15) + @ApiModelProperty(value = "是否删除 0未删除 1删除") + @TableLogic + private java.lang.String delFlag; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + @TableField(exist = false) + private String typeName; + @TableField(exist = false) + private String medicationName; + @TableField(exist = false) + private String categoryId; + @TableField(exist = false) + private String typeId; + @TableField(exist = false) + private String medicationId; +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java new file mode 100644 index 0000000..89f0e3b --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java @@ -0,0 +1,153 @@ +package com.nu.modules.configMaterialInfo.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.*; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 物料信息 + * @Author: jeecg-boot + * @Date: 2025-03-13 + * @Version: V1.0 + */ +@Data +@TableName("config_material_info") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="config_material_info对象", description="物料信息") +public class ConfigMaterialInfo implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**物料类别*/ + @Excel(name = "物料类别", width = 15, dictTable = "config_material_category", dicText = "category_name", dicCode = "id") + @Dict(dictTable = "config_material_category", dicText = "category_name", dicCode = "id") + @ApiModelProperty(value = "物料类别") + private java.lang.String categoryId; + /**物料类型*/ + @Excel(name = "物料类型", width = 15, dictTable = "config_material_type", dicText = "type_name", dicCode = "id") + @Dict(dictTable = "config_material_type", dicText = "type_name", dicCode = "id") + @ApiModelProperty(value = "物料类型") + private java.lang.String typeId; + /**用药类型*/ + @Excel(name = "用药类型", width = 15, dictTable = "config_material_medication", dicText = "medication_name", dicCode = "id") + @Dict(dictTable = "config_material_medication", dicText = "medication_name", dicCode = "id") + @ApiModelProperty(value = "用药类型") + private java.lang.String medicationId; + /**货品名称*/ + @Excel(name = "货品名称", width = 15) + @ApiModelProperty(value = "货品名称") + private java.lang.String materialName; + /**货品编码*/ + @Excel(name = "货品编码", width = 15) + @ApiModelProperty(value = "货品编码") + private java.lang.String materialNo; + /**规格型号*/ + @Excel(name = "规格型号", width = 15) + @ApiModelProperty(value = "规格型号") + private java.lang.String specificationModel; + /**销售单价*/ + @Excel(name = "销售单价", width = 15) + @ApiModelProperty(value = "销售单价") + private java.math.BigDecimal salesUnitPrice; + /**参考单价*/ + @Excel(name = "参考单价", width = 15) + @ApiModelProperty(value = "参考单价") + private java.math.BigDecimal referenceUnitPrice; + /**货品单位*/ + @Excel(name = "货品单位", width = 15) + @ApiModelProperty(value = "货品单位") + private java.lang.String materialUnits; + /**多单位开关 0关 1开*/ + @Excel(name = "多单位开关", width = 15,replace = {"开_Y","关_N"} ) + @ApiModelProperty(value = "多单位开关 0关 1开") + private java.lang.String multiUnitSwitch; + /**父级单位*/ + @Excel(name = "父级单位", width = 15) + @ApiModelProperty(value = "父级单位") + private java.lang.String oneUnit; + /**父级单位兑换比例*/ + @Excel(name = "父级单位兑换比例", width = 15) + @ApiModelProperty(value = "父级单位兑换比例") + private java.lang.Integer oneUnitProportion; + /**父级单位价格*/ + @Excel(name = "父级单位价格", width = 15) + @ApiModelProperty(value = "父级单位价格") + private java.math.BigDecimal oneUnitPrice; + /**爷级单位*/ + @Excel(name = "爷级单位", width = 15) + @ApiModelProperty(value = "爷级单位") + private java.lang.String twoUnit; + /**爷级单位兑换比例*/ + @Excel(name = "爷级单位兑换比例", width = 15) + @ApiModelProperty(value = "爷级单位兑换比例") + private java.lang.Integer twoUnitProportion; + /**爷级单位价格*/ + @Excel(name = "爷级单位价格", width = 15) + @ApiModelProperty(value = "爷级单位价格") + private java.math.BigDecimal twoUnitPrice; + /**多单位采购默认使用 0子集 1父级 2爷级*/ + @Excel(name = "多单位采购默认使用", width = 15) + @ApiModelProperty(value = "多单位采购默认使用 0子集 1父级 2爷级") + private java.lang.String multiUnitType; + /**供应商*/ + @Excel(name = "供应商", width = 15,dictTable = "config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name") + @ApiModelProperty(value = "供应商") + @Dict(dictTable = "config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name") + private java.lang.String suppliers; + /**物料图片*/ + @ApiModelProperty(value = "物料图片") + private java.lang.String materialImg; + /**物料标识*/ + @ApiModelProperty(value = "物料标识") + private java.lang.String materialIdent; + /**是否启用 0启用 1未启用*/ + @Dict(dicCode = "iz_enabled") + @ApiModelProperty(value = "是否启用 0启用 1未启用") + private java.lang.String izEnabled; + /**是否删除 0未删除 1删除*/ + @ApiModelProperty(value = "是否删除 0未删除 1删除") + @TableLogic + private java.lang.String delFlag; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + /**拼音*/ + private java.lang.String pinyin; + + @TableField(exist = false) + private String treeId;//树id，用于查询 +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java new file mode 100644 index 0000000..4c9f924 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java @@ -0,0 +1,83 @@ +package com.nu.modules.ConfigMaterial.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 物料用药类型 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +@Data +@TableName("config_material_medication") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="config_material_medication对象", description="物料用药类型") +public class ConfigMaterialMedication implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**物料类别*/ + @Excel(name = "物料类别", width = 15, dictTable = "config_material_category", dicText = "category_name", dicCode = "id") + @Dict(dictTable = "config_material_category", dicText = "category_name", dicCode = "id") + @ApiModelProperty(value = "物料类别") + private java.lang.String categoryId; + /**物料类型*/ + @Excel(name = "物料类型", width = 15, dictTable = "config_material_type", dicText = "type_name", dicCode = "id") + @Dict(dictTable = "config_material_type", dicText = "type_name", dicCode = "id") + @ApiModelProperty(value = "物料类型") + private java.lang.String typeId; + /**名称*/ + @Excel(name = "名称", width = 15) + @ApiModelProperty(value = "名称") + private java.lang.String medicationName; + /**是否启用 0启用 1未启用*/ + @Excel(name = "是否启用", width = 15, dicCode = "iz_enabled") + @Dict(dicCode = "iz_enabled") + @ApiModelProperty(value = "是否启用 0启用 1未启用") + private java.lang.String izEnabled; + /**是否删除 0未删除 1删除*/ + @ApiModelProperty(value = "是否删除 0未删除 1删除") + @TableLogic + private java.lang.String delFlag; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java new file mode 100644 index 0000000..16fe4bb --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java @@ -0,0 +1,78 @@ +package com.nu.modules.ConfigMaterial.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 物料类型 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +@Data +@TableName("config_material_type") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="config_material_type对象", description="物料类型") +public class ConfigMaterialType implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**物料类别*/ + @Excel(name = "物料类别", width = 15,dictTable = "config_material_category" , dicText = "category_name" , dicCode = "id") + @ApiModelProperty(value = "物料类别") + @Dict(dictTable = "config_material_category" , dicText = "category_name" , dicCode = "id") + private java.lang.String categoryId; + /**物料类型*/ + @Excel(name = "物料类型", width = 15) + @ApiModelProperty(value = "物料类型") + private java.lang.String typeName; + /**是否启用 0启用 1未启用*/ + @Excel(name = "是否启用", width = 15, dicCode = "iz_enabled") + @Dict(dicCode = "iz_enabled") + @ApiModelProperty(value = "是否启用 0启用 1未启用") + private java.lang.String izEnabled; + /**是否删除 0未删除 1删除*/ + @ApiModelProperty(value = "是否删除 0未删除 1删除") + @TableLogic + private java.lang.String delFlag; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java new file mode 100644 index 0000000..7d6e58a --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java @@ -0,0 +1,22 @@ +package com.nu.modules.ConfigMaterial.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialCategory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 物料类别 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +public interface ConfigMaterialCategoryMapper extends BaseMapper { + + IPage selectMaterialList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java new file mode 100644 index 0000000..20ab6aa --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java @@ -0,0 +1,17 @@ +package com.nu.modules.configMaterialInfo.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.nu.modules.configMaterialInfo.entity.ConfigMaterialInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 物料信息 + * @Author: jeecg-boot + * @Date: 2025-03-13 + * @Version: V1.0 + */ +public interface ConfigMaterialInfoMapper extends BaseMapper { + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialMedicationMapper.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialMedicationMapper.java new file mode 100644 index 0000000..c698745 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialMedicationMapper.java @@ -0,0 +1,17 @@ +package com.nu.modules.ConfigMaterial.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialMedication; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 物料用药类型 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +public interface ConfigMaterialMedicationMapper extends BaseMapper { + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialTypeMapper.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialTypeMapper.java new file mode 100644 index 0000000..7ac2b10 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialTypeMapper.java @@ -0,0 +1,17 @@ +package com.nu.modules.ConfigMaterial.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialType; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 物料类型 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +public interface ConfigMaterialTypeMapper extends BaseMapper { + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml new file mode 100644 index 0000000..5412f1c --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml new file mode 100644 index 0000000..7b73c47 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialMedicationMapper.xml b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialMedicationMapper.xml new file mode 100644 index 0000000..da939af --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialMedicationMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialTypeMapper.xml b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialTypeMapper.xml new file mode 100644 index 0000000..cbf9043 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialTypeMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialCategoryService.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialCategoryService.java new file mode 100644 index 0000000..f04b824 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialCategoryService.java @@ -0,0 +1,23 @@ +package com.nu.modules.ConfigMaterial.service; + +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.ConfigMaterial.entity.ConfigMaterialCategory; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; +import java.util.Map; + +/** + * @Description: 物料类别 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +public interface IConfigMaterialCategoryService extends IService { + + IPage selectMaterialList(Page page, QueryWrapper queryWrapper); + + List> getMaterialTreeData(ConfigMaterialCategory configMaterialCategory); +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java new file mode 100644 index 0000000..1e2fc30 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java @@ -0,0 +1,14 @@ +package com.nu.modules.configMaterialInfo.service; + +import com.nu.modules.configMaterialInfo.entity.ConfigMaterialInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 物料信息 + * @Author: jeecg-boot + * @Date: 2025-03-13 + * @Version: V1.0 + */ +public interface IConfigMaterialInfoService extends IService { + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialMedicationService.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialMedicationService.java new file mode 100644 index 0000000..e5d55be --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialMedicationService.java @@ -0,0 +1,14 @@ +package com.nu.modules.ConfigMaterial.service; + +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialMedication; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 物料用药类型 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +public interface IConfigMaterialMedicationService extends IService { + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialTypeService.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialTypeService.java new file mode 100644 index 0000000..87ca862 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialTypeService.java @@ -0,0 +1,14 @@ +package com.nu.modules.ConfigMaterial.service; + +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialType; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 物料类型 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +public interface IConfigMaterialTypeService extends IService { + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java new file mode 100644 index 0000000..243f697 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java @@ -0,0 +1,107 @@ +package com.nu.modules.ConfigMaterial.service.impl; + +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.ConfigMaterial.entity.ConfigMaterialCategory; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialMedication; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialType; +import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialCategoryMapper; +import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialMedicationMapper; +import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialTypeMapper; +import com.nu.modules.ConfigMaterial.service.IConfigMaterialCategoryService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.*; + +/** + * @Description: 物料类别 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +@Service +public class ConfigMaterialCategoryServiceImpl extends ServiceImpl implements IConfigMaterialCategoryService { + + @Autowired + public ConfigMaterialTypeMapper configMaterialTypeMapper; + + @Autowired + public ConfigMaterialMedicationMapper configMaterialMedicationMapper; + + @Override + public IPage selectMaterialList(Page page, QueryWrapper queryWrapper) { + return baseMapper.selectMaterialList(page,queryWrapper); + } + + @Override + public List>getMaterialTreeData(ConfigMaterialCategory configMaterialCategory) { + + //查询护理分类信息 + QueryWrapper categoryQueryWrapper = new QueryWrapper<>(); + categoryQueryWrapper.eq("iz_enabled","0"); + categoryQueryWrapper.eq("del_flag","0"); + categoryQueryWrapper.orderByAsc("sort"); + List list =baseMapper.selectList(categoryQueryWrapper); + + //查询护理类型信息 + QueryWrapper typeQueryWrapper = new QueryWrapper<>(); + typeQueryWrapper.eq("iz_enabled","0"); + typeQueryWrapper.eq("del_flag","0"); + List list2 = configMaterialTypeMapper.selectList(typeQueryWrapper); + + //查询用药类型信息 + QueryWrapper medicationQueryWrapper = new QueryWrapper<>(); + medicationQueryWrapper.eq("iz_enabled","0"); + medicationQueryWrapper.eq("del_flag","0"); + List list3 = configMaterialMedicationMapper.selectList(medicationQueryWrapper); + + + List> wllxMapList = new ArrayList>(); + for(ConfigMaterialType par : list2){ + Map wllxMap = new HashMap(); + List> yylxMapList = new ArrayList>(); + for(ConfigMaterialMedication yylxPar:list3){ + if(StringUtils.equals(yylxPar.getTypeId(),par.getId())){ + Map yylxMap = new HashMap(); + yylxMap.put("key",yylxPar.getId()); + yylxMap.put("levle","3"); + yylxMap.put("title",yylxPar.getMedicationName()); + yylxMapList.add(yylxMap); + } + } + wllxMap.put("key",par.getId()); + wllxMap.put("parentId",par.getCategoryId()); + wllxMap.put("title",par.getTypeName()); + wllxMap.put("levle","2"); + wllxMap.put("children",yylxMapList); + wllxMapList.add(wllxMap); + } + + List> infoMapList = new ArrayList>(); + int index = 0; + for(ConfigMaterialCategory par : list){ + index++; + Map infoMap = new HashMap(); + List> wllxMap2List = new ArrayList>(); + for(Map wllxPar : wllxMapList){ + if(StringUtils.equals(par.getId(),wllxPar.get("parentId").toString())){ + wllxMap2List.add(wllxPar); + } + } + infoMap.put("key",par.getId()); + infoMap.put("title",index + " " +par.getCategoryName()); + infoMap.put("levle","1"); + infoMap.put("children",wllxMap2List); + infoMapList.add(infoMap); + } + + + + return infoMapList; + } +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java new file mode 100644 index 0000000..ba8d001 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.configMaterialInfo.service.impl; + +import com.nu.modules.configMaterialInfo.entity.ConfigMaterialInfo; +import com.nu.modules.configMaterialInfo.mapper.ConfigMaterialInfoMapper; +import com.nu.modules.configMaterialInfo.service.IConfigMaterialInfoService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 物料信息 + * @Author: jeecg-boot + * @Date: 2025-03-13 + * @Version: V1.0 + */ +@Service +public class ConfigMaterialInfoServiceImpl extends ServiceImpl implements IConfigMaterialInfoService { + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialMedicationServiceImpl.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialMedicationServiceImpl.java new file mode 100644 index 0000000..d271c99 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialMedicationServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.ConfigMaterial.service.impl; + +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialMedication; +import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialMedicationMapper; +import com.nu.modules.ConfigMaterial.service.IConfigMaterialMedicationService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 物料用药类型 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +@Service +public class ConfigMaterialMedicationServiceImpl extends ServiceImpl implements IConfigMaterialMedicationService { + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialTypeServiceImpl.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialTypeServiceImpl.java new file mode 100644 index 0000000..25e241d --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialTypeServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.ConfigMaterial.service.impl; + +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialType; +import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialTypeMapper; +import com.nu.modules.ConfigMaterial.service.IConfigMaterialTypeService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 物料类型 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +@Service +public class ConfigMaterialTypeServiceImpl extends ServiceImpl implements IConfigMaterialTypeService { + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java index 0e8cb7b..a175275 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java @@ -77,11 +77,9 @@ public class ConfigSuppliersInfo implements Serializable { @ApiModelProperty(value = "微信账号") private java.lang.String wechartId; /**资质照片*/ - @Excel(name = "资质照片", width = 15) @ApiModelProperty(value = "资质照片") private java.lang.String imgPath; /**是否删除 0未删除 1删除*/ - @Excel(name = "是否删除 0未删除 1删除", width = 15) @ApiModelProperty(value = "是否删除 0未删除 1删除") @TableLogic private java.lang.String delFlag; diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/utils/PinyinUtils.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/utils/PinyinUtils.java new file mode 100644 index 0000000..c371526 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/utils/PinyinUtils.java @@ -0,0 +1,58 @@ +package com.nu.modules.utils; +import lombok.extern.slf4j.Slf4j; +import net.sourceforge.pinyin4j.PinyinHelper; +import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType; +import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat; +import net.sourceforge.pinyin4j.format.HanyuPinyinToneType; +import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination; +import org.springframework.stereotype.Component; + +@Slf4j +public class PinyinUtils { + + + public static String test(String chinese) { + return chinese; + } + + + /** + * 获取汉字串拼音首字母，英文字符不变 + * + * @param chinese 汉字串 + * @return 汉语拼音首字母 + */ + public static String getFirstLetter(String chinese) { + StringBuilder result = new StringBuilder(); + HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat(); + format.setCaseType(HanyuPinyinCaseType.UPPERCASE); // 设置拼音为大写 + format.setToneType(HanyuPinyinToneType.WITHOUT_TONE); // 不带声调 + + char[] arr = chinese.toCharArray(); + for (char c : arr) { + try { + // 判断是否是汉字字符 + if (Character.toString(c).matches("[\\u4E00-\\u9FA5]+")) { + String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(c, format); + if (pinyinArray != null) { + result.append(pinyinArray[0].charAt(0)); // 取拼音的首字母 + } else { + result.append(c); // 如果转换失败，则原样保留字符 + } + } else { + result.append(c); // 非汉字字符，直接拼接 + } + } catch (BadHanyuPinyinOutputFormatCombination e) { + e.printStackTrace(); + result.append(c); // 如果捕获到异常，则原样保留字符 + } + } + return result.toString(); + } + + public static void main(String[] args) { + String chinese = "汉字转拼音取首字母"; + String firstLetter = getFirstLetter(chinese); + System.out.println("拼音首字母: " + firstLetter); // 输出: HZTPQSZMX + } +} diff --git a/nursing-unit-system/nu-system-start/src/main/resources/jeecg/jeecg_database.properties b/nursing-unit-system/nu-system-start/src/main/resources/jeecg/jeecg_database.properties index c8fb425..980ce2c 100644 --- a/nursing-unit-system/nu-system-start/src/main/resources/jeecg/jeecg_database.properties +++ b/nursing-unit-system/nu-system-start/src/main/resources/jeecg/jeecg_database.properties @@ -1,6 +1,6 @@ #mysql diver_name=com.mysql.jdbc.Driver -url=jdbc:mysql://1.92.152.160:33061/nursing_unit_001?useUnicode=true&characterEncoding=UTF-8 +url=jdbc:mysql://1.92.152.160:33061/nursing_unit?useUnicode=true&characterEncoding=UTF-8 username=root password=root database_name=jeecg-boot