Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-07 3b8f9eaa550172ec455bba3a9c52809f67b2c9ee

Merge remote-tracking branch 'origin/master'

 base-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java

@@ -66,6 +66,12 @@
        return Result.success(maps);
    }

    @ApiOperation(value = "新增仪器设备：设备组下拉框")
    @GetMapping("/list_group")
    public Result<?> listGroup() {
        return Result.success(deviceService.listGroup());
    }

    @ApiOperation(value = "新增仪器设备")
    @PostMapping("/add")
    public Result<?> addDevice(@RequestBody DeviceDto deviceDto) {

 base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java

@@ -34,4 +34,7 @@
    //原材料检验-->选择设备
    List<Map<String, Object>> chooseDevice();

    //新增--选择设备组
    List<String> listGroup();

}

 base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java

@@ -71,4 +71,10 @@
     * @return
     */
    List<Map<String,Object>> chooseDevice();

    /**
     * 新增仪器设备：设备组下拉框
     * @return
     */
    List<String> listGroup();
}

 base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java

@@ -83,4 +83,10 @@
    public List<Map<String, Object>> chooseDevice() {
        return deviceMapper.chooseDevice();
    }

    //新增仪器设备：设备组下拉框
    @Override
    public List<String> listGroup() {
        return deviceMapper.listGroup();
    }
}

 base-server/src/main/resources/mapper/DeviceMapper.xml

@@ -50,12 +50,27 @@
    </select>

    <!--原材料检验-选择设备-->
    <select id="chooseDevice" resultType="java.util.Map">
        select id, name
    <resultMap id="oneMap" type="map">
        <result property="name" column="father"/>
        <collection property="children" resultMap="twoMap" javaType="List"/>
    </resultMap>
    <resultMap id="twoMap" type="map">
        <id property="id" column="id"/>
        <result property="name" column="name"/>
    </resultMap>
    <select id="chooseDevice" resultMap="oneMap">
        select id, father, name
        from mom_ocean.device
        where state = 1
          and device_status in (1, 5)
    </select>

    <!--新增选择设备组-->
    <select id="listGroup" resultType="java.lang.String">
        select distinct father
        from mom_ocean.device
        where state = 1
    </select>
    <!--批量删除-->
    <update id="delAllDevice">
        update mom_ocean.device