设备，外设单元修改

唐耀东

2022-02-07 afb22090c509befbf68e7aaef00f06795d11337d

设备，外设单元修改

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java

@@ -61,13 +61,13 @@
    public AjaxResult externaList() {

        // 智控设备类型
        List<SysDictData> dict1 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT101"));
        List<SysDictData> dict1 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT101").orderByAsc(SysDictData::getDictSort));
        // β网络工作频段
        List<SysDictData> dict2 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT102"));
        List<SysDictData> dict2 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT102").orderByAsc(SysDictData::getDictSort));
        // 串口通信波特率
        List<SysDictData> dict3 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT103"));
        List<SysDictData> dict3 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT103").orderByAsc(SysDictData::getDictSort));
        // 采集周期
        List<SysDictData> dict7 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT107"));
        List<SysDictData> dict7 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT107").orderByAsc(SysDictData::getDictSort));
        // 外设单元
        List<DevPeripheralUnit> peripheralUnit = iDevPeripheralUnitService.list(new QueryWrapper<DevPeripheralUnit>());
        //外设厂商

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/DevPeripheralUnitController.java

@@ -72,6 +72,7 @@
     */
    @ApiOperation("获取外设单元详细信息")
    @PreAuthorize("@ss.hasPermi('oa:peripheralUnit:query')")
    @DataDictClass
    @GetMapping("/{id}")
    public AjaxResult<DevPeripheralUnitVo> getInfo(@ApiParam("主键")
                                                  @NotNull(message = "主键不能为空")

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -93,8 +93,9 @@
    @PutMapping("/updatePwd")
    public AjaxResult<Void> updatePwd(String oldPassword, String newPassword) {
        LoginUser loginUser = getLoginUser();
        SysUser sysUser = userService.selectUserById(loginUser.getUserId());
        String userName = loginUser.getUsername();
        String password = loginUser.getPassword();
        String password = sysUser.getPassword();
        if (!SecurityUtils.matchesPassword(oldPassword, password)) {
            return AjaxResult.error("修改密码失败，旧密码错误");
        }

 ruoyi-admin/src/main/resources/application-prod.yml

@@ -1,9 +1,9 @@
--- # 配置临时路径存储
spring:
  servlet:
    multipart:
#spring:
  #servlet:
    #multipart:
      # 临时文件存储位置 避免临时文件被系统清理报错
      location: /ruoyi/server/temp
      #location: /ruoyi/server/temp

--- # 监控配置
spring:

 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/DevEquipmentVo.java

@@ -45,6 +45,7 @@
    @ExcelProperty(value = "设备类型", converter = ExcelDictConvert.class)
    @ExcelDictFormat(dictType = "DICT101")
    @ApiModelProperty("设备类型")
    @Dict(dicCode = "DICT101")
    private String type;

    /**
@@ -89,6 +90,7 @@
    @ExcelProperty(value = "β工作频段", converter = ExcelDictConvert.class)
    @ExcelDictFormat(dictType = "DICT102")
    @ApiModelProperty("β工作频段")
    @Dict(dicCode = "DICT102")
    private String frequencyBand;

    /**

 ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java

@@ -158,6 +158,9 @@
        if (StringUtils.isNotBlank(bo.getHostId())) {
            po.setHostId(bo.getHostId());
        }
        if(StringUtils.isNotBlank(bo.getEdition())){
            po.setEdition(bo.getEdition());
        }
//        if (StringUtils.isEmpty(bo.getNetworkId())) {
//            po.setNetworkId(bo.getNetworkId());
//        }