diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/nubaseinfo/api/INuBaseInfoApi.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/nubaseinfo/api/INuBaseInfoApi.java index 4c027b5..f0c5687 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/nubaseinfo/api/INuBaseInfoApi.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/nubaseinfo/api/INuBaseInfoApi.java @@ -14,4 +14,8 @@ public interface INuBaseInfoApi { void sync(); IPage queryPadPageList(Page page, QueryWrapper queryWrapper); + + NuBaseInfoApiDto queryinfoByBuId(QueryWrapper queryWrapper); + + int updateBaseInfo(NuBaseInfoApiDto nuBaseInfoApiDto); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/NuBaseInfoMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/NuBaseInfoMapper.java index 447fbac..88ac77e 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/NuBaseInfoMapper.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/NuBaseInfoMapper.java @@ -24,4 +24,6 @@ public interface NuBaseInfoMapper extends BaseMapper { IPage queryPadPageList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); IPage qyList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + NuBaseInfoApiDto queryinfoByBuId(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/xml/NuBaseInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/xml/NuBaseInfoMapper.xml index 4e99d2b..c665fe9 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/xml/NuBaseInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/xml/NuBaseInfoMapper.xml @@ -20,4 +20,9 @@ left join nu_iot_tplink_camera b on a.nu_id = b.nu_id ${ew.customSqlSegment} + + diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/impl/NuBaseInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/impl/NuBaseInfoServiceImpl.java index 191b1f7..c6e27e3 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/impl/NuBaseInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/impl/NuBaseInfoServiceImpl.java @@ -121,4 +121,16 @@ public class NuBaseInfoServiceImpl extends ServiceImpl queryWrapper) { + return baseMapper.queryinfoByBuId(queryWrapper); + } + + @Override + public int updateBaseInfo(NuBaseInfoApiDto nuBaseInfoApiDto) { + NuBaseInfo baseInfo = new NuBaseInfo(); + BeanUtils.copyProperties(nuBaseInfoApiDto,baseInfo); + return baseMapper.updateById(baseInfo); + } } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/baseinfo/api/BaseInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/baseinfo/api/BaseInfoApi.java index 772c1ad..ead59d6 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/baseinfo/api/BaseInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/baseinfo/api/BaseInfoApi.java @@ -6,14 +6,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.nubaseinfo.api.INuBaseInfoApi; import com.nu.modules.nubaseinfo.entity.NuBaseInfoApiDto; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; 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.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.HashMap; @@ -40,5 +39,33 @@ public class BaseInfoApi { return Result.OK(pageList); } + @ApiOperation(value = "ipad-根据护理单元NUID查询数据", notes = "ipad-根据护理单元NUID查询数据") + @GetMapping(value = "/queryinfoByBuId") + public Result queryinfoByBuId(NuBaseInfoApiDto nuBaseInfoApiDto, HttpServletRequest req) { + if(StringUtils.isBlank(nuBaseInfoApiDto.getNuId())){ + return Result.error("请填写NUID"); + } + Map customeRuleMap = new HashMap<>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuBaseInfoApiDto, req.getParameterMap(), customeRuleMap); + NuBaseInfoApiDto dto = iNuBaseInfoApi.queryinfoByBuId( queryWrapper); + if(dto == null ){ + return Result.error("未查询到数据"); + } + return Result.OK(dto); + } + + + @AutoLog(value = "ipad-护理单元-编辑") + @ApiOperation(value = "ipad-护理单元-编辑", notes = "ipad-护理单元-编辑") + @PostMapping(value = "/updateBaseInfo") + public Result updateBaseInfo(@RequestBody NuBaseInfoApiDto nuBaseInfoApiDto) { + int dto = iNuBaseInfoApi.updateBaseInfo(nuBaseInfoApiDto); + if(dto>0){ + return Result.OK("操作成功"); + }else{ + return Result.OK("操作失败"); + } + } + }