From bdd5fede35ba9fadc21617a09cb80488a96be81f Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 14 Mar 2025 15:33:34 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9Eiot=EF=BC=88?= =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=EF=BC=89=E6=A8=A1=E5=9D=97=202?= =?UTF-8?q?=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=88=E9=9D=9E=E5=8F=AF=E7=94=A8=E7=89=88?= =?UTF-8?q?=E6=9C=AC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServiceType/entity/ConfigServiceType.java | 12 +- .../entity/ConfigServiceCategory.java | 8 +- .../ConfigServiceDirectiveController.java | 391 +++++++++++------- .../entity/ConfigServiceDirective.java | 57 ++- .../nu-iot-api/nu-iot-local-api/pom.xml | 13 + nursing-unit-iot/nu-iot-api/pom.xml | 24 ++ nursing-unit-iot/nu-iot-biz/pom.xml | 35 ++ nursing-unit-iot/pom.xml | 19 + nursing-unit-system/nu-system-start/pom.xml | 9 +- .../src/main/resources/application-dev.yml | 1 + pom.xml | 1 + 11 files changed, 388 insertions(+), 182 deletions(-) create mode 100644 nursing-unit-iot/nu-iot-api/nu-iot-local-api/pom.xml create mode 100644 nursing-unit-iot/nu-iot-api/pom.xml create mode 100644 nursing-unit-iot/nu-iot-biz/pom.xml create mode 100644 nursing-unit-iot/pom.xml diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java index d10a132..8fccfa8 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java @@ -39,8 +39,8 @@ public class ConfigServiceType implements Serializable { @ApiModelProperty(value = "id") private java.lang.String id; /**服务类别id*/ - @Excel(name = "服务类别id", width = 15) - @ApiModelProperty(value = "服务类别id") + @Excel(name = "服务类别", width = 15) + @ApiModelProperty(value = "服务类别") @Dict(dicCode = "id" , dictTable = "config_service_category" , dicText = "category_name") private java.lang.String categoryId; /**服务类型名称*/ @@ -52,13 +52,13 @@ public class ConfigServiceType implements Serializable { @ApiModelProperty(value = "排序") private java.lang.Integer sort; /**是否启用 0启用 1未启用*/ - @Excel(name = "是否启用 0启用 1未启用", width = 15) - @ApiModelProperty(value = "是否启用 0启用 1未启用") + @Excel(name = "是否启用", width = 15) + @ApiModelProperty(value = "是否启用") @Dict(dicCode = "iz_enabled") private java.lang.String izEnabled; /**是否删除 0未删除 1删除*/ - @Excel(name = "是否删除 0未删除 1删除", width = 15) - @ApiModelProperty(value = "是否删除 0未删除 1删除") + @Excel(name = "是否删除", width = 15) + @ApiModelProperty(value = "是否删除") @TableLogic private java.lang.String delFlag; /**创建人*/ diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java index 7f65938..c6cb91c 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java @@ -47,13 +47,13 @@ public class ConfigServiceCategory implements Serializable { @ApiModelProperty(value = "排序") private java.lang.Integer sort; /**是否启用 0启用 1未启用*/ - @Excel(name = "是否启用 0启用 1未启用", width = 15) - @ApiModelProperty(value = "是否启用 0启用 1未启用") + @Excel(name = "是否启用", width = 15) + @ApiModelProperty(value = "是否启用") @Dict(dicCode = "iz_enabled") private java.lang.String izEnabled; /**是否删除 0未删除 1删除*/ - @Excel(name = "是否删除 0未删除 1删除", width = 15) - @ApiModelProperty(value = "是否删除 0未删除 1删除") + @Excel(name = "是否删除", width = 15) + @ApiModelProperty(value = "是否删除") @TableLogic private java.lang.String delFlag; /**创建人*/ diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java index 43b4afd..7af3aab 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java @@ -1,74 +1,61 @@ package com.nu.modules.serviceDirective.controller; +import cn.hutool.core.bean.BeanUtil; +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.serviceDirective.entity.ConfigServiceDirective; +import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService; +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.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.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.serviceDirective.entity.ConfigServiceDirective; -import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService; -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-13 + * @Date: 2025-03-13 * @Version: V1.0 */ -@Api(tags="服务指令") +@Api(tags = "服务指令") @RestController @RequestMapping("/serviceDirective/configServiceDirective") @Slf4j public class ConfigServiceDirectiveController extends JeecgController { - @Autowired - private IConfigServiceDirectiveService configServiceDirectiveService; - - /** - * 分页列表查询 - * - * @param configServiceDirective - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "服务指令-分页列表查询") - @ApiOperation(value="服务指令-分页列表查询", notes="服务指令-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(ConfigServiceDirective configServiceDirective, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + @Autowired + private IConfigServiceDirectiveService configServiceDirectiveService; + + /** + * 分页列表查询 + * + * @param configServiceDirective + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "服务指令-分页列表查询") + @ApiOperation(value = "服务指令-分页列表查询", notes = "服务指令-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ConfigServiceDirective configServiceDirective, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { // 自定义查询规则 Map customeRuleMap = new HashMap<>(); // 自定义多选的查询规则为：LIKE_WITH_OR @@ -80,95 +67,201 @@ public class ConfigServiceDirectiveController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(),customeRuleMap); - Page page = new Page(pageNo, pageSize); - IPage pageList = configServiceDirectiveService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param configServiceDirective - * @return - */ - @AutoLog(value = "服务指令-添加") - @ApiOperation(value="服务指令-添加", notes="服务指令-添加") - @RequiresPermissions("serviceDirective:config_service_directive:add") - @PostMapping(value = "/add") - public Result add(@RequestBody ConfigServiceDirective configServiceDirective) { - configServiceDirectiveService.save(configServiceDirective); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param configServiceDirective - * @return - */ - @AutoLog(value = "服务指令-编辑") - @ApiOperation(value="服务指令-编辑", notes="服务指令-编辑") - @RequiresPermissions("serviceDirective:config_service_directive:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody ConfigServiceDirective configServiceDirective) { - configServiceDirectiveService.updateById(configServiceDirective); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "服务指令-通过id删除") - @ApiOperation(value="服务指令-通过id删除", notes="服务指令-通过id删除") - @RequiresPermissions("serviceDirective:config_service_directive:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - configServiceDirectiveService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "服务指令-批量删除") - @ApiOperation(value="服务指令-批量删除", notes="服务指令-批量删除") - @RequiresPermissions("serviceDirective:config_service_directive:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.configServiceDirectiveService.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) { - ConfigServiceDirective configServiceDirective = configServiceDirectiveService.getById(id); - if(configServiceDirective==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(configServiceDirective); - } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap); + Page page = new Page(pageNo, pageSize); + IPage pageList = configServiceDirectiveService.page(page, queryWrapper); + + //处理单元格合并所需数据 + { + List records_ = pageList.getRecords(); + List records = BeanUtil.copyToList(records_, ConfigServiceDirective.class); + String fwlb = "";//存储循环到的服务类别值 + int fwlb_repCount = 0;//存储服务类别重复了几次 + String fwlx = "";//存储循环到的服务类型值 + int fwlx_repCount = 0;//存储服务类型重复了几次 + String zlbq = "";//存储循环到的指令标签值 + int zlbq_repCount = 0;//存储指令标签重复了几次 + for (int i = 0; i < records.size(); i++) { + if (i == 0) { + fwlb = records.get(i).getCategoryId(); + fwlx = records.get(i).getTypeId(); + zlbq = records.get(i).getInstructionTagId(); + } else { + //服务类别 + { + if (fwlb.equals(records.get(i).getCategoryId())) { + //如果是重复数据则存储对应数据 + fwlb_repCount++; + records.get(i).setCategoryRowSpan(0); + if (i == records.size() - 1) { + records.get(i - fwlb_repCount).setCategoryRowSpan(fwlb_repCount + 1); + } + } else { + //需要做服务类别重复数据记录 + if (fwlb_repCount > 0) { + records.get(i - fwlb_repCount).setCategoryRowSpan(fwlb_repCount + 1); + } + //处理服务类型 + { + if (fwlx_repCount > 0) { + records.get(i - fwlx_repCount).setTypeRowSpan(fwlx_repCount + 1); + } + //重置数据 + fwlx = ""; + fwlx_repCount = 0; + } + //处理指令标签 + { + if (zlbq_repCount > 0) { + records.get(i - zlbq_repCount).setInstructionRowSpan(zlbq_repCount + 1); + } + //重置数据 + zlbq = ""; + zlbq_repCount = 0; + } + //重置数据 + fwlb = records.get(i).getCategoryId(); + fwlb_repCount = 0; + } + } + //服务类型 + { + if (fwlx.equals(records.get(i).getTypeId())) { + //如果是重复数据则存储对应数据 + fwlx_repCount++; + records.get(i).setTypeRowSpan(0); + if (i == records.size() - 1) { + records.get(i - fwlx_repCount).setTypeRowSpan(fwlx_repCount + 1); + } + } else { + //需要做重复数据记录 + if (fwlx_repCount > 0) { + records.get(i - fwlx_repCount).setTypeRowSpan(fwlx_repCount + 1); + } + //处理指令标签 + { + if (zlbq_repCount > 0) { + records.get(i - zlbq_repCount).setInstructionRowSpan(zlbq_repCount + 1); + } + //重置数据 + zlbq = ""; + zlbq_repCount = 0; + } + //重置数据 + fwlx = records.get(i).getTypeId(); + fwlx_repCount = 0; + } + } + //指令标签 + { + if (zlbq.equals(records.get(i).getInstructionTagId())) { + //如果是重复数据则存储对应数据 + zlbq_repCount++; + records.get(i).setInstructionRowSpan(0); + if (i == records.size() - 1) { + records.get(i - zlbq_repCount).setInstructionRowSpan(zlbq_repCount + 1); + } + } else { + //需要做重复数据记录 + if (zlbq_repCount > 0) { + records.get(i - zlbq_repCount).setInstructionRowSpan(zlbq_repCount + 1); + } + //重置数据 + zlbq = records.get(i).getInstructionTagId(); + zlbq_repCount = 0; + } + } + } + } + pageList.setRecords(records); + } + + return Result.OK(pageList); + } /** - * 导出excel - * - * @param request - * @param configServiceDirective - */ + * 添加 + * + * @param configServiceDirective + * @return + */ + @AutoLog(value = "服务指令-添加") + @ApiOperation(value = "服务指令-添加", notes = "服务指令-添加") + @RequiresPermissions("serviceDirective:config_service_directive:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ConfigServiceDirective configServiceDirective) { + configServiceDirectiveService.save(configServiceDirective); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param configServiceDirective + * @return + */ + @AutoLog(value = "服务指令-编辑") + @ApiOperation(value = "服务指令-编辑", notes = "服务指令-编辑") + @RequiresPermissions("serviceDirective:config_service_directive:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody ConfigServiceDirective configServiceDirective) { + configServiceDirectiveService.updateById(configServiceDirective); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "服务指令-通过id删除") + @ApiOperation(value = "服务指令-通过id删除", notes = "服务指令-通过id删除") + @RequiresPermissions("serviceDirective:config_service_directive:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + configServiceDirectiveService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "服务指令-批量删除") + @ApiOperation(value = "服务指令-批量删除", notes = "服务指令-批量删除") + @RequiresPermissions("serviceDirective:config_service_directive:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.configServiceDirectiveService.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) { + ConfigServiceDirective configServiceDirective = configServiceDirectiveService.getById(id); + if (configServiceDirective == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(configServiceDirective); + } + + /** + * 导出excel + * + * @param request + * @param configServiceDirective + */ @RequiresPermissions("serviceDirective:config_service_directive:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, ConfigServiceDirective configServiceDirective) { @@ -176,12 +269,12 @@ public class ConfigServiceDirectiveController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java index bdd3302..c2ae9a0 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java @@ -4,10 +4,8 @@ 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 com.baomidou.mybatisplus.annotation.*; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; @@ -39,16 +37,19 @@ public class ConfigServiceDirective implements Serializable { @ApiModelProperty(value = "id") private java.lang.String id; /**服务类别id*/ - @Excel(name = "服务类别id", width = 15) - @ApiModelProperty(value = "服务类别id") + @Excel(name = "服务类别", width = 15) + @ApiModelProperty(value = "服务类别") + @Dict(dicCode = "id" , dictTable = "config_service_category" , dicText = "category_name") private java.lang.String categoryId; /**服务类型id*/ - @Excel(name = "服务类型id", width = 15) - @ApiModelProperty(value = "服务类型id") + @Excel(name = "服务类型", width = 15) + @ApiModelProperty(value = "服务类型") + @Dict(dicCode = "id" , dictTable = "config_service_type" , dicText = "type_name") private java.lang.String typeId; /**指令标签id*/ - @Excel(name = "指令标签id", width = 15) - @ApiModelProperty(value = "指令标签id") + @Excel(name = "指令标签", width = 15) + @ApiModelProperty(value = "指令标签") + @Dict(dicCode = "instruction_tag" ) private java.lang.String instructionTagId; /**服务指令名称*/ @Excel(name = "服务指令名称", width = 15) @@ -63,20 +64,24 @@ public class ConfigServiceDirective implements Serializable { @ApiModelProperty(value = "提成价格") private java.math.BigDecimal comPrice; /**是否参与医保报销 0不报销 1报销*/ - @Excel(name = "是否参与医保报销 0不报销 1报销", width = 15) - @ApiModelProperty(value = "是否参与医保报销 0不报销 1报销") + @Excel(name = "医保报销", width = 15) + @ApiModelProperty(value = "医保报销") + @Dict(dicCode = "med_ins_reimb" ) private java.lang.String izReimbursement; /**是否参与机构优惠 0不参与 1参与*/ - @Excel(name = "是否参与机构优惠 0不参与 1参与", width = 15) - @ApiModelProperty(value = "是否参与机构优惠 0不参与 1参与") + @Excel(name = "机构优惠", width = 15) + @ApiModelProperty(value = "机构优惠") + @Dict(dicCode = "institutional_discount" ) private java.lang.String izPreferential; /**收费频次 1按次收费 2按天收费*/ - @Excel(name = "收费频次 1按次收费 2按天收费", width = 15) - @ApiModelProperty(value = "收费频次 1按次收费 2按天收费") + @Excel(name = "收费频次", width = 15) + @ApiModelProperty(value = "收费频次") + @Dict(dicCode = "billing_frequency" ) private java.lang.String chargingFrequency; /**周期类型 1日常护理 2周期护理 3即时护理*/ - @Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15) - @ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理") + @Excel(name = "周期类型", width = 15) + @ApiModelProperty(value = "周期类型") + @Dict(dicCode = "period_type" ) private java.lang.String cycleType; /**排序*/ @Excel(name = "排序", width = 15) @@ -91,13 +96,13 @@ public class ConfigServiceDirective implements Serializable { @ApiModelProperty(value = "服务时长（分钟）") private java.lang.String serviceDuration; /**是否启用 0启用 1未启用*/ - @Excel(name = "是否启用 0启用 1未启用", width = 15) - @ApiModelProperty(value = "是否启用 0启用 1未启用") + @Excel(name = "是否启用", width = 15) + @ApiModelProperty(value = "是否启用") @Dict(dicCode = "iz_enabled") private java.lang.String izEnabled; /**是否删除 0未删除 1删除*/ - @Excel(name = "是否删除 0未删除 1删除", width = 15) - @ApiModelProperty(value = "是否删除 0未删除 1删除") + @Excel(name = "是否删除", width = 15) + @ApiModelProperty(value = "是否删除") @TableLogic private java.lang.String delFlag; /**创建人*/ @@ -127,4 +132,12 @@ public class ConfigServiceDirective implements Serializable { @Excel(name = "视频文件", width = 15) @ApiModelProperty(value = "视频文件") private java.lang.String mp4File; + + + @TableField(exist = false) + private Integer categoryRowSpan; + @TableField(exist = false) + private Integer typeRowSpan; + @TableField(exist = false) + private Integer instructionRowSpan; } diff --git a/nursing-unit-iot/nu-iot-api/nu-iot-local-api/pom.xml b/nursing-unit-iot/nu-iot-api/nu-iot-local-api/pom.xml new file mode 100644 index 0000000..f4b0297 --- /dev/null +++ b/nursing-unit-iot/nu-iot-api/nu-iot-local-api/pom.xml @@ -0,0 +1,13 @@ + + + + com.nursingunit.boot + nu-iot-api + 2.0.0 + + 4.0.0 + nu-iot-local-api + + diff --git a/nursing-unit-iot/nu-iot-api/pom.xml b/nursing-unit-iot/nu-iot-api/pom.xml new file mode 100644 index 0000000..7dcd6df --- /dev/null +++ b/nursing-unit-iot/nu-iot-api/pom.xml @@ -0,0 +1,24 @@ + + + + com.nursingunit.boot + nursing-unit-iot + 2.0.0 + + 4.0.0 + nu-iot-api + pom + + + nu-iot-local-api + + + + + com.nursingunit.boot + nursing-unit-base-core + + + diff --git a/nursing-unit-iot/nu-iot-biz/pom.xml b/nursing-unit-iot/nu-iot-biz/pom.xml new file mode 100644 index 0000000..a7d6313 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/pom.xml @@ -0,0 +1,35 @@ + + + com.nursingunit.boot + nursing-unit-iot + 2.0.0 + + 4.0.0 + nu-iot-biz + + + + com.nursingunit.boot + nu-iot-local-api + ${nursingunit.version} + + + org.hibernate + hibernate-core + + + org.jeecgframework.boot + hibernate-re + + + + + org.jeecgframework + weixin4j + + + + + diff --git a/nursing-unit-iot/pom.xml b/nursing-unit-iot/pom.xml new file mode 100644 index 0000000..383741c --- /dev/null +++ b/nursing-unit-iot/pom.xml @@ -0,0 +1,19 @@ + + + + com.nursingunit.boot + nursing-unit-parent + 2.0.0 + + 4.0.0 + nursing-unit-iot + pom + + + nu-iot-api + nu-iot-biz + + + diff --git a/nursing-unit-system/nu-system-start/pom.xml b/nursing-unit-system/nu-system-start/pom.xml index 6fec439..6b487e0 100644 --- a/nursing-unit-system/nu-system-start/pom.xml +++ b/nursing-unit-system/nu-system-start/pom.xml @@ -24,12 +24,19 @@ nursing-unit-demo ${nursingunit.version} - + com.nursingunit.boot nu-config-biz ${nursingunit.version} + + + com.nursingunit.boot + nu-iot-biz + ${nursingunit.version} + + 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 58f754a..dd4aaae 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 @@ -164,6 +164,7 @@ spring: datasource: master: url: jdbc:mysql://1.92.152.160:33061/nursing_unit_001?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai +# url: jdbc:mysql://localhost:3306/nursing_unit_001?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: root driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/pom.xml b/pom.xml index b659829..db89b09 100644 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,7 @@ nursing-unit-base-core nursing-unit-demo nursing-unit-config + nursing-unit-iot nursing-unit-system