Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
huangzj
2023-07-04 08:32:00 +08:00
parent 26a14a7c6b
commit 1b3013e87a
8 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/ProjectEquipmentQueryParm.java
View File

@@ -26,6 +26,9 @@ public class ProjectEquipmentQueryParm {
@ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
private Integer pageSize;
@ApiModelProperty(value="工程")
private String engineerId;
@ApiModelProperty(value="项目")
private String projectId;

23
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentTransferPO.java
View File

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import lombok.Data;
import java.util.Date;
@@ -18,7 +19,7 @@ import java.util.Date;
*/
@Data
@TableName(value = "cs_equipment_transfer")
public class CsEquipmentTransferPO {
public class CsEquipmentTransferPO extends BaseEntity {
/**
* id
*/
@@ -67,29 +68,9 @@ public class CsEquipmentTransferPO {
@TableField(value = "`status`")
private Integer status;
/**
* 创建用户
*/
@TableField(value = "create_by")
private String createBy;
/**
* 创建时间
*/
@TableField(value = "create_time")
private Date createTime;
/**
* 更新用户
*/
@TableField(value = "update_by")
private String updateBy;
/**
* 更新时间
*/
@TableField(value = "update_time")
private Date updateTime;
public static final String COL_ID = "id";

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppProjectMapper.java
View File

@@ -60,5 +60,5 @@ public interface AppProjectMapper extends BaseMapper<AppProjectPO> {
// " order by a.create_time desc",
// "</script>"}
// )
Page<AppProjectVO> getPageVo(Page<AppProjectVO> returnpage, @Param("temp")AppProjectQueryParm appProjectQueryParm, @Param("userId") String userId);
Page<AppProjectVO> getPageVo(Page<AppProjectVO> returnpage, @Param("temp")AppProjectQueryParm appProjectQueryParm);
}

8
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml
View File

@@ -25,14 +25,14 @@
<select id="getPageVo" resultType="com.njcn.csdevice.pojo.vo.AppProjectVO">
select a.*,b.pid as engineering_id,(select name from cs_ledger c where c.id=b.pid) as engineering_name from cs_project a LEFT JOIN cs_ledger b on a.id = b.id where 1=1
and a.status ="1"
<if test="userId != null and userId !=''">
and exists (select 1 from cs_engineering_user d where d.engineering_id=b.pid and d.user_id=#{userId})
</if>
<!-- <if test="userId != null and userId !=''">-->
<!-- and exists (select 1 from cs_engineering_user d where d.engineering_id=b.pid and d.user_id=#{userId})-->
<!-- </if>-->
<if test="temp!=null and temp.projectId != null and temp.projectId !=''">
AND a.id = #{temp.projectId}
</if>
<if test="temp!=null and temp.engineeringId != null and temp.engineeringId !=''">
AND b.id = #{temp.engineeringId}
AND b.pid = #{temp.engineeringId}
</if>
<if test="temp!=null and temp.endTime != null and temp.endTime !=''">
AND a.create_time &lt;= #{temp.endTime}"

3
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
View File

@@ -56,6 +56,9 @@
<if test="projectEquipmentQueryParm!=null and projectEquipmentQueryParm.projectId != null and projectEquipmentQueryParm.projectId !=''">
AND b.id = #{projectEquipmentQueryParm.projectId}
</if>
<if test="projectEquipmentQueryParm!=null and projectEquipmentQueryParm.engineerId != null and projectEquipmentQueryParm.engineerId !=''">
AND a.id = #{projectEquipmentQueryParm.engineerId}
</if>
order by a.create_time desc
</select>

11
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
View File

@@ -143,11 +143,14 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
public IPage<AppProjectVO> queryProject(AppProjectQueryParm appProjectQueryParm) {
Page<AppProjectVO> returnpage = new Page<> (appProjectQueryParm.getPageNum ( ), appProjectQueryParm.getPageSize ( ));
String userId = RequestUtil.getUserIndex();
if(Objects.equals(RequestUtil.getUsername(),"root")){
userId = null;
// String userId = RequestUtil.getUserIndex();
// if(Objects.equals(RequestUtil.getUsername(),"root")){
// userId = null;
// }
if(StringUtils.isBlank(appProjectQueryParm.getEngineeringId())){
return returnpage;
}
returnpage = appProjectMapper.getPageVo (returnpage, appProjectQueryParm, userId);
returnpage = appProjectMapper.getPageVo (returnpage, appProjectQueryParm);
List<AppProjectVO> collect = returnpage.getRecords().stream().map(temp -> {
AppTopologyDiagramQueryParm appTopologyDiagramQueryParm = new AppTopologyDiagramQueryParm();
appTopologyDiagramQueryParm.setProjectId(temp.getId());

4
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
View File

@@ -111,9 +111,7 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
public List<CsEngineeringVO> queryEngineering(CsEngineeringQueryParm csEngineeringQueryParm) {
List<CsEngineeringVO> csEngineeringVOList = new ArrayList<> ();
QueryWrapper<CsEngineeringPO> queryWrapper = new QueryWrapper<> ();
QueryWrapper<CsEngineeringUserPO> csEngineeringUserPOQueryWrapper = new QueryWrapper<> ();
/*获取用户下的工程id*/
/*获取用户工程，设备信息过滤*/
List<String> roleengineer = roleEngineerDevService.getRoleengineer();
if(CollectionUtil.isEmpty(roleengineer)){

5
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.njcn.csdevice.service.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.cloud.commons.lang.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -107,7 +108,9 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
@Override
public IPage<ProjectEquipmentVO> queryEquipmentByProject(ProjectEquipmentQueryParm projectEquipmentQueryParm) {
Page<ProjectEquipmentVO> returnpage = new Page<> (projectEquipmentQueryParm.getPageNum ( ), projectEquipmentQueryParm.getPageSize ( ));
if(StringUtils.isEmpty(projectEquipmentQueryParm.getEngineerId())||StringUtils.isEmpty(projectEquipmentQueryParm.getProjectId())){
return returnpage;
}
Page<ProjectEquipmentVO> list = this.baseMapper.queryProjectEquipmentVO(returnpage,projectEquipmentQueryParm);
return list;