diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java index 488cb51..8304b1e 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java @@ -103,6 +103,12 @@ public class NuBaseInfoController extends JeecgController page = new Page(pageNo, pageSize); IPage pageList = nuBaseInfoService.page(page, queryWrapper); diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java new file mode 100644 index 0000000..2d93297 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java @@ -0,0 +1,46 @@ +package com.nu.modules.orgapplyinfo.controller; + +import com.nu.modules.orgapplyinfo.entity.OrgApplyInfo; +import org.jeecg.common.api.vo.Result; +import com.nu.modules.orgapplyinfo.service.IOrgApplyInfoService; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; + +/** + * @Description: 机构加盟申请信息表 + * @Author: caolei + * @Date: 2025-07-25 + * @Version: V1.0 + */ +@Api(tags = "机构加盟申请信息表") +@RestController +@RequestMapping("/admin/orgapplyinfo/orgApplyInfo") +@Slf4j +public class OrgApplyInfoController extends JeecgController { + @Autowired + private IOrgApplyInfoService orgApplyInfoService; + + /** + * 获取各机构详细信息 + * + * @param orgCode 机构编码 + * @return + */ + @GetMapping(value = "/getOrgInfo") + public Result> getOrgInfo( + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "8") Integer pageSize, + @RequestParam(value = "orgCode", defaultValue = "", required = false) String orgCode, + @RequestParam(value = "title", defaultValue = "", required = false) String title) { + IPage page = new Page<>(pageNo, pageSize); + IPage resultPage = orgApplyInfoService.queryOrgInfo(page, orgCode, title); + return Result.OK(resultPage); + } +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java new file mode 100644 index 0000000..5692f58 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java @@ -0,0 +1,32 @@ +package com.nu.modules.orgapplyinfo.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Description: 机构信息 + * @Author: caolei + * @Date: 2025-07-25 + * @Version: V1.0 + */ +@Data +public class OrgApplyInfo implements Serializable { + private static final long serialVersionUID = 1L; + /**机构id*/ + private String orgId; + /**机构/部门名称*/ + private String departName; + /**机构编码*/ + private String orgCode; + /**加盟时间*/ + private Date franchiseTime; + /**机构负责人*/ + private String orgLeader; + /**机构负责人电话*/ + private String orgLeaderPhone; + /**机构地址*/ + private String comRegisterAddress; +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/OrgApplyInfoMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/OrgApplyInfoMapper.java new file mode 100644 index 0000000..2351fef --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/OrgApplyInfoMapper.java @@ -0,0 +1,17 @@ +package com.nu.modules.orgapplyinfo.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nu.modules.orgapplyinfo.entity.OrgApplyInfo; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 机构加盟申请信息表 + * @Author: caolei + * @Date: 2025-07-25 + * @Version: V1.0 + */ +public interface OrgApplyInfoMapper extends BaseMapper { + + IPage queryOrgInfo(@Param("page") IPage page, @Param("orgCode") String orgCode, @Param("title") String title); +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml new file mode 100644 index 0000000..a0a626f --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/IOrgApplyInfoService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/IOrgApplyInfoService.java new file mode 100644 index 0000000..48151d3 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/IOrgApplyInfoService.java @@ -0,0 +1,16 @@ +package com.nu.modules.orgapplyinfo.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nu.modules.orgapplyinfo.entity.OrgApplyInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 机构加盟申请信息表 + * @Author: caolei + * @Date: 2025-07-25 + * @Version: V1.0 + */ +public interface IOrgApplyInfoService extends IService { + + IPage queryOrgInfo(IPage page, String orgCode, String title); +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java new file mode 100644 index 0000000..ee5eb3e --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java @@ -0,0 +1,23 @@ +package com.nu.modules.orgapplyinfo.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nu.modules.orgapplyinfo.entity.OrgApplyInfo; +import com.nu.modules.orgapplyinfo.mapper.OrgApplyInfoMapper; +import com.nu.modules.orgapplyinfo.service.IOrgApplyInfoService; +import org.springframework.stereotype.Service; + +/** + * @Description: 机构加盟申请信息表 + * @Author: caolei + * @Date: 2025-07-25 + * @Version: V1.0 + */ +@Service +public class OrgApplyInfoServiceImpl extends ServiceImpl implements IOrgApplyInfoService { + + @Override + public IPage queryOrgInfo(IPage page, String orgCode, String title) { + return baseMapper.queryOrgInfo(page, orgCode, title); + } +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java index 1cc1def..8928a23 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java @@ -2,7 +2,6 @@ package com.nu.modules.tq.water.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.tq.electricity.entity.ElectricityMeter; import com.nu.modules.tq.water.entity.WaterMeter; import com.nu.modules.tq.water.service.IWaterMeterService; import io.swagger.annotations.ApiOperation; @@ -15,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.util.List; import java.util.Map; @Slf4j @@ -119,4 +119,95 @@ public class WaterMeterController extends JeecgController> sourceList(WaterMeter waterMeter, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + Page page = new Page(pageNo, pageSize); + IPage pageList = service.findSourcePage(page, waterMeter); + return Result.OK(pageList); + } + + /** + * 水表数据中机构列表查询 + * + * @param waterMeter + * @return + */ + @GetMapping(value = "/departList") + public Result> departList(WaterMeter waterMeter) { + List list = service.findDepartList(waterMeter); + return Result.OK(list); + } + + /** + * 水表数据中区域列表查询 + * + * @param waterMeter + * @return + */ + @GetMapping(value = "/nuList") + public Result> nuList(WaterMeter waterMeter) { + List list = service.findNuList(waterMeter); + return Result.OK(list); + } + + /** + * 水表数据中已同步列表查询 + * + * @param waterMeter + * @return + */ + @GetMapping(value = "/businessList") + public Result> businessList(WaterMeter waterMeter, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + Page page = new Page(pageNo, pageSize); + IPage pageList = service.findBusinessPage(page,waterMeter); + return Result.OK(pageList); + } + + /** + * 以设备维度同步水表到业务 + * + * @param list + * @return + */ + @PostMapping(value = "/syncDevices") + public Result syncDevices(@RequestBody List list) { + String result = service.syncDevices(list); + if(StringUtils.equals(result,"0")){ + return Result.OK("操作成功!"); + }else if (StringUtils.equals(result,"1")){ + return Result.error("参数为空!"); + }else if (StringUtils.equals(result,"2")){ + return Result.error("设备ID为空！"); + }else{ + return Result.error("其他错误，请联系管理员！"); + } + } + + /** + * 水表同步日志列表查询 + * + * @param waterMeter + * @return + */ + @GetMapping(value = "/syncLogList") + public Result> syncLogList(WaterMeter waterMeter, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + Page page = new Page(pageNo, pageSize); + IPage pageList = service.findSyncLogPage(page, waterMeter); + return Result.OK(pageList); + } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java index 5e9c607..ea517f5 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java @@ -9,9 +9,11 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; +import java.util.List; /** *

Class :物联电表管理Entity @@ -75,10 +77,27 @@ public class WaterMeter implements Serializable { private String departId;//机构ID private String departName;//机构名称 private String departServerUrl;//机构服务地址 + private String orgCode;//机构编码 private String oldServerUrl;//原机构服务地址 private String syncType;//是否同步 0 未同步 1已同步 private String oldDepartId;//原机构id private String oldDepartName;//原机构名称 @TableField(exist = false) private String checkType; + private String oldOrgCode;//原机构编码 + @Dict(dicCode = "nu_type") + private String areaFlag;//区域标签 + private String viewType;//选择，未选择 用于设备同步功能 + private String dataType;//数据类型 + + private String sn;//设备号 + private String deviceName;//设备名称 + private String status;//状态 + private String serverType;//服务类型 + private String oldNuId;//原护理单元ID + private String createTime;//时间 + private List seedList;//子列表 + + + } \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java index 8980fde..00e5b6f 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java @@ -20,4 +20,12 @@ public interface WaterMeterMapper extends BaseMapper { int updateWater(WaterMeter waterMeter); void updateDepartById(WaterMeter waterInfo); + + IPage findSourcePage(Page page, @Param("params") WaterMeter waterMeter); + List findDepartList(WaterMeter waterMeter); + List findNuList(WaterMeter waterMeter); + IPage findBusinessPage(Page page, @Param("params") WaterMeter waterMeter); + + IPage findSyncLogMainPage(Page page, @Param("params") WaterMeter waterMeter); + List findSyncLogSeedList(WaterMeter waterMeter); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml index a8cedc4..8e11732 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml @@ -140,5 +140,162 @@ update nu_iot_tq_water_meter set nu_id = null,nu_name = null,depart_id = null,depart_name = null,depart_server_url=null where id = #{id} + + + + + + + + + + + \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/IWaterMeterService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/IWaterMeterService.java index f938353..b2dcd73 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/IWaterMeterService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/IWaterMeterService.java @@ -25,4 +25,11 @@ public interface IWaterMeterService extends IService { void editHldy(WaterMeter waterMeter); String syncWaterList(Map waterList); + + IPage findSourcePage(Page page, WaterMeter waterMeter); + List findDepartList(WaterMeter waterMeter); + List findNuList(WaterMeter waterMeter); + IPage findBusinessPage(Page page,WaterMeter waterMeter); + String syncDevices(List list); + IPage findSyncLogPage(Page page,WaterMeter waterMeter); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java index 121393c..530ea25 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java @@ -678,4 +678,46 @@ public class WaterMeterServiceImpl extends ServiceImpl findSourcePage(Page page, WaterMeter waterMeter){ + return baseMapper.findSourcePage(page,waterMeter); + } + + @Override + public List findDepartList(WaterMeter waterMeter){ + return baseMapper.findDepartList(waterMeter); + } + + @Override + public List findNuList(WaterMeter waterMeter){ + return baseMapper.findNuList(waterMeter); + } + + @Override + public IPage findBusinessPage(Page page, WaterMeter waterMeter){ + return baseMapper.findBusinessPage(page,waterMeter); + } + + /** + * 以设备维度同步水表到业务 + * @param list + * @return + */ + @Override + public String syncDevices(List list){ + return "0"; + } + + @Override + public IPage findSyncLogPage(Page page, WaterMeter waterMeter){ + IPage mainPage = baseMapper.findSyncLogMainPage(page,waterMeter); + List records = mainPage.getRecords(); + for(int i=0;i seedList = baseMapper.findSyncLogSeedList(record); + record.setSeedList(seedList); + } + return mainPage; + } }