yangjun
/
hldy_yunwei_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备维护BUG处理

This commit is contained in:
曹磊 2025-08-21 18:10:24 +08:00
parent 8aca289d72
commit 3ad0a30bfc
5 changed files with 69 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/weihu/controller/DeviceMaintainController.java
View File

@ -10,6 +10,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@Slf4j
@ -51,4 +52,16 @@ public class DeviceMaintainController extends JeecgController<DeviceMaintain, De
return Result.OK("操作成功!");
}
@GetMapping(value = "/departlist")
public Result<List<DeviceMaintain>> queryDepartList(DeviceMaintain deviceInfo) {
List<DeviceMaintain> list = service.queryDepartList(deviceInfo);
return Result.OK(list);
}
@GetMapping(value = "/nulist")
public Result<List<DeviceMaintain>> queryNuList(DeviceMaintain deviceInfo) {
List<DeviceMaintain> list = service.queryNuList(deviceInfo);
return Result.OK(list);
}
}

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/weihu/mapper/DeviceMaintainMapper.java
View File

@ -6,6 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nu.modules.weihu.entity.DeviceMaintain;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface DeviceMaintainMapper extends BaseMapper<DeviceMaintain> {
IPage<DeviceMaintain> findPage(Page<DeviceMaintain> page, @Param("params") DeviceMaintain deviceInfo);
List<DeviceMaintain> queryDepartList(DeviceMaintain deviceInfo);
List<DeviceMaintain> queryNuList(DeviceMaintain deviceInfo);
}

41
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/weihu/mapper/xml/DeviceMaintainMapper.xml
View File

@ -30,10 +30,13 @@
<if test="params.departId != null and params.departId != ''">
AND a.depart_id = #{params.departId}
</if>
<if test="params.orgCode != null and params.orgCode != ''">
AND a.depart_server_url = #{params.orgCode}
</if>
<if test="params.maintainStatus != null and params.maintainStatus != ''">
AND a.maintain_status = #{params.maintainStatus}
</if>
<if test="params.departId != null and params.departId != ''">
<if test="params.reserveDepartId != null and params.reserveDepartId != ''">
AND a.reserve_depart_id = #{params.reserveDepartId}
</if>
</where>
@ -65,10 +68,13 @@
<if test="params.departId != null and params.departId != ''">
AND a.depart_id = #{params.departId}
</if>
<if test="params.orgCode != null and params.orgCode != ''">
AND a.depart_server_url = #{params.orgCode}
</if>
<if test="params.maintainStatus != null and params.maintainStatus != ''">
AND a.maintain_status = #{params.maintainStatus}
</if>
<if test="params.departId != null and params.departId != ''">
<if test="params.reserveDepartId != null and params.reserveDepartId != ''">
AND a.reserve_depart_id = #{params.reserveDepartId}
</if>
</where>
@ -100,10 +106,13 @@
<if test="params.departId != null and params.departId != ''">
AND a.depart_id = #{params.departId}
</if>
<if test="params.orgCode != null and params.orgCode != ''">
AND a.depart_server_url = #{params.orgCode}
</if>
<if test="params.maintainStatus != null and params.maintainStatus != ''">
AND a.maintain_status = #{params.maintainStatus}
</if>
<if test="params.departId != null and params.departId != ''">
<if test="params.reserveDepartId != null and params.reserveDepartId != ''">
AND a.reserve_depart_id = #{params.reserveDepartId}
</if>
</where>
@ -135,10 +144,13 @@
<if test="params.departId != null and params.departId != ''">
AND a.depart_id = #{params.departId}
</if>
<if test="params.orgCode != null and params.orgCode != ''">
AND a.depart_server_url = #{params.orgCode}
</if>
<if test="params.maintainStatus != null and params.maintainStatus != ''">
AND a.maintain_status = #{params.maintainStatus}
</if>
<if test="params.departId != null and params.departId != ''">
<if test="params.reserveDepartId != null and params.reserveDepartId != ''">
AND a.reserve_depart_id = #{params.reserveDepartId}
</if>
</where>
@ -149,4 +161,25 @@
</if>
</where>
</select>
<select id="queryDepartList" parameterType="com.nu.modules.weihu.entity.DeviceMaintain" resultType="com.nu.modules.weihu.entity.DeviceMaintain">
select
id as departId,
depart_name as departName,
org_code as orgCode
from sys_depart
where del_flag = '0'
</select>
<select id="queryNuList" parameterType="com.nu.modules.weihu.entity.DeviceMaintain" resultType="com.nu.modules.weihu.entity.DeviceMaintain">
select
nu_id as nuId,
nu_name as nuName
from nu_base_info
where del_flag = '0'
<if test="orgCode != null and orgCode != ''">
AND sys_org_code = #{orgCode}
</if>
</select>
</mapper>

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/weihu/service/DeviceMaintainService.java
View File

@ -5,7 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.weihu.entity.DeviceMaintain;
import java.util.List;
public interface DeviceMaintainService extends IService<DeviceMaintain> {
IPage<DeviceMaintain> findPage(Page<DeviceMaintain> page, DeviceMaintain deviceInfo);
void saveSendOrg(DeviceMaintain deviceInfo);
List<DeviceMaintain> queryDepartList(DeviceMaintain deviceInfo);
List<DeviceMaintain> queryNuList(DeviceMaintain deviceInfo);
}

11
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/weihu/service/impl/DeviceMaintainServiceImpl.java
View File

@ -116,5 +116,16 @@ public class DeviceMaintainServiceImpl extends ServiceImpl<DeviceMaintainMapper,
humidDeviceService.updateById(humidDevice);
}
}
@Override
public List<DeviceMaintain> queryDepartList(DeviceMaintain deviceInfo){
return baseMapper.queryDepartList(deviceInfo);
}
@Override
public List<DeviceMaintain> queryNuList(DeviceMaintain deviceInfo){
return baseMapper.queryNuList(deviceInfo);
}
}