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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
huangzj
2023-06-16 10:12:39 +08:00
parent 6eb5bf4029 ea7136e0ad
commit d44017f2d0
20 changed files with 300 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,4 +22,6 @@ public interface CsDataArrayMapper extends BaseMapper<CsDataArray> {
List<DataArrayDTO> getData(@Param("list") List<String> list);
List<CsDataArray> getDictData(@Param("id") String id);
}

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryQueryParm;
import com.njcn.csdevice.pojo.param.ProjectEquipmentQueryParm;
import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO;
import com.njcn.system.pojo.vo.EleEpdPqdVO;
import org.apache.ibatis.annotations.Param;
@@ -22,7 +23,7 @@ import org.apache.ibatis.annotations.Param;
public interface CsEquipmentDeliveryMapper extends BaseMapper<CsEquipmentDeliveryPO> {
Page<ProjectEquipmentVO> queryProjectEquipmentVO(Page<ProjectEquipmentVO> returnpage,@Param("projectEquipmentQueryParm")ProjectEquipmentQueryParm projectEquipmentQueryParm);
Page<CsEquipmentDeliveryPO> page(Page<CsEquipmentDeliveryPO> returnpage,@Param("ew") QueryWrapper<CsEquipmentDeliveryPO> queryWrapper);
Page<CsEquipmentDeliveryVO> page(Page<CsEquipmentDeliveryPO> returnpage, @Param("ew") QueryWrapper<CsEquipmentDeliveryPO> queryWrapper);
}

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

@@ -19,8 +19,6 @@
order by idx
</select>
<select id="getData" resultType="DataArrayDTO">
select
t1.id dataSetId,
@@ -41,5 +39,12 @@
order by convert (substring_index(group_concat(distinct t0.sort),',',-1),unsigned)
</select>
<select id="getDictData" resultType="CsDataArray">
select
distinct data_id,name
from
cs_data_array t0
where
pid = #{id}
</select>
</mapper>

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

@@ -60,7 +60,7 @@
</select>
<select id="page" resultType="CsEquipmentDeliveryPO">
<select id="page" resultType="CsEquipmentDeliveryVO">
select
*
from