6 bug修改

gaoaoy

2024-03-04 c042e9a6e38d7264d053617f1a21b6ecf42f65cd

6 bug修改

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

@@ -58,5 +58,19 @@
        return Result.success(deviceService.selectEquipmentOverview());
    }

    @ApiOperation(value = "获取被授权人")
    @GetMapping("/authorizedPerson")
    @ValueAuth
    public Result authorizedPerson() {
        return Result.success(deviceService.authorizedPerson());
    }

    @ApiOperation(value = "搜索")
    @GetMapping("/search")
    @ValueAuth
    public Result search(Integer status, String deviceName, String specificationModel, String largeCategory) {
        return Result.success(deviceService.search(status, deviceName, specificationModel, largeCategory));
    }

}


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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.Device;
import org.springframework.data.repository.query.Param;

import java.util.List;

@@ -16,5 +17,10 @@
    IPage<Device> selectDeviceParameter(Page page, QueryWrapper<Device> ew);

    List<Device> selectEquipmentOverview();

    List<Device> authorizedPerson();

    List<Device> search(@Param(value = "status") Integer status, @Param(value = "deviceName") String deviceName,
                        @Param(value = "specificationModel") String specificationModel, @Param(value = "largeCategory") String largeCategory);
}


 cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java

@@ -128,6 +128,10 @@
    @ApiModelProperty(value = "校准证书")
    private String calibrationCerticate;

    @ValueTableShow(26)
    @ApiModelProperty(value = "状态")
    private Integer status;

    @ApiModelProperty(value = "创建人id")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;
@@ -141,4 +145,5 @@
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

}

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

@@ -22,5 +22,9 @@

    List<Device> selectEquipmentOverview();

    List<Device> authorizedPerson();

    List<Device> search( Integer status, String deviceName, String specificationModel, String largeCategory);

}


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

@@ -31,14 +31,14 @@
        Map<String, Object> map = new HashMap<>();
        map.put("head", PrintChina.printChina(Device.class));
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDeviceParameter");
        if(map1.get("look")==1) itemParameter.setCreateUser(map1.get("userId"));
        if (map1.get("look") == 1) itemParameter.setCreateUser(map1.get("userId"));
        map.put("body", deviceMapper.selectDeviceParameter(page, QueryWrappers.queryWrappers(itemParameter)));
        return map;
    }

    @Override
    public int addDeviceParameter(Device itemParameter) {
       return deviceMapper.insert(itemParameter);
        return deviceMapper.insert(itemParameter);
    }

    @Override
@@ -56,5 +56,15 @@
        return deviceMapper.selectEquipmentOverview();
    }

    @Override
    public List<Device> authorizedPerson() {
        return deviceMapper.authorizedPerson();
    }

    @Override
    public List<Device> search(Integer status, String deviceName, String specificationModel, String largeCategory) {
        return deviceMapper.search(status, deviceName, specificationModel, largeCategory);
    }

}


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

@@ -35,7 +35,8 @@
        create_user,
        create_time,
        update_user,
        update_time
        update_time,
        status,
        from device
        ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
@@ -49,6 +50,7 @@
        specificationModel,
        deviceStatus,
        create_user,
        status,
        update_time
        from device
        ) a
@@ -56,4 +58,29 @@
            ${ew.customSqlSegment}
        </if>
    </select>
    <select id="authorizedPerson" resultType="com.yuanchu.mom.pojo.Device">
        select *
        from (select id,
                     authorized_person,
                     status
              from device) a
    </select>
    <select id="search" resultType="com.yuanchu.mom.pojo.Device">
        select *
       from device
         <where>
             <if test="status!=null">
                 and status = #{status}
             </if>
             <if test="deviceName!=null and deviceName!=''">
                 and device_name like concat('%',#{deviceName},'%')
             </if>
             <if test="specificationModel!=null and specificationModel!= ''">
                 and specification_model = #{specificationModel}
             </if>
             <if test="largeCategory!=null and largeCategory!= ''">
                 and large_category = #{largeCategory}
             </if>
         </where>
    </select>
</mapper>