Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes

ZengTao

2024-04-10 73033f1d691ef89f39b175ffb96f800076975d5c

 springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java

@@ -61,6 +61,39 @@
  @Autowired
  private JdbcConnections jdbcConnections;

  // 写入word
  @GetMapping("/WriteWord")
  public Result WriteWord(String address,float value)  {
    System.err.println("写入word"+address+"+"+value);
    if(address.equals("DB10.224")||address.equals("DB10.226")||address.equals("DB10.228")||address.equals("DB10.230")){
      
      S7control.getinstance().WriteWord(address, (short)value);
    }else{
      S7control.getinstance().writeFloat32(address, value);
    }
    
    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
    return Result.success(map);
  }

  // 写入bit
  @GetMapping("/WriteBit")
  public Result WriteBit(String address,short value)  {
    
    boolean values;
    if (value == 0) {
      values=false;
    }else{
      values=true;
    }
    S7control.getinstance().WriteBit(address, values);
    System.err.println("写入bit"+address+"+"+values);
    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
    return Result.success(map);
  }

  // 获取当前登录用户权限
  @GetMapping("/SelectPermissionByUserName")
  public Result SelectPermissionByUserName(String username) throws SQLException {